forked from AuroraMiddleware/gtk
Reinstate fixes for (#124212, Marco Pesenti Gritti):
Sun Nov 16 22:50:58 2003 Matthias Clasen <maclas@gmx.de> Reinstate fixes for (#124212, Marco Pesenti Gritti): * gtk/gtkuimanager.c (update_smart_separators): Don't spit warnings for popups. (_gtk_menu_is_empty): Return FALSE for non-menus.
This commit is contained in:
parent
ed42eb8fa6
commit
01d2e36671
@ -1,3 +1,11 @@
|
||||
Sun Nov 16 22:50:58 2003 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
Reinstate fixes for (#124212, Marco Pesenti Gritti):
|
||||
|
||||
* gtk/gtkuimanager.c (update_smart_separators): Don't spit
|
||||
warnings for popups.
|
||||
(_gtk_menu_is_empty): Return FALSE for non-menus.
|
||||
|
||||
Sun Nov 16 21:48:40 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcellview.c (gtk_cell_view_finalize): just call
|
||||
|
@ -1,3 +1,11 @@
|
||||
Sun Nov 16 22:50:58 2003 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
Reinstate fixes for (#124212, Marco Pesenti Gritti):
|
||||
|
||||
* gtk/gtkuimanager.c (update_smart_separators): Don't spit
|
||||
warnings for popups.
|
||||
(_gtk_menu_is_empty): Return FALSE for non-menus.
|
||||
|
||||
Sun Nov 16 21:48:40 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcellview.c (gtk_cell_view_finalize): just call
|
||||
|
@ -1,3 +1,11 @@
|
||||
Sun Nov 16 22:50:58 2003 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
Reinstate fixes for (#124212, Marco Pesenti Gritti):
|
||||
|
||||
* gtk/gtkuimanager.c (update_smart_separators): Don't spit
|
||||
warnings for popups.
|
||||
(_gtk_menu_is_empty): Return FALSE for non-menus.
|
||||
|
||||
Sun Nov 16 21:48:40 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcellview.c (gtk_cell_view_finalize): just call
|
||||
|
@ -1,3 +1,11 @@
|
||||
Sun Nov 16 22:50:58 2003 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
Reinstate fixes for (#124212, Marco Pesenti Gritti):
|
||||
|
||||
* gtk/gtkuimanager.c (update_smart_separators): Don't spit
|
||||
warnings for popups.
|
||||
(_gtk_menu_is_empty): Return FALSE for non-menus.
|
||||
|
||||
Sun Nov 16 21:48:40 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcellview.c (gtk_cell_view_finalize): just call
|
||||
|
@ -1,3 +1,11 @@
|
||||
Sun Nov 16 22:50:58 2003 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
Reinstate fixes for (#124212, Marco Pesenti Gritti):
|
||||
|
||||
* gtk/gtkuimanager.c (update_smart_separators): Don't spit
|
||||
warnings for popups.
|
||||
(_gtk_menu_is_empty): Return FALSE for non-menus.
|
||||
|
||||
Sun Nov 16 21:48:40 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcellview.c (gtk_cell_view_finalize): just call
|
||||
|
@ -1662,7 +1662,7 @@ _gtk_menu_is_empty (GtkWidget *menu)
|
||||
g_return_val_if_fail (menu == NULL || GTK_IS_MENU (menu), TRUE);
|
||||
|
||||
if (!menu)
|
||||
return TRUE;
|
||||
return FALSE;
|
||||
|
||||
children = gtk_container_get_children (GTK_CONTAINER (menu));
|
||||
|
||||
@ -1772,8 +1772,10 @@ update_smart_separators (GtkWidget *proxy)
|
||||
GtkWidget *item;
|
||||
|
||||
item = gtk_menu_get_attach_widget (GTK_MENU (parent));
|
||||
_gtk_action_sync_menu_visible (NULL, item, empty);
|
||||
g_object_set (G_OBJECT (filler), "visible", empty, NULL);
|
||||
if (GTK_IS_MENU_ITEM (item))
|
||||
_gtk_action_sync_menu_visible (NULL, item, empty);
|
||||
if (GTK_IS_WIDGET (filler))
|
||||
g_object_set (G_OBJECT (filler), "visible", empty, NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user