diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-06-18 09:12:32 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-06-18 09:12:32 +0000 |
| commit | fe8a946e876ad50ad70535ab70380c03a4eab58b (patch) | |
| tree | 36a02fd1b3bcb54afc7b1177316a6599230e9ca9 /gtk/gtkmenu.c | |
| parent | 060948a43b05e6c62d0d1d246e012cebd1956f5d (diff) | |
| download | gtk+-fe8a946e876ad50ad70535ab70380c03a4eab58b.tar.gz | |
deprecate GtkDestroyNotify.
2008-06-18 Michael Natterer <mitch@imendio.com>
* gtk/gtktypeutils.h: deprecate GtkDestroyNotify.
* gtk/gtkactiongroup.[ch]
* gtk/gtkcombobox.[ch]
* gtk/gtkcontainer.[ch]
* gtk/gtkliststore.[ch]
* gtk/gtkmain.[ch]
* gtk/gtkmenu.c
* gtk/gtkstock.[ch]
* gtk/gtktreedatalist.[ch]
* gtk/gtktreemodelfilter.[ch]
* gtk/gtktreemodelsort.[ch]
* gtk/gtktreeprivate.h
* gtk/gtktreeselection.[ch]
* gtk/gtktreesortable.[ch]
* gtk/gtktreestore.[ch]
* gtk/gtktreeview.[ch]
* gtk/gtktreeviewcolumn.[ch]: s/GtkDestroyNotify/GDestroyNotify/g.
svn path=/trunk/; revision=20448
Diffstat (limited to 'gtk/gtkmenu.c')
| -rw-r--r-- | gtk/gtkmenu.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 75fad41251..8ea3ba866a 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -1033,8 +1033,9 @@ gtk_menu_attach_to_widget (GtkMenu *menu, { list = g_list_prepend (list, menu); } - g_object_set_data_full (G_OBJECT (attach_widget), I_(ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free); - + g_object_set_data_full (G_OBJECT (attach_widget), I_(ATTACHED_MENUS), list, + (GDestroyNotify) g_list_free); + if (GTK_WIDGET_STATE (menu) != GTK_STATE_NORMAL) gtk_widget_set_state (GTK_WIDGET (menu), GTK_STATE_NORMAL); @@ -1086,7 +1087,8 @@ gtk_menu_detach (GtkMenu *menu) list = g_object_steal_data (G_OBJECT (data->attach_widget), ATTACHED_MENUS); list = g_list_remove (list, menu); if (list) - g_object_set_data_full (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free); + g_object_set_data_full (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), list, + (GDestroyNotify) g_list_free); else g_object_set_data (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), NULL); |