*** empty log message ***v3314aBefore64PImerge

5 files changed, 48 insertions, 2 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 9c79c9458d..3e2dd08b96 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
@@ -759,6 +759,12 @@ OS_AXValueCreate=
 OS_AXValueCreate_0=cast=AXValueType
 OS_AXValueCreate_1=cast=(CFRange *)
 
+OS_AcquireFirstMatchingEventInQueue=
+OS_AcquireFirstMatchingEventInQueue_0=cast=EventQueueRef
+OS_AcquireFirstMatchingEventInQueue_1=
+OS_AcquireFirstMatchingEventInQueue_2=cast=const EventTypeSpec *
+OS_AcquireFirstMatchingEventInQueue_3=
+
 OS_ActiveNonFloatingWindow=
 
 OS_AddDataBrowserItems=
@@ -2052,6 +2058,11 @@ OS_FetchFontInfo_1=
 OS_FetchFontInfo_2=
 OS_FetchFontInfo_3=
 
+OS_FindSpecificEventInQueue=
+OS_FindSpecificEventInQueue_0=cast=EventQueueRef
+OS_FindSpecificEventInQueue_1=cast=EventComparatorUPP
+OS_FindSpecificEventInQueue_2=cast=void *
+
 OS_FindWindow=
 OS_FindWindow_0=cast=(Point *),flags=struct
 OS_FindWindow_1=cast=(WindowRef *)
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 55d4de14ee..9fe9e6edc1 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
@@ -770,6 +770,22 @@ fail:
 }
 #endif
 
+#ifndef NO_AcquireFirstMatchingEventInQueue
+JNIEXPORT jint JNICALL OS_NATIVE(AcquireFirstMatchingEventInQueue)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3)
+{
+	jint *lparg2=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, AcquireFirstMatchingEventInQueue_FUNC);
+	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jint)AcquireFirstMatchingEventInQueue((EventQueueRef)arg0, arg1, (const EventTypeSpec *)lparg2, arg3);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	OS_NATIVE_EXIT(env, that, AcquireFirstMatchingEventInQueue_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_ActiveNonFloatingWindow
 JNIEXPORT jint JNICALL OS_NATIVE(ActiveNonFloatingWindow)
 	(JNIEnv *env, jclass that)
@@ -4425,6 +4441,18 @@ fail:
 }
 #endif
 
+#ifndef NO_FindSpecificEventInQueue
+JNIEXPORT jint JNICALL OS_NATIVE(FindSpecificEventInQueue)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, FindSpecificEventInQueue_FUNC);
+	rc = (jint)FindSpecificEventInQueue((EventQueueRef)arg0, (EventComparatorUPP)arg1, (void *)arg2);
+	OS_NATIVE_EXIT(env, that, FindSpecificEventInQueue_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_FindWindow
 JNIEXPORT jshort JNICALL OS_NATIVE(FindWindow)
 	(JNIEnv *env, jclass that, jobject arg0, jintArray arg1)
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 a246ea3102..1c9c7cff05 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 = 940;
-int OS_nativeFunctionCallCount[940];
+int OS_nativeFunctionCount = 942;
+int OS_nativeFunctionCallCount[942];
 char * OS_nativeFunctionNames[] = {
 	"AECountItems",
 	"AEGetNthPtr",
@@ -63,6 +63,7 @@ char * OS_nativeFunctionNames[] = {
 	"AXUIElementCreateWithHIObjectAndIdentifier",
 	"AXUIElementGetIdentifier",
 	"AXValueCreate",
+	"AcquireFirstMatchingEventInQueue",
 	"ActiveNonFloatingWindow",
 	"AddDataBrowserItems",
 	"AddDataBrowserListViewColumn",
@@ -336,6 +337,7 @@ char * OS_nativeFunctionNames[] = {
 	"FSpGetFInfo",
 	"FSpMakeFSRef",
 	"FetchFontInfo",
+	"FindSpecificEventInQueue",
 	"FindWindow",
 	"Fix2Long",
 	"Fix2X",
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 0d2c152c80..68416a255c 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
@@ -67,6 +67,7 @@ typedef enum {
 	AXUIElementCreateWithHIObjectAndIdentifier_FUNC,
 	AXUIElementGetIdentifier_FUNC,
 	AXValueCreate_FUNC,
+	AcquireFirstMatchingEventInQueue_FUNC,
 	ActiveNonFloatingWindow_FUNC,
 	AddDataBrowserItems_FUNC,
 	AddDataBrowserListViewColumn_FUNC,
@@ -340,6 +341,7 @@ typedef enum {
 	FSpGetFInfo_FUNC,
 	FSpMakeFSRef_FUNC,
 	FetchFontInfo_FUNC,
+	FindSpecificEventInQueue_FUNC,
 	FindWindow_FUNC,
 	Fix2Long_FUNC,
 	Fix2X_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 7a86e7d74b..f8f0379a9b 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
@@ -441,6 +441,7 @@ public class OS extends Platform {
 	public static final int kEventParamWindowRef = ('w'<<24) + ('i'<<16) + ('n'<<8) + 'd';
 	public static final int kEventParamWindowRegionCode   = ('w'<<24) + ('s'<<16) + ('h'<<8) + 'p';
 	public static final int kEventProcessCommand = 1;
+	public static final int kEventQueueOptionsNone = 0;
 	public static final int kEventRawKeyDown = 1;
 	public static final int kEventRawKeyRepeat = 2;
 	public static final int kEventRawKeyUp = 3;
@@ -971,6 +972,7 @@ public static final native int AddDataBrowserItems(int cHandle, int containerID,
 public static final native int AddDataBrowserListViewColumn(int browser, DataBrowserListViewColumnDesc columnDesc, int position);
 public static final native int AddDragItemFlavor(int theDrag, int theItemRef, int theType, byte[] dataPtr, int dataSize, int theFlags);  
 public static final native int AppendMenuItemTextWithCFString(int mHandle, int sHandle, int attributes, int commandID, short[] outItemIndex);
+public static final native int AcquireFirstMatchingEventInQueue(int inQueue, int inNumTypes, int[] inList, int inOptions);
 public static final native int AutoSizeDataBrowserListViewColumns(int cHandle);
 public static final native void BeginUpdate(int wHandle);
 public static final native void BringToFront(int wHandle);
@@ -1223,6 +1225,7 @@ public static final native void EraseRect(Rect bounds);
 public static final native void EraseRgn(int rgnHandle);
 public static final native int FetchFontInfo(short fontID, short fontSize, short fontStyle, FontInfo info); 
 public static final native int Fix2Long(int x);
+public static final native int FindSpecificEventInQueue(int inQueue, int inComparator, int inCompareData);
 public static final native double Fix2X(int x);
 public static final native int FMCreateFontFamilyInstanceIterator(short iFontFamily, int ioIterator);
 public static final native int FMCreateFontFamilyIterator(int iFilter, int iRefCon, int iOptions, int ioIterator);