[kaffe] CVS kaffe (robilad): Resynced with GNU classpath: swing fixes

[Kaffe CVS]

PatchSet 5722 
Date: 2005/04/19 18:08:03
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU classpath: swing fixes

2005-04-19  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-04-12  Roman Kennke  <roman at kennke.org>

        * javax/swing/plaf/basic/BasicMenuUI.java
        (getMaximumSize): Now returns preferredSize because JMenu should
        never be bigger than that.
        * javax/swing/JRootPane
        (RootLayout.layoutContainer): Make JMenuBars take the whole width.

Members: 
	ChangeLog:1.3889->1.3890 
	libraries/javalib/javax/swing/JRootPane.java:1.10->1.11 
	libraries/javalib/javax/swing/plaf/basic/BasicMenuUI.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3889 kaffe/ChangeLog:1.3890
--- kaffe/ChangeLog:1.3889	Tue Apr 19 18:04:37 2005
+++ kaffe/ChangeLog	Tue Apr 19 18:08:03 2005
@@ -4,6 +4,18 @@
 
 	2005-04-12  Roman Kennke  <roman at kennke.org>
 
+        * javax/swing/plaf/basic/BasicMenuUI.java
+        (getMaximumSize): Now returns preferredSize because JMenu should
+        never be bigger than that.
+        * javax/swing/JRootPane
+        (RootLayout.layoutContainer): Make JMenuBars take the whole width.
+
+2005-04-19  Dalibor Topic  <robilad at kaffe.org>
+
+        Resynced with GNU Classpath.
+
+	2005-04-12  Roman Kennke  <roman at kennke.org>
+
         * javax/swing/plaf/basic/BasicMenuBarUI.java:
         Fixed tabs to spaces.
 
Index: kaffe/libraries/javalib/javax/swing/JRootPane.java
diff -u kaffe/libraries/javalib/javax/swing/JRootPane.java:1.10 kaffe/libraries/javalib/javax/swing/JRootPane.java:1.11
--- kaffe/libraries/javalib/javax/swing/JRootPane.java:1.10	Tue Apr 19 18:04:44 2005
+++ kaffe/libraries/javalib/javax/swing/JRootPane.java	Tue Apr 19 18:08:09 2005
@@ -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: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicMenuUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicMenuUI.java:1.4 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicMenuUI.java:1.5
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicMenuUI.java:1.4	Sun Oct 24 13:39:20 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicMenuUI.java	Tue Apr 19 18:08:11 2005
@@ -179,7 +179,7 @@
    */
   public Dimension getMaximumSize(JComponent c)
   {
-    return null;
+    return c.getPreferredSize();
   }
 
   protected String getPropertyPrefix()