From aef2c7cc9b54adfc6942047d5d8e79a0f558f990 Mon Sep 17 00:00:00 2001 From: Silenio Quarti Date: Tue, 29 Jul 2008 21:53:32 +0000 Subject: *** empty log message *** --- .../org.eclipse.swt.internal.gdip.Gdip.properties | 10 ++++++++++ .../Eclipse SWT PI/win32/library/gdip.cpp | 17 +++++++++++++++++ .../Eclipse SWT PI/win32/library/gdip_stats.cpp | 5 +++-- .../Eclipse SWT PI/win32/library/gdip_stats.h | 1 + .../win32/org/eclipse/swt/internal/gdip/Gdip.java | 2 ++ 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties index c033fea454..e9ea91196c 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties @@ -255,6 +255,16 @@ Gdip_Graphics_DrawArc_5= Gdip_Graphics_DrawArc_6= Gdip_Graphics_DrawArc_7= +Gdip_Graphics_DrawDriverString=flags=cpp +Gdip_Graphics_DrawDriverString_0=cast=(Graphics *) +Gdip_Graphics_DrawDriverString_1=cast=(const UINT16 *) +Gdip_Graphics_DrawDriverString_2= +Gdip_Graphics_DrawDriverString_3=cast=const Font * +Gdip_Graphics_DrawDriverString_4=cast=const Brush * +Gdip_Graphics_DrawDriverString_5=cast=const PointF * +Gdip_Graphics_DrawDriverString_6= +Gdip_Graphics_DrawDriverString_7=cast=const Matrix * + Gdip_Graphics_DrawEllipse=flags=cpp Gdip_Graphics_DrawEllipse_0=cast=(Graphics *) Gdip_Graphics_DrawEllipse_1=cast=(Pen *) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp index 17cd181cc0..08b4fe561e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp @@ -701,6 +701,23 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawArc) } #endif +#ifndef NO_Graphics_1DrawDriverString +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jint arg7); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString) + (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jint arg7) +{ + PointF _arg5(25.0f,70.0f), *lparg5=NULL; + jint rc = 0; + Gdip_NATIVE_ENTER(env, that, Graphics_1DrawDriverString_FUNC); + if (arg5) if ((lparg5 = getPointFFields(env, arg5, &_arg5)) == NULL) goto fail; + rc = (jint)((Graphics *)arg0)->DrawDriverString((const UINT16 *)arg1, arg2, (const Font *)arg3, (const Brush *)arg4, (const PointF *)lparg5, arg6, (const Matrix *)arg7); +fail: + if (arg5 && lparg5) setPointFFields(env, arg5, lparg5); + Gdip_NATIVE_EXIT(env, that, Graphics_1DrawDriverString_FUNC); + return rc; +} +#endif + #ifndef NO_Graphics_1DrawEllipse extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp index 81fdb2a82e..43c5a554e6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp @@ -14,8 +14,8 @@ #ifdef NATIVE_STATS -int Gdip_nativeFunctionCount = 175; -int Gdip_nativeFunctionCallCount[175]; +int Gdip_nativeFunctionCount = 176; +int Gdip_nativeFunctionCallCount[176]; char * Gdip_nativeFunctionNames[] = { "BitmapData_1delete", "BitmapData_1new", @@ -69,6 +69,7 @@ char * Gdip_nativeFunctionNames[] = { "GraphicsPath_1new__I", "GraphicsPath_1new___3I_3BII", "Graphics_1DrawArc", + "Graphics_1DrawDriverString", "Graphics_1DrawEllipse", "Graphics_1DrawImage__IIII", "Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h index 177ae50433..6ab33c0a18 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h @@ -77,6 +77,7 @@ typedef enum { GraphicsPath_1new__I_FUNC, GraphicsPath_1new___3I_3BII_FUNC, Graphics_1DrawArc_FUNC, + Graphics_1DrawDriverString_FUNC, Graphics_1DrawEllipse_FUNC, Graphics_1DrawImage__IIII_FUNC, Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java index 7ad557e6af..d6ef0a7a5c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java @@ -43,6 +43,7 @@ public class Gdip extends Platform { public static final int DashStyleDashDot = 3; public static final int DashStyleDashDotDot = 4; public static final int DashStyleCustom = 5; + public static final int DriverStringOptionsRealizedAdvance = 4; public static final int FontStyleRegular = 0; public static final int FontStyleBold = 1; public static final int FontStyleItalic = 2; @@ -169,6 +170,7 @@ public static final native int FontFamily_GetFamilyName(int /*long*/ family, cha public static final native int /*long*/ Graphics_new(int /*long*/ hdc); public static final native void Graphics_delete(int /*long*/ graphics); public static final native int Graphics_DrawArc(int /*long*/ graphics, int /*long*/ pen, int x, int y, int width, int height, float startAngle, float sweepAngle); +public static final native int Graphics_DrawDriverString( int /*long*/ graphics, int /*long*/ text, int length, int /*long*/ font, int /*long*/ brush, PointF /*long*/ positions, int flags, int /*long*/ matrix); public static final native int Graphics_DrawEllipse(int /*long*/ graphics, int /*long*/ pen, int x, int y, int width, int height); public static final native int Graphics_DrawImage(int /*long*/ graphics, int /*long*/ image, int x, int y); public static final native int Graphics_DrawImage(int /*long*/ graphics, int /*long*/ image, Rect destRect, int srcx, int srcy, int srcwidth, int srcheight, int srcUnit, int /*long*/ imageAttributes, int /*long*/ callback, int /*long*/ callbackData); -- cgit v1.2.3