[kaffe] CVS kaffe (robilad): swing fixlets

[Kaffe CVS]

PatchSet 6587 
Date: 2005/05/29 23:59:56
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
swing fixlets

Members: 
	ChangeLog:1.4113->1.4114 
	libraries/javalib/javax/swing/JRootPane.java:1.11->1.12 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4113 kaffe/ChangeLog:1.4114
--- kaffe/ChangeLog:1.4113	Sun May 29 23:56:10 2005
+++ kaffe/ChangeLog	Sun May 29 23:59:56 2005
@@ -1,5 +1,11 @@
 2005-05-30  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/javax/swing/JRootPane.java: 
+	(layoutContainer, preferredLayoutSize) Use getContentPane
+	to fix initialisation problems.
+
+2005-05-30  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/awt/GridBagLayout.java: 
 	(addLayoutComponent) Improved error message.
 
Index: kaffe/libraries/javalib/javax/swing/JRootPane.java
diff -u kaffe/libraries/javalib/javax/swing/JRootPane.java:1.11 kaffe/libraries/javalib/javax/swing/JRootPane.java:1.12
--- kaffe/libraries/javalib/javax/swing/JRootPane.java:1.11	Tue Apr 19 18:08:09 2005
+++ kaffe/libraries/javalib/javax/swing/JRootPane.java	Mon May 30 00:00:00 2005
@@ -163,7 +163,7 @@
     {
       Dimension menuBarSize;
       Dimension containerSize = c.getSize(null);
-      Dimension contentPaneSize = contentPane.getPreferredSize();
+      Dimension contentPaneSize = getContentPane().getPreferredSize();
 
       /*
        if size of top-level window wasn't set then just set
@@ -275,7 +275,7 @@
       Dimension prefSize;
 
       Dimension containerSize = c.getSize();
-      Dimension contentPaneSize = contentPane.getPreferredSize();
+      Dimension contentPaneSize = getContentPane().getPreferredSize();
 
       if (containerSize.width == 0 && containerSize.height == 0)
         {