diff options
author | Francis Kung <fkung@redhat.com> | 2007-03-16 15:14:53 +0000 |
---|---|---|
committer | Francis Kung <fkung@redhat.com> | 2007-03-16 15:14:53 +0000 |
commit | dd8d7b5172cd89d71c4ec8abdc75a11f5ee756f9 (patch) | |
tree | 58066df7d955103d99cbf8b5ccf3615c5e8894b9 /include | |
parent | 49d052d30cc7f5579709b69c5e1064dc102195fe (diff) | |
download | classpath-dd8d7b5172cd89d71c4ec8abdc75a11f5ee756f9.tar.gz |
2007-03-16 Francis Kung <fkung@redhat.com>
* gnu/java/awt/peer/gtk/CairoGraphics2D.java
(cairoArc): Make protected rather than private so it can be over-ridden.
(cairoClip): Likewise.
(cairoClosePath): Likewise.
(cairoCurveTo): Likewise.
(cairoDrawGlyphVector): Likewise.
(cairoFill): Likewise.
(cairoLineTo): Likewise.
(cairoMoveTo): Likewise.
(cairoNewPath): Likewise.
(cairoRectangle): Likewise.
(cairoResetClip): Likewise.
(cairoRestore): Likewise.
(cairoSave): Likewise.
(cairoScale): Likewise.
(cairoSetAntialias): Likewise.
(cairoSetDash): Likewise.
(cairoSetFillRule): Likewise.
(cairoSetFont): Likewise.
(cairoSetLine): Likewise.
(cairoSetMatrix): Likewise.
(cairoSetOperator): Likewise.
(cairoSetRGBAColor): Likewise.
(cairoStroke): Likewise.
(drawPixels): Likewise.
(init): Likewise.
(setGradient): Likewise.
(setPaintPixels): Likewise.
(cairoDrawLine): Removed.
(cairoDrawRect): Removed.
(cairoFillRect): Removed.
(cairoPreserveClip): Removed.
(cairoRelCurveTo): Removed.
(cairoRelLineTo): Removed.
(cairoRelMoveTo): Removed.
* gnu/java/awt/peer/gtk/ComponentGraphics.java
(cairoArc): New method wrapping superclass method in locks.
(cairoClip): Likewise.
(cairoClosePath): Likewise.
(cairoCurveTo): Likewise.
(cairoDrawGlyphVector): Likewise.
(cairoFill): Likewise.
(cairoLineTo): Likewise.
(cairoMoveTo): Likewise.
(cairoNewPath): Likewise.
(cairoRectangle): Likewise.
(cairoResetClip): Likewise.
(cairoRestore): Likewise.
(cairoSave): Likewise.
(cairoScale): Likewise.
(cairoSetAntialias): Likewise.
(cairoSetDash): Likewise.
(cairoSetFillRule): Likewise.
(cairoSetFont): Likewise.
(cairoSetLine): Likewise.
(cairoSetMatrix): Likewise.
(cairoSetOperator): Likewise.
(cairoSetRGBAColor): Likewise.
(cairoStroke): Likewise.
(disposeNative): Likewise.
(drawPixels): Likewise.
(init): Likewise.
(setGradient): Likewise.
(setPaintPixels): Likewise.
(draw): Do not lock, as locking is now done in the wrapped native methods.
(drawComposite): Likewise.
(drawGlyphVector): Likewise.
(drawImage): Likewise.
(drawRenderedImage): Likewise.
(fill): Likewise.
(setClip): Removed.
(lock): Added documentation.
(unlock): Added documentation.
* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Regenerated.
* include/gnu_java_awt_peer_gtk_CairoSurface.h: Regenerated.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawLine): Removed.
(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawRect): Removed.
(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFillRect): Removed.
(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip): Removed.
(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo): Removed.
(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo): Removed.
(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo): Removed.
Diffstat (limited to 'include')
-rw-r--r-- | include/gnu_java_awt_peer_gtk_CairoGraphics2D.h | 7 | ||||
-rw-r--r-- | include/gnu_java_awt_peer_gtk_CairoSurface.h | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h b/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h index 6d252340a..1bb829de3 100644 --- a/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h +++ b/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h @@ -24,7 +24,6 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine ( JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash (JNIEnv *env, jobject, jlong, jdoubleArray, jint, jdouble); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector (JNIEnv *env, jobject, jlong, jobject, jfloat, jfloat, jint, jintArray, jfloatArray); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFont (JNIEnv *env, jobject, jlong, jobject); -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoArc (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSave (JNIEnv *env, jobject, jlong); @@ -32,19 +31,13 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRestore ( JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoNewPath (JNIEnv *env, jobject, jlong); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClosePath (JNIEnv *env, jobject, jlong); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoMoveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble); -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoLineTo (JNIEnv *env, jobject, jlong, jdouble, jdouble); -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo (JNIEnv *env, jobject, jlong, jdouble, jdouble); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke (JNIEnv *env, jobject, jlong); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill (JNIEnv *env, jobject, jlong, jdouble); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip (JNIEnv *env, jobject, jlong); -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip (JNIEnv *env, jobject, jlong); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip (JNIEnv *env, jobject, jlong); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetAntialias (JNIEnv *env, jobject, jlong, jboolean); -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawLine (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble); -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawRect (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble); -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFillRect (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble); #undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_NEAREST #define gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_NEAREST 0L #undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BILINEAR diff --git a/include/gnu_java_awt_peer_gtk_CairoSurface.h b/include/gnu_java_awt_peer_gtk_CairoSurface.h index 1da9c369b..ba7a1f573 100644 --- a/include/gnu_java_awt_peer_gtk_CairoSurface.h +++ b/include/gnu_java_awt_peer_gtk_CairoSurface.h @@ -13,11 +13,11 @@ extern "C" JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_create (JNIEnv *env, jobject, jint, jint, jint, jintArray); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_destroy (JNIEnv *env, jobject, jlong, jintArray); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface (JNIEnv *env, jobject, jlong, jlong, jdoubleArray, jdouble, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_syncNativeToJava (JNIEnv *env, jobject, jlong, jintArray); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_syncJavaToNative (JNIEnv *env, jobject, jlong, jintArray); JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer (JNIEnv *env, jobject, jlong); JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeNewCairoContext (JNIEnv *env, jobject, jlong); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative2 (JNIEnv *env, jobject, jlong, jint, jint, jint, jint, jint, jint, jint); -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_syncJavaToNative (JNIEnv *env, jobject, jlong, jintArray); -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_syncNativeToJava (JNIEnv *env, jobject, jlong, jintArray); #ifdef __cplusplus } |