diff options
| -rw-r--r-- | gtk/gtkmenuitem.c | 50 | ||||
| -rw-r--r-- | gtk/gtkuimanager.c | 44 |
2 files changed, 47 insertions, 47 deletions
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index d420bf1c19..576a64a15c 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -43,6 +43,7 @@ #include "gtksettings.h" #include "gtktypebuiltins.h" #include "a11y/gtkmenuitemaccessible.h" +#include "deprecated/gtktearoffmenuitem.h" /** * SECTION:gtkmenuitem @@ -1156,7 +1157,50 @@ activatable_update_label (GtkMenuItem *menu_item, GtkAction *action) } } -gboolean _gtk_menu_is_empty (GtkWidget *menu); +/* + * gtk_menu_is_empty: + * @menu: (allow-none): a #GtkMenu or %NULL + * + * Determines whether @menu is empty. A menu is considered empty if it + * the only visible children are tearoff menu items or "filler" menu + * items which were inserted to mark the menu as empty. + * + * This function is used by #GtkAction. + * + * Return value: whether @menu is empty. + **/ +static gboolean +gtk_menu_is_empty (GtkWidget *menu) +{ + GList *children, *cur; + gboolean result = TRUE; + + g_return_val_if_fail (menu == NULL || GTK_IS_MENU (menu), TRUE); + + if (!menu) + return FALSE; + + children = gtk_container_get_children (GTK_CONTAINER (menu)); + + cur = children; + while (cur) + { + if (gtk_widget_get_visible (cur->data)) + { + if (!GTK_IS_TEAROFF_MENU_ITEM (cur->data) && + !g_object_get_data (cur->data, "gtk-empty-menu-item")) + { + result = FALSE; + break; + } + } + cur = cur->next; + } + g_list_free (children); + + return result; +} + static void gtk_menu_item_update (GtkActivatable *activatable, @@ -1168,7 +1212,7 @@ gtk_menu_item_update (GtkActivatable *activatable, if (strcmp (property_name, "visible") == 0) _gtk_action_sync_menu_visible (action, GTK_WIDGET (menu_item), - _gtk_menu_is_empty (gtk_menu_item_get_submenu (menu_item))); + gtk_menu_is_empty (gtk_menu_item_get_submenu (menu_item))); else if (strcmp (property_name, "sensitive") == 0) gtk_widget_set_sensitive (GTK_WIDGET (menu_item), gtk_action_is_sensitive (action)); else if (priv->use_action_appearance) @@ -1198,7 +1242,7 @@ gtk_menu_item_sync_action_properties (GtkActivatable *activatable, return; _gtk_action_sync_menu_visible (action, GTK_WIDGET (menu_item), - _gtk_menu_is_empty (gtk_menu_item_get_submenu (menu_item))); + gtk_menu_is_empty (gtk_menu_item_get_submenu (menu_item))); gtk_widget_set_sensitive (GTK_WIDGET (menu_item), gtk_action_is_sensitive (action)); diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index f67fe962d9..9d93046bcd 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -2416,50 +2416,6 @@ find_toolbar_position (GNode *node, return TRUE; } -/** - * _gtk_menu_is_empty: - * @menu: (allow-none): a #GtkMenu or %NULL - * - * Determines whether @menu is empty. A menu is considered empty if it - * the only visible children are tearoff menu items or "filler" menu - * items which were inserted to mark the menu as empty. - * - * This function is used by #GtkAction. - * - * Return value: whether @menu is empty. - **/ -gboolean -_gtk_menu_is_empty (GtkWidget *menu) -{ - GList *children, *cur; - gboolean result = TRUE; - - g_return_val_if_fail (menu == NULL || GTK_IS_MENU (menu), TRUE); - - if (!menu) - return FALSE; - - children = gtk_container_get_children (GTK_CONTAINER (menu)); - - cur = children; - while (cur) - { - if (gtk_widget_get_visible (cur->data)) - { - if (!GTK_IS_TEAROFF_MENU_ITEM (cur->data) && - !g_object_get_data (cur->data, "gtk-empty-menu-item")) - { - result = FALSE; - break; - } - } - cur = cur->next; - } - g_list_free (children); - - return result; -} - enum { SEPARATOR_MODE_SMART, SEPARATOR_MODE_VISIBLE, |