Fixed bug where right justified menu would overlap last left justified

Sun Apr  5 21:47:12 1998  Owen Taylor  <owt1@cornell.edu>

	* gtk/gtkmenubar.c: Fixed bug where right justified
	menu would overlap last left justified item.

ChangeLog

+Sun Apr  5 21:47:12 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkmenubar.c: Fixed bug where right justified
+	menu would overlap last left justified item.
+
 Sun Apr  5 19:30:23 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkclist.c: Fixed assignment of adjustment->value

ChangeLog.pre-2-0

+Sun Apr  5 21:47:12 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkmenubar.c: Fixed bug where right justified
+	menu would overlap last left justified item.
+
 Sun Apr  5 19:30:23 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkclist.c: Fixed assignment of adjustment->value

ChangeLog.pre-2-10

+Sun Apr  5 21:47:12 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkmenubar.c: Fixed bug where right justified
+	menu would overlap last left justified item.
+
 Sun Apr  5 19:30:23 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkclist.c: Fixed assignment of adjustment->value

ChangeLog.pre-2-2

+Sun Apr  5 21:47:12 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkmenubar.c: Fixed bug where right justified
+	menu would overlap last left justified item.
+
 Sun Apr  5 19:30:23 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkclist.c: Fixed assignment of adjustment->value

ChangeLog.pre-2-4

+Sun Apr  5 21:47:12 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkmenubar.c: Fixed bug where right justified
+	menu would overlap last left justified item.
+
 Sun Apr  5 19:30:23 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkclist.c: Fixed assignment of adjustment->value

ChangeLog.pre-2-6

+Sun Apr  5 21:47:12 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkmenubar.c: Fixed bug where right justified
+	menu would overlap last left justified item.
+
 Sun Apr  5 19:30:23 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkclist.c: Fixed assignment of adjustment->value

ChangeLog.pre-2-8

+Sun Apr  5 21:47:12 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkmenubar.c: Fixed bug where right justified
+	menu would overlap last left justified item.
+
 Sun Apr  5 19:30:23 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkclist.c: Fixed assignment of adjustment->value

gtk/gtkmenubar.c

@@ -149,6 +149,12 @@ gtk_menu_bar_size_request (GtkWidget      *widget,
 
 	      requisition->width += child->requisition.width;
 	      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;
 	    }
@@ -210,10 +216,11 @@ gtk_menu_bar_size_allocate (GtkWidget     *widget,
 
 	  /* Support for the right justified help menu */
 	  if ( (children == NULL) && (GTK_IS_MENU_ITEM(child))
-	      && (GTK_MENU_ITEM(child)->right_justify)) {
-		  child_allocation.x = allocation->width -
-			  child_allocation.width - CHILD_SPACING - offset;
-	  }
+	      && (GTK_MENU_ITEM(child)->right_justify)) 
+	    {
+	      child_allocation.x = allocation->width -
+		  child->requisition.width - CHILD_SPACING - offset;
+	    }
 	  if (GTK_WIDGET_VISIBLE (child))
 	    {
 	      child_allocation.width = child->requisition.width;