I just realized that I committed some other stuff that I was
experimenting with. This patch reverts this. You haven't seen
anything ;-) This has to be cleaned up and committed later.
2008-02-08 Roman Kennke <[EMAIL PROTECTED]>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
* gnu/java/awt/peer/gtk/GtkToolkit.java: Removed mistakenly
committed code.
/Roman
Am Freitag, den 08.02.2008, 23:22 +0100 schrieb Roman Kennke:
> This changes the System.loadLibrary() calls in the GTK peers, so that
> they are only called when configured so. This is important for VMs that
> can't or don't want to link dynamically, e.g. when creating full static
> linked binaries like Jamaica.
>
> 2008-02-08 Roman Kennke <[EMAIL PROTECTED]>
>
> * gnu/java/awt/peer/gtk/CairoGraphics2D.java,
> * gnu/java/awt/peer/gtk/GdkFontPeer.java,
> * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java,
> * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,
> * gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java,
> * gnu/java/awt/peer/gtk/GtkComponentPeer.java,
> * gnu/java/awt/peer/gtk/GtkToolkit.java: Only call
> System.loadLibrary() when configured so.
>
> /Roman
--
Dipl.-Inform. (FH) Roman Kennke, Software Engineer, http://kennke.org
aicas Allerton Interworks Computer Automated Systems GmbH
Haid-und-Neu-Straße 18 * D-76131 Karlsruhe * Germany
http://www.aicas.com * Tel: +49-721-663 968-0
USt-Id: DE216375633, Handelsregister HRB 109481, AG Karlsruhe
Geschäftsführer: Dr. James J. Hunt
Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.131
diff -u -1 -0 -r1.131 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java 8 Feb 2008 22:17:40 -0000 1.131
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java 8 Feb 2008 22:23:09 -0000
@@ -73,22 +73,20 @@
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.awt.peer.LightweightPeer;
import java.awt.peer.WindowPeer;
import java.util.Timer;
import java.util.TimerTask;
-import sun.java2d.pipe.Region;
-
public class GtkComponentPeer extends GtkGenericPeer
implements ComponentPeer
{
VolatileImage backBuffer;
BufferCapabilities caps;
Component awtComponent;
Insets insets;
@@ -913,15 +911,11 @@
public boolean requestFocus(Component lightweightChild, boolean temporary,
boolean focusedWindowChangeAllowed,
long time, sun.awt.CausedFocusEvent.Cause cause)
{
// TODO: Implement this properly and remove the other requestFocus()
// methods.
return true;
}
- public void applyShape(Region shape)
- {
- // TODO: Implement properly.
- }
}
Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.105
diff -u -1 -0 -r1.105 GtkToolkit.java
--- gnu/java/awt/peer/gtk/GtkToolkit.java 8 Feb 2008 22:17:40 -0000 1.105
+++ gnu/java/awt/peer/gtk/GtkToolkit.java 8 Feb 2008 22:23:09 -0000
@@ -60,21 +60,20 @@
import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.FileDialog;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Frame;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.awt.Image;
-import java.awt.KeyboardFocusManager;
import java.awt.Label;
import java.awt.List;
import java.awt.Menu;
import java.awt.MenuBar;
import java.awt.MenuItem;
import java.awt.Panel;
import java.awt.Point;
import java.awt.PopupMenu;
import java.awt.PrintJob;
import java.awt.Rectangle;
@@ -98,21 +97,20 @@
import java.awt.image.ImageProducer;
import java.awt.peer.ButtonPeer;
import java.awt.peer.CanvasPeer;
import java.awt.peer.CheckboxMenuItemPeer;
import java.awt.peer.CheckboxPeer;
import java.awt.peer.ChoicePeer;
import java.awt.peer.DialogPeer;
import java.awt.peer.FileDialogPeer;
import java.awt.peer.FontPeer;
import java.awt.peer.FramePeer;
-import java.awt.peer.KeyboardFocusManagerPeer;
import java.awt.peer.LabelPeer;
import java.awt.peer.ListPeer;
import java.awt.peer.MenuBarPeer;
import java.awt.peer.MenuItemPeer;
import java.awt.peer.MenuPeer;
import java.awt.peer.MouseInfoPeer;
import java.awt.peer.PanelPeer;
import java.awt.peer.PopupMenuPeer;
import java.awt.peer.RobotPeer;
import java.awt.peer.ScrollPanePeer;
@@ -122,31 +120,28 @@
import java.awt.peer.WindowPeer;
import java.io.InputStream;
import java.net.URL;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
import javax.imageio.spi.IIORegistry;
-import sun.awt.KeyboardFocusManagerPeerProvider;
-
/* This class uses a deprecated method java.awt.peer.ComponentPeer.getPeer().
This merits comment. We are basically calling Sun's bluff on this one.
We think Sun has deprecated it simply to discourage its use as it is
bad programming style. However, we need to get at a component's peer in
this class. If getPeer() ever goes away, we can implement a hash table
that will keep up with every window's peer, but for now this is faster. */
public class GtkToolkit extends gnu.java.awt.ClasspathToolkit
- implements KeyboardFocusManagerPeerProvider
{
static final Object GTK_LOCK;
private static EventQueue q;
static native void gtkInit(int portableNativeSync, Object lock);
static native void gtkMain();
static native void gtkQuit();
@@ -761,16 +756,11 @@
{
return false;
}
@Override
public boolean isModalityTypeSupported(Dialog.ModalityType modalityType)
{
return false;
}
- public KeyboardFocusManagerPeer createKeyboardFocusManagerPeer(KeyboardFocusManager manager)
- {
- return null;
- }
-
} // class GtkToolkit
