diff options
| author | Graydon Hoare <graydon@gcc.gnu.org> | 2003-12-31 08:58:31 +0000 |
|---|---|---|
| committer | Graydon Hoare <graydon@gcc.gnu.org> | 2003-12-31 08:58:31 +0000 |
| commit | 8fe7789eddcc6ff9517e5768a573fc89d95b102b (patch) | |
| tree | 242b3e4088e49dd2c4f8cc0dcf7bb9282753348f /libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java | |
| parent | 4f0c9c8a876450531bcfa8989d327efdbd0cd93c (diff) | |
configure.in: Add --enable-gtk-cairo check.
2003-12-16 Graydon Hoare <graydon@redhat.com>
* configure.in: Add --enable-gtk-cairo check.
* configure: Regenerate.
* Makefile.am: Conditionally link against cairo.
* Makefile.in: Regenerate.
* acinclude.m4: Include PKG_CHECK_MODULES.
* aclocal.m4: Regenerate.
* gnu/java/awt/peer/gtk/GtkToolkit.java (useGraphics2D): New method.
(getFontMetrics, getClasspathFontPeer):
* gnu/java/awt/peer/gtk/GtkCanvasPeer.java (getGraphics):
* gnu/java/awt/peer/gtk/GtkComponentPeer.java (createImage):
* gnu/java/awt/peer/gtk/GtkContainerPeer.java (getGraphics):
* gnu/java/awt/peer/gtk/GtkFramePeer.java (getGraphics):
Switch behavior depending on GtkToolkit.useGraphics2D().
* gnu/java/awt/peer/gtk/GtkFontPeer.java: Extend ClasspathFontPeer.
* java/awt/Font.java: Switch to peer model.
* jni/gtk-peer/gtkcairopeer.h: Definitions of cairo stuff.
* jni/gtk-peer/gdkfont.h: Include gtkcairopeer.h.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Include gtkcairopeer.h.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c: Un-include gtkpeer.h.
From-SVN: r75260
Diffstat (limited to 'libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java')
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java index 4e216f8770e..6a7c3405f84 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java @@ -48,6 +48,7 @@ import java.awt.Font; import java.awt.FontMetrics; import java.awt.Frame; import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.GraphicsConfiguration; import java.awt.Image; import java.awt.Insets; @@ -148,7 +149,16 @@ public class GtkComponentPeer extends GtkGenericPeer public Image createImage (int width, int height) { - GdkGraphics g = new GdkGraphics (width, height); + Graphics g; + if (GtkToolkit.useGraphics2D ()) + { + Graphics2D g2 = new GdkGraphics2D (width, height); + g2.setBackground (getBackground ()); + g = g2; + } + else + g = new GdkGraphics (width, height); + return new GtkOffScreenImage (null, g, width, height); } |