Queue a resize on the contained menuitems as well.

2005-07-04  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenubar.c (gtk_menu_bar_set_pack_direction)
	(gtk_menu_bar_set_child_pack_direction): Queue a resize
	on the contained menuitems as well.

diff --git a/ChangeLog b/ChangeLog
index d0dbef032e5ab08f915f1efab025b8124ac7e04d..aa3fd76882abff4bb468aac9e4d0cb23f1502bc7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenubar.c (gtk_menu_bar_set_pack_direction) 
+       (gtk_menu_bar_set_child_pack_direction): Queue a resize
+       on the contained menuitems as well.  
+
+       * demos/gtk-demo/appwindow.c: Break some overlong lines. 
+
 2005-07-03  Hans Breuer  <hans@breuer.org>
 
        * **/makefile.msc[.in] : updated

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d0dbef032e5ab08f915f1efab025b8124ac7e04d..aa3fd76882abff4bb468aac9e4d0cb23f1502bc7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-07-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenubar.c (gtk_menu_bar_set_pack_direction) 
+       (gtk_menu_bar_set_child_pack_direction): Queue a resize
+       on the contained menuitems as well.  
+
+       * demos/gtk-demo/appwindow.c: Break some overlong lines. 
+
 2005-07-03  Hans Breuer  <hans@breuer.org>
 
        * **/makefile.msc[.in] : updated

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d0dbef032e5ab08f915f1efab025b8124ac7e04d..aa3fd76882abff4bb468aac9e4d0cb23f1502bc7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2005-07-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenubar.c (gtk_menu_bar_set_pack_direction) 
+       (gtk_menu_bar_set_child_pack_direction): Queue a resize
+       on the contained menuitems as well.  
+
+       * demos/gtk-demo/appwindow.c: Break some overlong lines. 
+
 2005-07-03  Hans Breuer  <hans@breuer.org>
 
        * **/makefile.msc[.in] : updated

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 61b991e1d29384fc9eadb17c5fc6dd1dca472d31..c2427b553fdfa96e911c44b1a79350869c45eec4 100644 (file)
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -892,6 +892,7 @@ void gtk_menu_bar_set_pack_direction (GtkMenuBar       *menubar,
                                      GtkPackDirection  pack_dir)
 {
   GtkMenuBarPrivate *priv;
+  GList *l;
 
   g_return_if_fail (GTK_IS_MENU_BAR (menubar));
 
@@ -902,6 +903,10 @@ void gtk_menu_bar_set_pack_direction (GtkMenuBar       *menubar,
       priv->pack_direction = pack_dir;
 
       gtk_widget_queue_resize (GTK_WIDGET (menubar));
+
+      for (l = GTK_MENU_SHELL (menubar)->children; l; l = l->next)
+       gtk_widget_queue_resize (GTK_WIDGET (l->data));
+
       g_object_notify (G_OBJECT (menubar), "pack-direction");
     }
 }
@@ -943,6 +948,7 @@ void gtk_menu_bar_set_child_pack_direction (GtkMenuBar       *menubar,
                                            GtkPackDirection  child_pack_dir)
 {
   GtkMenuBarPrivate *priv;
+  GList *l;
 
   g_return_if_fail (GTK_IS_MENU_BAR (menubar));
 
@@ -953,6 +959,10 @@ void gtk_menu_bar_set_child_pack_direction (GtkMenuBar       *menubar,
       priv->child_pack_direction = child_pack_dir;
 
       gtk_widget_queue_resize (GTK_WIDGET (menubar));
+
+      for (l = GTK_MENU_SHELL (menubar)->children; l; l = l->next)
+       gtk_widget_queue_resize (GTK_WIDGET (l->data));
+
       g_object_notify (G_OBJECT (menubar), "child-pack-direction");
     }
 }