? 57100.patch
? birnan
? core.14263
? groupproperty.patch
? gtktoolbar.bad-approach.c
? mb-childspace-2.patch
Index: gtkmenubar.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkmenubar.c,v
retrieving revision 1.54
diff -u -p -u -r1.54 gtkmenubar.c
--- gtkmenubar.c	16 Jan 2004 23:09:31 -0000	1.54
+++ gtkmenubar.c	21 Feb 2004 17:35:00 -0000
@@ -38,7 +38,6 @@
 
 
 #define BORDER_SPACING  0
-#define CHILD_SPACING   3
 #define DEFAULT_IPADDING 1
 
 static void gtk_menu_bar_class_init        (GtkMenuBarClass *klass);
@@ -227,13 +226,6 @@ gtk_menu_bar_size_request (GtkWidget    
               requisition->width += toggle_size;
               
 	      requisition->height = MAX (requisition->height, child_requisition.height);
-	      /* Support for the right justified help menu */
-	      if ((children == NULL) && GTK_IS_MENU_ITEM(child) &&
-		  GTK_MENU_ITEM(child)->right_justify)
-		{
-		  requisition->width += CHILD_SPACING;
-		}
-
 	      nchildren += 1;
 	    }
 	}
@@ -252,9 +244,6 @@ gtk_menu_bar_size_request (GtkWidget    
 	  requisition->width += widget->style->xthickness * 2;
 	  requisition->height += widget->style->ythickness * 2;
 	}
-
-      if (nchildren > 0)
-	requisition->width += 2 * CHILD_SPACING * (nchildren - 1);
     }
 }
 
@@ -344,7 +333,7 @@ gtk_menu_bar_size_allocate (GtkWidget   
                                                   toggle_size);
 	      gtk_widget_size_allocate (child, &child_allocation);
 
-	      ltr_x += child_allocation.width + CHILD_SPACING * 2;
+	      ltr_x += child_allocation.width;
 	    }
 	}
     }
Index: gtkrc.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkrc.c,v
retrieving revision 1.141
diff -u -p -u -r1.141 gtkrc.c
--- gtkrc.c	20 Sep 2003 23:52:16 -0000	1.141
+++ gtkrc.c	21 Feb 2004 17:35:06 -0000
@@ -673,6 +673,10 @@ _gtk_rc_init (void)
 		       "  bg[NORMAL]   = \"#bab5ab\"\n"
 		       "}\n"
 		       "\n"
+		       "style \"gtk-default-menu-bar-item-style\" {\n"
+		       "  GtkMenuItem::horizontal_padding = 5\n"
+		       "}\n"
+		       "\n"
 		       "style \"gtk-default-menu-item-style\" {\n"
 		       "  bg[PRELIGHT] = \"#4b6983\"\n"
 		       "  fg[PRELIGHT] = \"#ffffff\"\n"
@@ -689,6 +693,11 @@ _gtk_rc_init (void)
 		       "widget_class \"*.GtkCheckMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n"
 		       "widget_class \"*.GtkImageMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n"
 		       "widget_class \"*.GtkSeparatorMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n"
+		       "widget_class \"*GtkMenuBar*GtkMenuItem\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
+		       "widget_class \"*GtkMenuBar*GtkAccelMenuItem\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
+		       "widget_class \"*GtkMenuBar*GtkRadioMenuItem\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
+		       "widget_class \"*GtkMenuBar*GtkCheckMenuItem\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
+		       "widget_class \"*GtkMenuBar*GtkImageMenuItem\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
       );
 }
   
