diff options
author | Roman Kennke <roman@kennke.org> | 2008-02-08 22:17:37 +0000 |
---|---|---|
committer | Roman Kennke <roman@kennke.org> | 2008-02-08 22:17:37 +0000 |
commit | 13d8e9dc096fc7520582ba77896213a41dc748d8 (patch) | |
tree | a8120a991925138daa6412424d42e5182e4b438e /gnu/java/awt/peer/gtk | |
parent | c741164be6b498c0df30dfc6c3d329530f2e10a6 (diff) | |
download | classpath-13d8e9dc096fc7520582ba77896213a41dc748d8.tar.gz |
2008-02-08 Roman Kennke <kennke@aicas.com>
* 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.
Diffstat (limited to 'gnu/java/awt/peer/gtk')
-rw-r--r-- | gnu/java/awt/peer/gtk/CairoGraphics2D.java | 7 | ||||
-rw-r--r-- | gnu/java/awt/peer/gtk/GdkFontPeer.java | 6 | ||||
-rw-r--r-- | gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java | 6 | ||||
-rw-r--r-- | gnu/java/awt/peer/gtk/GdkPixbufDecoder.java | 6 | ||||
-rw-r--r-- | gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java | 7 | ||||
-rw-r--r-- | gnu/java/awt/peer/gtk/GtkComponentPeer.java | 6 | ||||
-rw-r--r-- | gnu/java/awt/peer/gtk/GtkToolkit.java | 17 |
7 files changed, 49 insertions, 6 deletions
diff --git a/gnu/java/awt/peer/gtk/CairoGraphics2D.java b/gnu/java/awt/peer/gtk/CairoGraphics2D.java index 7dc0158d4..fcd3f6acd 100644 --- a/gnu/java/awt/peer/gtk/CairoGraphics2D.java +++ b/gnu/java/awt/peer/gtk/CairoGraphics2D.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.awt.peer.gtk; +import gnu.classpath.Configuration; + import gnu.java.awt.ClasspathToolkit; import java.awt.AWTPermission; @@ -120,7 +122,10 @@ public abstract class CairoGraphics2D extends Graphics2D { static { - System.loadLibrary("gtkpeer"); + if (Configuration.INIT_LOAD_LIBRARY) + { + System.loadLibrary("gtkpeer"); + } } /** diff --git a/gnu/java/awt/peer/gtk/GdkFontPeer.java b/gnu/java/awt/peer/gtk/GdkFontPeer.java index 95a806ac7..403671cc6 100644 --- a/gnu/java/awt/peer/gtk/GdkFontPeer.java +++ b/gnu/java/awt/peer/gtk/GdkFontPeer.java @@ -38,6 +38,7 @@ exception statement from your version. */ package gnu.java.awt.peer.gtk; +import gnu.classpath.Configuration; import gnu.classpath.Pointer; import gnu.java.awt.ClasspathToolkit; @@ -166,7 +167,10 @@ public class GdkFontPeer extends ClasspathFontPeer static { - System.loadLibrary("gtkpeer"); + if (Configuration.INIT_LOAD_LIBRARY) + { + System.loadLibrary("gtkpeer"); + } initStaticState (); diff --git a/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java b/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java index d06af8443..980866c4b 100644 --- a/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java +++ b/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java @@ -38,6 +38,7 @@ exception statement from your version. */ package gnu.java.awt.peer.gtk; +import gnu.classpath.Configuration; import gnu.java.awt.ClasspathGraphicsEnvironment; import java.awt.Font; @@ -72,7 +73,10 @@ public class GdkGraphicsEnvironment extends ClasspathGraphicsEnvironment static { - System.loadLibrary("gtkpeer"); + if (Configuration.INIT_LOAD_LIBRARY) + { + System.loadLibrary("gtkpeer"); + } GtkToolkit.initializeGlobalIDs(); initIDs(); diff --git a/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java b/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java index e52bf050c..dbf4a2018 100644 --- a/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java +++ b/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java @@ -68,13 +68,17 @@ import javax.imageio.spi.ImageWriterSpi; import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.ImageOutputStream; +import gnu.classpath.Configuration; import gnu.classpath.Pointer; public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder { static { - System.loadLibrary("gtkpeer"); + if (Configuration.INIT_LOAD_LIBRARY) + { + System.loadLibrary("gtkpeer"); + } initStaticState (); } diff --git a/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java b/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java index 7ef4645a2..9ce0b96da 100644 --- a/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java +++ b/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java @@ -46,6 +46,7 @@ import java.awt.Rectangle; import java.awt.Window; import java.util.ArrayList; +import gnu.classpath.Configuration; import gnu.classpath.Pointer; class GdkScreenGraphicsDevice extends GraphicsDevice @@ -98,7 +99,11 @@ class GdkScreenGraphicsDevice extends GraphicsDevice static { - System.loadLibrary("gtkpeer"); + if (Configuration.INIT_LOAD_LIBRARY) + { + System.loadLibrary("gtkpeer"); + } + GtkToolkit.initializeGlobalIDs(); initIDs(); } diff --git a/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/gnu/java/awt/peer/gtk/GtkComponentPeer.java index 76fefaaa5..039583f3f 100644 --- a/gnu/java/awt/peer/gtk/GtkComponentPeer.java +++ b/gnu/java/awt/peer/gtk/GtkComponentPeer.java @@ -80,6 +80,8 @@ 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 { @@ -918,4 +920,8 @@ public class GtkComponentPeer extends GtkGenericPeer return true; } + public void applyShape(Region shape) + { + // TODO: Implement properly. + } } diff --git a/gnu/java/awt/peer/gtk/GtkToolkit.java b/gnu/java/awt/peer/gtk/GtkToolkit.java index dc9c7155e..b11e609ef 100644 --- a/gnu/java/awt/peer/gtk/GtkToolkit.java +++ b/gnu/java/awt/peer/gtk/GtkToolkit.java @@ -39,6 +39,8 @@ exception statement from your version. */ package gnu.java.awt.peer.gtk; +import gnu.classpath.Configuration; + import gnu.java.awt.AWTUtilities; import gnu.java.awt.EmbeddedWindow; import gnu.java.awt.dnd.GtkMouseDragGestureRecognizer; @@ -65,6 +67,7 @@ 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; @@ -102,6 +105,7 @@ 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; @@ -125,6 +129,8 @@ 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 @@ -133,6 +139,7 @@ import javax.imageio.spi.IIORegistry; 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; @@ -170,7 +177,10 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit static { - System.loadLibrary("gtkpeer"); + if (Configuration.INIT_LOAD_LIBRARY) + { + System.loadLibrary("gtkpeer"); + } /** * Gotta do that first. @@ -758,4 +768,9 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit return false; } + public KeyboardFocusManagerPeer createKeyboardFocusManagerPeer(KeyboardFocusManager manager) + { + return null; + } + } // class GtkToolkit |