summaryrefslogtreecommitdiff
path: root/gnu/java
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2005-11-03 05:14:22 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2005-11-03 05:14:22 +0000
commitfcc6901097d22fcf4a9466d037f9229d9fae0923 (patch)
treec7bec5fe5ed6cb276fced2364790ec5ac31f7257 /gnu/java
parentf92dcd5a541b10477c62976b9c7daa9868a7f8e7 (diff)
downloadclasspath-fcc6901097d22fcf4a9466d037f9229d9fae0923.tar.gz
2005-11-03 Andrew John Hughes <gnu_andrew@member.fsf.org>generics-0_19-release
* Merge from HEAD-->generics to match 0.19
Diffstat (limited to 'gnu/java')
-rw-r--r--gnu/java/awt/peer/gtk/GdkGraphics.java4
1 files changed, 4 insertions, 0 deletions
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);
}