summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2003-01-17 23:18:55 +0000
committerTom Tromey <tromey@redhat.com>2003-01-17 23:18:55 +0000
commitb31ec49ee0597304218f6d43aa7535bd689305ce (patch)
treecf2c6a6f937b74232c7adc80e3f815e07865c85c
parentbd80166b273acd2fea88060401972c6613000349 (diff)
downloadclasspath-b31ec49ee0597304218f6d43aa7535bd689305ce.tar.gz
* java/awt/Toolkit.java (default_toolkit_name): Use AWT_TOOLKIT.
* gnu/classpath/Configuration.java.in (AWT_TOOLKIT): New constant.
-rw-r--r--ChangeLog6
-rw-r--r--gnu/classpath/Configuration.java.in8
-rw-r--r--java/awt/Toolkit.java4
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 34c7c4574..6ad6f1437 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-17 Tom Tromey <tromey@redhat.com>
+
+ * java/awt/Toolkit.java (default_toolkit_name): Use AWT_TOOLKIT.
+ * gnu/classpath/Configuration.java.in (AWT_TOOLKIT): New
+ constant.
+
2003-01-17 Mark Wielaard <mark@klomp.org>
Jeroen Frijters <jeroen@sumatra.nl>
diff --git a/gnu/classpath/Configuration.java.in b/gnu/classpath/Configuration.java.in
index f5ae29f02..f6872f010 100644
--- a/gnu/classpath/Configuration.java.in
+++ b/gnu/classpath/Configuration.java.in
@@ -1,5 +1,5 @@
/* gnu.classpath.Configuration
- Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2001, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -105,4 +105,10 @@ public interface Configuration
* @see java.lang.reflect.Proxy
*/
boolean HAVE_NATIVE_GENERATE_PROXY_CLASS = false;
+
+ /**
+ * The name of the default AWT toolkit to use.
+ * @see java.awt.Toolkit
+ */
+ String AWT_TOOLKIT = "gnu.java.awt.peer.gtk.GtkToolkit";
}
diff --git a/java/awt/Toolkit.java b/java/awt/Toolkit.java
index 2f3886230..c39bc0406 100644
--- a/java/awt/Toolkit.java
+++ b/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.java.awt.peer.gtk.GtkToolkit";
+ = gnu.classpath.Configuration.AWT_TOOLKIT;
/**
* The toolkit in use. Once we load it, we don't ever change it