301684 - Fatal crash when creating Cursor

5 files changed, 4 insertions, 22 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java
index 5dd175cec3..dc368cd8e1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java
@@ -27,10 +27,6 @@ class MozillaDelegate {
 	static Callback Callback3;
 	static Hashtable handles = new Hashtable ();
 
-	static {
-		Cocoa.NSApplicationLoad ();
-	}
-
 MozillaDelegate (Browser browser) {
 	super ();
 	this.browser = browser;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c
index c721b0fcf5..dc80e60634 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
@@ -67,18 +67,6 @@ JNIEXPORT jint JNICALL Cocoa_NATIVE(HIWebViewGetWebView)
 }
 #endif
 
-#ifndef NO_NSApplicationLoad
-JNIEXPORT jint JNICALL Cocoa_NATIVE(NSApplicationLoad)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	Cocoa_NATIVE_ENTER(env, that, NSApplicationLoad_FUNC);
-	rc = (jint)NSApplicationLoad();
-	Cocoa_NATIVE_EXIT(env, that, NSApplicationLoad_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_NSDeviceRGBColorSpace
 JNIEXPORT jint JNICALL Cocoa_NATIVE(NSDeviceRGBColorSpace)
 	(JNIEnv *env, jclass that)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_stats.c
index ab44d0ad7f..a51c942092 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_stats.c
@@ -14,14 +14,13 @@
 
 #ifdef NATIVE_STATS
 
-int Cocoa_nativeFunctionCount = 37;
-int Cocoa_nativeFunctionCallCount[37];
+int Cocoa_nativeFunctionCount = 36;
+int Cocoa_nativeFunctionCallCount[36];
 char * Cocoa_nativeFunctionNames[] = {
 	"HICocoaViewCreate",
 	"HIJavaViewCreateWithCocoaView",
 	"HIWebViewCreate",
 	"HIWebViewGetWebView",
-	"NSApplicationLoad",
 	"NSDeviceRGBColorSpace",
 	"NSSearchPathForDirectoriesInDomains",
 	"WebInitForCarbon",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_stats.h
index 19f8642388..c81ba28683 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_stats.h
@@ -29,7 +29,6 @@ typedef enum {
 	HIJavaViewCreateWithCocoaView_FUNC,
 	HIWebViewCreate_FUNC,
 	HIWebViewGetWebView_FUNC,
-	NSApplicationLoad_FUNC,
 	NSDeviceRGBColorSpace_FUNC,
 	NSSearchPathForDirectoriesInDomains_FUNC,
 	WebInitForCarbon_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java
index 031d81a30f..5e2ca4b84f 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java
@@ -16,6 +16,7 @@ public class Cocoa extends Platform {
 		
 static {
 	Library.loadLibrary("swt-cocoa"); //$NON-NLS-1$
+	WebInitForCarbon();
 }
 	
 /* Objective-C class ids */
@@ -401,7 +402,6 @@ public static final native void objc_msgSend_stret(NSRect result, int object, in
 /** @param selectorName cast=(const char *) */
 public static final native int sel_registerName(byte[] selectorName);
 
-public static final native int NSApplicationLoad();
 /** @method flags=const */
 public static final native int NSDeviceRGBColorSpace();
 /**