prims.cc (_Jv_argv, _Jv_argc): New fields.

2000-10-02  Bryce McKinlay  <bryce@albatross.co.nz>

	* prims.cc (_Jv_argv, _Jv_argc): New fields.
	(JvRunMain): Set _Jv_argv and _Jv_argc.
	* java/awt/Component.java: Minor fixes.
	* java/awt/Image.java (UndefinedProperty): Initialize final field.
	* java/awt/Toolkit.java (systemEventQueue): Removed.
	(getDefaultToolkit): Default to "gnu.awt.gtk.GtkToolkit".
	* java/awt/Window.java (getToolkit): Don't call super.
	* java/awt/image/BufferedImage.java: Fix definate assignment errors.
	* java/awt/peer/ContainerPeer.java (insets): Remove unused method.
	* gnu/awt/gtk/GtkComponentPeer.java: New file.
	* gnu/awt/gtk/GtkContainerPeer.java: New file.
	* gnu/awt/gtk/GtkFramePeer.java: New file.
	* gnu/awt/gtk/GtkMainThread.java: New file.
	* gnu/awt/gtk/GtkToolkit.java: New file.
	* gnu/awt/gtk/GtkWindowPeer.java: New file.
	* gnu/awt/gtk/gtkcommon.cc: New file.
	* gnu/awt/gtk/gtkcommon.h: New file.
	* gnu/awt/gtk/natGtkComponentPeer.cc: New file.
	* gnu/awt/gtk/natGtkContainerPeer.cc: New file.
	* gnu/awt/gtk/natGtkFramePeer.cc: New file.
	* gnu/awt/gtk/natGtkMainThread.cc: New file.
	* gnu/awt/gtk/natGtkToolkit.cc: New file.
	* gnu/awt/gtk/natGtkWindowPeer.cc: New file.

From-SVN: r36688

6 files changed, 11 insertions, 12 deletions

diff --git a/libjava/java/awt/Component.java b/libjava/java/awt/Component.java
index e7489046755..3614b2b5a30 100644
--- a/libjava/java/awt/Component.java
+++ b/libjava/java/awt/Component.java
@@ -220,6 +220,8 @@ public abstract class Component implements ImageObserver, MenuContainer,
   public void setEnabled(boolean b)
   {
     this.enabled = b;
+    if (peer != null)
+      peer.setEnabled(b);
   }
   
   /** @deprecated */
@@ -299,8 +301,6 @@ public abstract class Component implements ImageObserver, MenuContainer,
     if (peer != null)
       peer.setForeground(c);
     this.foreground = c;
-    if (peer != null)
-      peer.setForeground(foreground);
   }
 
   /** @return the background color of the component. null may be
@@ -321,7 +321,6 @@ public abstract class Component implements ImageObserver, MenuContainer,
     if (peer != null)
       peer.setBackground(c);
     this.background = c;
-    if (peer != null) peer.setBackground(background);
   }
   
   public Font getFont()
@@ -1412,7 +1411,8 @@ public abstract class Component implements ImageObserver, MenuContainer,
        etc. */
   }
 
-  void addNotifyContainerChildren() {
+  void addNotifyContainerChildren() 
+  {
     // nothing to do unless we're a container
   }
 
diff --git a/libjava/java/awt/Image.java b/libjava/java/awt/Image.java
index 488109b73a9..d97364861e0 100644
--- a/libjava/java/awt/Image.java
+++ b/libjava/java/awt/Image.java
@@ -24,7 +24,7 @@ import java.awt.image.ImageProducer;
 
 public abstract class Image extends Object
 {
-  public static final Object UndefinedProperty;
+  public static final Object UndefinedProperty = new Object();
 
   public static final int SCALE_DEFAULT        = 1<<0,
                           SCALE_FAST           = 1<<1,
diff --git a/libjava/java/awt/Toolkit.java b/libjava/java/awt/Toolkit.java
index 9675e20975c..8e4e21873f6 100644
--- a/libjava/java/awt/Toolkit.java
+++ b/libjava/java/awt/Toolkit.java
@@ -21,7 +21,6 @@ import gnu.gcj.awt.GLightweightPeer;
 public abstract class Toolkit
 {
   static Toolkit defaultToolkit;
-  static EventQueue systemEventQueue = new EventQueue();
   PropertyChangeSupport changeSupport = new PropertyChangeSupport(this);
   Hashtable desktopProperties = new Hashtable();
 
@@ -33,7 +32,7 @@ public abstract class Toolkit
     Class toolkit_class;
     String tk_class_name = System.getProperty("awt.toolkit");
     if (tk_class_name == null)
-      tk_class_name = "gnu.awt.peer.gtk.GTKToolkit";
+      tk_class_name = "gnu.awt.gtk.GtkToolkit";
 
     try
     {
diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java
index 928c255e761..b06eff0548a 100644
--- a/libjava/java/awt/Window.java
+++ b/libjava/java/awt/Window.java
@@ -186,10 +186,11 @@ public class Window extends Container
       }
   }
 
+  /** @specnote Unlike Component.getToolkit, this implementation always 
+                returns the value of Toolkit.getDefaultToolkit(). */
   public Toolkit getToolkit()
   {
-    // FIXME: why different from Component.getToolkit() ?
-    return super.getToolkit();
+    return Toolkit.getDefaultToolkit ();    
   }
 
   public final String getWarningString()
diff --git a/libjava/java/awt/image/BufferedImage.java b/libjava/java/awt/image/BufferedImage.java
index 9eba6fcb96c..d2f332d982b 100644
--- a/libjava/java/awt/image/BufferedImage.java
+++ b/libjava/java/awt/image/BufferedImage.java
@@ -62,7 +62,7 @@ public class BufferedImage extends java.awt.Image
   
   public BufferedImage(int w, int h, int type)
   {
-    ColorModel cm;
+    ColorModel cm = null;
     
     boolean alpha = false;
     boolean premultiplied = false;
@@ -85,7 +85,7 @@ public class BufferedImage extends java.awt.Image
       case TYPE_INT_ARGB_PRE:
       case TYPE_USHORT_565_RGB:
       case TYPE_USHORT_555_RGB:
-	int[] masks;
+	int[] masks = null;
 	switch (type)
 	  {
 	  case TYPE_INT_RGB:
diff --git a/libjava/java/awt/peer/ContainerPeer.java b/libjava/java/awt/peer/ContainerPeer.java
index 8f1235cb6db..ea44e1329c9 100644
--- a/libjava/java/awt/peer/ContainerPeer.java
+++ b/libjava/java/awt/peer/ContainerPeer.java
@@ -12,7 +12,6 @@ import java.awt.Insets;
 
 public interface ContainerPeer extends ComponentPeer
 {
-  Insets insets();
   Insets getInsets();
   void beginValidate();
   void endValidate();