From 415e62e2329a7f347ee0bb0f658daa35fa929a55 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Fri, 27 Apr 2007 18:08:03 +0000 Subject: [multiple changes] 2007-03-16 Francis Kung * 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_ComponentGraphics.h: Regenerated. * lib/gnu/java/awt/peer/gtk/ComponentGraphics.class: Regenerated. * lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class: 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. 2007-04-27 Thomas Fitzsimmons * gnu/java/awt/peer/gtk/CairoGraphics2D.h: Regenerate. * gnu/java/awt/peer/gtk/ComponentGraphics.h: Regenerate. From-SVN: r124226 --- libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h | 63 ++++++++++------------- libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h | 33 +++++++++++- 2 files changed, 60 insertions(+), 36 deletions(-) (limited to 'libjava/gnu') diff --git a/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h b/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h index a20f472..1be46fb 100644 --- a/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h +++ b/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h @@ -88,8 +88,8 @@ public: virtual void copy(::gnu::java::awt::peer::gtk::CairoGraphics2D *, jlong); virtual void finalize(); virtual void dispose(); -private: - jlong init(jlong); +public: // actually protected + virtual jlong init(jlong); public: virtual ::java::awt::Graphics * create() = 0; virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration() = 0; @@ -98,41 +98,34 @@ public: // actually protected virtual ::java::awt::geom::Rectangle2D * getRealBounds() = 0; public: virtual void disposeNative(jlong); -private: - void drawPixels(jlong, JArray< jint > *, jint, jint, jint, JArray< jdouble > *, jdouble, jint); - void setGradient(jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean); - void setPaintPixels(jlong, JArray< jint > *, jint, jint, jint, jboolean, jint, jint); - void cairoSetMatrix(jlong, JArray< jdouble > *); - void cairoScale(jlong, jdouble, jdouble); - void cairoSetOperator(jlong, jint); - void cairoSetRGBAColor(jlong, jdouble, jdouble, jdouble, jdouble); - void cairoSetFillRule(jlong, jint); - void cairoSetLine(jlong, jdouble, jint, jint, jdouble); - void cairoSetDash(jlong, JArray< jdouble > *, jint, jdouble); +public: // actually protected + virtual void drawPixels(jlong, JArray< jint > *, jint, jint, jint, JArray< jdouble > *, jdouble, jint); + virtual void setGradient(jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean); + virtual void setPaintPixels(jlong, JArray< jint > *, jint, jint, jint, jboolean, jint, jint); + virtual void cairoSetMatrix(jlong, JArray< jdouble > *); + virtual void cairoScale(jlong, jdouble, jdouble); + virtual void cairoSetOperator(jlong, jint); + virtual void cairoSetRGBAColor(jlong, jdouble, jdouble, jdouble, jdouble); + virtual void cairoSetFillRule(jlong, jint); + virtual void cairoSetLine(jlong, jdouble, jint, jint, jdouble); + virtual void cairoSetDash(jlong, JArray< jdouble > *, jint, jdouble); public: // actually package-private virtual void cairoDrawGlyphVector(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *, jfloat, jfloat, jint, JArray< jint > *, JArray< jfloat > *); -private: - void cairoSetFont(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *); - void cairoRelCurveTo(jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble); - void cairoRectangle(jlong, jdouble, jdouble, jdouble, jdouble); - void cairoArc(jlong, jdouble, jdouble, jdouble, jdouble, jdouble); - void cairoSave(jlong); - void cairoRestore(jlong); - void cairoNewPath(jlong); - void cairoClosePath(jlong); - void cairoMoveTo(jlong, jdouble, jdouble); - void cairoRelMoveTo(jlong, jdouble, jdouble); - void cairoLineTo(jlong, jdouble, jdouble); - void cairoRelLineTo(jlong, jdouble, jdouble); - void cairoCurveTo(jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble); - void cairoStroke(jlong); - void cairoFill(jlong, jdouble); - void cairoClip(jlong); - void cairoPreserveClip(jlong); - void cairoResetClip(jlong); - void cairoDrawLine(jlong, jdouble, jdouble, jdouble, jdouble); - void cairoDrawRect(jlong, jdouble, jdouble, jdouble, jdouble); - void cairoFillRect(jlong, jdouble, jdouble, jdouble, jdouble); +public: // actually protected + virtual void cairoSetFont(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *); + virtual void cairoRectangle(jlong, jdouble, jdouble, jdouble, jdouble); + virtual void cairoArc(jlong, jdouble, jdouble, jdouble, jdouble, jdouble); + virtual void cairoSave(jlong); + virtual void cairoRestore(jlong); + virtual void cairoNewPath(jlong); + virtual void cairoClosePath(jlong); + virtual void cairoMoveTo(jlong, jdouble, jdouble); + virtual void cairoLineTo(jlong, jdouble, jdouble); + virtual void cairoCurveTo(jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble); + virtual void cairoStroke(jlong); + virtual void cairoFill(jlong, jdouble); + virtual void cairoClip(jlong); + virtual void cairoResetClip(jlong); public: virtual void setTransform(::java::awt::geom::AffineTransform *); private: diff --git a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h index 1f11a4b..534834b 100644 --- a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h +++ b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h @@ -7,6 +7,8 @@ #pragma interface #include +#include + extern "Java" { namespace gnu @@ -24,6 +26,7 @@ extern "Java" namespace gtk { class ComponentGraphics; + class GdkFontPeer; class GtkComponentPeer; class GtkImage; } @@ -101,12 +104,40 @@ public: virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat); virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *); virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *); - virtual void setClip(::java::awt::Shape *); private: jboolean drawComposite(::java::awt::geom::Rectangle2D *, ::java::awt::image::ImageObserver *); void createBuffer(); public: // actually protected virtual ::java::awt::image::ColorModel * getNativeCM(); + virtual jlong init(jlong); +public: + virtual void disposeNative(jlong); +public: // actually protected + virtual void drawPixels(jlong, JArray< jint > *, jint, jint, jint, JArray< jdouble > *, jdouble, jint); + virtual void setGradient(jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean); + virtual void setPaintPixels(jlong, JArray< jint > *, jint, jint, jint, jboolean, jint, jint); + virtual void cairoSetMatrix(jlong, JArray< jdouble > *); + virtual void cairoScale(jlong, jdouble, jdouble); + virtual void cairoSetOperator(jlong, jint); + virtual void cairoSetRGBAColor(jlong, jdouble, jdouble, jdouble, jdouble); + virtual void cairoSetFillRule(jlong, jint); + virtual void cairoSetLine(jlong, jdouble, jint, jint, jdouble); + virtual void cairoSetDash(jlong, JArray< jdouble > *, jint, jdouble); + virtual void cairoDrawGlyphVector(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *, jfloat, jfloat, jint, JArray< jint > *, JArray< jfloat > *); + virtual void cairoSetFont(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *); + virtual void cairoRectangle(jlong, jdouble, jdouble, jdouble, jdouble); + virtual void cairoArc(jlong, jdouble, jdouble, jdouble, jdouble, jdouble); + virtual void cairoSave(jlong); + virtual void cairoRestore(jlong); + virtual void cairoNewPath(jlong); + virtual void cairoClosePath(jlong); + virtual void cairoMoveTo(jlong, jdouble, jdouble); + virtual void cairoLineTo(jlong, jdouble, jdouble); + virtual void cairoCurveTo(jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble); + virtual void cairoStroke(jlong); + virtual void cairoFill(jlong, jdouble); + virtual void cairoClip(jlong); + virtual void cairoResetClip(jlong); private: static jboolean hasXRenderExtension; ::gnu::java::awt::peer::gtk::GtkComponentPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::CairoGraphics2D)))) component; -- cgit v1.1