Bug 367809 - [SWT Mac OS X] path.addString does not appear to handle

unicode properly

4 files changed, 35 insertions, 12 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
index c56f7e04b2..3d248b28fb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
@@ -4751,6 +4751,17 @@
 	<enum name="NSFileHandlingPanelOKButton" swt_gen="true"></enum>
 	<enum name="NSFlagsChanged" swt_gen="true"></enum>
 	<enum name="NSFocusRingTypeNone" swt_gen="true"></enum>
+	<enum name="NSFontPanelAllEffectsModeMask" swt_gen="true"></enum>
+	<enum name="NSFontPanelAllModesMask" swt_gen="true"></enum>
+	<enum name="NSFontPanelCollectionModeMask" swt_gen="true"></enum>
+	<enum name="NSFontPanelDocumentColorEffectModeMask" swt_gen="true"></enum>
+	<enum name="NSFontPanelFaceModeMask" swt_gen="true"></enum>
+	<enum name="NSFontPanelShadowEffectModeMask" swt_gen="true"></enum>
+	<enum name="NSFontPanelSizeModeMask" swt_gen="true"></enum>
+	<enum name="NSFontPanelStandardModesMask" swt_gen="true"></enum>
+	<enum name="NSFontPanelStrikethroughEffectModeMask" swt_gen="true"></enum>
+	<enum name="NSFontPanelTextColorEffectModeMask" swt_gen="true"></enum>
+	<enum name="NSFontPanelUnderlineEffectModeMask" swt_gen="true"></enum>
 	<enum name="NSHelpFunctionKey" swt_gen="true"></enum>
 	<enum name="NSHelpKeyMask" swt_gen="true"></enum>
 	<enum name="NSHourMinuteDatePickerElementFlag" swt_gen="true"></enum>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
index ef51c74258..8947ccd70a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
@@ -50,6 +50,12 @@
 		</method>
 	</class>
 	<class name="NSAttributedString" swt_gen="mixed">
+		<method selector="attribute:atIndex:effectiveRange:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<arg swt_gen="true"></arg>
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="attributedSubstringFromRange:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java
index 7d26d529f4..336244f429 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 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
@@ -69,6 +69,11 @@ public NSSize size() {
 	return result;
 }
 
+public id attribute(NSString attrName, int /*long*/ location, int /*long*/ range) {
+	int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_attribute_atIndex_effectiveRange_, attrName != null ? attrName.id : 0, location, range);
+	return result != 0 ? new id(result) : null;
+}
+
 public NSAttributedString attributedSubstringFromRange(NSRange range) {
 	int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_attributedSubstringFromRange_, range);
 	return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null);
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 01d3f53403..979688a89a 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
@@ -960,6 +960,7 @@ public static final int /*long*/ sel_arrayWithCapacity_ = sel_registerName("arra
 public static final int /*long*/ sel_arrayWithObject_ = sel_registerName("arrayWithObject:");
 public static final int /*long*/ sel_arrowCursor = sel_registerName("arrowCursor");
 public static final int /*long*/ sel_ascender = sel_registerName("ascender");
+public static final int /*long*/ sel_attribute_atIndex_effectiveRange_ = sel_registerName("attribute:atIndex:effectiveRange:");
 public static final int /*long*/ sel_attributedStringValue = sel_registerName("attributedStringValue");
 public static final int /*long*/ sel_attributedStringWithAttachment_ = sel_registerName("attributedStringWithAttachment:");
 public static final int /*long*/ sel_attributedSubstringFromRange_ = sel_registerName("attributedSubstringFromRange:");
@@ -2281,17 +2282,17 @@ public static final int NSEventTypeSwipe = 31;
 public static final int NSFileHandlingPanelOKButton = 1;
 public static final int NSFlagsChanged = 12;
 public static final int NSFocusRingTypeNone = 1;
-public static final int NSFontPanelFaceModeMask = 1 << 0;
-public static final int NSFontPanelSizeModeMask = 1 << 1;
-public static final int NSFontPanelCollectionModeMask = 1 << 2;
-public static final int NSFontPanelUnderlineEffectModeMask = 1<<8;
-public static final int NSFontPanelStrikethroughEffectModeMask = 1<<9;
-public static final int NSFontPanelTextColorEffectModeMask = 1<< 10;
-public static final int NSFontPanelDocumentColorEffectModeMask = 1<<11;
-public static final int NSFontPanelShadowEffectModeMask = 1<<12;
-public static final int NSFontPanelAllEffectsModeMask = 0XFFF00;
-public static final int NSFontPanelStandardModesMask = 0xFFFF;
-public static final int NSFontPanelAllModesMask = 0xFFFFFFFF;
+public static final int NSFontPanelAllEffectsModeMask = 1048320;
+public static final int NSFontPanelAllModesMask = -1;
+public static final int NSFontPanelCollectionModeMask = 4;
+public static final int NSFontPanelDocumentColorEffectModeMask = 2048;
+public static final int NSFontPanelFaceModeMask = 1;
+public static final int NSFontPanelShadowEffectModeMask = 4096;
+public static final int NSFontPanelSizeModeMask = 2;
+public static final int NSFontPanelStandardModesMask = 65535;
+public static final int NSFontPanelStrikethroughEffectModeMask = 512;
+public static final int NSFontPanelTextColorEffectModeMask = 1024;
+public static final int NSFontPanelUnderlineEffectModeMask = 256;
 public static final int NSHelpFunctionKey = 63302;
 public static final int NSHelpKeyMask = 4194304;
 public static final int NSHourMinuteDatePickerElementFlag = 12;