*** empty log message ***

5 files changed, 51 insertions, 9 deletions

diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
index 59ffa5b25f..7199839b5c 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
@@ -1290,6 +1290,10 @@ OS_CGContextSetAlpha=
 OS_CGContextSetAlpha_0=cast=(CGContextRef)
 OS_CGContextSetAlpha_1=
 
+OS_CGContextSetBlendMode=
+OS_CGContextSetBlendMode_0=cast=(CGContextRef)
+OS_CGContextSetBlendMode_1=
+
 OS_CGContextSetFillColor=
 OS_CGContextSetFillColor_0=cast=(CGContextRef)
 OS_CGContextSetFillColor_1=cast=(const float *)
@@ -2983,8 +2987,12 @@ OS_HIScrollViewCreate=
 OS_HIScrollViewCreate_0=
 OS_HIScrollViewCreate_1=cast=(HIViewRef*)
 
+OS_HIScrollViewSetScrollBarAutoHide=
+OS_HIScrollViewSetScrollBarAutoHide_0=cast=(HIViewRef)
+OS_HIScrollViewSetScrollBarAutoHide_1=
+
 OS_HISearchFieldChangeAttributes=
-OS_HISearchFieldChangeAttributes_0=cast=HIViewRef
+OS_HISearchFieldChangeAttributes_0=cast=(HIViewRef)
 OS_HISearchFieldChangeAttributes_1=cast=OptionBits
 OS_HISearchFieldChangeAttributes_2=cast=(OptionBits)
 
@@ -3007,6 +3015,13 @@ OS_HISearchFieldSetDescriptiveText=
 OS_HISearchFieldSetDescriptiveText_0=cast=HIViewRef
 OS_HISearchFieldSetDescriptiveText_1=cast=CFStringRef
 
+OS_HIShapeCreateWithQDRgn=flags=dynamic
+OS_HIShapeCreateWithQDRgn_0=
+
+OS_HIShapeReplacePathInCGContext=flags=dynamic
+OS_HIShapeReplacePathInCGContext_0=
+OS_HIShapeReplacePathInCGContext_1=
+
 OS_HITextViewCreate=
 OS_HITextViewCreate_0=
 OS_HITextViewCreate_1=
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
index 358ffbfc29..3619df601b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
@@ -1998,6 +1998,16 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetAlpha)
 }
 #endif
 
+#ifndef NO_CGContextSetBlendMode
+JNIEXPORT void JNICALL OS_NATIVE(CGContextSetBlendMode)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, CGContextSetBlendMode_FUNC);
+	CGContextSetBlendMode((CGContextRef)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, CGContextSetBlendMode_FUNC);
+}
+#endif
+
 #ifndef NO_CGContextSetFillColor
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetFillColor)
 	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1)
@@ -7317,6 +7327,18 @@ fail:
 }
 #endif
 
+#ifndef NO_HIScrollViewSetScrollBarAutoHide
+JNIEXPORT jint JNICALL OS_NATIVE(HIScrollViewSetScrollBarAutoHide)
+	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, HIScrollViewSetScrollBarAutoHide_FUNC);
+	rc = (jint)HIScrollViewSetScrollBarAutoHide((HIViewRef)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, HIScrollViewSetScrollBarAutoHide_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_HISearchFieldChangeAttributes
 JNIEXPORT jint JNICALL OS_NATIVE(HISearchFieldChangeAttributes)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
@@ -7399,12 +7421,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIShapeCreateWithQDRgn)
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, HIShapeCreateWithQDRgn_FUNC);
 /*
-	rc = (jint)HIShapeCreateWithQDRgn((RgnHandle)arg0);
+	rc = (jint)HIShapeCreateWithQDRgn(arg0);
 */
 	{
 		static int initialized = 0;
 		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(RgnHandle);
+		typedef jint (*FPTR)(jint);
 		static FPTR fptr;
 		rc = 0;
 		if (!initialized) {
@@ -7413,7 +7435,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIShapeCreateWithQDRgn)
 			initialized = 1;
 		}
 		if (fptr) {
-			rc = (jint)(*fptr)((RgnHandle)arg0);
+			rc = (jint)(*fptr)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, HIShapeCreateWithQDRgn_FUNC);
@@ -7428,12 +7450,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIShapeReplacePathInCGContext)
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, HIShapeReplacePathInCGContext_FUNC);
 /*
-	rc = (jint)HIShapeReplacePathInCGContext((HIShapeRef)arg0, (CGContextRef)arg1);
+	rc = (jint)HIShapeReplacePathInCGContext(arg0, arg1);
 */
 	{
 		static int initialized = 0;
 		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(HIShapeRef, CGContextRef);
+		typedef jint (*FPTR)(jint, jint);
 		static FPTR fptr;
 		rc = 0;
 		if (!initialized) {
@@ -7442,7 +7464,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIShapeReplacePathInCGContext)
 			initialized = 1;
 		}
 		if (fptr) {
-			rc = (jint)(*fptr)((HIShapeRef)arg0, (CGContextRef)arg1);
+			rc = (jint)(*fptr)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, HIShapeReplacePathInCGContext_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
index 7f49f6a361..b573f3e712 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 926;
-int OS_nativeFunctionCallCount[926];
+int OS_nativeFunctionCount = 928;
+int OS_nativeFunctionCallCount[928];
 char * OS_nativeFunctionNames[] = {
 	"AECountItems",
 	"AEGetNthPtr",
@@ -168,6 +168,7 @@ char * OS_nativeFunctionNames[] = {
 	"CGContextScaleCTM",
 	"CGContextSelectFont",
 	"CGContextSetAlpha",
+	"CGContextSetBlendMode",
 	"CGContextSetFillColor",
 	"CGContextSetFillColorSpace",
 	"CGContextSetFillPattern",
@@ -522,6 +523,7 @@ char * OS_nativeFunctionNames[] = {
 	"HIObjectRegisterSubclass",
 	"HIObjectSetAccessibilityIgnored",
 	"HIScrollViewCreate",
+	"HIScrollViewSetScrollBarAutoHide",
 	"HISearchFieldChangeAttributes",
 	"HISearchFieldCopyDescriptiveText",
 	"HISearchFieldCreate",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
index 0130b46f32..f2d29a7202 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
@@ -176,6 +176,7 @@ typedef enum {
 	CGContextScaleCTM_FUNC,
 	CGContextSelectFont_FUNC,
 	CGContextSetAlpha_FUNC,
+	CGContextSetBlendMode_FUNC,
 	CGContextSetFillColor_FUNC,
 	CGContextSetFillColorSpace_FUNC,
 	CGContextSetFillPattern_FUNC,
@@ -530,6 +531,7 @@ typedef enum {
 	HIObjectRegisterSubclass_FUNC,
 	HIObjectSetAccessibilityIgnored_FUNC,
 	HIScrollViewCreate_FUNC,
+	HIScrollViewSetScrollBarAutoHide_FUNC,
 	HISearchFieldChangeAttributes_FUNC,
 	HISearchFieldCopyDescriptiveText_FUNC,
 	HISearchFieldCreate_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
index 4b06352e4e..7a3884fa07 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
@@ -1167,6 +1167,7 @@ public static final native void CGContextSelectFont (int ctx, byte[] name, float
 public static final native void CGContextSetFillColorSpace (int ctx, int colorspace);
 public static final native void CGContextSetFillPattern (int context, int pattern, float[] components);
 public static final native void CGContextSetAlpha (int context, float alpha);
+public static final native void CGContextSetBlendMode(int context, int mode);
 public static final native void CGContextSetFillColor (int ctx, float[] value);
 public static final native void CGContextSetFont (int ctx, int font);
 public static final native void CGContextSetFontSize (int ctx, float size);