[commit-cp] classpath/gnu/java/awt/peer/gtk GdkTextLayout.java

[Mark Wielaard]

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Changes by:     Mark Wielaard <mark>    06/06/10 20:02:09

Modified files:
        gnu/java/awt/peer/gtk: GdkTextLayout.java 

Log message:
                * native/jni/gtk-peer/cairographics2d.h (cp_gtk_get_cairo_t):
                Removed.
                * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
                Mark all unused parameters.
                (cp_gtk_get_cairo_t): Removed.
                (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix):
                Don't mix declerations and statements.
                * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c:
                Mark all unused parameters.
                (Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface):
                Get cairographics2d pointer directly.
                * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
                
(Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout):
                Use jlong to pass pointer.
                * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
                Mark all unused parameters.
                * include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Regenerated.
                * include/gnu_java_awt_peer_gtk_CairoSurface.h: Regenerated.
                * include/gnu_java_awt_peer_gtk_ComponentGraphics.h: 
Regenerated.
                * include/gnu_java_awt_peer_gtk_GdkTextLayout.h: Regenerated.
                * include/gnu_java_awt_peer_gtk_GtkVolatileImage.h: Regenerated.
                * include/java_io_VMFile.h: Regenerated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java?cvsroot=classpath&r1=1.9&r2=1.10

Patches:
Index: GdkTextLayout.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- GdkTextLayout.java  1 Jun 2006 10:51:17 -0000       1.9
+++ GdkTextLayout.java  10 Jun 2006 20:02:09 -0000      1.10
@@ -1,5 +1,5 @@
 /* GdkTextLayout.java
-   Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -84,7 +84,7 @@
 
   private native void dispose ();
 
-  private native void cairoDrawGdkTextLayout(CairoGraphics2D g, float x, float 
y);
+  private native void cairoDrawGdkTextLayout(long cg2d, float x, float y);
 
   static native void initStaticState();
 
@@ -216,7 +216,7 @@
 
   public void draw (Graphics2D g2, float x, float y)
   {
-    cairoDrawGdkTextLayout((CairoGraphics2D)g2, x, y);
+    cairoDrawGdkTextLayout(((CairoGraphics2D) g2).nativePointer, x, y);
   }
 
   public TextHitInfo getStrongCaret (TextHitInfo hit1,