### Eclipse Workspace Patch 1.0 #P org.eclipse.swt Index: Eclipse SWT PI/carbon/library/os.c =================================================================== RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c,v retrieving revision 1.69 diff -u -r1.69 os.c --- Eclipse SWT PI/carbon/library/os.c 20 Jul 2005 16:45:51 -0000 1.69 +++ Eclipse SWT PI/carbon/library/os.c 23 Nov 2005 16:03:44 -0000 @@ -59,6 +59,18 @@ } #endif +#ifndef NO_AEInstallEventHandler +JNIEXPORT jint JNICALL OS_NATIVE(AEInstallEventHandler) + (jint arg0, jint arg1, jint arg2, jint arg3, jboolean arg4) +{ + jint rc = 0; + OS_NATIVE_ENTER(env, that, AEInstallEventHandler_FUNC); + rc = (jint) AEInstallEventHandler((AEEventClass)arg0, (AEEventID)arg1, (AEEventHandlerUPP)arg2, (long)arg3, (Boolean)arg4); + OS_NATIVE_EXIT(env, that, AEInstallEventHandler_FUNC); + return rc; +} +#endif + #ifndef NO_AEProcessAppleEvent JNIEXPORT jint JNICALL OS_NATIVE(AEProcessAppleEvent) (JNIEnv *env, jclass that, jobject arg0) @@ -7302,6 +7314,18 @@ } #endif +#ifndef NO_IsEventInQueue +JNIEXPORT jboolean JNICALL OS_NATIVE(IsEventInQueue) + (JNIEnv *env, jclass that, jint arg0, jint arg1) +{ + jboolean rc = 0; + OS_NATIVE_ENTER(env, that, IsEventInQueue_FUNC); + rc = (jboolean)IsEventInQueue((EventQueueRef)arg0, (EventRef)arg1); + OS_NATIVE_EXIT(env, that, IsEventInQueue_FUNC); + return rc; +} +#endif + #ifndef NO_IsMenuCommandEnabled JNIEXPORT jboolean JNICALL OS_NATIVE(IsMenuCommandEnabled) (JNIEnv *env, jclass that, jint arg0, jint arg1) @@ -8953,6 +8977,18 @@ } #endif +#ifndef NO_RemoveEventFromQueue +JNIEXPORT jint JNICALL OS_NATIVE(RemoveEventFromQueue) + (JNIEnv *env, jclass that, jint arg0, jint arg1) +{ + jint rc = 0; + OS_NATIVE_ENTER(env, that, RemoveEventFromQueue_FUNC); + rc = (jint)RemoveEventFromQueue((EventQueueRef)arg0, (EventRef)arg1); + OS_NATIVE_EXIT(env, that, RemoveEventFromQueue_FUNC); + return rc; +} +#endif + #ifndef NO_RemoveEventHandler JNIEXPORT jint JNICALL OS_NATIVE(RemoveEventHandler) (JNIEnv *env, jclass that, jint arg0) Index: Eclipse SWT PI/carbon/library/build.xml =================================================================== RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.xml,v retrieving revision 1.4 diff -u -r1.4 build.xml --- Eclipse SWT PI/carbon/library/build.xml 11 Apr 2005 15:56:33 -0000 1.4 +++ Eclipse SWT PI/carbon/library/build.xml 23 Nov 2005 16:03:43 -0000 @@ -3,9 +3,9 @@ - + @@ -13,7 +13,7 @@ - + Index: Eclipse SWT PI/carbon/library/os_stats.h =================================================================== RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h,v retrieving revision 1.38 diff -u -r1.38 os_stats.h --- Eclipse SWT PI/carbon/library/os_stats.h 20 Jul 2005 16:45:51 -0000 1.38 +++ Eclipse SWT PI/carbon/library/os_stats.h 23 Nov 2005 16:03:45 -0000 @@ -23,6 +23,7 @@ typedef enum { AECountItems_FUNC, AEGetNthPtr_FUNC, + AEInstallEventHandler_FUNC, AEProcessAppleEvent_FUNC, ATSFontGetPostScriptName_FUNC, ATSUBatchBreakLines_FUNC, @@ -539,6 +540,7 @@ IsControlEnabled_FUNC, IsControlVisible_FUNC, IsDataBrowserItemSelected_FUNC, + IsEventInQueue_FUNC, IsMenuCommandEnabled_FUNC, IsMenuItemEnabled_FUNC, IsValidControlHandle_FUNC, @@ -661,6 +663,7 @@ RemoveControlProperty_FUNC, RemoveDataBrowserItems_FUNC, RemoveDataBrowserTableViewColumn_FUNC, + RemoveEventFromQueue_FUNC, RemoveEventHandler_FUNC, RemoveEventLoopTimer_FUNC, RemoveReceiveHandler_FUNC, Index: Eclipse SWT PI/carbon/library/os_stats.c =================================================================== RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c,v retrieving revision 1.39 diff -u -r1.39 os_stats.c --- Eclipse SWT PI/carbon/library/os_stats.c 20 Jul 2005 16:45:51 -0000 1.39 +++ Eclipse SWT PI/carbon/library/os_stats.c 23 Nov 2005 16:03:45 -0000 @@ -14,11 +14,12 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 847; -int OS_nativeFunctionCallCount[847]; +int OS_nativeFunctionCount = 850; +int OS_nativeFunctionCallCount[850]; char * OS_nativeFunctionNames[] = { "AECountItems", "AEGetNthPtr", + "AEInstallEventHandler", "AEProcessAppleEvent", "ATSFontGetPostScriptName", "ATSUBatchBreakLines", @@ -535,6 +536,7 @@ "IsControlEnabled", "IsControlVisible", "IsDataBrowserItemSelected", + "IsEventInQueue", "IsMenuCommandEnabled", "IsMenuItemEnabled", "IsValidControlHandle", @@ -657,6 +659,7 @@ "RemoveControlProperty", "RemoveDataBrowserItems", "RemoveDataBrowserTableViewColumn", + "RemoveEventFromQueue", "RemoveEventHandler", "RemoveEventLoopTimer", "RemoveReceiveHandler", Index: Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java =================================================================== RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java,v retrieving revision 1.181 diff -u -r1.181 OS.java --- Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java 11 Aug 2005 17:10:08 -0000 1.181 +++ Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java 23 Nov 2005 16:03:45 -0000 @@ -766,6 +766,7 @@ public static final native int ActiveNonFloatingWindow(); public static final native int AECountItems(AEDesc theAEDescList, int[] theCount); public static final native int AEGetNthPtr(AEDesc theAEDescList, int index, int desiredType, int[] theAEKeyword, int[] typeCode, int dataPtr, int maximumSize, int[] actualSize); +public static final native int AEInstallEventHandler(int eventClass, int eventId, int handler, int refCon, boolean sysHandler); public static final native int AEProcessAppleEvent(EventRecord theEventRecord); public static final native int ATSFontGetPostScriptName(int iFont, int iOptions, int[] oName); public static final native int ATSUBatchBreakLines(int iTextLayout, int iRangeStart, int iRangeLength, int iLineWidth, int[] oBreakCount); @@ -1280,6 +1281,7 @@ public static final native boolean IsControlEnabled(int cHandle); public static final native boolean IsControlVisible(int cHandle); public static final native boolean IsDataBrowserItemSelected(int cHandle, int itemID); +public static final native boolean IsEventInQueue(int queue, int event); public static final native boolean IsMenuCommandEnabled(int mHandle, int commandId); public static final native boolean IsMenuItemEnabled(int mHandle, short index); public static final native boolean IsValidControlHandle(int cHandle); @@ -1400,6 +1402,7 @@ public static final native int RemoveControlProperty(int control, int propertyCreator, int propertyTag); public static final native int RemoveDataBrowserItems(int cHandle, int containerID, int numItems, int[] itemIDs, int preSortProperty); public static final native int RemoveDataBrowserTableViewColumn(int browser, int column); +public static final native int RemoveEventFromQueue(int queue, int event); public static final native int RemoveEventHandler(int inHandlerRef); public static final native int RemoveEventLoopTimer(int inTimer); public static final native int RemoveReceiveHandler(int receiveHandler,int theWindow);