diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-07-05 03:21:52 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-07-05 03:21:52 +0000 |
| commit | 159ff9c811369cb62c787569ba3658265116295d (patch) | |
| tree | 0c9a8958d7b4d0627cd85e0e6b1fe057005c6198 /gtk | |
| parent | c1a14d036d1abe6475a8b8776381dcca0fe5bbef (diff) | |
| download | gtk+-159ff9c811369cb62c787569ba3658265116295d.tar.gz | |
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)
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkdnd.c | 5 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index f97ad54d3e..cd3f14cb10 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -208,7 +208,7 @@ static void gtk_drag_proxy_begin (GtkWidget *widget, guint32 time); static void gtk_drag_dest_realized (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_leave (GtkWidget *widget, GdkDragContext *context, @@ -1438,7 +1438,8 @@ gtk_drag_dest_realized (GtkWidget *widget) } 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); diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 29bf94167c..34bfb84883 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -3253,7 +3253,7 @@ gtk_widget_set_name (GtkWidget *widget, g_object_notify (G_OBJECT (widget), "name"); } -s + /** * gtk_widget_get_name: * @widget: a #GtkWidget @@ -3574,7 +3574,7 @@ gtk_widget_reset_rc_style (GtkWidget *widget) new_style = gtk_widget_get_default_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); } /** |