2005-08-18 Thomas Fitzsimmons <fitzsim@redhat.com>

	* gnu/java/awt/peer/GLightweightPeer.java,
	gnu/java/awt/peer/gtk/GtkComponentPeer.java,
	gnu/java/awt/peer/gtk/GtkContainerPeer.java,
	gnu/java/awt/peer/gtk/GtkFramePeer.java,
	gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
	gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
	gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
	gnu/java/awt/peer/gtk/GtkToolkit.java,
	gnu/java/awt/peer/gtk/GtkWindowPeer.java,
	gnu/java/awt/peer/qt/QtComponentPeer.java,
	gnu/java/awt/peer/qt/QtContainerPeer.java,
	gnu/java/awt/peer/qt/QtFramePeer.java,
	gnu/java/awt/peer/qt/QtMenuComponentPeer.java,
	gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java,
	gnu/java/awt/peer/qt/QtTextAreaPeer.java,
	gnu/java/awt/peer/qt/QtTextFieldPeer.java,
	gnu/java/awt/peer/qt/QtWindowPeer.java,
	java/awt/peer/ComponentPeer.java,
	java/awt/peer/ContainerPeer.java, java/awt/peer/FramePeer.java,
	java/awt/peer/MenuComponentPeer.java,
	java/awt/peer/TextComponentPeer.java,
	java/awt/peer/WindowPeer.java: Add new 1.5 methods.
	* java/awt/Window.java (Window()): Initialize
	graphicsConfiguration.
	* java/awt/GraphicsConfiguration.java
	(createCompatibleVolatileImage(int,int,int)): New method.
	* java/awt/Font.java (Font(String,Map)): Add FIXME.
	* gnu/java/awt/peer/gtk/GtkToolkit.java
	(getLocalGraphicsEnvironment): Call new constructor.
	* gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java (getToolkit):
	Remove method.
	* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
	(GdkGraphicsEnvironment(GtkToolkit)): Remove method.
	(GdkGraphicsEnvironment()): New constructor.
	(getToolkit): Remove method.
	* gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java
	(getToolkit): Remove method.
	(createCompatibleVolatileImage): New method.
	* gnu/java/awt/ClasspathToolkit.java (getFont): Add FIXME.

21 files changed, 250 insertions, 23 deletions

diff --git a/gnu/java/awt/ClasspathToolkit.java b/gnu/java/awt/ClasspathToolkit.java
index 9c2284dfe..09f405938 100644
--- a/gnu/java/awt/ClasspathToolkit.java
+++ b/gnu/java/awt/ClasspathToolkit.java
@@ -129,6 +129,7 @@ public abstract class ClasspathToolkit
    */
   public Font getFont (String name, Map attrs) 
   {
+    // FIXME: use reflection to get at this non-standard constructor.
     return new Font (name, attrs);
   }
 
diff --git a/gnu/java/awt/peer/GLightweightPeer.java b/gnu/java/awt/peer/GLightweightPeer.java
index 3bcaebcea..5252e80f1 100644
--- a/gnu/java/awt/peer/GLightweightPeer.java
+++ b/gnu/java/awt/peer/GLightweightPeer.java
@@ -52,6 +52,7 @@ import java.awt.GraphicsConfiguration;
 import java.awt.Image;
 import java.awt.Insets;
 import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.Toolkit;
 import java.awt.event.PaintEvent;
 import java.awt.image.ColorModel;
@@ -295,4 +296,44 @@ public class GLightweightPeer
   public void flip(BufferCapabilities.FlipContents contents) { }
 
   public void destroyBuffers() { }
+
+  public boolean isRestackSupported()
+  {
+    return false;
+  }
+
+  public void cancelPendingPaint(int x, int y, int width, int height)
+  {
+    
+  }
+
+  public void restack()
+  {
+    
+  }
+
+  public Rectangle getBounds()
+  {
+    return null;
+  }
+
+  public void reparent(ContainerPeer parent)
+  {
+    
+  }
+
+  public void setBounds(int x, int y, int z, int width, int height)
+  {
+    
+  }
+
+  public boolean isReparentSupported()
+  {
+    return false;
+  }
+
+  public void layout()
+  {
+    
+  }
 }
diff --git a/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java b/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java
index bfad87aca..6cf7310a5 100644
--- a/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java
+++ b/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java
@@ -42,6 +42,7 @@ import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.ImageCapabilities;
 import java.awt.Rectangle;
+import java.awt.Toolkit;
 
 import java.awt.geom.AffineTransform;
 
@@ -56,16 +57,11 @@ public class GdkGraphicsConfiguration
   ColorModel cm;
   Rectangle bounds;
 
-  public GtkToolkit getToolkit()
-  {
-    return gdkScreenGraphicsDevice.getToolkit();
-  }
-
   public GdkGraphicsConfiguration(GdkScreenGraphicsDevice dev)
   {
     this.gdkScreenGraphicsDevice = dev;
     cm = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).getColorModel();
-    bounds = getToolkit().getBounds();
+    bounds = ((GtkToolkit) Toolkit.getDefaultToolkit()).getBounds();
   }
 
   public GraphicsDevice getDevice()
@@ -135,4 +131,10 @@ public class GdkGraphicsConfiguration
     return new ImageCapabilities(false);
   }
 
+  public VolatileImage createCompatibleVolatileImage(int width, int height, int transparency)
+  {
+      // FIXME: implement
+    return null;
+  }
+
 }
diff --git a/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java b/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
index 4f9d1c27a..4b0b5d308 100644
--- a/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
+++ b/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
@@ -43,22 +43,14 @@ import java.awt.Graphics2D;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.HeadlessException;
+import java.awt.Toolkit;
 import java.awt.image.BufferedImage;
 import java.util.Locale;
 
 public class GdkGraphicsEnvironment extends GraphicsEnvironment
 {
-  GtkToolkit gtkToolkit;
-
-  public GtkToolkit getToolkit()
-  {
-    return gtkToolkit;
-  }
-
-  public GdkGraphicsEnvironment (GtkToolkit tk)
+  public GdkGraphicsEnvironment ()
   {
-    super();
-    gtkToolkit = tk;
   }
 
   public GraphicsDevice[] getScreenDevices ()
diff --git a/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java b/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java
index 2bf9d23db..b5d1237a4 100644
--- a/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java
+++ b/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java
@@ -42,16 +42,12 @@ import java.awt.Dimension;
 import java.awt.DisplayMode;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
+import java.awt.Toolkit;
 
 public class GdkScreenGraphicsDevice extends GraphicsDevice
 {
   GdkGraphicsEnvironment env;
 
-  public GtkToolkit getToolkit()
-  {
-    return env.getToolkit();
-  }
-
   public GdkScreenGraphicsDevice (GdkGraphicsEnvironment e)
   {    
     super ();
@@ -94,7 +90,7 @@ public class GdkScreenGraphicsDevice extends GraphicsDevice
   public DisplayMode getDisplayMode()
   {
     // determine display mode
-    Dimension dim = getToolkit().getScreenSize();
+    Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
     DisplayMode mode = new DisplayMode(dim.width, dim.height, 0,
 				       DisplayMode.REFRESH_RATE_UNKNOWN);
     return mode;
diff --git a/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
index e272bfafc..2633a7e9f 100644
--- a/gnu/java/awt/peer/gtk/GtkComponentPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
@@ -70,6 +70,7 @@ import java.awt.image.ImageObserver;
 import java.awt.image.ImageProducer;
 import java.awt.image.VolatileImage;
 import java.awt.peer.ComponentPeer;
+import java.awt.peer.ContainerPeer;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -683,4 +684,31 @@ public class GtkComponentPeer extends GtkGenericPeer
   {
     return "peer of " + awtComponent.toString();
   }
+  public Rectangle getBounds()
+  {
+      // FIXME: implement
+    return null;
+  }
+  public void reparent(ContainerPeer parent)
+  {
+    // FIXME: implement
+  
+  }
+  public void setBounds(int x, int y, int width, int height, int z)
+  {
+    // FIXME: implement
+      setBounds (x, y, width, height);
+   
+  }
+  public boolean isReparentSupported()
+  {
+    // FIXME: implement
+
+    return false;
+  }
+  public void layout()
+  {
+    // FIXME: implement
+ 
+  }
 }
diff --git a/gnu/java/awt/peer/gtk/GtkContainerPeer.java b/gnu/java/awt/peer/gtk/GtkContainerPeer.java
index 466aaeae9..b035a9814 100644
--- a/gnu/java/awt/peer/gtk/GtkContainerPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkContainerPeer.java
@@ -149,4 +149,21 @@ public class GtkContainerPeer extends GtkComponentPeer
           comp.getPeer().setBackground(c);
       }
   }
+
+  public boolean isRestackSupported()
+  {
+      // FIXME: implement
+    return false;
+  }
+
+  public void cancelPendingPaint(int x, int y, int width, int height)
+  {
+    // FIXME: implement
+  }
+
+  public void restack()
+  {
+      //FIXME: implement
+    
+  }
 }
diff --git a/gnu/java/awt/peer/gtk/GtkFramePeer.java b/gnu/java/awt/peer/gtk/GtkFramePeer.java
index c7f197405..76220a756 100644
--- a/gnu/java/awt/peer/gtk/GtkFramePeer.java
+++ b/gnu/java/awt/peer/gtk/GtkFramePeer.java
@@ -264,6 +264,21 @@ public class GtkFramePeer extends GtkWindowPeer
   {
 
   }
+  public void setBoundsPrivate(int x, int y, int width, int height)
+  {
+    // TODO Auto-generated method stub
+    
+  }
+  public void updateAlwaysOnTop()
+  {
+    // TODO Auto-generated method stub
+    
+  }
+  public boolean requestWindowFocus()
+  {
+    // TODO Auto-generated method stub
+    return false;
+  }
 }
 
 
diff --git a/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java b/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
index 8d9d1ca04..4c6335933 100644
--- a/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package gnu.java.awt.peer.gtk;
 
+import java.awt.Font;
 import java.awt.peer.MenuComponentPeer;
 
 public class GtkMenuComponentPeer extends GtkGenericPeer
@@ -60,4 +61,9 @@ public class GtkMenuComponentPeer extends GtkGenericPeer
   }
 
   public native void dispose();
+
+  public void setFont(Font font)
+  {
+  // FIXME: implement  
+  }
 }
diff --git a/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java b/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java
index a842b8318..e6896c913 100644
--- a/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java
@@ -43,6 +43,7 @@ import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Rectangle;
 import java.awt.TextArea;
+import java.awt.im.InputMethodRequests;
 import java.awt.peer.TextAreaPeer;
 import java.awt.peer.TextComponentPeer;
 
@@ -209,4 +210,10 @@ public class GtkTextAreaPeer extends GtkComponentPeer
   {
     insert (str, pos);
   }
+
+  public InputMethodRequests getInputMethodRequests()
+  {
+      // FIXME: implement
+    return null;
+  }
 }
diff --git a/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java b/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java
index 73a976bba..4afdae82e 100644
--- a/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java
@@ -45,6 +45,7 @@ import java.awt.FontMetrics;
 import java.awt.Rectangle;
 import java.awt.TextField;
 import java.awt.event.KeyEvent;
+import java.awt.im.InputMethodRequests;
 import java.awt.peer.TextFieldPeer;
 import java.awt.peer.TextComponentPeer;
 
@@ -193,4 +194,9 @@ public class GtkTextFieldPeer extends GtkComponentPeer
 
     super.handleEvent (e);
   }
+  public InputMethodRequests getInputMethodRequests()
+  {
+      // FIXME: implement
+    return null;
+  }
 }
diff --git a/gnu/java/awt/peer/gtk/GtkToolkit.java b/gnu/java/awt/peer/gtk/GtkToolkit.java
index 70957b9df..65e38f0fa 100644
--- a/gnu/java/awt/peer/gtk/GtkToolkit.java
+++ b/gnu/java/awt/peer/gtk/GtkToolkit.java
@@ -643,7 +643,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit
 
   public GraphicsEnvironment getLocalGraphicsEnvironment()
   {
-    return new GdkGraphicsEnvironment(this);
+    return new GdkGraphicsEnvironment();
   }
 
   public Font createFont(int format, InputStream stream)
diff --git a/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/gnu/java/awt/peer/gtk/GtkWindowPeer.java
index 518c52662..9fe46fa4c 100644
--- a/gnu/java/awt/peer/gtk/GtkWindowPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkWindowPeer.java
@@ -239,4 +239,14 @@ public class GtkWindowPeer extends GtkContainerPeer
     else
       q().postEvent (new WindowEvent ((Window) awtComponent, id, opposite));
   }
+  public void updateAlwaysOnTop()
+  {
+    // TODO Auto-generated method stub
+    
+  }
+  public boolean requestWindowFocus()
+  {
+    // TODO Auto-generated method stub
+    return false;
+  }
 }
diff --git a/gnu/java/awt/peer/qt/QtComponentPeer.java b/gnu/java/awt/peer/qt/QtComponentPeer.java
index 48c44b96d..3829cbf44 100644
--- a/gnu/java/awt/peer/qt/QtComponentPeer.java
+++ b/gnu/java/awt/peer/qt/QtComponentPeer.java
@@ -58,6 +58,7 @@ import java.awt.Rectangle;
 import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.peer.ComponentPeer;
+import java.awt.peer.ContainerPeer;
 import java.awt.image.ColorModel;
 import java.awt.image.VolatileImage;
 import java.awt.image.ImageObserver;
@@ -712,4 +713,34 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer
     }
   }
 
+  public Rectangle getBounds()
+  {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+  public void reparent(ContainerPeer parent)
+  {
+    // TODO Auto-generated method stub
+    
+  }
+
+  public void setBounds(int x, int y, int width, int height, int z)
+  {
+    // TODO Auto-generated method stub
+    
+  }
+
+  public boolean isReparentSupported()
+  {
+    // TODO Auto-generated method stub
+    return false;
+  }
+
+  public void layout()
+  {
+    // TODO Auto-generated method stub
+    
+  }
+
 }
diff --git a/gnu/java/awt/peer/qt/QtContainerPeer.java b/gnu/java/awt/peer/qt/QtContainerPeer.java
index c906d7a1e..3782d7815 100644
--- a/gnu/java/awt/peer/qt/QtContainerPeer.java
+++ b/gnu/java/awt/peer/qt/QtContainerPeer.java
@@ -92,6 +92,24 @@ public class QtContainerPeer extends QtComponentPeer implements ContainerPeer
     // FIXME etc.
     return false;
   }
+
+  public boolean isRestackSupported()
+  {
+    // TODO Auto-generated method stub
+    return false;
+  }
+
+  public void cancelPendingPaint(int x, int y, int width, int height)
+  {
+    // TODO Auto-generated method stub
+    
+  }
+
+  public void restack()
+  {
+    // TODO Auto-generated method stub
+    
+  }
 }
 
 
diff --git a/gnu/java/awt/peer/qt/QtFramePeer.java b/gnu/java/awt/peer/qt/QtFramePeer.java
index 6faede334..d7c83c528 100644
--- a/gnu/java/awt/peer/qt/QtFramePeer.java
+++ b/gnu/java/awt/peer/qt/QtFramePeer.java
@@ -142,4 +142,22 @@ public class QtFramePeer extends QtWindowPeer implements FramePeer
     // FIXME
   }
 
+  public void setBoundsPrivate(int x, int y, int width, int height)
+  {
+    // TODO Auto-generated method stub
+    
+  }
+
+  public void updateAlwaysOnTop()
+  {
+    // TODO Auto-generated method stub
+    
+  }
+
+  public boolean requestWindowFocus()
+  {
+    // TODO Auto-generated method stub
+    return false;
+  }
+
 }
diff --git a/gnu/java/awt/peer/qt/QtMenuComponentPeer.java b/gnu/java/awt/peer/qt/QtMenuComponentPeer.java
index b6344fe42..cc1408d3d 100644
--- a/gnu/java/awt/peer/qt/QtMenuComponentPeer.java
+++ b/gnu/java/awt/peer/qt/QtMenuComponentPeer.java
@@ -37,6 +37,7 @@ exception statement from your version. */
 
 package gnu.java.awt.peer.qt;
 
+import java.awt.Font;
 import java.awt.MenuComponent;
 import java.awt.peer.MenuComponentPeer;
 
@@ -74,4 +75,10 @@ public class QtMenuComponentPeer extends NativeWrapper
 
   public native void dispose();
 
+  public void setFont(Font font)
+  {
+    // TODO Auto-generated method stub
+    
+  }
+
 }
diff --git a/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java b/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java
index a9241ee09..850bee444 100644
--- a/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java
+++ b/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java
@@ -138,4 +138,10 @@ public class QtScreenDeviceConfiguration extends GraphicsConfiguration {
     nTrans.scale( 72.0 / dpiX, 72.0 / dpiY );
     return nTrans;
   }
+
+  public VolatileImage createCompatibleVolatileImage(int width, int height, int transparency)
+  {
+    // TODO Auto-generated method stub
+    return null;
+  }
 }
diff --git a/gnu/java/awt/peer/qt/QtTextAreaPeer.java b/gnu/java/awt/peer/qt/QtTextAreaPeer.java
index 833ee5e9a..4a96ac51c 100644
--- a/gnu/java/awt/peer/qt/QtTextAreaPeer.java
+++ b/gnu/java/awt/peer/qt/QtTextAreaPeer.java
@@ -41,6 +41,7 @@ import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.awt.TextArea;
 import java.awt.event.TextEvent;
+import java.awt.im.InputMethodRequests;
 import java.awt.peer.TextAreaPeer;
 
 public class QtTextAreaPeer extends QtComponentPeer implements TextAreaPeer
@@ -169,5 +170,11 @@ public class QtTextAreaPeer extends QtComponentPeer implements TextAreaPeer
   public native void setEditable(boolean editable);
 
   public native void setCaretPosition(int pos);
+
+  public InputMethodRequests getInputMethodRequests()
+  {
+    // TODO Auto-generated method stub
+    return null;
+  }
 }
 
diff --git a/gnu/java/awt/peer/qt/QtTextFieldPeer.java b/gnu/java/awt/peer/qt/QtTextFieldPeer.java
index 498ad22be..f6c61c735 100644
--- a/gnu/java/awt/peer/qt/QtTextFieldPeer.java
+++ b/gnu/java/awt/peer/qt/QtTextFieldPeer.java
@@ -41,6 +41,7 @@ import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.awt.TextField;
 import java.awt.event.TextEvent;
+import java.awt.im.InputMethodRequests;
 import java.awt.peer.TextFieldPeer;
 
 public class QtTextFieldPeer extends QtComponentPeer implements TextFieldPeer
@@ -149,5 +150,11 @@ public class QtTextFieldPeer extends QtComponentPeer implements TextFieldPeer
   public native void setEditable(boolean editable);
 
   public native void setText(String l);
+
+  public InputMethodRequests getInputMethodRequests()
+  {
+    // TODO Auto-generated method stub
+    return null;
+  }
 }
 
diff --git a/gnu/java/awt/peer/qt/QtWindowPeer.java b/gnu/java/awt/peer/qt/QtWindowPeer.java
index 1706137d4..7baf8e6eb 100644
--- a/gnu/java/awt/peer/qt/QtWindowPeer.java
+++ b/gnu/java/awt/peer/qt/QtWindowPeer.java
@@ -65,4 +65,16 @@ public class QtWindowPeer extends QtContainerPeer implements WindowPeer
    */
   public native void setTitle(String title);
 
+  public void updateAlwaysOnTop()
+  {
+    // TODO Auto-generated method stub
+    
+  }
+
+  public boolean requestWindowFocus()
+  {
+    // TODO Auto-generated method stub
+    return false;
+  }
+
 }