diff options
author | Javier Jardón <jjardon@gnome.org> | 2010-01-19 16:57:13 +0100 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2010-01-19 17:01:10 +0100 |
commit | 5469695f29683664122d87d9d7d085486d6e0007 (patch) | |
tree | a667d0c697941b63a970518bf280f2a2000f8430 /demos | |
parent | e31a6d1fea3834b5d0831e6337e6ed0774189d47 (diff) | |
download | gtk+-5469695f29683664122d87d9d7d085486d6e0007.tar.gz |
Fix some compilation warnings
The warnings was introduced with the changes in commit
a491091e292cad33c7c040b6deb05acb43aaec5f
Diffstat (limited to 'demos')
-rw-r--r-- | demos/gtk-demo/toolpalette.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/demos/gtk-demo/toolpalette.c b/demos/gtk-demo/toolpalette.c index d04b7b77eb..1f779af8b4 100644 --- a/demos/gtk-demo/toolpalette.c +++ b/demos/gtk-demo/toolpalette.c @@ -151,9 +151,9 @@ palette_drop_item (GtkToolItem *drag_item, } static void -palette_drop_group (GtkToolPalette *palette, - GtkWidget *drag_group, - GtkWidget *drop_group) +palette_drop_group (GtkToolPalette *palette, + GtkToolItemGroup *drag_group, + GtkToolItemGroup *drop_group) { gint drop_position = -1; @@ -173,8 +173,9 @@ palette_drag_data_received (GtkWidget *widget, guint time, gpointer data) { - GtkWidget *drag_palette = gtk_drag_get_source_widget (context); - GtkWidget *drag_item = NULL, *drop_group = NULL; + GtkToolItemGroup *drop_group = NULL; + GtkWidget *drag_palette = gtk_drag_get_source_widget (context); + GtkWidget *drag_item = NULL; while (drag_palette && !GTK_IS_TOOL_PALETTE (drag_palette)) drag_palette = gtk_widget_get_parent (drag_palette); @@ -188,10 +189,12 @@ palette_drag_data_received (GtkWidget *widget, } if (GTK_IS_TOOL_ITEM_GROUP (drag_item)) - palette_drop_group (GTK_TOOL_PALETTE (drag_palette), drag_item, drop_group); + palette_drop_group (GTK_TOOL_PALETTE (drag_palette), + GTK_TOOL_ITEM_GROUP (drag_item), + drop_group); else if (GTK_IS_TOOL_ITEM (drag_item) && drop_group) palette_drop_item (GTK_TOOL_ITEM (drag_item), - GTK_TOOL_ITEM_GROUP (drop_group), + drop_group, x - GTK_WIDGET (drop_group)->allocation.x, y - GTK_WIDGET (drop_group)->allocation.y); } |