summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti <silenio>2004-12-04 00:34:39 +0000
committerSilenio Quarti <silenio>2004-12-04 00:34:39 +0000
commit88e5df65fba7738d92456a53fbe2932fc03179ea (patch)
tree857e99cf50c3430927a17c2fd1e5d9d464f5d44f
parent24fb4b001904159bfbafe37784c52bec6ff6afc5 (diff)
downloadeclipse.platform.swt-88e5df65fba7738d92456a53fbe2932fc03179ea.tar.gz
eclipse.platform.swt-88e5df65fba7738d92456a53fbe2932fc03179ea.tar.xz
eclipse.platform.swt-88e5df65fba7738d92456a53fbe2932fc03179ea.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java3
5 files changed, 19 insertions, 3 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 2aa07c6965..dfaef06111 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
@@ -809,6 +809,9 @@ OS_CGContextDrawImage_0=cast=(CGContextRef)
OS_CGContextDrawImage_1=cast=(CGRect *),flags=struct
OS_CGContextDrawImage_2=cast=(CGImageRef)
+OS_CGContextEOClip=
+OS_CGContextEOClip_0=cast=(CGContextRef)
+
OS_CGContextEOFillPath=
OS_CGContextEOFillPath_0=cast=(CGContextRef)
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 794015af1c..7acce79115 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
@@ -1217,6 +1217,16 @@ fail:
}
#endif
+#ifndef NO_CGContextEOClip
+JNIEXPORT void JNICALL OS_NATIVE(CGContextEOClip)
+ (JNIEnv *env, jclass that, jint arg0)
+{
+ OS_NATIVE_ENTER(env, that, CGContextEOClip_FUNC);
+ CGContextEOClip((CGContextRef)arg0);
+ OS_NATIVE_EXIT(env, that, CGContextEOClip_FUNC);
+}
+#endif
+
#ifndef NO_CGContextEOFillPath
JNIEXPORT void JNICALL OS_NATIVE(CGContextEOFillPath)
(JNIEnv *env, jclass that, jint arg0)
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 9f768551ad..6406e174e8 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 = 791;
-int OS_nativeFunctionCallCount[791];
+int OS_nativeFunctionCount = 792;
+int OS_nativeFunctionCallCount[792];
char * OS_nativeFunctionNames[] = {
"AECountItems",
"AEGetNthPtr",
@@ -104,6 +104,7 @@ char * OS_nativeFunctionNames[] = {
"CGContextClosePath",
"CGContextConcatCTM",
"CGContextDrawImage",
+ "CGContextEOClip",
"CGContextEOFillPath",
"CGContextFillPath",
"CGContextFillRect",
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 aaa8f28838..44a196385e 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
@@ -108,6 +108,7 @@ typedef enum {
CGContextClosePath_FUNC,
CGContextConcatCTM_FUNC,
CGContextDrawImage_FUNC,
+ CGContextEOClip_FUNC,
CGContextEOFillPath_FUNC,
CGContextFillPath_FUNC,
CGContextFillRect_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 b93565f957..4934e17261 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
@@ -781,8 +781,9 @@ public static final native void CGContextClearRect (int ctx, CGRect rect);
public static final native void CGContextClosePath (int ctx);
public static final native void CGContextConcatCTM (int context, float[] transform);
public static final native void CGContextDrawImage (int ctx, CGRect rect, int image);
-public static final native void CGContextFillPath (int ctx);
+public static final native void CGContextEOClip (int ctx);
public static final native void CGContextEOFillPath (int ctx);
+public static final native void CGContextFillPath (int ctx);
public static final native void CGContextStrokeRect (int ctx, CGRect rect);
public static final native void CGContextFillRect (int ctx, CGRect rect);
public static final native void CGContextFlush (int ctx);