BugÊ324155 - Eclipse crash at quit when modal dialog opened

4 files changed, 25 insertions, 5 deletions

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 864eb5d5d6..bda460f384 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -173,6 +173,18 @@ fail:
 }
 #endif
 
+#ifndef NO_AERemoveEventHandler
+JNIEXPORT jint JNICALL OS_NATIVE(AERemoveEventHandler)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, AERemoveEventHandler_FUNC);
+	rc = (jint)AERemoveEventHandler((AEEventClass)arg0, (AEEventID)arg1, (AEEventHandlerUPP)arg2, arg3);
+	OS_NATIVE_EXIT(env, that, AERemoveEventHandler_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_ATSFontActivateFromFileSpecification
 JNIEXPORT jint JNICALL OS_NATIVE(ATSFontActivateFromFileSpecification)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
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 0ad6aab434..ae3a9c161c 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 1014;
-int OS_nativeFunctionCallCount[1014];
+int OS_nativeFunctionCount = 1015;
+int OS_nativeFunctionCallCount[1015];
 char * OS_nativeFunctionNames[] = {
 	"AECoerceDesc",
 	"AECountItems",
@@ -26,6 +26,7 @@ char * OS_nativeFunctionNames[] = {
 	"AEGetParamDesc",
 	"AEInstallEventHandler",
 	"AEProcessAppleEvent",
+	"AERemoveEventHandler",
 	"ATSFontActivateFromFileSpecification",
 	"ATSFontDeactivate",
 	"ATSFontFindFromName",
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 894bc975c0..32d36401e2 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,6 +34,7 @@ typedef enum {
 	AEGetParamDesc_FUNC,
 	AEInstallEventHandler_FUNC,
 	AEProcessAppleEvent_FUNC,
+	AERemoveEventHandler_FUNC,
 	ATSFontActivateFromFileSpecification_FUNC,
 	ATSFontDeactivate_FUNC,
 	ATSFontFindFromName_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 f3e06eac83..5789382b0e 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
@@ -1155,6 +1155,12 @@ public static final native int AEGetParamDesc (int theAppleEvent, int theAEKeywo
  * @param handlerRefcon cast=(long)
  */
 public static final native int AEInstallEventHandler(int theAEEventClass, int theAEEventID, int handler, int handlerRefcon, boolean isSysHandler);  
+/**
+ * @param theAEEventClass cast=(AEEventClass)
+ * @param theAEEventID cast=(AEEventID)
+ * @param handler cast=(AEEventHandlerUPP)
+ */
+public static final native int AERemoveEventHandler (int theAEEventClass, int theAEEventID, int handler, boolean isSysHandler);
 /** @param theEventRecord cast=(const EventRecord *) */
 public static final native int AEProcessAppleEvent(EventRecord theEventRecord);
 /**