From 3b79c66136e1c4bef99ce627cd34ba7c986f6ae3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 22 Apr 2004 18:04:05 +0000 Subject: [PATCH] Make sure the separators used to demarkate placeholder ends don't show up 2004-04-22 Matthias Clasen * gtk/gtkuimanager.c (update_node): Make sure the separators used to demarkate placeholder ends don't show up on show_all(). (#140496, Murray Cumming) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkuimanager.c | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/ChangeLog b/ChangeLog index b0aebb9ca..6cf12eef5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-04-22 Matthias Clasen + * gtk/gtkuimanager.c (update_node): Make sure the separators + used to demarkate placeholder ends don't show up on + show_all(). (#140496, Murray Cumming) + * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons work with negative increments. (#137975, Tim Gerla) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b0aebb9ca..6cf12eef5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2004-04-22 Matthias Clasen + * gtk/gtkuimanager.c (update_node): Make sure the separators + used to demarkate placeholder ends don't show up on + show_all(). (#140496, Murray Cumming) + * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons work with negative increments. (#137975, Tim Gerla) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b0aebb9ca..6cf12eef5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,9 @@ 2004-04-22 Matthias Clasen + * gtk/gtkuimanager.c (update_node): Make sure the separators + used to demarkate placeholder ends don't show up on + show_all(). (#140496, Murray Cumming) + * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons work with negative increments. (#137975, Tim Gerla) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b0aebb9ca..6cf12eef5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 2004-04-22 Matthias Clasen + * gtk/gtkuimanager.c (update_node): Make sure the separators + used to demarkate placeholder ends don't show up on + show_all(). (#140496, Murray Cumming) + * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons work with negative increments. (#137975, Tim Gerla) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b0aebb9ca..6cf12eef5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2004-04-22 Matthias Clasen + * gtk/gtkuimanager.c (update_node): Make sure the separators + used to demarkate placeholder ends don't show up on + show_all(). (#140496, Murray Cumming) + * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons work with negative increments. (#137975, Tim Gerla) diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 93ab1a067..d7b6c6f6c 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -2226,6 +2226,7 @@ update_node (GtkUIManager *self, g_object_set_data (G_OBJECT (info->proxy), "gtk-separator-mode", GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN)); + gtk_widget_set_no_show_all (info->proxy, TRUE); gtk_menu_shell_insert (GTK_MENU_SHELL (menushell), NODE_INFO (node)->proxy, pos); @@ -2233,6 +2234,7 @@ update_node (GtkUIManager *self, g_object_set_data (G_OBJECT (info->extra), "gtk-separator-mode", GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN)); + gtk_widget_set_no_show_all (info->extra, TRUE); gtk_menu_shell_insert (GTK_MENU_SHELL (menushell), NODE_INFO (node)->extra, pos+1); } @@ -2271,6 +2273,7 @@ update_node (GtkUIManager *self, g_object_set_data (G_OBJECT (info->proxy), "gtk-separator-mode", GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN)); + gtk_widget_set_no_show_all (info->proxy, TRUE); item = gtk_separator_tool_item_new (); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, pos+1); @@ -2278,6 +2281,7 @@ update_node (GtkUIManager *self, g_object_set_data (G_OBJECT (info->extra), "gtk-separator-mode", GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN)); + gtk_widget_set_no_show_all (info->extra, TRUE); } } break; -- 2.43.2