[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: awt fix
Kaffe CVS
cvs-commits at kaffe.org
Sat Jun 11 13:59:17 PDT 2005
PatchSet 6628
Date: 2005/06/11 20:53:08
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: awt fix
Members:
ChangeLog:1.4154->1.4155
libraries/javalib/java/awt/Component.java:1.52->1.53
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4154 kaffe/ChangeLog:1.4155
--- kaffe/ChangeLog:1.4154 Sat Jun 11 20:50:23 2005
+++ kaffe/ChangeLog Sat Jun 11 20:53:08 2005
@@ -1,6 +1,15 @@
2005-06-11 Dalibor Topic <robilad at kaffe.org>
Resynced with GNU Classpath.
+
+ 2005-06-02 Sven de Marothy <sven at physto.se>
+
+ * java/awt/Component.java
+ (setBackgroundColor): Return if the color equals the existing bgcolor.
+
+2005-06-11 Dalibor Topic <robilad at kaffe.org>
+
+ Resynced with GNU Classpath.
2005-06-02 Sven de Marothy <sven at physto.se>
Index: kaffe/libraries/javalib/java/awt/Component.java
diff -u kaffe/libraries/javalib/java/awt/Component.java:1.52 kaffe/libraries/javalib/java/awt/Component.java:1.53
--- kaffe/libraries/javalib/java/awt/Component.java:1.52 Sat May 21 15:13:38 2005
+++ kaffe/libraries/javalib/java/awt/Component.java Sat Jun 11 20:53:10 2005
@@ -1003,6 +1003,10 @@
*/
public void setBackground(Color c)
{
+ // return if the background is already set to that color.
+ if (background != null && c != null)
+ if (background.equals(c))
+ return;
// If c is null, inherit from closest ancestor whose bg is set.
if (c == null && parent != null)
c = parent.getBackground();
More information about the kaffe
mailing list