*** empty log message ***

7 files changed, 120 insertions, 2 deletions

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 971bd9e6d4..08a14048ba 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
@@ -673,6 +673,11 @@ OS_AlphaBlend_8=
 OS_AlphaBlend_9=
 OS_AlphaBlend_10=flags=struct
 
+OS_AnimateWindow=
+OS_AnimateWindow_0=cast=HWND
+OS_AnimateWindow_1=
+OS_AnimateWindow_2=
+
 OS_Arc=
 OS_Arc_0=cast=(HDC)
 OS_Arc_1=
@@ -1134,6 +1139,22 @@ OS_DrawThemeBackground_3=
 OS_DrawThemeBackground_4=cast=const RECT *
 OS_DrawThemeBackground_5=cast=const RECT *
 
+OS_DrawThemeParentBackground=flags=dynamic
+OS_DrawThemeParentBackground_0=
+OS_DrawThemeParentBackground_1=
+OS_DrawThemeParentBackground_2=
+
+OS_DrawThemeText=flags=dynamic
+OS_DrawThemeText_0=
+OS_DrawThemeText_1=
+OS_DrawThemeText_2=
+OS_DrawThemeText_3=
+OS_DrawThemeText_4=
+OS_DrawThemeText_5=
+OS_DrawThemeText_6=
+OS_DrawThemeText_7=
+OS_DrawThemeText_8=
+
 OS_Ellipse=
 OS_Ellipse_0=cast=(HDC)
 OS_Ellipse_1=
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 9d62e64db0..70cbb36c4e 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
@@ -87,6 +87,18 @@ fail:
 }
 #endif
 
+#ifndef NO_AnimateWindow
+JNIEXPORT jboolean JNICALL OS_NATIVE(AnimateWindow)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, AnimateWindow_FUNC);
+	rc = (jboolean)AnimateWindow((HWND)arg0, arg1, arg2);
+	OS_NATIVE_EXIT(env, that, AnimateWindow_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_Arc
 JNIEXPORT jboolean JNICALL OS_NATIVE(Arc)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
@@ -1467,6 +1479,73 @@ fail:
 }
 #endif
 
+#ifndef NO_DrawThemeParentBackground
+JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeParentBackground)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+{
+	RECT _arg2, *lparg2=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, DrawThemeParentBackground_FUNC);
+	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
+/*
+	rc = (jint)DrawThemeParentBackground(arg0, arg1, lparg2);
+*/
+	{
+		static int initialized = 0;
+		static HMODULE hm = NULL;
+		static FARPROC fp = NULL;
+		rc = 0;
+		if (!initialized) {
+			if (!hm) hm = LoadLibrary(DrawThemeParentBackground_LIB);
+			if (hm) fp = GetProcAddress(hm, "DrawThemeParentBackground");
+			initialized = 1;
+		}
+		if (fp) {
+			rc = (jint)fp(arg0, arg1, lparg2);
+		}
+	}
+fail:
+	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
+	OS_NATIVE_EXIT(env, that, DrawThemeParentBackground_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_DrawThemeText
+JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeText)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jint arg7, jobject arg8)
+{
+	jchar *lparg4=NULL;
+	RECT _arg8, *lparg8=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, DrawThemeText_FUNC);
+	if (arg4) if ((lparg4 = (*env)->GetCharArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg8) if ((lparg8 = getRECTFields(env, arg8, &_arg8)) == NULL) goto fail;
+/*
+	rc = (jint)DrawThemeText(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8);
+*/
+	{
+		static int initialized = 0;
+		static HMODULE hm = NULL;
+		static FARPROC fp = NULL;
+		rc = 0;
+		if (!initialized) {
+			if (!hm) hm = LoadLibrary(DrawThemeText_LIB);
+			if (hm) fp = GetProcAddress(hm, "DrawThemeText");
+			initialized = 1;
+		}
+		if (fp) {
+			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8);
+		}
+	}
+fail:
+	if (arg8 && lparg8) setRECTFields(env, arg8, lparg8);
+	if (arg4 && lparg4) (*env)->ReleaseCharArrayElements(env, arg4, lparg4, 0);
+	OS_NATIVE_EXIT(env, that, DrawThemeText_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_Ellipse
 JNIEXPORT jboolean JNICALL OS_NATIVE(Ellipse)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
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 3615e55e7b..7d85549d0f 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
@@ -126,6 +126,7 @@
 #ifdef _WIN32_WCE
 #define NO_AbortDoc
 #define NO_ActivateKeyboardLayout
+#define NO_AnimateWindow
 #define NO_Arc
 #define NO_AlphaBlend
 #define NO_BeginPath
@@ -163,6 +164,7 @@
 #define NO_DrawTextA
 #define NO_DrawThemeBackground
 #define NO_DrawThemeParentBackground
+#define NO_DrawThemeText
 #define NO_EnableScrollBar
 #define NO_EndDoc
 #define NO_EndPage
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 cd1be4d64b..6323994bc8 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
@@ -13,6 +13,8 @@
 #define AlphaBlend_LIB "msimg32.dll"
 #define CloseThemeData_LIB "uxtheme.dll"
 #define DrawThemeBackground_LIB "uxtheme.dll"
+#define DrawThemeParentBackground_LIB "uxtheme.dll"
+#define DrawThemeText_LIB "uxtheme.dll"
 #define EnumDisplayMonitors_LIB "user32.dll"
 #define EnumSystemLanguageGroupsA_LIB "kernel32.dll"
 #define EnumSystemLanguageGroupsW_LIB "kernel32.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 6faf81f68d..a9dcdb2f61 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,13 +14,14 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 658;
-int OS_nativeFunctionCallCount[658];
+int OS_nativeFunctionCount = 661;
+int OS_nativeFunctionCallCount[661];
 char * OS_nativeFunctionNames[] = {
 	"AbortDoc",
 	"ActivateKeyboardLayout",
 	"AdjustWindowRectEx",
 	"AlphaBlend",
+	"AnimateWindow",
 	"Arc",
 	"BeginDeferWindowPos",
 	"BeginPaint",
@@ -112,6 +113,8 @@ char * OS_nativeFunctionNames[] = {
 	"DrawTextA",
 	"DrawTextW",
 	"DrawThemeBackground",
+	"DrawThemeParentBackground",
+	"DrawThemeText",
 	"Ellipse",
 	"EnableMenuItem",
 	"EnableScrollBar",
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 64233c231c..ad7e04a6a8 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
@@ -25,6 +25,7 @@ typedef enum {
 	ActivateKeyboardLayout_FUNC,
 	AdjustWindowRectEx_FUNC,
 	AlphaBlend_FUNC,
+	AnimateWindow_FUNC,
 	Arc_FUNC,
 	BeginDeferWindowPos_FUNC,
 	BeginPaint_FUNC,
@@ -116,6 +117,8 @@ typedef enum {
 	DrawTextA_FUNC,
 	DrawTextW_FUNC,
 	DrawThemeBackground_FUNC,
+	DrawThemeParentBackground_FUNC,
+	DrawThemeText_FUNC,
 	Ellipse_FUNC,
 	EnableMenuItem_FUNC,
 	EnableScrollBar_FUNC,
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 1969f22f50..e269cc8164 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
@@ -177,6 +177,10 @@ public class OS extends Platform {
 	public static final int AC_SRC_OVER = 0;
 	public static final int AC_SRC_ALPHA = 1;
 	public static final int ALTERNATE = 1;
+	public static final int AW_VER_POSITIVE = 0x00000004;
+	public static final int AW_VER_NEGATIVE = 0x00000008;
+	public static final int AW_HIDE = 0x00010000;
+	public static final int AW_SLIDE = 0x00040000;
 	public static final int BDR_SUNKENINNER = 0x8;
 	public static final int BFFM_INITIALIZED = 0x1;
 	public static final int BFFM_SETSELECTION = IsUnicode ? 0x467 : 0x466;
@@ -949,6 +953,7 @@ public class OS extends Platform {
 	public static final int PM_NOYIELD = 0x2;
 	public static final int PRF_CLIENT = 0x4;
 	public static final int PRF_ERASEBKGND = 0x8;
+	public static final int PRF_NONCLIENT = 0x2; 
 	public static final int QS_HOTKEY = 0x0080;
 	public static final int QS_KEY = 0x0001;
 	public static final int QS_MOUSEMOVE = 0x0002;
@@ -2480,6 +2485,7 @@ public static final native int AbortDoc (int hdc);
 public static final native int ActivateKeyboardLayout(int hkl, int Flags);
 public static final native boolean AdjustWindowRectEx (RECT lpRect, int dwStyle, boolean bMenu, int dwExStyle);
 public static final native boolean AlphaBlend(int hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, int hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, BLENDFUNCTION blendFunction);
+public static final native boolean AnimateWindow(int hwnd, int dwTime, int dwFlags); 
 public static final native boolean Arc (int hdc,int nLeftRect,int nTopRect,int nRightRect,int nBottomRect,int nXStartArc,int nYStartArc,int nXEndArc,int nYEndArc);
 public static final native int BeginDeferWindowPos (int nNumWindows);
 public static final native int BeginPaint (int hWnd, PAINTSTRUCT lpPaint);
@@ -2571,6 +2577,8 @@ public static final native boolean DrawStateA (int hdc, int hbr, int lpOutputFun
 public static final native int DrawTextW (int hDC, char [] lpString, int nCount, RECT lpRect, int uFormat);
 public static final native int DrawTextA (int hDC, byte [] lpString, int nCount, RECT lpRect, int uFormat);
 public static final native int DrawThemeBackground(int hTheme, int hdc, int iPartId, int iStateId, RECT pRect, RECT pClipRect);
+public static final native int DrawThemeParentBackground(int hwnd, int hdc, RECT prc);
+public static final native int DrawThemeText(int hTheme, int hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwTextFlags, int dwTextFlags2, RECT pRect);
 public static final native boolean Ellipse (int hdc,int nLeftRect,int nTopRect,int nRightRect,int nBottomRect);
 public static final native boolean EnableMenuItem (int hMenu, int uIDEnableItem, int uEnable);
 public static final native boolean EnableScrollBar (int hWnd, int wSBflags, int wArrows);