summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal
diff options
context:
space:
mode:
authorGrant Gayed <ggayed>2010-11-15 21:08:16 +0000
committerGrant Gayed <ggayed>2010-11-15 21:08:16 +0000
commit07b4e1467fff65b3050b4b9c50f9a916d8642440 (patch)
treebc9302de0e3cb2d73bfab8537e85418a4ccddf97 /bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal
parentb590d64b3ccd7a0955639f7b5d741d1165df644c (diff)
downloadeclipse.platform.swt-07b4e1467fff65b3050b4b9c50f9a916d8642440.tar.gz
eclipse.platform.swt-07b4e1467fff65b3050b4b9c50f9a916d8642440.tar.xz
eclipse.platform.swt-07b4e1467fff65b3050b4b9c50f9a916d8642440.zip
329058 - BrowserFunction should map java null to JS null, not to undefined
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
index e88be0a99f..0e57e7247f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
@@ -112,6 +112,10 @@ public class OS extends C {
public static final int /*long*/ sel_javaRunLoopMode = sel_registerName("javaRunLoopMode");
+ /* These are not generated in order to avoid attempting to create a java method called "null" */
+ public static final int /*long*/ class_NSNull = objc_getClass("NSNull");
+ public static final int /*long*/ sel_null = sel_registerName("null");
+
/* NSTextAttachmentCell */
/** @method callback_types=NSPoint;id;SEL;,callback_flags=struct;none;none; */
public static final native int /*long*/ CALLBACK_cellBaselineOffset(int /*long*/ func);