diff options
Diffstat (limited to 'libjava/java/awt')
| -rw-r--r-- | libjava/java/awt/Toolkit.java | 4 | ||||
| -rw-r--r-- | libjava/java/awt/Window.java | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/libjava/java/awt/Toolkit.java b/libjava/java/awt/Toolkit.java index da9bc0e..225ef5b 100644 --- a/libjava/java/awt/Toolkit.java +++ b/libjava/java/awt/Toolkit.java @@ -1,5 +1,5 @@ /* Toolkit.java -- AWT Toolkit superclass - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -96,7 +96,7 @@ public abstract class Toolkit { /** The default toolkit name. */ private static String default_toolkit_name - = "gnu.awt.gtk.GtkToolkit"; + = gnu.classpath.Configuration.default_awt_peer_toolkit; /** * The toolkit in use. Once we load it, we don't ever change it diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java index 31e6b57..dbfe92c 100644 --- a/libjava/java/awt/Window.java +++ b/libjava/java/awt/Window.java @@ -1,5 +1,5 @@ /* Window.java -- - Copyright (C) 1999, 2000, 2002 Free Software Foundation + Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation This file is part of GNU Classpath. @@ -141,11 +141,12 @@ public class Window extends Container && gc.getDevice().getType() != GraphicsDevice.TYPE_RASTER_SCREEN) throw new IllegalArgumentException ("gc must be from a screen device"); - if (gc == null) - graphicsConfiguration = GraphicsEnvironment.getLocalGraphicsEnvironment() - .getDefaultScreenDevice() - .getDefaultConfiguration(); - else + // FIXME: until we implement this, it just causes AWT to crash. +// if (gc == null) +// graphicsConfiguration = GraphicsEnvironment.getLocalGraphicsEnvironment() +// .getDefaultScreenDevice() +// .getDefaultConfiguration(); +// else graphicsConfiguration = gc; } |