[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: cairo fixes

[Kaffe CVS]

PatchSet 5535 
Date: 2005/02/14 13:48:34
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: cairo fixes

2005-02-14  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-02-10  Michael Koch  <konqueror at gmx.de>

        * configure.ac: Define GTK_CAIRO in config.h
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
        (gtkInit): Compile Graphics2D stuff conditionally.

Members: 
	ChangeLog:1.3579->1.3580 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3579 kaffe/ChangeLog:1.3580
--- kaffe/ChangeLog:1.3579	Mon Feb 14 06:51:32 2005
+++ kaffe/ChangeLog	Mon Feb 14 13:48:34 2005
@@ -1,3 +1,13 @@
+2005-02-14  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
+	2005-02-10  Michael Koch  <konqueror at gmx.de>
+
+        * configure.ac: Define GTK_CAIRO in config.h
+        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
+        (gtkInit): Compile Graphics2D stuff conditionally.
+
 2005-02-14  Jim Huang  <jserv at kaffe.org>
 
 	* configure.ac: Fix typo.
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c:1.6 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c:1.7
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c:1.6	Sat Jan 22 18:47:30 2005
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c	Mon Feb 14 13:48:38 2005
@@ -1,5 +1,5 @@
 /* gtktoolkit.c -- Native portion of GtkToolkit
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -67,7 +67,9 @@
 jmethodID endNativeRepaintID;
 
 jmethodID initComponentGraphicsID;
+#ifdef GTK_CAIRO
 jmethodID initComponentGraphics2DID;
+#endif
 jmethodID setCursorID;
 
 JavaVM *java_vm;
@@ -119,7 +121,10 @@
   char *homedir, *rcpath = NULL;
 
   jclass gtkgenericpeer, gtkcomponentpeer, gtkchoicepeer, gtkwindowpeer, gtkscrollbarpeer, gtklistpeer,
-    gtkmenuitempeer, gtktextcomponentpeer, window, gdkgraphics, gdkgraphics2d;
+    gtkmenuitempeer, gtktextcomponentpeer, window, gdkgraphics;
+#ifdef GTK_CAIRO
+  jclass gdkgraphics2d;
+#endif
 
   gtkgenericpeer = (*env)->FindClass(env, "gnu/java/awt/peer/gtk/GtkGenericPeer");
 
@@ -188,8 +193,10 @@
                                      "gnu/java/awt/peer/gtk/GtkTextComponentPeer");
   gdkgraphics = (*env)->FindClass (env,
                                    "gnu/java/awt/peer/gtk/GdkGraphics");
+#ifdef GTK_CAIRO
   gdkgraphics2d = (*env)->FindClass (env,
                                      "gnu/java/awt/peer/gtk/GdkGraphics2D");
+#endif
   setBoundsCallbackID = (*env)->GetMethodID (env, window,
 					     "setBoundsCallback",
 					     "(IIII)V");
@@ -236,9 +243,11 @@
   initComponentGraphicsID = (*env)->GetMethodID (env, gdkgraphics,
                                                  "initComponentGraphics",
                                                  "()V");
+#ifdef GTK_CAIRO
   initComponentGraphics2DID = (*env)->GetMethodID (env, gdkgraphics2d,
                                                    "initComponentGraphics2D",
                                                    "()V");
+#endif
   global_gtk_window_group = gtk_window_group_new ();
 
   init_dpi_conversion_factor ();