Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Northover2007-10-15 10:38:41 -0400
committerSteve Northover2007-10-15 10:38:41 -0400
commitdb5810cfcd1a766cc77e510b5dc0ebe4e0fb472a (patch)
tree0913737e4f6c3a736180535d582873070ff21cef
parent38b82bb9a28a88ae974b9f3fbaaaa9ca3f7c2ca1 (diff)
downloadeclipse.platform.swt-db5810cfcd1a766cc77e510b5dc0ebe4e0fb472a.tar.gz
eclipse.platform.swt-db5810cfcd1a766cc77e510b5dc0ebe4e0fb472a.tar.xz
eclipse.platform.swt-db5810cfcd1a766cc77e510b5dc0ebe4e0fb472a.zip
release GDIP and UpdateLayeredWindow() natives
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties25
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties11
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp26
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp55
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp9
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c41
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java1
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java2
14 files changed, 162 insertions, 28 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 eb56ca5298..03ea8d95dd 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
@@ -440,10 +440,6 @@ Gdip_Graphics_ScaleTransform_1=
Gdip_Graphics_ScaleTransform_2=
Gdip_Graphics_ScaleTransform_3=cast=(MatrixOrder)
-Gdip_Graphics_1SetClip__II=flags=cpp
-Gdip_Graphics_1SetClip__II_0=cast=(Graphics *)
-Gdip_Graphics_1SetClip__II_1=cast=GraphicsPath *
-
Gdip_Graphics_1SetClip__III=flags=cpp
Gdip_Graphics_1SetClip__III_0=cast=(Graphics *)
Gdip_Graphics_1SetClip__III_1=cast=Region *
@@ -452,7 +448,16 @@ Gdip_Graphics_1SetClip__III_2=cast=CombineMode
Gdip_Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I=flags=cpp
Gdip_Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_0=cast=(Graphics *)
Gdip_Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_1=cast=Rect *,flags=struct
-Gdip_Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_2=cast=CombineMode
+Gdip_Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_2=cast=(CombineMode)
+
+Gdip_Graphics_1SetClipPath__II=flags=no_gen
+Gdip_Graphics_1SetClipPath__II_0=cast=(Graphics *)
+Gdip_Graphics_1SetClipPath__II_1=cast=(GraphicsPath *)
+
+Gdip_Graphics_1SetClipPath__III=flags=no_gen
+Gdip_Graphics_1SetClipPath__III_0=cast=(Graphics *)
+Gdip_Graphics_1SetClipPath__III_1=cast=(GraphicsPath *)
+Gdip_Graphics_1SetClipPath__III_2=cast=(CombineMode)
Gdip_Graphics_SetCompositingQuality=flags=cpp
Gdip_Graphics_SetCompositingQuality_0=cast=Graphics *
@@ -660,11 +665,21 @@ Gdip_PathGradientBrush_SetGraphicsPath=flags=cpp
Gdip_PathGradientBrush_SetGraphicsPath_0=cast=(PathGradientBrush *)
Gdip_PathGradientBrush_SetGraphicsPath_1=cast=(GraphicsPath *)
+Gdip_PathGradientBrush_SetInterpolationColors=flags=no_gen
+Gdip_PathGradientBrush_SetInterpolationColors_0=cast=(PathGradientBrush *)
+Gdip_PathGradientBrush_SetInterpolationColors_1=cast=const Color *
+Gdip_PathGradientBrush_SetInterpolationColors_2=cast=(const REAL *)
+Gdip_PathGradientBrush_SetInterpolationColors_3=
+
Gdip_PathGradientBrush_SetSurroundColors=flags=no_gen
Gdip_PathGradientBrush_SetSurroundColors_0=cast=(PathGradientBrush *)
Gdip_PathGradientBrush_SetSurroundColors_1=cast=Color *
Gdip_PathGradientBrush_SetSurroundColors_2=cast=INT *
+Gdip_PathGradientBrush_SetWrapMode=flags=cpp
+Gdip_PathGradientBrush_SetWrapMode_0=cast=(PathGradientBrush *)
+Gdip_PathGradientBrush_SetWrapMode_1=cast=(WrapMode)
+
Gdip_PathGradientBrush_delete=flags=delete
Gdip_PathGradientBrush_delete_0=
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
index 6f5d830ee4..a06f3fa836 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
@@ -4829,6 +4829,17 @@ OS_UnregisterClassW=
OS_UnregisterClassW_0=cast=(LPWSTR)
OS_UnregisterClassW_1=cast=(HINSTANCE)
+OS_UpdateLayeredWindow=flags=dynamic
+OS_UpdateLayeredWindow_0=cast=HWND
+OS_UpdateLayeredWindow_1=cast=HDC
+OS_UpdateLayeredWindow_2=
+OS_UpdateLayeredWindow_3=
+OS_UpdateLayeredWindow_4=cast=HDC
+OS_UpdateLayeredWindow_5=
+OS_UpdateLayeredWindow_6=cast=(COLORREF)
+OS_UpdateLayeredWindow_7=
+OS_UpdateLayeredWindow_8=
+
OS_UpdateWindow=
OS_UpdateWindow_0=cast=(HWND)
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 e852beabfd..86bea20f6e 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
@@ -1111,19 +1111,6 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ScaleTransform)
}
#endif
-#ifndef NO_Graphics_1SetClip__II
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__II)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
- jint rc = 0;
- Gdip_NATIVE_ENTER(env, that, Graphics_1SetClip__II_FUNC);
- rc = (jint)((Graphics *)arg0)->SetClip((GraphicsPath *)arg1);
- Gdip_NATIVE_EXIT(env, that, Graphics_1SetClip__II_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO_Graphics_1SetClip__III
extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__III)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__III)
@@ -1752,6 +1739,19 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetGraphicsPath)
}
#endif
+#ifndef NO_PathGradientBrush_1SetWrapMode
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+ jint rc = 0;
+ Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetWrapMode_FUNC);
+ rc = (jint)((PathGradientBrush *)arg0)->SetWrapMode((WrapMode)arg1);
+ Gdip_NATIVE_EXIT(env, that, PathGradientBrush_1SetWrapMode_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_PathGradientBrush_1delete
extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete)(JNIEnv *env, jclass that, jint arg0);
JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp
index 283cca62a6..d2492de362 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp
@@ -188,6 +188,61 @@ fail:
}
#endif
+#ifndef NO_Graphics_1SetClipPath__II
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+ jint rc = 0;
+ Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__II_FUNC);
+ rc = (jint)((Graphics *)arg0)->SetClip((GraphicsPath *)arg1);
+ Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__II_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO_Graphics_1SetClipPath__III
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+ jint rc = 0;
+ Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__III_FUNC);
+ rc = (jint)((Graphics *)arg0)->SetClip((GraphicsPath *)arg1, (CombineMode)arg2);
+ Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__III_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO_PathGradientBrush_1SetInterpolationColors
+JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetInterpolationColors)
+ (JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTRArray arg1, jfloatArray arg2, jint arg3)
+{
+ Color *colors=NULL;
+ SWT_PTR *lparg1=NULL;
+ jfloat *lparg2=NULL;
+ jint rc = 0;
+ Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetInterpolationColors_FUNC);
+ if (arg1) if ((lparg1 = env->GetSWT_PTRArrayElements(arg1, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = env->GetFloatArrayElements(arg2, NULL)) == NULL) goto fail;
+ if (lparg1) {
+ colors = new Color[arg3];
+ for (int i=0; i<arg3; i++) {
+ colors[i] = *(Color *)lparg1[i];
+ }
+ }
+ rc = (jint)((PathGradientBrush *)arg0)->SetInterpolationColors(colors, (const REAL *)lparg2, arg3);
+fail:
+ if (lparg1 && colors) {
+ delete colors;
+ }
+ if (arg2 && lparg2) env->ReleaseFloatArrayElements(arg2, lparg2, 0);
+ if (arg1 && lparg1) env->ReleaseSWT_PTRArrayElements(arg1, lparg1, 0);
+ Gdip_NATIVE_EXIT(env, that, PathGradientBrush_1SetInterpolationColors_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_PathGradientBrush_1SetSurroundColors
JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetSurroundColors)
(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTRArray arg1, jintArray arg2)
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 b8853df06e..b94b365528 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 = 170;
-int Gdip_nativeFunctionCallCount[170];
+int Gdip_nativeFunctionCount = 173;
+int Gdip_nativeFunctionCallCount[173];
char * Gdip_nativeFunctionNames[] = {
"BitmapData_1delete",
"BitmapData_1new",
@@ -100,9 +100,10 @@ char * Gdip_nativeFunctionNames[] = {
"Graphics_1Restore",
"Graphics_1Save",
"Graphics_1ScaleTransform",
- "Graphics_1SetClip__II",
"Graphics_1SetClip__III",
"Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I",
+ "Graphics_1SetClipPath__II",
+ "Graphics_1SetClipPath__III",
"Graphics_1SetCompositingQuality",
"Graphics_1SetInterpolationMode",
"Graphics_1SetPageUnit",
@@ -150,7 +151,9 @@ char * Gdip_nativeFunctionNames[] = {
"PathGradientBrush_1SetCenterColor",
"PathGradientBrush_1SetCenterPoint",
"PathGradientBrush_1SetGraphicsPath",
+ "PathGradientBrush_1SetInterpolationColors",
"PathGradientBrush_1SetSurroundColors",
+ "PathGradientBrush_1SetWrapMode",
"PathGradientBrush_1delete",
"PathGradientBrush_1new",
"Pen_1GetBrush",
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 fdd616bfe8..49ca8e8265 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
@@ -108,9 +108,10 @@ typedef enum {
Graphics_1Restore_FUNC,
Graphics_1Save_FUNC,
Graphics_1ScaleTransform_FUNC,
- Graphics_1SetClip__II_FUNC,
Graphics_1SetClip__III_FUNC,
Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_FUNC,
+ Graphics_1SetClipPath__II_FUNC,
+ Graphics_1SetClipPath__III_FUNC,
Graphics_1SetCompositingQuality_FUNC,
Graphics_1SetInterpolationMode_FUNC,
Graphics_1SetPageUnit_FUNC,
@@ -158,7 +159,9 @@ typedef enum {
PathGradientBrush_1SetCenterColor_FUNC,
PathGradientBrush_1SetCenterPoint_FUNC,
PathGradientBrush_1SetGraphicsPath_FUNC,
+ PathGradientBrush_1SetInterpolationColors_FUNC,
PathGradientBrush_1SetSurroundColors_FUNC,
+ PathGradientBrush_1SetWrapMode_FUNC,
PathGradientBrush_1delete_FUNC,
PathGradientBrush_1new_FUNC,
Pen_1GetBrush_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c
index 4819238251..897ae9ed6e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c
@@ -14350,6 +14350,47 @@ fail:
}
#endif
+#ifndef NO_UpdateLayeredWindow
+JNIEXPORT jboolean JNICALL OS_NATIVE(UpdateLayeredWindow)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jint arg4, jobject arg5, jint arg6, jobject arg7, jint arg8)
+{
+ POINT _arg2, *lparg2=NULL;
+ SIZE _arg3, *lparg3=NULL;
+ POINT _arg5, *lparg5=NULL;
+ BLENDFUNCTION _arg7, *lparg7=NULL;
+ jboolean rc = 0;
+ OS_NATIVE_ENTER(env, that, UpdateLayeredWindow_FUNC);
+ if (arg2) if ((lparg2 = getPOINTFields(env, arg2, &_arg2)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = getSIZEFields(env, arg3, &_arg3)) == NULL) goto fail;
+ if (arg5) if ((lparg5 = getPOINTFields(env, arg5, &_arg5)) == NULL) goto fail;
+ if (arg7) if ((lparg7 = getBLENDFUNCTIONFields(env, arg7, &_arg7)) == NULL) goto fail;
+/*
+ rc = (jboolean)UpdateLayeredWindow((HWND)arg0, (HDC)arg1, lparg2, lparg3, (HDC)arg4, lparg5, (COLORREF)arg6, lparg7, arg8);
+*/
+ {
+ static int initialized = 0;
+ static HMODULE hm = NULL;
+ static FARPROC fp = NULL;
+ rc = 0;
+ if (!initialized) {
+ if (!hm) hm = LoadLibrary(UpdateLayeredWindow_LIB);
+ if (hm) fp = GetProcAddress(hm, "UpdateLayeredWindow");
+ initialized = 1;
+ }
+ if (fp) {
+ rc = (jboolean)fp((HWND)arg0, (HDC)arg1, lparg2, lparg3, (HDC)arg4, lparg5, (COLORREF)arg6, lparg7, arg8);
+ }
+ }
+fail:
+ if (arg7 && lparg7) setBLENDFUNCTIONFields(env, arg7, lparg7);
+ if (arg5 && lparg5) setPOINTFields(env, arg5, lparg5);
+ if (arg3 && lparg3) setSIZEFields(env, arg3, lparg3);
+ if (arg2 && lparg2) setPOINTFields(env, arg2, lparg2);
+ OS_NATIVE_EXIT(env, that, UpdateLayeredWindow_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_UpdateWindow
JNIEXPORT jboolean JNICALL OS_NATIVE(UpdateWindow)
(JNIEnv *env, jclass that, jint arg0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
index 0f42e24d3a..111f6b1c1b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
@@ -504,16 +504,15 @@
#define NO_TransparentBlt
#define NO_UnhookWindowsHookEx
#define NO_UnregisterClassA
+#define NO_UpdateLayeredWindow
#define NO_VkKeyScanA
#define NO_VkKeyScanW
#define NO_VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2
-
#define NO_WaitMessage
#define NO_WindowFromDC
#define GetWindowLongPtrW GetWindowLongW
#define SetWindowLongPtrW SetWindowLongW
-
#define ChooseColorW ChooseColor
#define CHOOSECOLORW CHOOSECOLOR
#define LPCHOOSECOLORW LPCHOOSECOLOR
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h
index e7e29c2e19..735ed3def6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h
@@ -73,3 +73,4 @@
#define SetProcessDPIAware_LIB "user32.dll"
#define SetWindowTheme_LIB "uxtheme.dll"
#define TransparentBlt_LIB "msimg32.dll"
+#define UpdateLayeredWindow_LIB "user32.dll"
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c
index 64255711d5..7221a61ba0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c
@@ -14,8 +14,8 @@
#ifdef NATIVE_STATS
-int OS_nativeFunctionCount = 920;
-int OS_nativeFunctionCallCount[920];
+int OS_nativeFunctionCount = 921;
+int OS_nativeFunctionCallCount[921];
char * OS_nativeFunctionNames[] = {
"ACCEL_1sizeof",
"ACTCTX_1sizeof",
@@ -910,6 +910,7 @@ char * OS_nativeFunctionNames[] = {
"UnhookWindowsHookEx",
"UnregisterClassA",
"UnregisterClassW",
+ "UpdateLayeredWindow",
"UpdateWindow",
"ValidateRect",
"VkKeyScanA",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h
index 8526dfe273..e985e276c9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h
@@ -918,6 +918,7 @@ typedef enum {
UnhookWindowsHookEx_FUNC,
UnregisterClassA_FUNC,
UnregisterClassW_FUNC,
+ UpdateLayeredWindow_FUNC,
UpdateWindow_FUNC,
ValidateRect_FUNC,
VkKeyScanA_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 0b6e1043ba..5d1665b917 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
@@ -201,8 +201,9 @@ public static final native int Graphics_Restore(int /*long*/ graphics, int gstat
public static final native int Graphics_Save(int /*long*/ graphics);
public static final native int Graphics_ScaleTransform(int /*long*/ graphics, float sx, float sy, int order);
public static final native int Graphics_SetClip(int /*long*/ graphics, int /*long*/ hrgn, int combineMode);
-public static final native int Graphics_SetClip(int /*long*/ graphics, int /*long*/ path);
public static final native int Graphics_SetClip(int /*long*/ graphics, Rect rect, int combineMode);
+public static final native int Graphics_SetClipPath(int /*long*/ graphics, int /*long*/ path);
+public static final native int Graphics_SetClipPath(int /*long*/ graphics, int /*long*/ path, int combineMode);
public static final native int Graphics_SetCompositingQuality(int /*long*/ graphics, int compositingQuality);
public static final native int Graphics_SetPageUnit(int /*long*/ graphics, int unit);
public static final native int Graphics_SetPixelOffsetMode(int /*long*/ graphics, int pixelOffsetMode);
@@ -270,8 +271,10 @@ public static final native int /*long*/ PathGradientBrush_new(int /*long*/ path)
public static final native void PathGradientBrush_delete(int /*long*/ brush);
public static final native int PathGradientBrush_SetCenterColor(int /*long*/ brush, int /*long*/ color);
public static final native int PathGradientBrush_SetCenterPoint(int /*long*/ brush, PointF pt);
+public static final native int PathGradientBrush_SetInterpolationColors(int /*long*/ brush, int /*long*/[] presetColors, float[] blendPositions, int count);
public static final native int PathGradientBrush_SetSurroundColors(int /*long*/ brush, int /*long*/[] colors, int[] count);
public static final native int PathGradientBrush_SetGraphicsPath(int /*long*/ brush, int /*long*/ path);
+public static final native int PathGradientBrush_SetWrapMode(int /*long*/ brush, int wrapMode);
public static final native int /*long*/ Pen_new(int /*long*/ brush, float width);
public static final native void Pen_delete(int /*long*/ pen);
public static final native int /*long*/ Pen_GetBrush(int /*long*/ pen);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
index 7cdadd76b6..87969cd6dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
@@ -3950,6 +3950,7 @@ public static final native boolean TransparentImage (int /*long*/ hdcDest, int D
public static final native boolean UnhookWindowsHookEx (int /*long*/ hhk);
public static final native boolean UnregisterClassW (char [] lpClassName, int /*long*/ hInstance);
public static final native boolean UnregisterClassA (byte [] lpClassName, int /*long*/ hInstance);
+public static final native boolean UpdateLayeredWindow (int /*long*/ hwnd, int /*long*/ hdcDst, POINT pptDst, SIZE psize, int /*long*/ hdcSrc, POINT pptSrc, int crKey, BLENDFUNCTION pblend, int dwFlags);
public static final native boolean UpdateWindow (int /*long*/ hWnd);
public static final native boolean ValidateRect (int /*long*/ hWnd, RECT lpRect);
public static final native short VkKeyScanW (short ch);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
index bfcf6d8676..453830b33d 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
@@ -4019,7 +4019,7 @@ public void setClipping (Path path) {
initGdip();
int mode = OS.GetPolyFillMode(handle) == OS.WINDING ? Gdip.FillModeWinding : Gdip.FillModeAlternate;
Gdip.GraphicsPath_SetFillMode(path.handle, mode);
- Gdip.Graphics_SetClip(data.gdipGraphics, path.handle);
+ Gdip.Graphics_SetClipPath(data.gdipGraphics, path.handle);
}
}

Back to the top