Index: javax/swing/JRootPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JRootPane.java,v
retrieving revision 1.21
diff -u -r1.21 JRootPane.java
--- javax/swing/JRootPane.java	12 Apr 2005 19:48:43 -0000	1.21
+++ javax/swing/JRootPane.java	12 Apr 2005 21:10:00 -0000
@@ -218,7 +218,7 @@
               menuBarSize = menuBar.getPreferredSize();
               if (menuBarSize.height > containerSize.height)
                 menuBarSize.height = containerSize.height;
-              menuBar.setBounds(0, 0, menuBarSize.width, menuBarSize.height);
+              menuBar.setBounds(0, 0, containerSize.width, menuBarSize.height);
               int remainingHeight = containerSize.height - menuBarSize.height;
               glassPane.setBounds(0, menuBarSize.height, containerSize.width,
                                   containerSize.height - menuBarSize.height);
Index: javax/swing/plaf/basic/BasicMenuUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicMenuUI.java,v
retrieving revision 1.6
diff -u -r1.6 BasicMenuUI.java
--- javax/swing/plaf/basic/BasicMenuUI.java	22 Oct 2004 12:44:00 -0000	1.6
+++ javax/swing/plaf/basic/BasicMenuUI.java	12 Apr 2005 21:10:00 -0000
@@ -179,7 +179,7 @@
    */
   public Dimension getMaximumSize(JComponent c)
   {
-    return null;
+    return c.getPreferredSize();
   }
 
   protected String getPropertyPrefix()