diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gnu/java/awt/peer/gtk/GdkGraphics.java | 4 |
2 files changed, 10 insertions, 0 deletions
@@ -1,5 +1,11 @@ 2005-11-02 Mark Wielaard <mark@klomp.org> + * gnu/java/awt/peer/gtk/GdkGraphics.java (initComponentGraphics): Set + color to BLACK when getForeground() returns null. + (initComponentGraphicsUnlocked): Likewise. + +2005-11-02 Mark Wielaard <mark@klomp.org> + * javax/swing/Timer.java (Waker.run): Synchronize on queueLock and use queueLock.wait(), not Thread.sleep(). (start): Synchronize on queueLock and check whether waker is null. diff --git a/gnu/java/awt/peer/gtk/GdkGraphics.java b/gnu/java/awt/peer/gtk/GdkGraphics.java index cd3769736..d80306c8a 100644 --- a/gnu/java/awt/peer/gtk/GdkGraphics.java +++ b/gnu/java/awt/peer/gtk/GdkGraphics.java @@ -129,6 +129,8 @@ public class GdkGraphics extends Graphics { initState (component); color = component.awtComponent.getForeground (); + if (color == null) + color = Color.BLACK; Dimension d = component.awtComponent.getSize (); clip = new Rectangle (0, 0, d.width, d.height); } @@ -138,6 +140,8 @@ public class GdkGraphics extends Graphics { initStateUnlocked (component); color = component.awtComponent.getForeground (); + if (color == null) + color = Color.BLACK; Dimension d = component.awtComponent.getSize (); clip = new Rectangle (0, 0, d.width, d.height); } |