Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties32
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp78
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java6
5 files changed, 129 insertions, 3 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 9cb170f04a..eb56ca5298 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
@@ -537,8 +537,17 @@ Gdip_Image_GetPixelFormat_0=cast=(Image*)
Gdip_Image_GetWidth=flags=cpp
Gdip_Image_GetWidth_0=cast=Image *
+Gdip_LinearGradientBrush_ResetTransform=flags=cpp
+Gdip_LinearGradientBrush_ResetTransform_0=cast=(LinearGradientBrush *)
+
+Gdip_LinearGradientBrush_ScaleTransform=flags=cpp
+Gdip_LinearGradientBrush_ScaleTransform_0=cast=(LinearGradientBrush *)
+Gdip_LinearGradientBrush_ScaleTransform_1=
+Gdip_LinearGradientBrush_ScaleTransform_2=
+Gdip_LinearGradientBrush_ScaleTransform_3=cast=(MatrixOrder)
+
Gdip_LinearGradientBrush_SetInterpolationColors=flags=no_gen cpp
-Gdip_LinearGradientBrush_SetInterpolationColors_0=cast=LinearGradientBrush *
+Gdip_LinearGradientBrush_SetInterpolationColors_0=cast=(LinearGradientBrush *)
Gdip_LinearGradientBrush_SetInterpolationColors_1=cast=const Color *
Gdip_LinearGradientBrush_SetInterpolationColors_2=cast=const REAL *
Gdip_LinearGradientBrush_SetInterpolationColors_3=
@@ -547,6 +556,12 @@ Gdip_LinearGradientBrush_SetWrapMode=flags=cpp
Gdip_LinearGradientBrush_SetWrapMode_0=cast=LinearGradientBrush *
Gdip_LinearGradientBrush_SetWrapMode_1=cast=WrapMode
+Gdip_LinearGradientBrush_TranslateTransform=flags=cpp
+Gdip_LinearGradientBrush_TranslateTransform_0=cast=(LinearGradientBrush *)
+Gdip_LinearGradientBrush_TranslateTransform_1=
+Gdip_LinearGradientBrush_TranslateTransform_2=
+Gdip_LinearGradientBrush_TranslateTransform_3=cast=(MatrixOrder)
+
Gdip_LinearGradientBrush_delete=flags=delete
Gdip_LinearGradientBrush_delete_0=
@@ -757,10 +772,25 @@ Gdip_StringFormat_SetTabStops_3=
Gdip_StringFormat_delete=flags=delete
Gdip_StringFormat_delete_0=
+Gdip_TextureBrush_ResetTransform=flags=cpp
+Gdip_TextureBrush_ResetTransform_0=cast=(TextureBrush *)
+
+Gdip_TextureBrush_ScaleTransform=flags=cpp
+Gdip_TextureBrush_ScaleTransform_0=cast=(TextureBrush *)
+Gdip_TextureBrush_ScaleTransform_1=
+Gdip_TextureBrush_ScaleTransform_2=
+Gdip_TextureBrush_ScaleTransform_3=cast=MatrixOrder
+
Gdip_TextureBrush_SetTransform=flags=cpp
Gdip_TextureBrush_SetTransform_0=cast=(TextureBrush *)
Gdip_TextureBrush_SetTransform_1=cast=Matrix *
+Gdip_TextureBrush_TranslateTransform=flags=cpp
+Gdip_TextureBrush_TranslateTransform_0=cast=(TextureBrush *)
+Gdip_TextureBrush_TranslateTransform_1=
+Gdip_TextureBrush_TranslateTransform_2=
+Gdip_TextureBrush_TranslateTransform_3=cast=MatrixOrder
+
Gdip_TextureBrush_delete=flags=delete
Gdip_TextureBrush_delete_0=
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 79eca7513d..e852beabfd 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
@@ -1438,6 +1438,32 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetWidth)
}
#endif
+#ifndef NO_LinearGradientBrush_1ResetTransform
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform)
+ (JNIEnv *env, jclass that, jint arg0)
+{
+ jint rc = 0;
+ Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1ResetTransform_FUNC);
+ rc = (jint)((LinearGradientBrush *)arg0)->ResetTransform();
+ Gdip_NATIVE_EXIT(env, that, LinearGradientBrush_1ResetTransform_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO_LinearGradientBrush_1ScaleTransform
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform)
+ (JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+{
+ jint rc = 0;
+ Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1ScaleTransform_FUNC);
+ rc = (jint)((LinearGradientBrush *)arg0)->ScaleTransform(arg1, arg2, (MatrixOrder)arg3);
+ Gdip_NATIVE_EXIT(env, that, LinearGradientBrush_1ScaleTransform_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_LinearGradientBrush_1SetWrapMode
extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode)
@@ -1451,6 +1477,19 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode)
}
#endif
+#ifndef NO_LinearGradientBrush_1TranslateTransform
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform)
+ (JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+{
+ jint rc = 0;
+ Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1TranslateTransform_FUNC);
+ rc = (jint)((LinearGradientBrush *)arg0)->TranslateTransform(arg1, arg2, (MatrixOrder)arg3);
+ Gdip_NATIVE_EXIT(env, that, LinearGradientBrush_1TranslateTransform_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_LinearGradientBrush_1delete
extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete)(JNIEnv *env, jclass that, jint arg0);
JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete)
@@ -2099,6 +2138,32 @@ JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete)
}
#endif
+#ifndef NO_TextureBrush_1ResetTransform
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform)
+ (JNIEnv *env, jclass that, jint arg0)
+{
+ jint rc = 0;
+ Gdip_NATIVE_ENTER(env, that, TextureBrush_1ResetTransform_FUNC);
+ rc = (jint)((TextureBrush *)arg0)->ResetTransform();
+ Gdip_NATIVE_EXIT(env, that, TextureBrush_1ResetTransform_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO_TextureBrush_1ScaleTransform
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform)
+ (JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+{
+ jint rc = 0;
+ Gdip_NATIVE_ENTER(env, that, TextureBrush_1ScaleTransform_FUNC);
+ rc = (jint)((TextureBrush *)arg0)->ScaleTransform(arg1, arg2, (MatrixOrder)arg3);
+ Gdip_NATIVE_EXIT(env, that, TextureBrush_1ScaleTransform_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_TextureBrush_1SetTransform
extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)(JNIEnv *env, jclass that, jint arg0, jint arg1);
JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)
@@ -2112,6 +2177,19 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)
}
#endif
+#ifndef NO_TextureBrush_1TranslateTransform
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform)
+ (JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+{
+ jint rc = 0;
+ Gdip_NATIVE_ENTER(env, that, TextureBrush_1TranslateTransform_FUNC);
+ rc = (jint)((TextureBrush *)arg0)->TranslateTransform(arg1, arg2, (MatrixOrder)arg3);
+ Gdip_NATIVE_EXIT(env, that, TextureBrush_1TranslateTransform_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_TextureBrush_1delete
extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete)(JNIEnv *env, jclass that, jint arg0);
JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete)
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 f5cc672227..b8853df06e 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 = 164;
-int Gdip_nativeFunctionCallCount[164];
+int Gdip_nativeFunctionCount = 170;
+int Gdip_nativeFunctionCallCount[170];
char * Gdip_nativeFunctionNames[] = {
"BitmapData_1delete",
"BitmapData_1new",
@@ -125,8 +125,11 @@ char * Gdip_nativeFunctionNames[] = {
"Image_1GetPaletteSize",
"Image_1GetPixelFormat",
"Image_1GetWidth",
+ "LinearGradientBrush_1ResetTransform",
+ "LinearGradientBrush_1ScaleTransform",
"LinearGradientBrush_1SetInterpolationColors",
"LinearGradientBrush_1SetWrapMode",
+ "LinearGradientBrush_1TranslateTransform",
"LinearGradientBrush_1delete",
"LinearGradientBrush_1new",
"Matrix_1GetElements",
@@ -178,7 +181,10 @@ char * Gdip_nativeFunctionNames[] = {
"StringFormat_1SetHotkeyPrefix",
"StringFormat_1SetTabStops",
"StringFormat_1delete",
+ "TextureBrush_1ResetTransform",
+ "TextureBrush_1ScaleTransform",
"TextureBrush_1SetTransform",
+ "TextureBrush_1TranslateTransform",
"TextureBrush_1delete",
"TextureBrush_1new",
};
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 de7ed9a6f9..fdd616bfe8 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
@@ -133,8 +133,11 @@ typedef enum {
Image_1GetPaletteSize_FUNC,
Image_1GetPixelFormat_FUNC,
Image_1GetWidth_FUNC,
+ LinearGradientBrush_1ResetTransform_FUNC,
+ LinearGradientBrush_1ScaleTransform_FUNC,
LinearGradientBrush_1SetInterpolationColors_FUNC,
LinearGradientBrush_1SetWrapMode_FUNC,
+ LinearGradientBrush_1TranslateTransform_FUNC,
LinearGradientBrush_1delete_FUNC,
LinearGradientBrush_1new_FUNC,
Matrix_1GetElements_FUNC,
@@ -186,7 +189,10 @@ typedef enum {
StringFormat_1SetHotkeyPrefix_FUNC,
StringFormat_1SetTabStops_FUNC,
StringFormat_1delete_FUNC,
+ TextureBrush_1ResetTransform_FUNC,
+ TextureBrush_1ScaleTransform_FUNC,
TextureBrush_1SetTransform_FUNC,
+ TextureBrush_1TranslateTransform_FUNC,
TextureBrush_1delete_FUNC,
TextureBrush_1new_FUNC,
} Gdip_FUNCS;
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 b473453fe5..60bc89d4c4 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
@@ -248,6 +248,9 @@ public static final native int /*long*/ LinearGradientBrush_new(PointF point1, P
public static final native void LinearGradientBrush_delete(int /*long*/ brush);
public static final native int LinearGradientBrush_SetInterpolationColors(int /*long*/ brush, int /*long*/[] presetColors, float[] blendPositions, int count);
public static final native int LinearGradientBrush_SetWrapMode(int /*long*/ brush, int wrapMode);
+public static final native int LinearGradientBrush_ResetTransform(int /*long*/ brush);
+public static final native int LinearGradientBrush_ScaleTransform(int /*long*/ brush, float sx, float sy, int order);
+public static final native int LinearGradientBrush_TranslateTransform(int /*long*/ brush, float dx, float dy, int order);
public static final native int /*long*/ Matrix_new(float m11, float m12, float m21, float m22, float dx, float dy);
public static final native void Matrix_delete(int /*long*/ matrix);
public static final native int Matrix_GetElements(int /*long*/ matrix, float[] m);
@@ -300,4 +303,7 @@ public static final native int StringFormat_SetTabStops(int /*long*/ format, flo
public static final native int /*long*/ TextureBrush_new(int /*long*/ image, int wrapMode, float dstX, float dstY, float dstWidth, float dstHeight);
public static final native void TextureBrush_delete(int /*long*/ brush);
public static final native int TextureBrush_SetTransform(int /*long*/ brush, int /*long*/ matrix);
+public static final native int TextureBrush_ResetTransform(int /*long*/ brush);
+public static final native int TextureBrush_ScaleTransform(int /*long*/ brush, float sx, float sy, int order);
+public static final native int TextureBrush_TranslateTransform(int /*long*/ brush, float dx, float dy, int order);
}

Back to the top