Make compile.

Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
	Make compile.

	* gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
	with calling gtk_widget_set_style_internal() with
	the old style, not the new style. (#56989)
This commit is contained in:
Owen Taylor 2001-07-05 03:21:52 +00:00 committed by Owen Taylor
parent c1a14d036d
commit 159ff9c811
9 changed files with 68 additions and 4 deletions

View File

@ -1,3 +1,12 @@
Wed Jul 4 23:17:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
Make compile.
* gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
with calling gtk_widget_set_style_internal() with
the old style, not the new style. (#56989)
Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com> Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

View File

@ -1,3 +1,12 @@
Wed Jul 4 23:17:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
Make compile.
* gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
with calling gtk_widget_set_style_internal() with
the old style, not the new style. (#56989)
Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com> Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

View File

@ -1,3 +1,12 @@
Wed Jul 4 23:17:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
Make compile.
* gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
with calling gtk_widget_set_style_internal() with
the old style, not the new style. (#56989)
Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com> Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

View File

@ -1,3 +1,12 @@
Wed Jul 4 23:17:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
Make compile.
* gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
with calling gtk_widget_set_style_internal() with
the old style, not the new style. (#56989)
Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com> Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

View File

@ -1,3 +1,12 @@
Wed Jul 4 23:17:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
Make compile.
* gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
with calling gtk_widget_set_style_internal() with
the old style, not the new style. (#56989)
Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com> Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

View File

@ -1,3 +1,12 @@
Wed Jul 4 23:17:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
Make compile.
* gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
with calling gtk_widget_set_style_internal() with
the old style, not the new style. (#56989)
Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com> Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

View File

@ -1,3 +1,12 @@
Wed Jul 4 23:17:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
Make compile.
* gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
with calling gtk_widget_set_style_internal() with
the old style, not the new style. (#56989)
Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com> Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

View File

@ -208,7 +208,7 @@ static void gtk_drag_proxy_begin (GtkWidget *widget,
guint32 time); guint32 time);
static void gtk_drag_dest_realized (GtkWidget *widget); static void gtk_drag_dest_realized (GtkWidget *widget);
static void gtk_drag_dest_hierarchy_changed (GtkWidget *widget, static void gtk_drag_dest_hierarchy_changed (GtkWidget *widget,
GtkWidget *old_toplevel); GtkWidget *previous_toplevel);
static void gtk_drag_dest_site_destroy (gpointer data); static void gtk_drag_dest_site_destroy (gpointer data);
static void gtk_drag_dest_leave (GtkWidget *widget, static void gtk_drag_dest_leave (GtkWidget *widget,
GdkDragContext *context, GdkDragContext *context,
@ -1438,7 +1438,8 @@ gtk_drag_dest_realized (GtkWidget *widget)
} }
static void static void
gtk_drag_dest_hierarchy_changed (GtkWidget *widget) gtk_drag_dest_hierarchy_changed (GtkWidget *widget,
GtkWidget *previous_toplevel)
{ {
GtkWidget *toplevel = gtk_widget_get_toplevel (widget); GtkWidget *toplevel = gtk_widget_get_toplevel (widget);

View File

@ -3253,7 +3253,7 @@ gtk_widget_set_name (GtkWidget *widget,
g_object_notify (G_OBJECT (widget), "name"); g_object_notify (G_OBJECT (widget), "name");
} }
s
/** /**
* gtk_widget_get_name: * gtk_widget_get_name:
* @widget: a #GtkWidget * @widget: a #GtkWidget
@ -3574,7 +3574,7 @@ gtk_widget_reset_rc_style (GtkWidget *widget)
new_style = gtk_widget_get_default_style (); new_style = gtk_widget_get_default_style ();
if (initial_emission || new_style != widget->style) if (initial_emission || new_style != widget->style)
gtk_widget_set_style_internal (widget, widget->style, TRUE); gtk_widget_set_style_internal (widget, new_style, TRUE);
} }
/** /**