[kaffe] CVS kaffe (robilad): Resynced with gnu classpath

[Kaffe CVS]

PatchSet 6465 
Date: 2005/05/14 23:12:37
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with gnu classpath

2005-05-15  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

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

        * javax/swing/plaf/basic/BasicScrollBarUI.java
        (initDefaults): Initialize thumb*Color fields correctly.

Members: 
	ChangeLog:1.3992->1.3993 
	libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.10->1.11 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3992 kaffe/ChangeLog:1.3993
--- kaffe/ChangeLog:1.3992	Sat May 14 23:07:04 2005
+++ kaffe/ChangeLog	Sat May 14 23:12:37 2005
@@ -4,6 +4,15 @@
 
 	2005-04-25  Roman Kennke  <roman at kennke.org>
 
+        * javax/swing/plaf/basic/BasicScrollBarUI.java
+        (initDefaults): Initialize thumb*Color fields correctly.
+
+2005-05-15  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
+	2005-04-25  Roman Kennke  <roman at kennke.org>
+
         * javax/swing/text/GapContent.java:
         Added API comments.
 
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.10 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.11
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.10	Fri Apr 22 23:52:41 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java	Sat May 14 23:12:45 2005
@@ -818,6 +818,11 @@
     scrollbar.setBorder(defaults.getBorder("ScrollBar.border"));
     scrollbar.setOpaque(true);
 
+    thumbColor = defaults.getColor("ScrollBar.thumb");
+    thumbDarkShadowColor = defaults.getColor("ScrollBar.thumbDarkShadow");
+    thumbHighlightColor = defaults.getColor("ScrollBar.thumbHighlight");
+    thumbLightShadowColor = defaults.getColor("ScrollBar.thumbShadow");
+
     maximumThumbSize = defaults.getDimension("ScrollBar.maximumThumbSize");
     minimumThumbSize = defaults.getDimension("ScrollBar.minimumThumbSize");
   }