diff options
| author | Silenio Quarti <silenio> | 2008-08-18 15:14:00 +0000 |
|---|---|---|
| committer | Silenio Quarti <silenio> | 2008-08-18 15:14:00 +0000 |
| commit | 114a90e9c5c0a4fae8a6509db4dd3947871a06a6 (patch) | |
| tree | 9e22800b8fd3eb5e9d420a613644bfcbab975e8e | |
| parent | 047551711731234f55bfa1e053304f3a7d2a17a6 (diff) | |
| download | eclipse.platform.swt-114a90e9c5c0a4fae8a6509db4dd3947871a06a6.tar.gz eclipse.platform.swt-114a90e9c5c0a4fae8a6509db4dd3947871a06a6.tar.xz eclipse.platform.swt-114a90e9c5c0a4fae8a6509db4dd3947871a06a6.zip | |
64 bit work
125 files changed, 656 insertions, 654 deletions
diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/AppKitFull.bridgesupport.extras index 99e8e71f19..597693064c 100644 --- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/AppKitFull.bridgesupport.extras +++ b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/AppKitFull.bridgesupport.extras @@ -3670,7 +3670,7 @@ <retval swt_gen="true"></retval> </method> <method selector="setLineDash:count:phase:" swt_gen="true"> - <arg name="pattern" swt_gen="true" swt_java_type="float[]"></arg> + <arg name="pattern" swt_gen="true" swt_java_type="float[]" swt_java_type64="double[]"></arg> <arg name="count" swt_gen="true"></arg> <arg name="phase" swt_gen="true"></arg> <retval swt_gen="true"></retval> @@ -5727,7 +5727,7 @@ <retval></retval> </method> <method selector="getComponents:" swt_gen="true"> - <arg name="components" swt_gen="true" swt_java_type="float[]"></arg> + <arg name="components" swt_gen="true" swt_java_type="float[]" swt_java_type64="double[]"></arg> <retval swt_gen="true"></retval> </method> <method selector="getCyan:magenta:yellow:black:alpha:"> @@ -9985,7 +9985,7 @@ <method selector="glyphIndexForPoint:inTextContainer:fractionOfDistanceThroughGlyph:" swt_gen="true"> <arg name="point" swt_gen="true"></arg> <arg name="container" swt_gen="true"></arg> - <arg name="partialFraction" swt_gen="true" swt_java_type="float[]"></arg> + <arg name="partialFraction" swt_gen="true" swt_java_type="float[]" swt_java_type64="double[]"></arg> <retval swt_gen="true"></retval> </method> <method selector="glyphRangeForBoundingRect:inTextContainer:"> diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/FoundationFull.bridgesupport.extras b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/FoundationFull.bridgesupport.extras index 927d7e8c3e..d81cd7652b 100644 --- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/FoundationFull.bridgesupport.extras +++ b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/FoundationFull.bridgesupport.extras @@ -5464,7 +5464,7 @@ <retval></retval> </method> <method selector="getIndexes:maxCount:inIndexRange:" swt_gen="true"> - <arg name="indexBuffer" swt_gen="true" swt_java_type="int[]"></arg> + <arg name="indexBuffer" swt_gen="true" swt_java_type="int[]" swt_java_type64="long[]"></arg> <arg name="bufferSize" swt_gen="true"></arg> <arg name="range" swt_gen="true"></arg> <retval swt_gen="true"></retval> diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.xml b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.xml index 808011b9c0..0882d1a23d 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.xml +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.xml @@ -43,6 +43,7 @@ <echo>Converting java files to 32 bit in org.eclipse.swt project</echo> <replace dir="." includes="**/*.java" token="long /*int*/" value="int /*long*/"/> <replace dir="." includes="**/*.java" token="long[] /*int[]*/" value="int[] /*long[]*/"/> + <replace dir="." includes="**/*.java" token="double /*float*/" value="float /*double*/"/> <replace dir="." includes="**/*.java" token="double[] /*float[]*/" value="float[] /*double[]*/"/> <antcall target="build.cfiles"/> </target> diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMDocument.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMDocument.java index c39eac8940..6b21bc60be 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMDocument.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMDocument.java @@ -25,7 +25,7 @@ public DOMDocument(id id) { } public WebFrame webFrame() { - int result = OS.objc_msgSend(this.id, OS.sel_webFrame); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_webFrame); return result != 0 ? new WebFrame(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMKeyboardEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMKeyboardEvent.java index 69e4d44cd3..1fbb8f5f90 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMKeyboardEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMKeyboardEvent.java @@ -29,7 +29,7 @@ public boolean altKey() { } public int charCode() { - return OS.objc_msgSend(this.id, OS.sel_charCode); + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_charCode); } public boolean ctrlKey() { @@ -37,7 +37,7 @@ public boolean ctrlKey() { } public int keyCode() { - return OS.objc_msgSend(this.id, OS.sel_keyCode); + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_keyCode); } public boolean metaKey() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMMouseEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMMouseEvent.java index 5457d22bc6..5bf6478738 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMMouseEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMMouseEvent.java @@ -33,11 +33,11 @@ public short button() { } public int clientX() { - return OS.objc_msgSend(this.id, OS.sel_clientX); + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_clientX); } public int clientY() { - return OS.objc_msgSend(this.id, OS.sel_clientY); + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_clientY); } public boolean ctrlKey() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java index 882cdfc131..68bf4ffa82 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java @@ -25,7 +25,7 @@ public DOMUIEvent(id id) { } public int detail() { - return OS.objc_msgSend(this.id, OS.sel_detail); + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_detail); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java index d6b1834b9c..72a3d5ec0b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java @@ -29,11 +29,11 @@ public boolean altKey() { } public int clientX() { - return OS.objc_msgSend(this.id, OS.sel_clientX); + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_clientX); } public int clientY() { - return OS.objc_msgSend(this.id, OS.sel_clientY); + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_clientY); } public boolean ctrlKey() { @@ -49,7 +49,7 @@ public boolean shiftKey() { } public int wheelDelta() { - return OS.objc_msgSend(this.id, OS.sel_wheelDelta); + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_wheelDelta); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java index 2bf078247a..6710e9d8f5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java @@ -24,7 +24,7 @@ public NSActionCell(id id) { super(id); } -public void setAlignment(int mode) { +public void setAlignment(int /*long*/ mode) { OS.objc_msgSend(this.id, OS.sel_setAlignment_, mode); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java index 4cf95eaae1..9f8975d4c8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java @@ -29,7 +29,7 @@ public void concat() { } public NSAffineTransform initWithTransform(NSAffineTransform transform) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithTransform_, transform != null ? transform.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithTransform_, transform != null ? transform.id : 0); return result == this.id ? this : (result != 0 ? new NSAffineTransform(result) : null); } @@ -41,11 +41,11 @@ public void prependTransform(NSAffineTransform transform) { OS.objc_msgSend(this.id, OS.sel_prependTransform_, transform != null ? transform.id : 0); } -public void rotateByDegrees(float angle) { +public void rotateByDegrees(float /*double*/ angle) { OS.objc_msgSend(this.id, OS.sel_rotateByDegrees_, angle); } -public void scaleXBy(float scaleX, float scaleY) { +public void scaleXBy(float /*double*/ scaleX, float /*double*/ scaleY) { OS.objc_msgSend(this.id, OS.sel_scaleXBy_yBy_, scaleX, scaleY); } @@ -58,7 +58,7 @@ public void setTransformStruct(NSAffineTransformStruct transformStruct) { } public static NSAffineTransform transform() { - int result = OS.objc_msgSend(OS.class_NSAffineTransform, OS.sel_transform); + int /*long*/ result = OS.objc_msgSend(OS.class_NSAffineTransform, OS.sel_transform); return result != 0 ? new NSAffineTransform(result) : null; } @@ -80,7 +80,7 @@ public NSAffineTransformStruct transformStruct() { return result; } -public void translateXBy(float deltaX, float deltaY) { +public void translateXBy(float /*double*/ deltaX, float /*double*/ deltaY) { OS.objc_msgSend(this.id, OS.sel_translateXBy_yBy_, deltaX, deltaY); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java index 58f09993fe..5ca5cb679c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java @@ -25,20 +25,20 @@ public NSAlert(id id) { } public static NSAlert alertWithMessageText(NSString message, NSString defaultButton, NSString alternateButton, NSString otherButton, NSString informativeTextWithFormat) { - int result = OS.objc_msgSend(OS.class_NSAlert, OS.sel_alertWithMessageText_defaultButton_alternateButton_otherButton_informativeTextWithFormat_, message != null ? message.id : 0, defaultButton != null ? defaultButton.id : 0, alternateButton != null ? alternateButton.id : 0, otherButton != null ? otherButton.id : 0, informativeTextWithFormat != null ? informativeTextWithFormat.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSAlert, OS.sel_alertWithMessageText_defaultButton_alternateButton_otherButton_informativeTextWithFormat_, message != null ? message.id : 0, defaultButton != null ? defaultButton.id : 0, alternateButton != null ? alternateButton.id : 0, otherButton != null ? otherButton.id : 0, informativeTextWithFormat != null ? informativeTextWithFormat.id : 0); return result != 0 ? new NSAlert(result) : null; } -public int runModal() { - return OS.objc_msgSend(this.id, OS.sel_runModal); +public int /*long*/ runModal() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_runModal); } -public void setAlertStyle(int style) { +public void setAlertStyle(int /*long*/ style) { OS.objc_msgSend(this.id, OS.sel_setAlertStyle_, style); } public NSWindow window() { - int result = OS.objc_msgSend(this.id, OS.sel_window); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_window); return result != 0 ? new NSWindow(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventDescriptor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventDescriptor.java index 17a02d64a8..8c0384b781 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventDescriptor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventDescriptor.java @@ -25,7 +25,7 @@ public NSAppleEventDescriptor(id id) { } public NSAppleEventDescriptor initListDescriptor() { - int result = OS.objc_msgSend(this.id, OS.sel_initListDescriptor); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initListDescriptor); return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java index d6915cd065..f2a09d96f2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java @@ -29,7 +29,7 @@ public void activateIgnoringOtherApps(boolean flag) { } public NSEvent currentEvent() { - int result = OS.objc_msgSend(this.id, OS.sel_currentEvent); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_currentEvent); return result != 0 ? new NSEvent(result) : null; } @@ -46,17 +46,17 @@ public void hideOtherApplications(id sender) { } public NSWindow keyWindow() { - int result = OS.objc_msgSend(this.id, OS.sel_keyWindow); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_keyWindow); return result != 0 ? new NSWindow(result) : null; } public NSMenu mainMenu() { - int result = OS.objc_msgSend(this.id, OS.sel_mainMenu); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_mainMenu); return result != 0 ? new NSMenu(result) : null; } -public NSEvent nextEventMatchingMask(int mask, NSDate expiration, NSString mode, boolean deqFlag) { - int result = OS.objc_msgSend(this.id, OS.sel_nextEventMatchingMask_untilDate_inMode_dequeue_, mask, expiration != null ? expiration.id : 0, mode != null ? mode.id : 0, deqFlag); +public NSEvent nextEventMatchingMask(int /*long*/ mask, NSDate expiration, NSString mode, boolean deqFlag) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_nextEventMatchingMask_untilDate_inMode_dequeue_, mask, expiration != null ? expiration.id : 0, mode != null ? mode.id : 0, deqFlag); return result != 0 ? new NSEvent(result) : null; } @@ -65,7 +65,7 @@ public void orderFrontStandardAboutPanel(id sender) { } public NSArray orderedWindows() { - int result = OS.objc_msgSend(this.id, OS.sel_orderedWindows); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_orderedWindows); return result != 0 ? new NSArray(result) : null; } @@ -73,8 +73,8 @@ public void run() { OS.objc_msgSend(this.id, OS.sel_run); } -public int runModalForWindow(NSWindow theWindow) { - return OS.objc_msgSend(this.id, OS.sel_runModalForWindow_, theWindow != null ? theWindow.id : 0); +public int /*long*/ runModalForWindow(NSWindow theWindow) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_runModalForWindow_, theWindow != null ? theWindow.id : 0); } public void sendEvent(NSEvent theEvent) { @@ -86,7 +86,7 @@ public void setDelegate(id anObject) { } public static NSApplication sharedApplication() { - int result = OS.objc_msgSend(OS.class_NSApplication, OS.sel_sharedApplication); + int /*long*/ result = OS.objc_msgSend(OS.class_NSApplication, OS.sel_sharedApplication); return result != 0 ? new NSApplication(result) : null; } @@ -103,7 +103,7 @@ public void unhideAllApplications(id sender) { } public NSArray windows() { - int result = OS.objc_msgSend(this.id, OS.sel_windows); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_windows); return result != 0 ? new NSArray(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArray.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArray.java index 08461410f4..170dd53163 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArray.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArray.java @@ -25,16 +25,16 @@ public NSArray(id id) { } public static NSArray arrayWithObject(id anObject) { - int result = OS.objc_msgSend(OS.class_NSArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0); return result != 0 ? new NSArray(result) : null; } -public int count() { - return OS.objc_msgSend(this.id, OS.sel_count); +public int /*long*/ count() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_count); } -public id objectAtIndex(int index) { - int result = OS.objc_msgSend(this.id, OS.sel_objectAtIndex_, index); +public id objectAtIndex(int /*long*/ index) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_objectAtIndex_, index); return result != 0 ? new id(result) : null; } 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 ea74e2f9ee..e466ffc12c 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 @@ -24,12 +24,12 @@ public NSAttributedString(id id) { super(id); } -public NSDictionary attributesAtIndex(int location, int range, NSRange rangeLimit) { - int result = OS.objc_msgSend(this.id, OS.sel_attributesAtIndex_longestEffectiveRange_inRange_, location, range, rangeLimit); +public NSDictionary attributesAtIndex(int /*long*/ location, int /*long*/ range, NSRange rangeLimit) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_attributesAtIndex_longestEffectiveRange_inRange_, location, range, rangeLimit); return result != 0 ? new NSDictionary(result) : null; } -public NSRange doubleClickAtIndex(int location) { +public NSRange doubleClickAtIndex(int /*long*/ location) { NSRange result = new NSRange(); OS.objc_msgSend_stret(result, this.id, OS.sel_doubleClickAtIndex_, location); return result; @@ -44,12 +44,12 @@ public void drawInRect(NSRect rect) { } public NSAttributedString initWithString(NSString str, NSDictionary attrs) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithString_attributes_, str != null ? str.id : 0, attrs != null ? attrs.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithString_attributes_, str != null ? str.id : 0, attrs != null ? attrs.id : 0); return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null); } -public int nextWordFromIndex(int location, boolean isForward) { - return OS.objc_msgSend(this.id, OS.sel_nextWordFromIndex_forward_, location, isForward); +public int /*long*/ nextWordFromIndex(int /*long*/ location, boolean isForward) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_nextWordFromIndex_forward_, location, isForward); } public NSSize size() { @@ -59,21 +59,21 @@ public NSSize size() { } public NSAttributedString attributedSubstringFromRange(NSRange range) { - int result = OS.objc_msgSend(this.id, OS.sel_attributedSubstringFromRange_, range); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_attributedSubstringFromRange_, range); return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null); } public NSAttributedString initWithString(NSString str) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithString_, str != null ? str.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithString_, str != null ? str.id : 0); return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null); } -public int length() { - return OS.objc_msgSend(this.id, OS.sel_length); +public int /*long*/ length() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_length); } public NSString string() { - int result = OS.objc_msgSend(this.id, OS.sel_string); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_string); return result != 0 ? new NSString(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBezierPath.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBezierPath.java index fde2cfa77a..5bec8f2ff2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBezierPath.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBezierPath.java @@ -32,15 +32,15 @@ public void appendBezierPath(NSBezierPath path) { OS.objc_msgSend(this.id, OS.sel_appendBezierPath_, path != null ? path.id : 0); } -public void appendBezierPathWithArcWithCenter(NSPoint center, float radius, float startAngle, float endAngle) { +public void appendBezierPathWithArcWithCenter(NSPoint center, float /*double*/ radius, float /*double*/ startAngle, float /*double*/ endAngle) { OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_, center, radius, startAngle, endAngle); } -public void appendBezierPathWithArcWithCenter(NSPoint center, float radius, float startAngle, float endAngle, boolean clockwise) { +public void appendBezierPathWithArcWithCenter(NSPoint center, float /*double*/ radius, float /*double*/ startAngle, float /*double*/ endAngle, boolean clockwise) { OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_, center, radius, startAngle, endAngle, clockwise); } -public void appendBezierPathWithGlyphs(int glyphs, int count, NSFont font) { +public void appendBezierPathWithGlyphs(int /*long*/ glyphs, int /*long*/ count, NSFont font) { OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithGlyphs_count_inFont_, glyphs, count, font != null ? font.id : 0); } @@ -52,22 +52,22 @@ public void appendBezierPathWithRect(NSRect rect) { OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithRect_, rect); } -public void appendBezierPathWithRoundedRect(NSRect rect, float xRadius, float yRadius) { +public void appendBezierPathWithRoundedRect(NSRect rect, float /*double*/ xRadius, float /*double*/ yRadius) { OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithRoundedRect_xRadius_yRadius_, rect, xRadius, yRadius); } public static NSBezierPath bezierPath() { - int result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPath); + int /*long*/ result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPath); return result != 0 ? new NSBezierPath(result) : null; } public NSBezierPath bezierPathByFlatteningPath() { - int result = OS.objc_msgSend(this.id, OS.sel_bezierPathByFlatteningPath); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_bezierPathByFlatteningPath); return result == this.id ? this : (result != 0 ? new NSBezierPath(result) : null); } public static NSBezierPath bezierPathWithRect(NSRect rect) { - int result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPathWithRect_, rect); + int /*long*/ result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPathWithRect_, rect); return result != 0 ? new NSBezierPath(result) : null; } @@ -101,16 +101,16 @@ public void curveToPoint(NSPoint endPoint, NSPoint controlPoint1, NSPoint contro OS.objc_msgSend(this.id, OS.sel_curveToPoint_controlPoint1_controlPoint2_, endPoint, controlPoint1, controlPoint2); } -public static float defaultFlatness() { +public static float /*double*/ defaultFlatness() { return (float)OS.objc_msgSend_fpret(OS.class_NSBezierPath, OS.sel_defaultFlatness); } -public int elementAtIndex(int index, int points) { - return OS.objc_msgSend(this.id, OS.sel_elementAtIndex_associatedPoints_, index, points); +public int /*long*/ elementAtIndex(int /*long*/ index, int /*long*/ points) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_elementAtIndex_associatedPoints_, index, points); } -public int elementCount() { - return OS.objc_msgSend(this.id, OS.sel_elementCount); +public int /*long*/ elementCount() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_elementCount); } public void fill() { @@ -141,31 +141,31 @@ public void setClip() { OS.objc_msgSend(this.id, OS.sel_setClip); } -public static void setDefaultFlatness(float flatness) { +public static void setDefaultFlatness(float /*double*/ flatness) { OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultFlatness_, flatness); } -public void setLineCapStyle(int lineCapStyle) { +public void setLineCapStyle(int /*long*/ lineCapStyle) { OS.objc_msgSend(this.id, OS.sel_setLineCapStyle_, lineCapStyle); } -public void setLineDash(float[] pattern, int count, float phase) { +public void setLineDash(float[] /*double[]*/ pattern, int /*long*/ count, float /*double*/ phase) { OS.objc_msgSend(this.id, OS.sel_setLineDash_count_phase_, pattern, count, phase); } -public void setLineJoinStyle(int lineJoinStyle) { +public void setLineJoinStyle(int /*long*/ lineJoinStyle) { OS.objc_msgSend(this.id, OS.sel_setLineJoinStyle_, lineJoinStyle); } -public void setLineWidth(float lineWidth) { +public void setLineWidth(float /*double*/ lineWidth) { OS.objc_msgSend(this.id, OS.sel_setLineWidth_, lineWidth); } -public void setMiterLimit(float miterLimit) { +public void setMiterLimit(float /*double*/ miterLimit) { OS.objc_msgSend(this.id, OS.sel_setMiterLimit_, miterLimit); } -public void setWindingRule(int windingRule) { +public void setWindingRule(int /*long*/ windingRule) { OS.objc_msgSend(this.id, OS.sel_setWindingRule_, windingRule); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java index ed97cd5ba6..fd519aa357 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java @@ -24,29 +24,29 @@ public NSBitmapImageRep(id id) { super(id); } -public int bitmapData() { - return OS.objc_msgSend(this.id, OS.sel_bitmapData); +public int /*long*/ bitmapData() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_bitmapData); } -public int bitsPerPixel() { - return OS.objc_msgSend(this.id, OS.sel_bitsPerPixel); +public int /*long*/ bitsPerPixel() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_bitsPerPixel); } -public int bytesPerPlane() { - return OS.objc_msgSend(this.id, OS.sel_bytesPerPlane); +public int /*long*/ bytesPerPlane() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_bytesPerPlane); } -public int bytesPerRow() { - return OS.objc_msgSend(this.id, OS.sel_bytesPerRow); +public int /*long*/ bytesPerRow() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_bytesPerRow); } -public NSBitmapImageRep initWithBitmapDataPlanes(int planes, int width, int height, int bps, int spp, boolean alpha, boolean isPlanar, NSString colorSpaceName, int bitmapFormat, int rBytes, int pBits) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, bitmapFormat, rBytes, pBits); +public NSBitmapImageRep initWithBitmapDataPlanes(int /*long*/ planes, int /*long*/ width, int /*long*/ height, int /*long*/ bps, int /*long*/ spp, boolean alpha, boolean isPlanar, NSString colorSpaceName, int /*long*/ bitmapFormat, int /*long*/ rBytes, int /*long*/ pBits) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, bitmapFormat, rBytes, pBits); return result == this.id ? this : (result != 0 ? new NSBitmapImageRep(result) : null); } -public NSBitmapImageRep initWithBitmapDataPlanes(int planes, int width, int height, int bps, int spp, boolean alpha, boolean isPlanar, NSString colorSpaceName, int rBytes, int pBits) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, rBytes, pBits); +public NSBitmapImageRep initWithBitmapDataPlanes(int /*long*/ planes, int /*long*/ width, int /*long*/ height, int /*long*/ bps, int /*long*/ spp, boolean alpha, boolean isPlanar, NSString colorSpaceName, int /*long*/ rBytes, int /*long*/ pBits) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, rBytes, pBits); return result == this.id ? this : (result != 0 ? new NSBitmapImageRep(result) : null); } @@ -54,8 +54,8 @@ public boolean isPlanar() { return OS.objc_msgSend(this.id, OS.sel_isPlanar) != 0; } -public int samplesPerPixel() { - return OS.objc_msgSend(this.id, OS.sel_samplesPerPixel); +public int /*long*/ samplesPerPixel() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_samplesPerPixel); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java index 8fa9bd7880..1b284a071c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java @@ -30,15 +30,15 @@ public NSSize contentViewMargins() { return result; } -public void setBorderType(int aType) { +public void setBorderType(int /*long*/ aType) { OS.objc_msgSend(this.id, OS.sel_setBorderType_, aType); } -public void setBorderWidth(float borderWidth) { +public void setBorderWidth(float /*double*/ borderWidth) { OS.objc_msgSend(this.id, OS.sel_setBorderWidth_, borderWidth); } -public void setBoxType(int boxType) { +public void setBoxType(int /*long*/ boxType) { OS.objc_msgSend(this.id, OS.sel_setBoxType_, boxType); } @@ -58,7 +58,7 @@ public void setTitleFont(NSFont fontObj) { OS.objc_msgSend(this.id, OS.sel_setTitleFont_, fontObj != null ? fontObj.id : 0); } -public void setTitlePosition(int aPosition) { +public void setTitlePosition(int /*long*/ aPosition) { OS.objc_msgSend(this.id, OS.sel_setTitlePosition_, aPosition); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBundle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBundle.java index 696d56a469..47e6484991 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBundle.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBundle.java @@ -24,32 +24,32 @@ public NSBundle(id id) { super(id); } -public static boolean loadNibFile(NSString fileName, NSDictionary context, int zone) { +public static boolean loadNibFile(NSString fileName, NSDictionary context, int /*long*/ zone) { return OS.objc_msgSend(OS.class_NSBundle, OS.sel_loadNibFile_externalNameTable_withZone_, fileName != null ? fileName.id : 0, context != null ? context.id : 0, zone) != 0; } public NSString bundleIdentifier() { - int result = OS.objc_msgSend(this.id, OS.sel_bundleIdentifier); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_bundleIdentifier); return result != 0 ? new NSString(result) : null; } public NSString bundlePath() { - int result = OS.objc_msgSend(this.id, OS.sel_bundlePath); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_bundlePath); return result != 0 ? new NSString(result) : null; } public static NSBundle bundleWithPath(NSString path) { - int result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithPath_, path != null ? path.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithPath_, path != null ? path.id : 0); return result != 0 ? new NSBundle(result) : null; } public NSDictionary infoDictionary() { - int result = OS.objc_msgSend(this.id, OS.sel_infoDictionary); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_infoDictionary); return result != 0 ? new NSDictionary(result) : null; } public id objectForInfoDictionaryKey(NSString key) { - int result = OS.objc_msgSend(this.id, OS.sel_objectForInfoDictionaryKey_, key != null ? key.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_objectForInfoDictionaryKey_, key != null ? key.id : 0); return result != 0 ? new id(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java index 6d4cef3225..b8e21ab267 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java @@ -32,7 +32,7 @@ public void setAttributedTitle(NSAttributedString aString) { OS.objc_msgSend(this.id, OS.sel_setAttributedTitle_, aString != null ? aString.id : 0); } -public void setBezelStyle(int bezelStyle) { +public void setBezelStyle(int /*long*/ bezelStyle) { OS.objc_msgSend(this.id, OS.sel_setBezelStyle_, bezelStyle); } @@ -40,7 +40,7 @@ public void setBordered(boolean flag) { OS.objc_msgSend(this.id, OS.sel_setBordered_, flag); } -public void setButtonType(int aType) { +public void setButtonType(int /*long*/ aType) { OS.objc_msgSend(this.id, OS.sel_setButtonType_, aType); } @@ -48,11 +48,11 @@ public void setImage(NSImage image) { OS.objc_msgSend(this.id, OS.sel_setImage_, image != null ? image.id : 0); } -public void setImagePosition(int aPosition) { +public void setImagePosition(int /*long*/ aPosition) { OS.objc_msgSend(this.id, OS.sel_setImagePosition_, aPosition); } -public void setState(int value) { +public void setState(int /*long*/ value) { OS.objc_msgSend(this.id, OS.sel_setState_, value); } @@ -60,8 +60,8 @@ public void setTitle(NSString aString) { OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0); } -public int state() { - return OS.objc_msgSend(this.id, OS.sel_state); +public int /*long*/ state() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_state); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java index b24d5f781f..76a785f665 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java @@ -28,16 +28,16 @@ public void setBackgroundColor(NSColor color) { OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0); } -public void setButtonType(int aType) { +public void setButtonType(int /*long*/ aType) { OS.objc_msgSend(this.id, OS.sel_setButtonType_, aType); } -public void setImagePosition(int aPosition) { +public void setImagePosition(int /*long*/ aPosition) { OS.objc_msgSend(this.id, OS.sel_setImagePosition_, aPosition); } public NSString title() { - int result = OS.objc_msgSend(this.id, OS.sel_title); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_title); return result != 0 ? new NSString(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java index 587b36fd11..4c915fee4c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java @@ -25,51 +25,51 @@ public NSCalendarDate(id id) { } public static NSCalendarDate calendarDate() { - int result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_calendarDate); + int /*long*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_calendarDate); return result != 0 ? new NSCalendarDate(result) : null; } -public static NSCalendarDate dateWithYear(int year, int month, int day, int hour, int minute, int second, NSTimeZone aTimeZone) { - int result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithYear_month_day_hour_minute_second_timeZone_, year, month, day, hour, minute, second, aTimeZone != null ? aTimeZone.id : 0); +public static NSCalendarDate dateWithYear(int /*long*/ year, int /*long*/ month, int /*long*/ day, int /*long*/ hour, int /*long*/ minute, int /*long*/ second, NSTimeZone aTimeZone) { + int /*long*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithYear_month_day_hour_minute_second_timeZone_, year, month, day, hour, minute, second, aTimeZone != null ? aTimeZone.id : 0); return result != 0 ? new NSCalendarDate(result) : null; } -public int dayOfMonth() { - return OS.objc_msgSend(this.id, OS.sel_dayOfMonth); +public int /*long*/ dayOfMonth() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_dayOfMonth); } -public int hourOfDay() { - return OS.objc_msgSend(this.id, OS.sel_hourOfDay); +public int /*long*/ hourOfDay() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_hourOfDay); } -public int minuteOfHour() { - return OS.objc_msgSend(this.id, OS.sel_minuteOfHour); +public int /*long*/ minuteOfHour() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_minuteOfHour); } -public int monthOfYear() { - return OS.objc_msgSend(this.id, OS.sel_monthOfYear); +public int /*long*/ monthOfYear() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_monthOfYear); } -public int secondOfMinute() { - return OS.objc_msgSend(this.id, OS.sel_secondOfMinute); +public int /*long*/ secondOfMinute() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_secondOfMinute); } public NSTimeZone timeZone() { - int result = OS.objc_msgSend(this.id, OS.sel_timeZone); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_timeZone); return result != 0 ? new NSTimeZone(result) : null; } -public int yearOfCommonEra() { - return OS.objc_msgSend(this.id, OS.sel_yearOfCommonEra); +public int /*long*/ yearOfCommonEra() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_yearOfCommonEra); } public static NSDate dateWithTimeIntervalSinceNow(double secs) { - int result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithTimeIntervalSinceNow_, secs); + int /*long*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithTimeIntervalSinceNow_, secs); return result != 0 ? new NSCalendarDate(result) : null; } public static NSDate distantFuture() { - int result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_distantFuture); + int /*long*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_distantFuture); return result != 0 ? new NSCalendarDate(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java index dcf8ea2120..ea2b9789a2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java @@ -55,7 +55,7 @@ public void setWraps(boolean flag) { } public NSString title() { - int result = OS.objc_msgSend(this.id, OS.sel_title); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_title); return result != 0 ? new NSString(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCoder.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCoder.java index c3350f1f92..7c6390415a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCoder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCoder.java @@ -25,7 +25,7 @@ public NSCoder(id id) { } public int systemVersion() { - return OS.objc_msgSend(this.id, OS.sel_systemVersion); + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_systemVersion); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColor.java index 5519341702..a829fdccc0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColor.java @@ -24,102 +24,102 @@ public NSColor(id id) { super(id); } -public float alphaComponent() { +public float /*double*/ alphaComponent() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_alphaComponent); } public static NSColor blackColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_blackColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_blackColor); return result != 0 ? new NSColor(result) : null; } -public float blueComponent() { +public float /*double*/ blueComponent() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_blueComponent); } public static NSColor clearColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_clearColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_clearColor); return result != 0 ? new NSColor(result) : null; } public NSColor colorUsingColorSpace(NSColorSpace space) { - int result = OS.objc_msgSend(this.id, OS.sel_colorUsingColorSpace_, space != null ? space.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_colorUsingColorSpace_, space != null ? space.id : 0); return result == this.id ? this : (result != 0 ? new NSColor(result) : null); } public NSColor colorUsingColorSpaceName(NSString colorSpace) { - int result = OS.objc_msgSend(this.id, OS.sel_colorUsingColorSpaceName_, colorSpace != null ? colorSpace.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_colorUsingColorSpaceName_, colorSpace != null ? colorSpace.id : 0); return result == this.id ? this : (result != 0 ? new NSColor(result) : null); } -public static NSColor colorWithDeviceRed(float red, float green, float blue, float alpha) { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithDeviceRed_green_blue_alpha_, red, green, blue, alpha); +public static NSColor colorWithDeviceRed(float /*double*/ red, float /*double*/ green, float /*double*/ blue, float /*double*/ alpha) { + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithDeviceRed_green_blue_alpha_, red, green, blue, alpha); return result != 0 ? new NSColor(result) : null; } public static NSColor colorWithPatternImage(NSImage image) { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithPatternImage_, image != null ? image.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithPatternImage_, image != null ? image.id : 0); return result != 0 ? new NSColor(result) : null; } public static NSColor controlDarkShadowColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlDarkShadowColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlDarkShadowColor); return result != 0 ? new NSColor(result) : null; } public static NSColor controlHighlightColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlHighlightColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlHighlightColor); return result != 0 ? new NSColor(result) : null; } public static NSColor controlLightHighlightColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlLightHighlightColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlLightHighlightColor); return result != 0 ? new NSColor(result) : null; } public static NSColor controlShadowColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlShadowColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlShadowColor); return result != 0 ? new NSColor(result) : null; } public static NSColor controlTextColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlTextColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlTextColor); return result != 0 ? new NSColor(result) : null; } public static NSColor disabledControlTextColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_disabledControlTextColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_disabledControlTextColor); return result != 0 ? new NSColor(result) : null; } -public void getComponents(float[] components) { +public void getComponents(float[] /*double[]*/ components) { OS.objc_msgSend(this.id, OS.sel_getComponents_, components); } -public float greenComponent() { +public float /*double*/ greenComponent() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_greenComponent); } -public int numberOfComponents() { - return OS.objc_msgSend(this.id, OS.sel_numberOfComponents); +public int /*long*/ numberOfComponents() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_numberOfComponents); } -public float redComponent() { +public float /*double*/ redComponent() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_redComponent); } public static NSColor secondarySelectedControlColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_secondarySelectedControlColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_secondarySelectedControlColor); return result != 0 ? new NSColor(result) : null; } public static NSColor selectedTextBackgroundColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedTextBackgroundColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedTextBackgroundColor); return result != 0 ? new NSColor(result) : null; } public static NSColor selectedTextColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedTextColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedTextColor); return result != 0 ? new NSColor(result) : null; } @@ -136,27 +136,27 @@ public void setStroke() { } public static NSColor textBackgroundColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_textBackgroundColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_textBackgroundColor); return result != 0 ? new NSColor(result) : null; } public static NSColor textColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_textColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_textColor); return result != 0 ? new NSColor(result) : null; } public static NSColor windowBackgroundColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowBackgroundColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowBackgroundColor); return result != 0 ? new NSColor(result) : null; } public static NSColor windowFrameColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowFrameColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowFrameColor); return result != 0 ? new NSColor(result) : null; } public static NSColor windowFrameTextColor() { - int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowFrameTextColor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowFrameTextColor); return result != 0 ? new NSColor(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPanel.java index ac20fd7a9c..728231e82d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPanel.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPanel.java @@ -25,7 +25,7 @@ public NSColorPanel(id id) { } public NSColor color() { - int result = OS.objc_msgSend(this.id, OS.sel_color); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_color); return result != 0 ? new NSColor(result) : null; } @@ -34,7 +34,7 @@ public void setColor(NSColor color) { } public static NSColorPanel sharedColorPanel() { - int result = OS.objc_msgSend(OS.class_NSColorPanel, OS.sel_sharedColorPanel); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColorPanel, OS.sel_sharedColorPanel); return result != 0 ? new NSColorPanel(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorSpace.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorSpace.java index f8a34777bd..51651246d4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorSpace.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorSpace.java @@ -25,7 +25,7 @@ public NSColorSpace(id id) { } public static NSColorSpace deviceRGBColorSpace() { - int result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_deviceRGBColorSpace); + int /*long*/ result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_deviceRGBColorSpace); return result != 0 ? new NSColorSpace(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java index fb9a9b1c31..8925af79a1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java @@ -28,44 +28,44 @@ public void addItemWithObjectValue(id object) { OS.objc_msgSend(this.id, OS.sel_addItemWithObjectValue_, object != null ? object.id : 0); } -public void deselectItemAtIndex(int index) { +public void deselectItemAtIndex(int /*long*/ index) { OS.objc_msgSend(this.id, OS.sel_deselectItemAtIndex_, index); } -public int indexOfSelectedItem() { - return OS.objc_msgSend(this.id, OS.sel_indexOfSelectedItem); +public int /*long*/ indexOfSelectedItem() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_indexOfSelectedItem); } -public void insertItemWithObjectValue(id object, int index) { +public void insertItemWithObjectValue(id object, int /*long*/ index) { OS.objc_msgSend(this.id, OS.sel_insertItemWithObjectValue_atIndex_, object != null ? object.id : 0, index); } -public id itemObjectValueAtIndex(int index) { - int result = OS.objc_msgSend(this.id, OS.sel_itemObjectValueAtIndex_, index); +public id itemObjectValueAtIndex(int /*long*/ index) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemObjectValueAtIndex_, index); return result != 0 ? new id(result) : null; } -public int numberOfItems() { - return OS.objc_msgSend(this.id, OS.sel_numberOfItems); +public int /*long*/ numberOfItems() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_numberOfItems); } -public int numberOfVisibleItems() { - return OS.objc_msgSend(this.id, OS.sel_numberOfVisibleItems); +public int /*long*/ numberOfVisibleItems() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_numberOfVisibleItems); } public void removeAllItems() { OS.objc_msgSend(this.id, OS.sel_removeAllItems); } -public void removeItemAtIndex(int index) { +public void removeItemAtIndex(int /*long*/ index) { OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index); } -public void selectItemAtIndex(int index) { +public void selectItemAtIndex(int /*long*/ index) { OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_, index); } -public void setNumberOfVisibleItems(int visibleItems) { +public void setNumberOfVisibleItems(int /*long*/ visibleItems) { OS.objc_msgSend(this.id, OS.sel_setNumberOfVisibleItems_, visibleItems); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java index b122f3c621..56a2b266a3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java @@ -24,17 +24,17 @@ public NSControl(id id) { super(id); } -public int action() { - return OS.objc_msgSend(this.id, OS.sel_action); +public int /*long*/ action() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_action); } public NSCell cell() { - int result = OS.objc_msgSend(this.id, OS.sel_cell); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_cell); return result != 0 ? new NSCell(result) : null; } public NSText currentEditor() { - int result = OS.objc_msgSend(this.id, OS.sel_currentEditor); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_currentEditor); return result != 0 ? new NSText(result) : null; } @@ -47,19 +47,19 @@ public float floatValue() { } public NSFont font() { - int result = OS.objc_msgSend(this.id, OS.sel_font); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_font); return result != 0 ? new NSFont(result) : null; } -public boolean sendAction(int theAction, id theTarget) { +public boolean sendAction(int /*long*/ theAction, id theTarget) { return OS.objc_msgSend(this.id, OS.sel_sendAction_to_, theAction, theTarget != null ? theTarget.id : 0) != 0; } -public void setAction(int aSelector) { +public void setAction(int /*long*/ aSelector) { OS.objc_msgSend(this.id, OS.sel_setAction_, aSelector); } -public void setAlignment(int mode) { +public void setAlignment(int /*long*/ mode) { OS.objc_msgSend(this.id, OS.sel_setAlignment_, mode); } @@ -84,7 +84,7 @@ public void sizeToFit() { } public id target() { - int result = OS.objc_msgSend(this.id, OS.sel_target); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_target); return result != 0 ? new id(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCursor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCursor.java index 3fe808a4c0..3a1b8394ce 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCursor.java @@ -25,57 +25,57 @@ public NSCursor(id id) { } public static NSCursor IBeamCursor() { - int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_IBeamCursor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_IBeamCursor); return result != 0 ? new NSCursor(result) : null; } public static NSCursor arrowCursor() { - int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_arrowCursor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_arrowCursor); return result != 0 ? new NSCursor(result) : null; } public static NSCursor crosshairCursor() { - int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_crosshairCursor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_crosshairCursor); return result != 0 ? new NSCursor(result) : null; } public NSCursor initWithImage(NSImage newImage, NSPoint aPoint) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithImage_hotSpot_, newImage != null ? newImage.id : 0, aPoint); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithImage_hotSpot_, newImage != null ? newImage.id : 0, aPoint); return result == this.id ? this : (result != 0 ? new NSCursor(result) : null); } public static NSCursor pointingHandCursor() { - int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_pointingHandCursor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_pointingHandCursor); return result != 0 ? new NSCursor(result) : null; } public static NSCursor resizeDownCursor() { - int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeDownCursor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeDownCursor); return result != 0 ? new NSCursor(result) : null; } public static NSCursor resizeLeftCursor() { - int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeLeftCursor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeLeftCursor); return result != 0 ? new NSCursor(result) : null; } public static NSCursor resizeLeftRightCursor() { - int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeLeftRightCursor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeLeftRightCursor); return result != 0 ? new NSCursor(result) : null; } public static NSCursor resizeRightCursor() { - int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeRightCursor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeRightCursor); return result != 0 ? new NSCursor(result) : null; } public static NSCursor resizeUpCursor() { - int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeUpCursor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeUpCursor); return result != 0 ? new NSCursor(result) : null; } public static NSCursor resizeUpDownCursor() { - int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeUpDownCursor); + int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeUpDownCursor); return result != 0 ? new NSCursor(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSData.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSData.java index fcfe3b280c..eaf360fdd4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSData.java @@ -24,12 +24,12 @@ public NSData(id id) { super(id); } -public int bytes() { - return OS.objc_msgSend(this.id, OS.sel_bytes); +public int /*long*/ bytes() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_bytes); } -public static NSData dataWithBytes(byte[] bytes, int length) { - int result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithBytes_length_, bytes, length); +public static NSData dataWithBytes(byte[] bytes, int /*long*/ length) { + int /*long*/ result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithBytes_length_, bytes, length); return result != 0 ? new NSData(result) : null; } @@ -37,12 +37,12 @@ public void getBytes(byte[] buffer) { OS.objc_msgSend(this.id, OS.sel_getBytes_, buffer); } -public void getBytes(int buffer, int length) { +public void getBytes(int /*long*/ buffer, int /*long*/ length) { OS.objc_msgSend(this.id, OS.sel_getBytes_length_, buffer, length); } -public int length() { - return OS.objc_msgSend(this.id, OS.sel_length); +public int /*long*/ length() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_length); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDate.java index 05e5e146f0..6a72847cb2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDate.java @@ -25,17 +25,17 @@ public NSDate(id id) { } public NSCalendarDate dateWithCalendarFormat(NSString format, NSTimeZone aTimeZone) { - int result = OS.objc_msgSend(this.id, OS.sel_dateWithCalendarFormat_timeZone_, format != null ? format.id : 0, aTimeZone != null ? aTimeZone.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dateWithCalendarFormat_timeZone_, format != null ? format.id : 0, aTimeZone != null ? aTimeZone.id : 0); return result != 0 ? new NSCalendarDate(result) : null; } public static NSDate dateWithTimeIntervalSinceNow(double secs) { - int result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithTimeIntervalSinceNow_, secs); + int /*long*/ result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithTimeIntervalSinceNow_, secs); return result != 0 ? new NSDate(result) : null; } public static NSDate distantFuture() { - int result = OS.objc_msgSend(OS.class_NSDate, OS.sel_distantFuture); + int /*long*/ result = OS.objc_msgSend(OS.class_NSDate, OS.sel_distantFuture); return result != 0 ? new NSDate(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java index 382a4d2667..7d32a7cc04 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java @@ -25,7 +25,7 @@ public NSDatePicker(id id) { } public NSDate dateValue() { - int result = OS.objc_msgSend(this.id, OS.sel_dateValue); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dateValue); return result != 0 ? new NSDate(result) : null; } @@ -33,11 +33,11 @@ public void setBackgroundColor(NSColor color) { OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0); } -public void setDatePickerElements(int elementFlags) { +public void setDatePickerElements(int /*long*/ elementFlags) { OS.objc_msgSend(this.id, OS.sel_setDatePickerElements_, elementFlags); } -public void setDatePickerStyle(int newStyle) { +public void setDatePickerStyle(int /*long*/ newStyle) { OS.objc_msgSend(this.id, OS.sel_setDatePickerStyle_, newStyle); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java index 6832a36c6a..82049e36f4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java @@ -25,31 +25,31 @@ public NSDictionary(id id) { } public NSArray allKeys() { - int result = OS.objc_msgSend(this.id, OS.sel_allKeys); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_allKeys); return result != 0 ? new NSArray(result) : null; } -public int count() { - return OS.objc_msgSend(this.id, OS.sel_count); +public int /*long*/ count() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_count); } public static NSDictionary dictionaryWithObject(id object, id key) { - int result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionaryWithObject_forKey_, object != null ? object.id : 0, key != null ? key.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionaryWithObject_forKey_, object != null ? object.id : 0, key != null ? key.id : 0); return result != 0 ? new NSDictionary(result) : null; } public NSEnumerator objectEnumerator() { - int result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator); return result != 0 ? new NSEnumerator(result) : null; } public id objectForKey(id aKey) { - int result = OS.objc_msgSend(this.id, OS.sel_objectForKey_, aKey != null ? aKey.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_objectForKey_, aKey != null ? aKey.id : 0); return result != 0 ? new id(result) : null; } public id valueForKey(NSString key) { - int result = OS.objc_msgSend(this.id, OS.sel_valueForKey_, key != null ? key.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_valueForKey_, key != null ? key.id : 0); return result != 0 ? new id(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEnumerator.java index f2a704e315..754bcd9652 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEnumerator.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEnumerator.java @@ -25,7 +25,7 @@ public NSEnumerator(id id) { } public id nextObject() { - int result = OS.objc_msgSend(this.id, OS.sel_nextObject); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_nextObject); return result != 0 ? new id(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSError.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSError.java index 52249f0e47..397d7b402d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSError.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSError.java @@ -24,17 +24,17 @@ public NSError(id id) { super(id); } -public int code() { - return OS.objc_msgSend(this.id, OS.sel_code); +public int /*long*/ code() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_code); } public NSString localizedDescription() { - int result = OS.objc_msgSend(this.id, OS.sel_localizedDescription); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_localizedDescription); return result != 0 ? new NSString(result) : null; } public NSDictionary userInfo() { - int result = OS.objc_msgSend(this.id, OS.sel_userInfo); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo); return result != 0 ? new NSDictionary(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java index 709356dc75..a6c4ac6d85 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java @@ -24,29 +24,29 @@ public NSEvent(id id) { super(id); } -public int buttonNumber() { - return OS.objc_msgSend(this.id, OS.sel_buttonNumber); +public int /*long*/ buttonNumber() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_buttonNumber); } public NSString characters() { - int result = OS.objc_msgSend(this.id, OS.sel_characters); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_characters); return result != 0 ? new NSString(result) : null; } public NSString charactersIgnoringModifiers() { - int result = OS.objc_msgSend(this.id, OS.sel_charactersIgnoringModifiers); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_charactersIgnoringModifiers); return result != 0 ? new NSString(result) : null; } -public int clickCount() { - return OS.objc_msgSend(this.id, OS.sel_clickCount); +public int /*long*/ clickCount() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_clickCount); } -public float deltaX() { +public float /*double*/ deltaX() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_deltaX); } -public float deltaY() { +public float /*double*/ deltaY() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_deltaY); } @@ -60,8 +60,8 @@ public NSPoint locationInWindow() { return result; } -public int modifierFlags() { - return OS.objc_msgSend(this.id, OS.sel_modifierFlags); +public int /*long*/ modifierFlags() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_modifierFlags); } public static NSPoint mouseLocation() { @@ -70,17 +70,17 @@ public static NSPoint mouseLocation() { return result; } -public static NSEvent otherEventWithType(int type, NSPoint location, int flags, double time, int wNum, NSGraphicsContext context, short subtype, int d1, int d2) { - int result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_, type, location, flags, time, wNum, context != null ? context.id : 0, subtype, d1, d2); +public static NSEvent otherEventWithType(int /*long*/ type, NSPoint location, int /*long*/ flags, double time, int /*long*/ wNum, NSGraphicsContext context, short subtype, int /*long*/ d1, int /*long*/ d2) { + int /*long*/ result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_, type, location, flags, time, wNum, context != null ? context.id : 0, subtype, d1, d2); return result != 0 ? new NSEvent(result) : null; } -public int type() { - return OS.objc_msgSend(this.id, OS.sel_type); +public int /*long*/ type() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_type); } public NSWindow window() { - int result = OS.objc_msgSend(this.id, OS.sel_window); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_window); return result != 0 ? new NSWindow(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java index 140138494a..9b66ff369b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java @@ -29,16 +29,16 @@ public boolean createFileAtPath(NSString path, NSData data, NSDictionary attr) { } public static NSFileManager defaultManager() { - int result = OS.objc_msgSend(OS.class_NSFileManager, OS.sel_defaultManager); + int /*long*/ result = OS.objc_msgSend(OS.class_NSFileManager, OS.sel_defaultManager); return result != 0 ? new NSFileManager(result) : null; } public NSDirectoryEnumerator enumeratorAtPath(NSString path) { - int result = OS.objc_msgSend(this.id, OS.sel_enumeratorAtPath_, path != null ? path.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_enumeratorAtPath_, path != null ? path.id : 0); return result != 0 ? new NSDirectoryEnumerator(result) : null; } -public boolean removeItemAtPath(NSString path, int error) { +public boolean removeItemAtPath(NSString path, int /*long*/ error) { return OS.objc_msgSend(this.id, OS.sel_removeItemAtPath_error_, path != null ? path.id : 0, error) != 0; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFont.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFont.java index 71436e5312..76696cb841 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFont.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFont.java @@ -24,43 +24,43 @@ public NSFont(id id) { super(id); } -public float ascender() { +public float /*double*/ ascender() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_ascender); } -public float descender() { +public float /*double*/ descender() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_descender); } public NSString familyName() { - int result = OS.objc_msgSend(this.id, OS.sel_familyName); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_familyName); return result != 0 ? new NSString(result) : null; } public NSString fontName() { - int result = OS.objc_msgSend(this.id, OS.sel_fontName); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_fontName); return result != 0 ? new NSString(result) : null; } -public static NSFont fontWithName(NSString fontName, float fontSize) { - int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_fontWithName_size_, fontName != null ? fontName.id : 0, fontSize); +public static NSFont fontWithName(NSString fontName, float /*double*/ fontSize) { + int /*long*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_fontWithName_size_, fontName != null ? fontName.id : 0, fontSize); return result != 0 ? new NSFont(result) : null; } -public float leading() { +public float /*double*/ leading() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_leading); } -public float pointSize() { +public float /*double*/ pointSize() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_pointSize); } -public static NSFont systemFontOfSize(float fontSize) { - int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_systemFontOfSize_, fontSize); +public static NSFont systemFontOfSize(float /*double*/ fontSize) { + int /*long*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_systemFontOfSize_, fontSize); return result != 0 ? new NSFont(result) : null; } -public static float systemFontSize() { +public static float /*double*/ systemFontSize() { return (float)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSize); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontManager.java index bc2b5c53c6..1ab9e9e0af 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontManager.java @@ -25,12 +25,12 @@ public NSFontManager(id id) { } public NSArray availableFonts() { - int result = OS.objc_msgSend(this.id, OS.sel_availableFonts); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_availableFonts); return result != 0 ? new NSArray(result) : null; } public static NSFontManager sharedFontManager() { - int result = OS.objc_msgSend(OS.class_NSFontManager, OS.sel_sharedFontManager); + int /*long*/ result = OS.objc_msgSend(OS.class_NSFontManager, OS.sel_sharedFontManager); return result != 0 ? new NSFontManager(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontPanel.java index 5560f69d0c..f72d0af4dc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontPanel.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontPanel.java @@ -25,7 +25,7 @@ public NSFontPanel(id id) { } public NSFont panelConvertFont(NSFont fontObj) { - int result = OS.objc_msgSend(this.id, OS.sel_panelConvertFont_, fontObj != null ? fontObj.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_panelConvertFont_, fontObj != null ? fontObj.id : 0); return result != 0 ? new NSFont(result) : null; } @@ -34,7 +34,7 @@ public void setPanelFont(NSFont fontObj, boolean flag) { } public static NSFontPanel sharedFontPanel() { - int result = OS.objc_msgSend(OS.class_NSFontPanel, OS.sel_sharedFontPanel); + int /*long*/ result = OS.objc_msgSend(OS.class_NSFontPanel, OS.sel_sharedFontPanel); return result != 0 ? new NSFontPanel(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGradient.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGradient.java index 68e574b733..a6ec2baca4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGradient.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGradient.java @@ -24,16 +24,16 @@ public NSGradient(id id) { super(id); } -public void drawFromPoint(NSPoint startingPoint, NSPoint endingPoint, int options) { +public void drawFromPoint(NSPoint startingPoint, NSPoint endingPoint, int /*long*/ options) { OS.objc_msgSend(this.id, OS.sel_drawFromPoint_toPoint_options_, startingPoint, endingPoint, options); } -public void drawInRect(NSRect rect, float angle) { +public void drawInRect(NSRect rect, float /*double*/ angle) { OS.objc_msgSend(this.id, OS.sel_drawInRect_angle_, rect, angle); } public NSGradient initWithStartingColor(NSColor startingColor, NSColor endingColor) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithStartingColor_endingColor_, startingColor != null ? startingColor.id : 0, endingColor != null ? endingColor.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithStartingColor_endingColor_, startingColor != null ? startingColor.id : 0, endingColor != null ? endingColor.id : 0); return result == this.id ? this : (result != 0 ? new NSGradient(result) : null); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java index f1d9edd7b0..bda72a8497 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java @@ -25,7 +25,7 @@ public NSGraphicsContext(id id) { } public static NSGraphicsContext currentContext() { - int result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_currentContext); + int /*long*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_currentContext); return result != 0 ? new NSGraphicsContext(result) : null; } @@ -34,17 +34,17 @@ public void flushGraphics() { } public static NSGraphicsContext graphicsContextWithBitmapImageRep(NSBitmapImageRep bitmapRep) { - int result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithBitmapImageRep_, bitmapRep != null ? bitmapRep.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithBitmapImageRep_, bitmapRep != null ? bitmapRep.id : 0); return result != 0 ? new NSGraphicsContext(result) : null; } public static NSGraphicsContext graphicsContextWithWindow(NSWindow window) { - int result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithWindow_, window != null ? window.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithWindow_, window != null ? window.id : 0); return result != 0 ? new NSGraphicsContext(result) : null; } -public int imageInterpolation() { - return OS.objc_msgSend(this.id, OS.sel_imageInterpolation); +public int /*long*/ imageInterpolation() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_imageInterpolation); } public void restoreGraphicsState() { @@ -55,7 +55,7 @@ public void saveGraphicsState() { OS.objc_msgSend(this.id, OS.sel_saveGraphicsState); } -public void setCompositingOperation(int operation) { +public void setCompositingOperation(int /*long*/ operation) { OS.objc_msgSend(this.id, OS.sel_setCompositingOperation_, operation); } @@ -63,7 +63,7 @@ public static void setCurrentContext(NSGraphicsContext context) { OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_setCurrentContext_, context != null ? context.id : 0); } -public void setImageInterpolation(int interpolation) { +public void setImageInterpolation(int /*long*/ interpolation) { OS.objc_msgSend(this.id, OS.sel_setImageInterpolation_, interpolation); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookieStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookieStorage.java index 568acd2dd5..1b5f846f5a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookieStorage.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookieStorage.java @@ -25,7 +25,7 @@ public NSHTTPCookieStorage(id id) { } public NSArray cookies() { - int result = OS.objc_msgSend(this.id, OS.sel_cookies); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_cookies); return result != 0 ? new NSArray(result) : null; } @@ -34,7 +34,7 @@ public void deleteCookie(NSHTTPCookie cookie) { } public static NSHTTPCookieStorage sharedHTTPCookieStorage() { - int result = OS.objc_msgSend(OS.class_NSHTTPCookieStorage, OS.sel_sharedHTTPCookieStorage); + int /*long*/ result = OS.objc_msgSend(OS.class_NSHTTPCookieStorage, OS.sel_sharedHTTPCookieStorage); return result != 0 ? new NSHTTPCookieStorage(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java index 5d12f18f80..f748126482 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java @@ -25,7 +25,7 @@ public NSImage(id id) { } public NSData TIFFRepresentation() { - int result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentation); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentation); return result != 0 ? new NSData(result) : null; } @@ -34,29 +34,29 @@ public void addRepresentation(NSImageRep imageRep) { } public NSImageRep bestRepresentationForDevice(NSDictionary deviceDescription) { - int result = OS.objc_msgSend(this.id, OS.sel_bestRepresentationForDevice_, deviceDescription != null ? deviceDescription.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_bestRepresentationForDevice_, deviceDescription != null ? deviceDescription.id : 0); return result != 0 ? new NSImageRep(result) : null; } -public void drawAtPoint(NSPoint point, NSRect fromRect, int op, float delta) { +public void drawAtPoint(NSPoint point, NSRect fromRect, int /*long*/ op, float /*double*/ delta) { OS.objc_msgSend(this.id, OS.sel_drawAtPoint_fromRect_operation_fraction_, point, fromRect, op, delta); } -public void drawInRect(NSRect rect, NSRect fromRect, int op, float delta) { +public void drawInRect(NSRect rect, NSRect fromRect, int /*long*/ op, float /*double*/ delta) { OS.objc_msgSend(this.id, OS.sel_drawInRect_fromRect_operation_fraction_, rect, fromRect, op, delta); } public id initWithData(NSData data) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithData_, data != null ? data.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithData_, data != null ? data.id : 0); return result != 0 ? new id(result) : null; } public NSImage initWithSize(NSSize aSize) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithSize_, aSize); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithSize_, aSize); return result == this.id ? this : (result != 0 ? new NSImage(result) : null); } -public void setCacheMode(int mode) { +public void setCacheMode(int /*long*/ mode) { OS.objc_msgSend(this.id, OS.sel_setCacheMode_, mode); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java index 8824b1a44c..43ba33c1e1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java @@ -24,20 +24,20 @@ public NSImageRep(id id) { super(id); } -public int bitsPerSample() { - return OS.objc_msgSend(this.id, OS.sel_bitsPerSample); +public int /*long*/ bitsPerSample() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_bitsPerSample); } public boolean hasAlpha() { return OS.objc_msgSend(this.id, OS.sel_hasAlpha) != 0; } -public int pixelsHigh() { - return OS.objc_msgSend(this.id, OS.sel_pixelsHigh); +public int /*long*/ pixelsHigh() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_pixelsHigh); } -public int pixelsWide() { - return OS.objc_msgSend(this.id, OS.sel_pixelsWide); +public int /*long*/ pixelsWide() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_pixelsWide); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java index b2abeba585..ab983af669 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java @@ -28,11 +28,11 @@ public void setImage(NSImage newImage) { OS.objc_msgSend(this.id, OS.sel_setImage_, newImage != null ? newImage.id : 0); } -public void setImageAlignment(int newAlign) { +public void setImageAlignment(int /*long*/ newAlign) { OS.objc_msgSend(this.id, OS.sel_setImageAlignment_, newAlign); } -public void setImageScaling(int newScaling) { +public void setImageScaling(int /*long*/ newScaling) { OS.objc_msgSend(this.id, OS.sel_setImageScaling_, newScaling); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java index c8f89fb013..f73c79d2a3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java @@ -24,21 +24,21 @@ public NSIndexSet(id id) { super(id); } -public int count() { - return OS.objc_msgSend(this.id, OS.sel_count); +public int /*long*/ count() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_count); } -public int getIndexes(int[] indexBuffer, int bufferSize, int range) { - return OS.objc_msgSend(this.id, OS.sel_getIndexes_maxCount_inIndexRange_, indexBuffer, bufferSize, range); +public int /*long*/ getIndexes(int[] /*long[]*/ indexBuffer, int /*long*/ bufferSize, int /*long*/ range) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_getIndexes_maxCount_inIndexRange_, indexBuffer, bufferSize, range); } -public id initWithIndex(int value) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithIndex_, value); +public id initWithIndex(int /*long*/ value) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIndex_, value); return result != 0 ? new id(result) : null; } public id initWithIndexesInRange(NSRange range) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithIndexesInRange_, range); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIndexesInRange_, range); return result != 0 ? new id(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputManager.java index 4df5bed166..bc2d73e0cc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputManager.java @@ -25,7 +25,7 @@ public NSInputManager(id id) { } public static NSInputManager currentInputManager() { - int result = OS.objc_msgSend(OS.class_NSInputManager, OS.sel_currentInputManager); + int /*long*/ result = OS.objc_msgSend(OS.class_NSInputManager, OS.sel_currentInputManager); return result != 0 ? new NSInputManager(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedArchiver.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedArchiver.java index b30e5972ba..0c78a27029 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedArchiver.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedArchiver.java @@ -25,7 +25,7 @@ public NSKeyedArchiver(id id) { } public static NSData archivedDataWithRootObject(id rootObject) { - int result = OS.objc_msgSend(OS.class_NSKeyedArchiver, OS.sel_archivedDataWithRootObject_, rootObject != null ? rootObject.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSKeyedArchiver, OS.sel_archivedDataWithRootObject_, rootObject != null ? rootObject.id : 0); return result != 0 ? new NSData(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedUnarchiver.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedUnarchiver.java index 662d283fdd..653079c35e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedUnarchiver.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedUnarchiver.java @@ -25,7 +25,7 @@ public NSKeyedUnarchiver(id id) { } public static id unarchiveObjectWithData(NSData data) { - int result = OS.objc_msgSend(OS.class_NSKeyedUnarchiver, OS.sel_unarchiveObjectWithData_, data != null ? data.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSKeyedUnarchiver, OS.sel_unarchiveObjectWithData_, data != null ? data.id : 0); return result != 0 ? new id(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java index 88c50d258d..a6c9b9b232 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java @@ -38,11 +38,11 @@ public NSRect boundingRectForGlyphRange(NSRange glyphRange, NSTextContainer cont return result; } -public int characterIndexForGlyphAtIndex(int glyphIndex) { - return OS.objc_msgSend(this.id, OS.sel_characterIndexForGlyphAtIndex_, glyphIndex); +public int /*long*/ characterIndexForGlyphAtIndex(int /*long*/ glyphIndex) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_characterIndexForGlyphAtIndex_, glyphIndex); } -public float defaultLineHeightForFont(NSFont theFont) { +public float /*double*/ defaultLineHeightForFont(NSFont theFont) { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_defaultLineHeightForFont_, theFont != null ? theFont.id : 0); } @@ -54,16 +54,16 @@ public void drawGlyphsForGlyphRange(NSRange glyphsToShow, NSPoint origin) { OS.objc_msgSend(this.id, OS.sel_drawGlyphsForGlyphRange_atPoint_, glyphsToShow, origin); } -public int getGlyphs(int glyphArray, NSRange glyphRange) { - return OS.objc_msgSend(this.id, OS.sel_getGlyphs_range_, glyphArray, glyphRange); +public int /*long*/ getGlyphs(int /*long*/ glyphArray, NSRange glyphRange) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_getGlyphs_range_, glyphArray, glyphRange); } -public int glyphIndexForCharacterAtIndex(int charIndex) { - return OS.objc_msgSend(this.id, OS.sel_glyphIndexForCharacterAtIndex_, charIndex); +public int /*long*/ glyphIndexForCharacterAtIndex(int /*long*/ charIndex) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_glyphIndexForCharacterAtIndex_, charIndex); } -public int glyphIndexForPoint(NSPoint point, NSTextContainer container, float[] partialFraction) { - return OS.objc_msgSend(this.id, OS.sel_glyphIndexForPoint_inTextContainer_fractionOfDistanceThroughGlyph_, point, container != null ? container.id : 0, partialFraction); +public int /*long*/ glyphIndexForPoint(NSPoint point, NSTextContainer container, float[] /*double[]*/ partialFraction) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_glyphIndexForPoint_inTextContainer_fractionOfDistanceThroughGlyph_, point, container != null ? container.id : 0, partialFraction); } public NSRange glyphRangeForTextContainer(NSTextContainer container) { @@ -72,26 +72,26 @@ public NSRange glyphRangeForTextContainer(NSTextContainer container) { return result; } -public NSRect lineFragmentUsedRectForGlyphAtIndex(int glyphIndex, int effectiveGlyphRange) { +public NSRect lineFragmentUsedRectForGlyphAtIndex(int /*long*/ glyphIndex, int /*long*/ effectiveGlyphRange) { NSRect result = new NSRect(); OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_, glyphIndex, effectiveGlyphRange); return result; } -public NSRect lineFragmentUsedRectForGlyphAtIndex(int glyphIndex, int effectiveGlyphRange, boolean flag) { +public NSRect lineFragmentUsedRectForGlyphAtIndex(int /*long*/ glyphIndex, int /*long*/ effectiveGlyphRange, boolean flag) { NSRect result = new NSRect(); OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_, glyphIndex, effectiveGlyphRange, flag); return result; } -public NSPoint locationForGlyphAtIndex(int glyphIndex) { +public NSPoint locationForGlyphAtIndex(int /*long*/ glyphIndex) { NSPoint result = new NSPoint(); OS.objc_msgSend_stret(result, this.id, OS.sel_locationForGlyphAtIndex_, glyphIndex); return result; } -public int numberOfGlyphs() { - return OS.objc_msgSend(this.id, OS.sel_numberOfGlyphs); +public int /*long*/ numberOfGlyphs() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_numberOfGlyphs); } public void removeTemporaryAttribute(NSString attrName, NSRange charRange) { @@ -103,7 +103,7 @@ public void setLineFragmentRect(NSRect fragmentRect, NSRange glyphRange, NSRect } public NSTypesetter typesetter() { - int result = OS.objc_msgSend(this.id, OS.sel_typesetter); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_typesetter); return result != 0 ? new NSTypesetter(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java index 87a54999c2..60896c3b03 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java @@ -33,26 +33,26 @@ public void cancelTracking() { } public NSMenu initWithTitle(NSString aTitle) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithTitle_, aTitle != null ? aTitle.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithTitle_, aTitle != null ? aTitle.id : 0); return result == this.id ? this : (result != 0 ? new NSMenu(result) : null); } -public void insertItem(NSMenuItem newItem, int index) { +public void insertItem(NSMenuItem newItem, int /*long*/ index) { OS.objc_msgSend(this.id, OS.sel_insertItem_atIndex_, newItem != null ? newItem.id : 0, index); } public NSArray itemArray() { - int result = OS.objc_msgSend(this.id, OS.sel_itemArray); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemArray); return result != 0 ? new NSArray(result) : null; } -public NSMenuItem itemAtIndex(int index) { - int result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_, index); +public NSMenuItem itemAtIndex(int /*long*/ index) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_, index); return result != 0 ? new NSMenuItem(result) : null; } -public int numberOfItems() { - return OS.objc_msgSend(this.id, OS.sel_numberOfItems); +public int /*long*/ numberOfItems() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_numberOfItems); } public static void popUpContextMenu(NSMenu menu, NSEvent event, NSView view) { @@ -63,7 +63,7 @@ public void removeItem(NSMenuItem item) { OS.objc_msgSend(this.id, OS.sel_removeItem_, item != null ? item.id : 0); } -public void removeItemAtIndex(int index) { +public void removeItemAtIndex(int /*long*/ index) { OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java index 56ce04afb8..33fea6beee 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java @@ -24,17 +24,17 @@ public NSMenuItem(id id) { super(id); } -public NSMenuItem initWithTitle(NSString aString, int aSelector, NSString charCode) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithTitle_action_keyEquivalent_, aString != null ? aString.id : 0, aSelector, charCode != null ? charCode.id : 0); +public NSMenuItem initWithTitle(NSString aString, int /*long*/ aSelector, NSString charCode) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithTitle_action_keyEquivalent_, aString != null ? aString.id : 0, aSelector, charCode != null ? charCode.id : 0); return result == this.id ? this : (result != 0 ? new NSMenuItem(result) : null); } public static NSMenuItem separatorItem() { - int result = OS.objc_msgSend(OS.class_NSMenuItem, OS.sel_separatorItem); + int /*long*/ result = OS.objc_msgSend(OS.class_NSMenuItem, OS.sel_separatorItem); return result != 0 ? new NSMenuItem(result) : null; } -public void setAction(int aSelector) { +public void setAction(int /*long*/ aSelector) { OS.objc_msgSend(this.id, OS.sel_setAction_, aSelector); } @@ -50,7 +50,7 @@ public void setKeyEquivalent(NSString aKeyEquivalent) { OS.objc_msgSend(this.id, OS.sel_setKeyEquivalent_, aKeyEquivalent != null ? aKeyEquivalent.id : 0); } -public void setKeyEquivalentModifierMask(int mask) { +public void setKeyEquivalentModifierMask(int /*long*/ mask) { OS.objc_msgSend(this.id, OS.sel_setKeyEquivalentModifierMask_, mask); } @@ -58,7 +58,7 @@ public void setMenu(NSMenu menu) { OS.objc_msgSend(this.id, OS.sel_setMenu_, menu != null ? menu.id : 0); } -public void setState(int state) { +public void setState(int /*long*/ state) { OS.objc_msgSend(this.id, OS.sel_setState_, state); } @@ -74,17 +74,17 @@ public void setTitle(NSString aString) { OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0); } -public int state() { - return OS.objc_msgSend(this.id, OS.sel_state); +public int /*long*/ state() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_state); } public NSMenu submenu() { - int result = OS.objc_msgSend(this.id, OS.sel_submenu); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_submenu); return result != 0 ? new NSMenu(result) : null; } public NSString title() { - int result = OS.objc_msgSend(this.id, OS.sel_title); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_title); return result != 0 ? new NSString(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java index c2e047fbbf..35664fd185 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java @@ -28,13 +28,13 @@ public void addObject(id anObject) { OS.objc_msgSend(this.id, OS.sel_addObject_, anObject != null ? anObject.id : 0); } -public static NSMutableArray arrayWithCapacity(int numItems) { - int result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithCapacity_, numItems); +public static NSMutableArray arrayWithCapacity(int /*long*/ numItems) { + int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithCapacity_, numItems); return result != 0 ? new NSMutableArray(result) : null; } public static NSArray arrayWithObject(id anObject) { - int result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0); return result != 0 ? new NSMutableArray(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java index c717b6947f..51fd5012be 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java @@ -25,7 +25,7 @@ public NSMutableAttributedString(id id) { } public NSMutableString mutableString() { - int result = OS.objc_msgSend(this.id, OS.sel_mutableString); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_mutableString); return result != 0 ? new NSMutableString(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java index d2ce57c316..2663e8ee92 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java @@ -24,8 +24,8 @@ public NSMutableDictionary(id id) { super(id); } -public static NSMutableDictionary dictionaryWithCapacity(int numItems) { - int result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithCapacity_, numItems); +public static NSMutableDictionary dictionaryWithCapacity(int /*long*/ numItems) { + int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithCapacity_, numItems); return result != 0 ? new NSMutableDictionary(result) : null; } @@ -38,7 +38,7 @@ public void setValue(id value, NSString key) { } public static NSDictionary dictionaryWithObject(id object, id key) { - int result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithObject_forKey_, object != null ? object.id : 0, key != null ? key.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithObject_forKey_, object != null ? object.id : 0, key != null ? key.id : 0); return result != 0 ? new NSMutableDictionary(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java index 82cf05dc48..e25f20026e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java @@ -24,7 +24,7 @@ public NSMutableIndexSet(id id) { super(id); } -public void addIndex(int value) { +public void addIndex(int /*long*/ value) { OS.objc_msgSend(this.id, OS.sel_addIndex_, value); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java index 2e28025891..d25d3e2886 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java @@ -24,15 +24,15 @@ public NSMutableParagraphStyle(id id) { super(id); } -public void setAlignment(int alignment) { +public void setAlignment(int /*long*/ alignment) { OS.objc_msgSend(this.id, OS.sel_setAlignment_, alignment); } -public void setFirstLineHeadIndent(float aFloat) { +public void setFirstLineHeadIndent(float /*double*/ aFloat) { OS.objc_msgSend(this.id, OS.sel_setFirstLineHeadIndent_, aFloat); } -public void setLineSpacing(float aFloat) { +public void setLineSpacing(float /*double*/ aFloat) { OS.objc_msgSend(this.id, OS.sel_setLineSpacing_, aFloat); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java index 42f22e2848..2b317d8949 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java @@ -29,7 +29,7 @@ public void addObjectsFromArray(NSArray array) { } public static NSSet set() { - int result = OS.objc_msgSend(OS.class_NSMutableSet, OS.sel_set); + int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableSet, OS.sel_set); return result != 0 ? new NSMutableSet(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java index 311ec127e0..05214bb0cc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java @@ -28,8 +28,8 @@ public void appendString(NSString aString) { OS.objc_msgSend(this.id, OS.sel_appendString_, aString != null ? aString.id : 0); } -public static NSString stringWithCharacters(char[] characters, int length) { - int result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithCharacters_length_, characters, length); +public static NSString stringWithCharacters(char[] characters, int /*long*/ length) { + int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithCharacters_length_, characters, length); return result != 0 ? new NSMutableString(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java index 634f466b61..3071ad3f8d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java @@ -29,7 +29,7 @@ public void setURL(NSURL URL) { } public static NSURLRequest requestWithURL(NSURL URL) { - int result = OS.objc_msgSend(OS.class_NSMutableURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0); return result != 0 ? new NSMutableURLRequest(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotification.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotification.java index 6d87b85bfa..1da9d4d146 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotification.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotification.java @@ -25,7 +25,7 @@ public NSNotification(id id) { } public id object() { - int result = OS.objc_msgSend(this.id, OS.sel_object); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_object); return result != 0 ? new id(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationCenter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationCenter.java index bd88acec39..ab0bc21705 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationCenter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationCenter.java @@ -24,12 +24,12 @@ public NSNotificationCenter(id id) { super(id); } -public void addObserver(id observer, int aSelector, NSString aName, id anObject) { +public void addObserver(id observer, int /*long*/ aSelector, NSString aName, id anObject) { OS.objc_msgSend(this.id, OS.sel_addObserver_selector_name_object_, observer != null ? observer.id : 0, aSelector, aName != null ? aName.id : 0, anObject != null ? anObject.id : 0); } public static NSNotificationCenter defaultCenter() { - int result = OS.objc_msgSend(OS.class_NSNotificationCenter, OS.sel_defaultCenter); + int /*long*/ result = OS.objc_msgSend(OS.class_NSNotificationCenter, OS.sel_defaultCenter); return result != 0 ? new NSNotificationCenter(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumber.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumber.java index e46f1a42d3..23ed2a4be7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumber.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumber.java @@ -25,36 +25,36 @@ public NSNumber(id id) { } public int intValue() { - return OS.objc_msgSend(this.id, OS.sel_intValue); + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_intValue); } public static NSNumber numberWithBool(boolean value) { - int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithBool_, value); + int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithBool_, value); return result != 0 ? new NSNumber(result) : null; } public static NSNumber numberWithInt(int value) { - int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithInt_, value); + int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithInt_, value); return result != 0 ? new NSNumber(result) : null; } public static NSValue valueWithPoint(NSPoint point) { - int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithPoint_, point); + int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithPoint_, point); return result != 0 ? new NSValue(result) : null; } public static NSValue valueWithRange(NSRange range) { - int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRange_, range); + int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRange_, range); return result != 0 ? new NSValue(result) : null; } public static NSValue valueWithRect(NSRect rect) { - int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRect_, rect); + int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRect_, rect); return result != 0 ? new NSValue(result) : null; } public static NSValue valueWithSize(NSSize size) { - int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithSize_, size); + int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithSize_, size); return result != 0 ? new NSValue(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java index e2ae3a46e3..cd3c788853 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java @@ -30,7 +30,7 @@ public NSObject alloc() { } public id autorelease() { - int result = OS.objc_msgSend(this.id, OS.sel_autorelease); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_autorelease); return result != 0 ? new id(result) : null; } @@ -39,12 +39,12 @@ public boolean conformsToProtocol(Protocol aProtocol) { } public id copy() { - int result = OS.objc_msgSend(this.id, OS.sel_copy); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_copy); return result != 0 ? new id(result) : null; } public NSObject init() { - int result = OS.objc_msgSend(this.id, OS.sel_init); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_init); return result == this.id ? this : (result != 0 ? new NSObject(result) : null); } @@ -56,11 +56,11 @@ public boolean isEqualTo(id object) { return OS.objc_msgSend(this.id, OS.sel_isEqualTo_, object != null ? object.id : 0) != 0; } -public boolean isKindOfClass(int aClass) { +public boolean isKindOfClass(int /*long*/ aClass) { return OS.objc_msgSend(this.id, OS.sel_isKindOfClass_, aClass) != 0; } -public void performSelectorOnMainThread(int aSelector, id arg, boolean wait) { +public void performSelectorOnMainThread(int /*long*/ aSelector, id arg, boolean wait) { OS.objc_msgSend(this.id, OS.sel_performSelectorOnMainThread_withObject_waitUntilDone_, aSelector, arg != null ? arg.id : 0, wait); } @@ -68,21 +68,21 @@ public void release() { OS.objc_msgSend(this.id, OS.sel_release); } -public boolean respondsToSelector(int aSelector) { +public boolean respondsToSelector(int /*long*/ aSelector) { return OS.objc_msgSend(this.id, OS.sel_respondsToSelector_, aSelector) != 0; } public id retain() { - int result = OS.objc_msgSend(this.id, OS.sel_retain); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_retain); return result != 0 ? new id(result) : null; } -public int retainCount() { - return OS.objc_msgSend(this.id, OS.sel_retainCount); +public int /*long*/ retainCount() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_retainCount); } -public int superclass() { - return OS.objc_msgSend(this.id, OS.sel_superclass); +public int /*long*/ superclass() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_superclass); } public void addEventListener(NSString type, id listener, boolean useCapture) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java index 3d7644031c..6cccae00ef 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java @@ -29,7 +29,7 @@ public static void clearCurrentContext() { } public static NSOpenGLContext currentContext() { - int result = OS.objc_msgSend(OS.class_NSOpenGLContext, OS.sel_currentContext); + int /*long*/ result = OS.objc_msgSend(OS.class_NSOpenGLContext, OS.sel_currentContext); return result != 0 ? new NSOpenGLContext(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java index f86cde1e78..e710ea0e0d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java @@ -25,7 +25,7 @@ public NSOpenGLPixelFormat(id id) { } public id initWithAttributes(int[] attribs) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithAttributes_, attribs); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithAttributes_, attribs); return result != 0 ? new id(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLView.java index bf99815972..3c6ee72d3b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLView.java @@ -29,12 +29,12 @@ public void clearGLContext() { } public id initWithFrame(NSRect frameRect, NSOpenGLPixelFormat format) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_pixelFormat_, frameRect, format != null ? format.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_pixelFormat_, frameRect, format != null ? format.id : 0); return result != 0 ? new id(result) : null; } public NSOpenGLContext openGLContext() { - int result = OS.objc_msgSend(this.id, OS.sel_openGLContext); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_openGLContext); return result != 0 ? new NSOpenGLContext(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java index b32a56feb9..3522982f08 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java @@ -25,12 +25,12 @@ public NSOpenPanel(id id) { } public NSArray filenames() { - int result = OS.objc_msgSend(this.id, OS.sel_filenames); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_filenames); return result != 0 ? new NSArray(result) : null; } public static NSOpenPanel openPanel() { - int result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_openPanel); + int /*long*/ result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_openPanel); return result != 0 ? new NSOpenPanel(result) : null; } @@ -47,7 +47,7 @@ public void setCanChooseFiles(boolean flag) { } public static NSSavePanel savePanel() { - int result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_savePanel); + int /*long*/ result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_savePanel); return result != 0 ? new NSSavePanel(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java index b916ebbe00..b95fcce360 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java @@ -32,17 +32,17 @@ public void expandItem(id item) { OS.objc_msgSend(this.id, OS.sel_expandItem_, item != null ? item.id : 0); } -public float indentationPerLevel() { +public float /*double*/ indentationPerLevel() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_indentationPerLevel); } -public id itemAtRow(int row) { - int result = OS.objc_msgSend(this.id, OS.sel_itemAtRow_, row); +public id itemAtRow(int /*long*/ row) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemAtRow_, row); return result != 0 ? new id(result) : null; } -public int levelForItem(id item) { - return OS.objc_msgSend(this.id, OS.sel_levelForItem_, item != null ? item.id : 0); +public int /*long*/ levelForItem(id item) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_levelForItem_, item != null ? item.id : 0); } public void reloadItem(id item) { @@ -53,8 +53,8 @@ public void reloadItem(id item, boolean reloadChildren) { OS.objc_msgSend(this.id, OS.sel_reloadItem_reloadChildren_, item != null ? item.id : 0, reloadChildren); } -public int rowForItem(id item) { - return OS.objc_msgSend(this.id, OS.sel_rowForItem_, item != null ? item.id : 0); +public int /*long*/ rowForItem(id item) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_rowForItem_, item != null ? item.id : 0); } public void setAutoresizesOutlineColumn(boolean resize) { @@ -65,7 +65,7 @@ public void setAutosaveExpandedItems(boolean save) { OS.objc_msgSend(this.id, OS.sel_setAutosaveExpandedItems_, save); } -public void setIndentationPerLevel(float indentationPerLevel) { +public void setIndentationPerLevel(float /*double*/ indentationPerLevel) { OS.objc_msgSend(this.id, OS.sel_setIndentationPerLevel_, indentationPerLevel); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSParagraphStyle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSParagraphStyle.java index c63cea3eba..cb43093562 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSParagraphStyle.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSParagraphStyle.java @@ -24,8 +24,8 @@ public NSParagraphStyle(id id) { super(id); } -public int alignment() { - return OS.objc_msgSend(this.id, OS.sel_alignment); +public int /*long*/ alignment() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_alignment); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPasteboard.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPasteboard.java index 2e1369b98e..b73b68fef0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPasteboard.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPasteboard.java @@ -24,36 +24,36 @@ public NSPasteboard(id id) { super(id); } -public int addTypes(NSArray newTypes, id newOwner) { - return OS.objc_msgSend(this.id, OS.sel_addTypes_owner_, newTypes != null ? newTypes.id : 0, newOwner != null ? newOwner.id : 0); +public int /*long*/ addTypes(NSArray newTypes, id newOwner) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_addTypes_owner_, newTypes != null ? newTypes.id : 0, newOwner != null ? newOwner.id : 0); } public NSString availableTypeFromArray(NSArray types) { - int result = OS.objc_msgSend(this.id, OS.sel_availableTypeFromArray_, types != null ? types.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_availableTypeFromArray_, types != null ? types.id : 0); return result != 0 ? new NSString(result) : null; } public NSData dataForType(NSString dataType) { - int result = OS.objc_msgSend(this.id, OS.sel_dataForType_, dataType != null ? dataType.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dataForType_, dataType != null ? dataType.id : 0); return result != 0 ? new NSData(result) : null; } -public int declareTypes(NSArray newTypes, id newOwner) { - return OS.objc_msgSend(this.id, OS.sel_declareTypes_owner_, newTypes != null ? newTypes.id : 0, newOwner != null ? newOwner.id : 0); +public int /*long*/ declareTypes(NSArray newTypes, id newOwner) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_declareTypes_owner_, newTypes != null ? newTypes.id : 0, newOwner != null ? newOwner.id : 0); } public static NSPasteboard generalPasteboard() { - int result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_generalPasteboard); + int /*long*/ result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_generalPasteboard); return result != 0 ? new NSPasteboard(result) : null; } public static NSPasteboard pasteboardWithName(NSString name) { - int result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardWithName_, name != null ? name.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardWithName_, name != null ? name.id : 0); return result != 0 ? new NSPasteboard(result) : null; } public id propertyListForType(NSString dataType) { - int result = OS.objc_msgSend(this.id, OS.sel_propertyListForType_, dataType != null ? dataType.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_propertyListForType_, dataType != null ? dataType.id : 0); return result != 0 ? new id(result) : null; } @@ -70,12 +70,12 @@ public boolean setString(NSString string, NSString dataType) { } public NSString stringForType(NSString dataType) { - int result = OS.objc_msgSend(this.id, OS.sel_stringForType_, dataType != null ? dataType.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringForType_, dataType != null ? dataType.id : 0); return result != 0 ? new NSString(result) : null; } public NSArray types() { - int result = OS.objc_msgSend(this.id, OS.sel_types); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_types); return result != 0 ? new NSArray(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java index 7b44f26d71..691c7b5c3c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java @@ -24,39 +24,39 @@ public NSPopUpButton(id id) { super(id); } -public int indexOfSelectedItem() { - return OS.objc_msgSend(this.id, OS.sel_indexOfSelectedItem); +public int /*long*/ indexOfSelectedItem() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_indexOfSelectedItem); } public NSPopUpButton initWithFrame(NSRect buttonFrame, boolean flag) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_pullsDown_, buttonFrame, flag); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_pullsDown_, buttonFrame, flag); return result == this.id ? this : (result != 0 ? new NSPopUpButton(result) : null); } -public NSMenuItem itemAtIndex(int index) { - int result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_, index); +public NSMenuItem itemAtIndex(int /*long*/ index) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_, index); return result != 0 ? new NSMenuItem(result) : null; } -public NSString itemTitleAtIndex(int index) { - int result = OS.objc_msgSend(this.id, OS.sel_itemTitleAtIndex_, index); +public NSString itemTitleAtIndex(int /*long*/ index) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemTitleAtIndex_, index); return result != 0 ? new NSString(result) : null; } public NSMenu menu() { - int result = OS.objc_msgSend(this.id, OS.sel_menu); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_menu); return result != 0 ? new NSMenu(result) : null; } -public int numberOfItems() { - return OS.objc_msgSend(this.id, OS.sel_numberOfItems); +public int /*long*/ numberOfItems() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_numberOfItems); } public void removeAllItems() { OS.objc_msgSend(this.id, OS.sel_removeAllItems); } -public void removeItemAtIndex(int index) { +public void removeItemAtIndex(int /*long*/ index) { OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index); } @@ -64,7 +64,7 @@ public void selectItem(NSMenuItem item) { OS.objc_msgSend(this.id, OS.sel_selectItem_, item != null ? item.id : 0); } -public void selectItemAtIndex(int index) { +public void selectItemAtIndex(int /*long*/ index) { OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_, index); } @@ -77,7 +77,7 @@ public void setPullsDown(boolean flag) { } public NSString titleOfSelectedItem() { - int result = OS.objc_msgSend(this.id, OS.sel_titleOfSelectedItem); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_titleOfSelectedItem); return result != 0 ? new NSString(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java index 81c42bb862..61c472b58d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java @@ -25,12 +25,12 @@ public NSPrintInfo(id id) { } public static NSPrinter defaultPrinter() { - int result = OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_defaultPrinter); + int /*long*/ result = OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_defaultPrinter); return result != 0 ? new NSPrinter(result) : null; } public NSMutableDictionary dictionary() { - int result = OS.objc_msgSend(this.id, OS.sel_dictionary); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dictionary); return result != 0 ? new NSMutableDictionary(result) : null; } @@ -41,12 +41,12 @@ public NSRect imageablePageBounds() { } public NSPrintInfo initWithDictionary(NSDictionary attributes) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithDictionary_, attributes != null ? attributes.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithDictionary_, attributes != null ? attributes.id : 0); return result == this.id ? this : (result != 0 ? new NSPrintInfo(result) : null); } public NSString jobDisposition() { - int result = OS.objc_msgSend(this.id, OS.sel_jobDisposition); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_jobDisposition); return result != 0 ? new NSString(result) : null; } @@ -57,7 +57,7 @@ public NSSize paperSize() { } public NSPrinter printer() { - int result = OS.objc_msgSend(this.id, OS.sel_printer); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_printer); return result != 0 ? new NSPrinter(result) : null; } @@ -74,7 +74,7 @@ public void setUpPrintOperationDefaultValues() { } public static NSPrintInfo sharedPrintInfo() { - int result = OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_sharedPrintInfo); + int /*long*/ result = OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_sharedPrintInfo); return result != 0 ? new NSPrintInfo(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java index dfdceb8fa8..53324120d8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java @@ -29,12 +29,12 @@ public void cleanUpOperation() { } public NSGraphicsContext context() { - int result = OS.objc_msgSend(this.id, OS.sel_context); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_context); return result != 0 ? new NSGraphicsContext(result) : null; } public NSGraphicsContext createContext() { - int result = OS.objc_msgSend(this.id, OS.sel_createContext); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_createContext); return result != 0 ? new NSGraphicsContext(result) : null; } @@ -47,7 +47,7 @@ public void destroyContext() { } public static NSPrintOperation printOperationWithView(NSView view, NSPrintInfo printInfo) { - int result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_printOperationWithView_printInfo_, view != null ? view.id : 0, printInfo != null ? printInfo.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_printOperationWithView_printInfo_, view != null ? view.id : 0, printInfo != null ? printInfo.id : 0); return result != 0 ? new NSPrintOperation(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintPanel.java index ffc55018d8..a367ea7253 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintPanel.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintPanel.java @@ -24,20 +24,20 @@ public NSPrintPanel(id id) { super(id); } -public int options() { - return OS.objc_msgSend(this.id, OS.sel_options); +public int /*long*/ options() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_options); } public static NSPrintPanel printPanel() { - int result = OS.objc_msgSend(OS.class_NSPrintPanel, OS.sel_printPanel); + int /*long*/ result = OS.objc_msgSend(OS.class_NSPrintPanel, OS.sel_printPanel); return result != 0 ? new NSPrintPanel(result) : null; } -public int runModalWithPrintInfo(NSPrintInfo printInfo) { - return OS.objc_msgSend(this.id, OS.sel_runModalWithPrintInfo_, printInfo != null ? printInfo.id : 0); +public int /*long*/ runModalWithPrintInfo(NSPrintInfo printInfo) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_runModalWithPrintInfo_, printInfo != null ? printInfo.id : 0); } -public void setOptions(int options) { +public void setOptions(int /*long*/ options) { OS.objc_msgSend(this.id, OS.sel_setOptions_, options); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrinter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrinter.java index d0920d6312..b3b449fe78 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrinter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrinter.java @@ -25,17 +25,17 @@ public NSPrinter(id id) { } public NSString name() { - int result = OS.objc_msgSend(this.id, OS.sel_name); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_name); return result != 0 ? new NSString(result) : null; } public static NSArray printerNames() { - int result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerNames); + int /*long*/ result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerNames); return result != 0 ? new NSArray(result) : null; } public static NSPrinter printerWithName(NSString name) { - int result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerWithName_, name != null ? name.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerWithName_, name != null ? name.id : 0); return result != 0 ? new NSPrinter(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java index 137ee7cf40..6f58b2ac14 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java @@ -32,7 +32,7 @@ public boolean becomeFirstResponder() { return OS.objc_msgSend(this.id, OS.sel_becomeFirstResponder) != 0; } -public void doCommandBySelector(int aSelector) { +public void doCommandBySelector(int /*long*/ aSelector) { OS.objc_msgSend(this.id, OS.sel_doCommandBySelector_, aSelector); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunLoop.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunLoop.java index 82684a0c61..6991de88ea 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunLoop.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunLoop.java @@ -25,12 +25,12 @@ public NSRunLoop(id id) { } public static NSRunLoop currentRunLoop() { - int result = OS.objc_msgSend(OS.class_NSRunLoop, OS.sel_currentRunLoop); + int /*long*/ result = OS.objc_msgSend(OS.class_NSRunLoop, OS.sel_currentRunLoop); return result != 0 ? new NSRunLoop(result) : null; } public static NSRunLoop mainRunLoop() { - int result = OS.objc_msgSend(OS.class_NSRunLoop, OS.sel_mainRunLoop); + int /*long*/ result = OS.objc_msgSend(OS.class_NSRunLoop, OS.sel_mainRunLoop); return result != 0 ? new NSRunLoop(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java index 325bb80301..5f565c5ccd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java @@ -25,16 +25,16 @@ public NSSavePanel(id id) { } public NSString filename() { - int result = OS.objc_msgSend(this.id, OS.sel_filename); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_filename); return result != 0 ? new NSString(result) : null; } -public int runModal() { - return OS.objc_msgSend(this.id, OS.sel_runModal); +public int /*long*/ runModal() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_runModal); } public static NSSavePanel savePanel() { - int result = OS.objc_msgSend(OS.class_NSSavePanel, OS.sel_savePanel); + int /*long*/ result = OS.objc_msgSend(OS.class_NSSavePanel, OS.sel_savePanel); return result != 0 ? new NSSavePanel(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScreen.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScreen.java index 0aab84a946..8053129803 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScreen.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScreen.java @@ -25,11 +25,11 @@ public NSScreen(id id) { } public int depth() { - return OS.objc_msgSend(this.id, OS.sel_depth); + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_depth); } public NSDictionary deviceDescription() { - int result = OS.objc_msgSend(this.id, OS.sel_deviceDescription); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_deviceDescription); return result != 0 ? new NSDictionary(result) : null; } @@ -40,12 +40,12 @@ public NSRect frame() { } public static NSScreen mainScreen() { - int result = OS.objc_msgSend(OS.class_NSScreen, OS.sel_mainScreen); + int /*long*/ result = OS.objc_msgSend(OS.class_NSScreen, OS.sel_mainScreen); return result != 0 ? new NSScreen(result) : null; } public static NSArray screens() { - int result = OS.objc_msgSend(OS.class_NSScreen, OS.sel_screens); + int /*long*/ result = OS.objc_msgSend(OS.class_NSScreen, OS.sel_screens); return result != 0 ? new NSArray(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java index 7ee496e3ee..60dfb20e2b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java @@ -30,19 +30,19 @@ public NSSize contentSize() { return result; } -public static NSSize contentSizeForFrameSize(NSSize fSize, boolean hFlag, boolean vFlag, int aType) { +public static NSSize contentSizeForFrameSize(NSSize fSize, boolean hFlag, boolean vFlag, int /*long*/ aType) { NSSize result = new NSSize(); OS.objc_msgSend_stret(result, OS.class_NSScrollView, OS.sel_contentSizeForFrameSize_hasHorizontalScroller_hasVerticalScroller_borderType_, fSize, hFlag, vFlag, aType); return result; } public NSClipView contentView() { - int result = OS.objc_msgSend(this.id, OS.sel_contentView); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_contentView); return result != 0 ? new NSClipView(result) : null; } public NSView documentView() { - int result = OS.objc_msgSend(this.id, OS.sel_documentView); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_documentView); return result != 0 ? new NSView(result) : null; } @@ -52,7 +52,7 @@ public NSRect documentVisibleRect() { return result; } -public static NSSize frameSizeForContentSize(NSSize cSize, boolean hFlag, boolean vFlag, int aType) { +public static NSSize frameSizeForContentSize(NSSize cSize, boolean hFlag, boolean vFlag, int /*long*/ aType) { NSSize result = new NSSize(); OS.objc_msgSend_stret(result, OS.class_NSScrollView, OS.sel_frameSizeForContentSize_hasHorizontalScroller_hasVerticalScroller_borderType_, cSize, hFlag, vFlag, aType); return result; @@ -62,7 +62,7 @@ public void setAutohidesScrollers(boolean flag) { OS.objc_msgSend(this.id, OS.sel_setAutohidesScrollers_, flag); } -public void setBorderType(int aType) { +public void setBorderType(int /*long*/ aType) { OS.objc_msgSend(this.id, OS.sel_setBorderType_, aType); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScroller.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScroller.java index 3492309e60..e2126ea08f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScroller.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScroller.java @@ -24,15 +24,15 @@ public NSScroller(id id) { super(id); } -public int hitPart() { - return OS.objc_msgSend(this.id, OS.sel_hitPart); +public int /*long*/ hitPart() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_hitPart); } -public static float scrollerWidth() { +public static float /*double*/ scrollerWidth() { return (float)OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidth); } -public void setFloatValue(float aFloat, float proportion) { +public void setFloatValue(float aFloat, float /*double*/ proportion) { OS.objc_msgSend(this.id, OS.sel_setFloatValue_knobProportion_, aFloat, proportion); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchField.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchField.java index 2dd0070a3e..0be6a22f27 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchField.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchField.java @@ -25,7 +25,7 @@ public NSSearchField(id id) { } public NSArray recentSearches() { - int result = OS.objc_msgSend(this.id, OS.sel_recentSearches); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_recentSearches); return result != 0 ? new NSArray(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java index 281b382565..55b4e10427 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java @@ -24,17 +24,17 @@ public NSSet(id id) { super(id); } -public int count() { - return OS.objc_msgSend(this.id, OS.sel_count); +public int /*long*/ count() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_count); } public NSEnumerator objectEnumerator() { - int result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator); return result != 0 ? new NSEnumerator(result) : null; } public static NSSet set() { - int result = OS.objc_msgSend(OS.class_NSSet, OS.sel_set); + int /*long*/ result = OS.objc_msgSend(OS.class_NSSet, OS.sel_set); return result != 0 ? new NSSet(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusBar.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusBar.java index 2ab968664f..313ebd0797 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusBar.java @@ -28,13 +28,13 @@ public void removeStatusItem(NSStatusItem item) { OS.objc_msgSend(this.id, OS.sel_removeStatusItem_, item != null ? item.id : 0); } -public NSStatusItem statusItemWithLength(float length) { - int result = OS.objc_msgSend(this.id, OS.sel_statusItemWithLength_, length); +public NSStatusItem statusItemWithLength(float /*double*/ length) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_statusItemWithLength_, length); return result != 0 ? new NSStatusItem(result) : null; } public static NSStatusBar systemStatusBar() { - int result = OS.objc_msgSend(OS.class_NSStatusBar, OS.sel_systemStatusBar); + int /*long*/ result = OS.objc_msgSend(OS.class_NSStatusBar, OS.sel_systemStatusBar); return result != 0 ? new NSStatusBar(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusItem.java index 8c846adacc..aacd1418ed 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusItem.java @@ -32,7 +32,7 @@ public void setHighlightMode(boolean highlightMode) { OS.objc_msgSend(this.id, OS.sel_setHighlightMode_, highlightMode); } -public void setLength(float length) { +public void setLength(float /*double*/ length) { OS.objc_msgSend(this.id, OS.sel_setLength_, length); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java index d7bf229c38..b22b30816d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java @@ -25,7 +25,7 @@ public NSString(id id) { } public String getString() { - char[] buffer = new char[length()]; + char[] buffer = new char[(int)/*64*/length()]; getCharacters(buffer); return new String(buffer); } @@ -36,7 +36,7 @@ public static NSString stringWith(String str) { return stringWithCharacters(buffer, buffer.length); } -public short characterAtIndex(int index) { +public short characterAtIndex(int /*long*/ index) { return (short)OS.objc_msgSend(this.id, OS.sel_characterAtIndex_, index); } @@ -49,41 +49,41 @@ public void getCharacters(char[] buffer, NSRange aRange) { } public NSString lastPathComponent() { - int result = OS.objc_msgSend(this.id, OS.sel_lastPathComponent); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_lastPathComponent); return result == this.id ? this : (result != 0 ? new NSString(result) : null); } -public int length() { - return OS.objc_msgSend(this.id, OS.sel_length); +public int /*long*/ length() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_length); } public NSString lowercaseString() { - int result = OS.objc_msgSend(this.id, OS.sel_lowercaseString); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_lowercaseString); return result == this.id ? this : (result != 0 ? new NSString(result) : null); } -public NSString stringByAddingPercentEscapesUsingEncoding(int enc) { - int result = OS.objc_msgSend(this.id, OS.sel_stringByAddingPercentEscapesUsingEncoding_, enc); +public NSString stringByAddingPercentEscapesUsingEncoding(int /*long*/ enc) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAddingPercentEscapesUsingEncoding_, enc); return result == this.id ? this : (result != 0 ? new NSString(result) : null); } public NSString stringByAppendingPathComponent(NSString str) { - int result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingPathComponent_, str != null ? str.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingPathComponent_, str != null ? str.id : 0); return result == this.id ? this : (result != 0 ? new NSString(result) : null); } public NSString stringByDeletingPathExtension() { - int result = OS.objc_msgSend(this.id, OS.sel_stringByDeletingPathExtension); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringByDeletingPathExtension); return result == this.id ? this : (result != 0 ? new NSString(result) : null); } public NSString stringByReplacingOccurrencesOfString(NSString target, NSString replacement) { - int result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingOccurrencesOfString_withString_, target != null ? target.id : 0, replacement != null ? replacement.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingOccurrencesOfString_withString_, target != null ? target.id : 0, replacement != null ? replacement.id : 0); return result == this.id ? this : (result != 0 ? new NSString(result) : null); } -public static NSString stringWithCharacters(char[] characters, int length) { - int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithCharacters_length_, characters, length); +public static NSString stringWithCharacters(char[] characters, int /*long*/ length) { + int /*long*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithCharacters_length_, characters, length); return result != 0 ? new NSString(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java index d09aea2b23..2e02ca43bc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java @@ -34,7 +34,7 @@ public NSRect contentRect() { return result; } -public void insertTabViewItem(NSTabViewItem tabViewItem, int index) { +public void insertTabViewItem(NSTabViewItem tabViewItem, int /*long*/ index) { OS.objc_msgSend(this.id, OS.sel_insertTabViewItem_atIndex_, tabViewItem != null ? tabViewItem.id : 0, index); } @@ -48,12 +48,12 @@ public void removeTabViewItem(NSTabViewItem tabViewItem) { OS.objc_msgSend(this.id, OS.sel_removeTabViewItem_, tabViewItem != null ? tabViewItem.id : 0); } -public void selectTabViewItemAtIndex(int index) { +public void selectTabViewItemAtIndex(int /*long*/ index) { OS.objc_msgSend(this.id, OS.sel_selectTabViewItemAtIndex_, index); } public NSTabViewItem selectedTabViewItem() { - int result = OS.objc_msgSend(this.id, OS.sel_selectedTabViewItem); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_selectedTabViewItem); return result != 0 ? new NSTabViewItem(result) : null; } @@ -65,12 +65,12 @@ public void setFont(NSFont font) { OS.objc_msgSend(this.id, OS.sel_setFont_, font != null ? font.id : 0); } -public void setTabViewType(int tabViewType) { +public void setTabViewType(int /*long*/ tabViewType) { OS.objc_msgSend(this.id, OS.sel_setTabViewType_, tabViewType); } public NSTabViewItem tabViewItemAtPoint(NSPoint point) { - int result = OS.objc_msgSend(this.id, OS.sel_tabViewItemAtPoint_, point); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_tabViewItemAtPoint_, point); return result != 0 ? new NSTabViewItem(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java index 34d6439799..c5c1ecb0da 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java @@ -25,7 +25,7 @@ public NSTabViewItem(id id) { } public id initWithIdentifier(id identifier) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0); return result != 0 ? new id(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java index 88afc8de6e..7dfbbc90f0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java @@ -25,17 +25,17 @@ public NSTableColumn(id id) { } public NSTableHeaderCell headerCell() { - int result = OS.objc_msgSend(this.id, OS.sel_headerCell); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_headerCell); return result != 0 ? new NSTableHeaderCell(result) : null; } public id initWithIdentifier(id identifier) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0); return result != 0 ? new id(result) : null; } -public int resizingMask() { - return OS.objc_msgSend(this.id, OS.sel_resizingMask); +public int /*long*/ resizingMask() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_resizingMask); } public void setDataCell(NSCell cell) { @@ -50,19 +50,19 @@ public void setHeaderCell(NSCell cell) { OS.objc_msgSend(this.id, OS.sel_setHeaderCell_, cell != null ? cell.id : 0); } -public void setMinWidth(float minWidth) { +public void setMinWidth(float /*double*/ minWidth) { OS.objc_msgSend(this.id, OS.sel_setMinWidth_, minWidth); } -public void setResizingMask(int resizingMask) { +public void setResizingMask(int /*long*/ resizingMask) { OS.objc_msgSend(this.id, OS.sel_setResizingMask_, resizingMask); } -public void setWidth(float width) { +public void setWidth(float /*double*/ width) { OS.objc_msgSend(this.id, OS.sel_setWidth_, width); } -public float width() { +public float /*double*/ width() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_width); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderCell.java index d74891b571..1e4dcee3c5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderCell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderCell.java @@ -24,7 +24,7 @@ public NSTableHeaderCell(id id) { super(id); } -public void drawSortIndicatorWithFrame(NSRect cellFrame, NSView controlView, boolean ascending, int priority) { +public void drawSortIndicatorWithFrame(NSRect cellFrame, NSView controlView, boolean ascending, int /*long*/ priority) { OS.objc_msgSend(this.id, OS.sel_drawSortIndicatorWithFrame_inView_ascending_priority_, cellFrame, controlView != null ? controlView.id : 0, ascending, priority); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderView.java index 0756a7e4e3..16cf7ba03a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderView.java @@ -24,11 +24,11 @@ public NSTableHeaderView(id id) { super(id); } -public int columnAtPoint(NSPoint point) { - return OS.objc_msgSend(this.id, OS.sel_columnAtPoint_, point); +public int /*long*/ columnAtPoint(NSPoint point) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_columnAtPoint_, point); } -public NSRect headerRectOfColumn(int column) { +public NSRect headerRectOfColumn(int /*long*/ column) { NSRect result = new NSRect(); OS.objc_msgSend_stret(result, this.id, OS.sel_headerRectOfColumn_, column); return result; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java index edaa0fae8f..49db32d0ab 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java @@ -32,26 +32,26 @@ public void deselectAll(id sender) { OS.objc_msgSend(this.id, OS.sel_deselectAll_, sender != null ? sender.id : 0); } -public void deselectRow(int row) { +public void deselectRow(int /*long*/ row) { OS.objc_msgSend(this.id, OS.sel_deselectRow_, row); } -public NSRect frameOfCellAtColumn(int column, int row) { +public NSRect frameOfCellAtColumn(int /*long*/ column, int /*long*/ row) { NSRect result = new NSRect(); OS.objc_msgSend_stret(result, this.id, OS.sel_frameOfCellAtColumn_row_, column, row); return result; } public NSTableHeaderView headerView() { - int result = OS.objc_msgSend(this.id, OS.sel_headerView); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_headerView); return result != 0 ? new NSTableHeaderView(result) : null; } -public boolean isRowSelected(int row) { +public boolean isRowSelected(int /*long*/ row) { return OS.objc_msgSend(this.id, OS.sel_isRowSelected_, row) != 0; } -public void moveColumn(int column, int newIndex) { +public void moveColumn(int /*long*/ column, int /*long*/ newIndex) { OS.objc_msgSend(this.id, OS.sel_moveColumn_toColumn_, column, newIndex); } @@ -59,19 +59,19 @@ public void noteNumberOfRowsChanged() { OS.objc_msgSend(this.id, OS.sel_noteNumberOfRowsChanged); } -public int numberOfColumns() { - return OS.objc_msgSend(this.id, OS.sel_numberOfColumns); +public int /*long*/ numberOfColumns() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_numberOfColumns); } -public int numberOfRows() { - return OS.objc_msgSend(this.id, OS.sel_numberOfRows); +public int /*long*/ numberOfRows() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_numberOfRows); } -public int numberOfSelectedRows() { - return OS.objc_msgSend(this.id, OS.sel_numberOfSelectedRows); +public int /*long*/ numberOfSelectedRows() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_numberOfSelectedRows); } -public NSRect rectOfRow(int row) { +public NSRect rectOfRow(int /*long*/ row) { NSRect result = new NSRect(); OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfRow_, row); return result; @@ -85,19 +85,19 @@ public void removeTableColumn(NSTableColumn column) { OS.objc_msgSend(this.id, OS.sel_removeTableColumn_, column != null ? column.id : 0); } -public int rowAtPoint(NSPoint point) { - return OS.objc_msgSend(this.id, OS.sel_rowAtPoint_, point); +public int /*long*/ rowAtPoint(NSPoint point) { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_rowAtPoint_, point); } -public float rowHeight() { +public float /*double*/ rowHeight() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rowHeight); } -public void scrollColumnToVisible(int column) { +public void scrollColumnToVisible(int /*long*/ column) { OS.objc_msgSend(this.id, OS.sel_scrollColumnToVisible_, column); } -public void scrollRowToVisible(int row) { +public void scrollRowToVisible(int /*long*/ row) { OS.objc_msgSend(this.id, OS.sel_scrollRowToVisible_, row); } @@ -105,7 +105,7 @@ public void selectAll(id sender) { OS.objc_msgSend(this.id, OS.sel_selectAll_, sender != null ? sender.id : 0); } -public void selectRow(int row, boolean extend) { +public void selectRow(int /*long*/ row, boolean extend) { OS.objc_msgSend(this.id, OS.sel_selectRow_byExtendingSelection_, row, extend); } @@ -113,12 +113,12 @@ public void selectRowIndexes(NSIndexSet indexes, boolean extend) { OS.objc_msgSend(this.id, OS.sel_selectRowIndexes_byExtendingSelection_, indexes != null ? indexes.id : 0, extend); } -public int selectedRow() { - return OS.objc_msgSend(this.id, OS.sel_selectedRow); +public int /*long*/ selectedRow() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_selectedRow); } public NSIndexSet selectedRowIndexes() { - int result = OS.objc_msgSend(this.id, OS.sel_selectedRowIndexes); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_selectedRowIndexes); return result != 0 ? new NSIndexSet(result) : null; } @@ -138,7 +138,7 @@ public void setDelegate(id delegate) { OS.objc_msgSend(this.id, OS.sel_setDelegate_, delegate != null ? delegate.id : 0); } -public void setDoubleAction(int aSelector) { +public void setDoubleAction(int /*long*/ aSelector) { OS.objc_msgSend(this.id, OS.sel_setDoubleAction_, aSelector); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java index fd1ca54760..09128e95fe 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java @@ -54,7 +54,7 @@ public NSRange selectedRange() { return result; } -public void setAlignment(int mode) { +public void setAlignment(int /*long*/ mode) { OS.objc_msgSend(this.id, OS.sel_setAlignment_, mode); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java index 727e4e7f96..0965b2a804 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java @@ -31,7 +31,7 @@ public NSSize containerSize() { } public NSTextContainer initWithContainerSize(NSSize size) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithContainerSize_, size); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContainerSize_, size); return result == this.id ? this : (result != 0 ? new NSTextContainer(result) : null); } @@ -39,7 +39,7 @@ public void setContainerSize(NSSize size) { OS.objc_msgSend(this.id, OS.sel_setContainerSize_, size); } -public void setLineFragmentPadding(float pad) { +public void setLineFragmentPadding(float /*double*/ pad) { OS.objc_msgSend(this.id, OS.sel_setLineFragmentPadding_, pad); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java index 96ac2586df..a612e69beb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java @@ -29,7 +29,7 @@ public void setTextColor(NSColor color) { } public NSColor textColor() { - int result = OS.objc_msgSend(this.id, OS.sel_textColor); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_textColor); return result != 0 ? new NSColor(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java index 633bdf2a63..997267d116 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java @@ -29,7 +29,7 @@ public void addLayoutManager(NSLayoutManager obj) { } public NSArray paragraphs() { - int result = OS.objc_msgSend(this.id, OS.sel_paragraphs); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_paragraphs); return result != 0 ? new NSArray(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java index ed2eddb6fe..5e43198987 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java @@ -25,7 +25,7 @@ public NSTextView(id id) { } public NSDictionary markedTextAttributes() { - int result = OS.objc_msgSend(this.id, OS.sel_markedTextAttributes); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_markedTextAttributes); return result != 0 ? new NSDictionary(result) : null; } @@ -34,12 +34,12 @@ public void setRichText(boolean flag) { } public NSTextContainer textContainer() { - int result = OS.objc_msgSend(this.id, OS.sel_textContainer); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_textContainer); return result != 0 ? new NSTextContainer(result) : null; } public NSTextStorage textStorage() { - int result = OS.objc_msgSend(this.id, OS.sel_textStorage); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_textStorage); return result != 0 ? new NSTextStorage(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimeZone.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimeZone.java index 0a7599c652..db165f0581 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimeZone.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimeZone.java @@ -25,7 +25,7 @@ public NSTimeZone(id id) { } public static NSTimeZone defaultTimeZone() { - int result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_defaultTimeZone); + int /*long*/ result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_defaultTimeZone); return result != 0 ? new NSTimeZone(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java index 27f960f7b7..cad8667cc3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java @@ -28,8 +28,8 @@ public void invalidate() { OS.objc_msgSend(this.id, OS.sel_invalidate); } -public static NSTimer scheduledTimerWithTimeInterval(double ti, id aTarget, int aSelector, id userInfo, boolean yesOrNo) { - int result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_, ti, aTarget != null ? aTarget.id : 0, aSelector, userInfo != null ? userInfo.id : 0, yesOrNo); +public static NSTimer scheduledTimerWithTimeInterval(double ti, id aTarget, int /*long*/ aSelector, id userInfo, boolean yesOrNo) { + int /*long*/ result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_, ti, aTarget != null ? aTarget.id : 0, aSelector, userInfo != null ? userInfo.id : 0, yesOrNo); return result != 0 ? new NSTimer(result) : null; } @@ -38,7 +38,7 @@ public void setFireDate(NSDate date) { } public id userInfo() { - int result = OS.objc_msgSend(this.id, OS.sel_userInfo); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo); return result != 0 ? new id(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTypesetter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTypesetter.java index aa66daa42d..a6f7e32f27 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTypesetter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTypesetter.java @@ -24,7 +24,7 @@ public NSTypesetter(id id) { super(id); } -public float baselineOffsetInLayoutManager(NSLayoutManager layoutMgr, int glyphIndex) { +public float /*double*/ baselineOffsetInLayoutManager(NSLayoutManager layoutMgr, int /*long*/ glyphIndex) { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_baselineOffsetInLayoutManager_glyphIndex_, layoutMgr != null ? layoutMgr.id : 0, glyphIndex); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURL.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURL.java index 63407e6842..1677d5e61b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURL.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURL.java @@ -25,17 +25,17 @@ public NSURL(id id) { } public static NSURL URLWithString(NSString URLString) { - int result = OS.objc_msgSend(OS.class_NSURL, OS.sel_URLWithString_, URLString != null ? URLString.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSURL, OS.sel_URLWithString_, URLString != null ? URLString.id : 0); return result != 0 ? new NSURL(result) : null; } public NSString absoluteString() { - int result = OS.objc_msgSend(this.id, OS.sel_absoluteString); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_absoluteString); return result != 0 ? new NSString(result) : null; } public static NSURL fileURLWithPath(NSString path) { - int result = OS.objc_msgSend(OS.class_NSURL, OS.sel_fileURLWithPath_, path != null ? path.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSURL, OS.sel_fileURLWithPath_, path != null ? path.id : 0); return result != 0 ? new NSURL(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLRequest.java index ae59eeeada..51ba84d080 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLRequest.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLRequest.java @@ -25,17 +25,17 @@ public NSURLRequest(id id) { } public NSURL URL() { - int result = OS.objc_msgSend(this.id, OS.sel_URL); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_URL); return result != 0 ? new NSURL(result) : null; } public NSURLRequest initWithURL(NSURL URL) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithURL_, URL != null ? URL.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithURL_, URL != null ? URL.id : 0); return result == this.id ? this : (result != 0 ? new NSURLRequest(result) : null); } public static NSURLRequest requestWithURL(NSURL URL) { - int result = OS.objc_msgSend(OS.class_NSURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0); + int /*long*/ result = OS.objc_msgSend(OS.class_NSURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0); return result != 0 ? new NSURLRequest(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValue.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValue.java index 9ab6b0a302..c1baae64d3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValue.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValue.java @@ -37,22 +37,22 @@ public NSSize sizeValue() { } public static NSValue valueWithPoint(NSPoint point) { - int result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithPoint_, point); + int /*long*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithPoint_, point); return result != 0 ? new NSValue(result) : null; } public static NSValue valueWithRange(NSRange range) { - int result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithRange_, range); + int /*long*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithRange_, range); return result != 0 ? new NSValue(result) : null; } public static NSValue valueWithRect(NSRect rect) { - int result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithRect_, rect); + int /*long*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithRect_, rect); return result != 0 ? new NSValue(result) : null; } public static NSValue valueWithSize(NSSize size) { - int result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithSize_, size); + int /*long*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithSize_, size); return result != 0 ? new NSValue(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java index d58b247908..4b598f4962 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java @@ -28,7 +28,7 @@ public void addSubview(NSView aView) { OS.objc_msgSend(this.id, OS.sel_addSubview_, aView != null ? aView.id : 0); } -public void addSubview(NSView aView, int place, NSView otherView) { +public void addSubview(NSView aView, int /*long*/ place, NSView otherView) { OS.objc_msgSend(this.id, OS.sel_addSubview_positioned_relativeTo_, aView != null ? aView.id : 0, place, otherView != null ? otherView.id : 0); } @@ -141,12 +141,12 @@ public NSRect frame() { } public NSView hitTest(NSPoint aPoint) { - int result = OS.objc_msgSend(this.id, OS.sel_hitTest_, aPoint); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_hitTest_, aPoint); return result == this.id ? this : (result != 0 ? new NSView(result) : null); } public NSView initWithFrame(NSRect frameRect) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_, frameRect); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_, frameRect); return result == this.id ? this : (result != 0 ? new NSView(result) : null); } @@ -159,7 +159,7 @@ public boolean isOpaque() { } public NSMenu menuForEvent(NSEvent event) { - int result = OS.objc_msgSend(this.id, OS.sel_menuForEvent_, event != null ? event.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_menuForEvent_, event != null ? event.id : 0); return result != 0 ? new NSMenu(result) : null; } @@ -175,11 +175,11 @@ public void setAutoresizesSubviews(boolean flag) { OS.objc_msgSend(this.id, OS.sel_setAutoresizesSubviews_, flag); } -public void setAutoresizingMask(int mask) { +public void setAutoresizingMask(int /*long*/ mask) { OS.objc_msgSend(this.id, OS.sel_setAutoresizingMask_, mask); } -public void setFocusRingType(int focusRingType) { +public void setFocusRingType(int /*long*/ focusRingType) { OS.objc_msgSend(this.id, OS.sel_setFocusRingType_, focusRingType); } @@ -212,12 +212,12 @@ public void setToolTip(NSString string) { } public NSArray subviews() { - int result = OS.objc_msgSend(this.id, OS.sel_subviews); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_subviews); return result != 0 ? new NSArray(result) : null; } public NSView superview() { - int result = OS.objc_msgSend(this.id, OS.sel_superview); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_superview); return result == this.id ? this : (result != 0 ? new NSView(result) : null); } @@ -228,7 +228,7 @@ public NSRect visibleRect() { } public NSWindow window() { - int result = OS.objc_msgSend(this.id, OS.sel_window); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_window); return result != 0 ? new NSWindow(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java index 26c314fc9f..4a7d555f2c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java @@ -24,7 +24,7 @@ public NSWindow(id id) { super(id); } -public float alphaValue() { +public float /*double*/ alphaValue() { return (float)OS.objc_msgSend_fpret(this.id, OS.sel_alphaValue); } @@ -45,7 +45,7 @@ public NSRect contentRectForFrameRect(NSRect frameRect) { } public NSView contentView() { - int result = OS.objc_msgSend(this.id, OS.sel_contentView); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_contentView); return result != 0 ? new NSView(result) : null; } @@ -62,12 +62,12 @@ public NSPoint convertScreenToBase(NSPoint aPoint) { } public NSText fieldEditor(boolean createFlag, id anObject) { - int result = OS.objc_msgSend(this.id, OS.sel_fieldEditor_forObject_, createFlag, anObject != null ? anObject.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_fieldEditor_forObject_, createFlag, anObject != null ? anObject.id : 0); return result != 0 ? new NSText(result) : null; } public NSResponder firstResponder() { - int result = OS.objc_msgSend(this.id, OS.sel_firstResponder); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_firstResponder); return result != 0 ? new NSResponder(result) : null; } @@ -84,17 +84,17 @@ public NSRect frameRectForContentRect(NSRect contentRect) { } public NSGraphicsContext graphicsContext() { - int result = OS.objc_msgSend(this.id, OS.sel_graphicsContext); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_graphicsContext); return result != 0 ? new NSGraphicsContext(result) : null; } -public NSWindow initWithContentRect(NSRect contentRect, int aStyle, int bufferingType, boolean flag) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_styleMask_backing_defer_, contentRect, aStyle, bufferingType, flag); +public NSWindow initWithContentRect(NSRect contentRect, int /*long*/ aStyle, int /*long*/ bufferingType, boolean flag) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_styleMask_backing_defer_, contentRect, aStyle, bufferingType, flag); return result == this.id ? this : (result != 0 ? new NSWindow(result) : null); } -public NSWindow initWithContentRect(NSRect contentRect, int aStyle, int bufferingType, boolean flag, NSScreen screen) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_styleMask_backing_defer_screen_, contentRect, aStyle, bufferingType, flag, screen != null ? screen.id : 0); +public NSWindow initWithContentRect(NSRect contentRect, int /*long*/ aStyle, int /*long*/ bufferingType, boolean flag, NSScreen screen) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_styleMask_backing_defer_screen_, contentRect, aStyle, bufferingType, flag, screen != null ? screen.id : 0); return result == this.id ? this : (result != 0 ? new NSWindow(result) : null); } @@ -129,7 +129,7 @@ public void orderOut(id sender) { } public NSScreen screen() { - int result = OS.objc_msgSend(this.id, OS.sel_screen); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_screen); return result != 0 ? new NSScreen(result) : null; } @@ -137,7 +137,7 @@ public void setAcceptsMouseMovedEvents(boolean flag) { OS.objc_msgSend(this.id, OS.sel_setAcceptsMouseMovedEvents_, flag); } -public void setAlphaValue(float windowAlpha) { +public void setAlphaValue(float /*double*/ windowAlpha) { OS.objc_msgSend(this.id, OS.sel_setAlphaValue_, windowAlpha); } @@ -161,7 +161,7 @@ public void setHasShadow(boolean hasShadow) { OS.objc_msgSend(this.id, OS.sel_setHasShadow_, hasShadow); } -public void setLevel(int newLevel) { +public void setLevel(int /*long*/ newLevel) { OS.objc_msgSend(this.id, OS.sel_setLevel_, newLevel); } @@ -173,12 +173,12 @@ public void setTitle(NSString aString) { OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0); } -public int styleMask() { - return OS.objc_msgSend(this.id, OS.sel_styleMask); +public int /*long*/ styleMask() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_styleMask); } -public int windowNumber() { - return OS.objc_msgSend(this.id, OS.sel_windowNumber); +public int /*long*/ windowNumber() { + return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_windowNumber); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWorkspace.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWorkspace.java index c6dead1b02..f76a955bcf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWorkspace.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWorkspace.java @@ -25,21 +25,21 @@ public NSWorkspace(id id) { } public NSString fullPathForApplication(NSString appName) { - int result = OS.objc_msgSend(this.id, OS.sel_fullPathForApplication_, appName != null ? appName.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_fullPathForApplication_, appName != null ? appName.id : 0); return result != 0 ? new NSString(result) : null; } -public boolean getInfoForFile(NSString fullPath, int appName, int type) { +public boolean getInfoForFile(NSString fullPath, int /*long*/ appName, int /*long*/ type) { return OS.objc_msgSend(this.id, OS.sel_getInfoForFile_application_type_, fullPath != null ? fullPath.id : 0, appName, type) != 0; } public NSImage iconForFile(NSString fullPath) { - int result = OS.objc_msgSend(this.id, OS.sel_iconForFile_, fullPath != null ? fullPath.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_iconForFile_, fullPath != null ? fullPath.id : 0); return result != 0 ? new NSImage(result) : null; } public NSImage iconForFileType(NSString fileType) { - int result = OS.objc_msgSend(this.id, OS.sel_iconForFileType_, fileType != null ? fileType.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_iconForFileType_, fileType != null ? fileType.id : 0); return result != 0 ? new NSImage(result) : null; } @@ -55,12 +55,12 @@ public boolean openURL(NSURL url) { return OS.objc_msgSend(this.id, OS.sel_openURL_, url != null ? url.id : 0) != 0; } -public boolean openURLs(NSArray urls, NSString bundleIdentifier, int options, NSAppleEventDescriptor descriptor, int identifiers) { +public boolean openURLs(NSArray urls, NSString bundleIdentifier, int /*long*/ options, NSAppleEventDescriptor descriptor, int /*long*/ identifiers) { return OS.objc_msgSend(this.id, OS.sel_openURLs_withAppBundleIdentifier_options_additionalEventParamDescriptor_launchIdentifiers_, urls != null ? urls.id : 0, bundleIdentifier != null ? bundleIdentifier.id : 0, options, descriptor != null ? descriptor.id : 0, identifiers) != 0; } public static NSWorkspace sharedWorkspace() { - int result = OS.objc_msgSend(OS.class_NSWorkspace, OS.sel_sharedWorkspace); + int /*long*/ result = OS.objc_msgSend(OS.class_NSWorkspace, OS.sel_sharedWorkspace); return result != 0 ? new NSWorkspace(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 e98e1787b6..be0fda2587 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 @@ -2917,86 +2917,87 @@ public static final native int /*long*/ NSSearchPathForDirectoriesInDomains(int public static final native int /*long*/ NSTemporaryDirectory(); /** Sends */ + public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long*/ sel); +public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0); public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1); -public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, float /*double*/ arg1, float /*double*/ arg2, float /*double*/ arg3, boolean arg4); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSAffineTransformStruct arg0); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, NSPoint arg1, NSPoint arg2); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, NSPoint arg1, int /*long*/ arg2); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, NSRect arg1, int /*long*/ arg2, float /*double*/ arg3); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, float /*double*/ arg1, float /*double*/ arg2, float /*double*/ arg3); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, float /*double*/ arg1, float /*double*/ arg2, float /*double*/ arg3, boolean arg4); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, int /*long*/ arg1, float[] /*double[]*/ arg2); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0, NSPoint arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0, int /*long*/ arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, NSPoint arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, NSRange arg1, NSRect arg2); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, NSRect arg1, int /*long*/ arg2, float /*double*/ arg3); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, boolean arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, float /*double*/ arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, float /*double*/ arg1, float /*double*/ arg2); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, boolean arg2, int /*long*/ arg3); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, int /*long*/ arg2); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3, int /*long*/ arg4); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSSize arg0); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, boolean arg0); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, boolean arg0, int /*long*/ arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, byte[] arg0); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, byte[] arg0, int /*long*/ arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, char[] arg0); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, char[] arg0, NSRange arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, char[] arg0, int /*long*/ arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, double arg0); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, double arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, boolean arg4); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, float /*double*/ arg0, float /*double*/ arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, float /*double*/ arg0, float /*double*/ arg1, float /*double*/ arg2, float /*double*/ arg3); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, float[] /*double[]*/ arg0); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, float[] /*double[]*/ arg0, int /*long*/ arg1, float /*double*/ arg2); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1, int /*long*/ arg2, double arg3, int /*long*/ arg4, int /*long*/ arg5, short arg6, int /*long*/ arg7, int /*long*/ arg8); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSRange arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, boolean arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, float /*double*/ arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, NSRange arg2); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, boolean arg2); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, boolean arg5, boolean arg6, int /*long*/ arg7, int /*long*/ arg8, int /*long*/ arg9); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, boolean arg5, boolean arg6, int /*long*/ arg7, int /*long*/ arg8, int /*long*/ arg9, int /*long*/ arg10); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5, int /*long*/ arg6); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int[] /*long[]*/ arg0, int /*long*/ arg1, int /*long*/ arg2); +public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int[] arg0); +public static final native int objc_msgSend(int id, int sel, float arg0); +public static final native long objc_msgSend(long id, long sel, float arg0, double arg1); +public static final native long objc_msgSend(long id, long sel, int arg0); +public static final native void objc_msgSend_stret(NSAffineTransformStruct result, int /*long*/ id, int /*long*/ sel); +public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel); +public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel, NSPoint arg0); +public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel, NSPoint arg0, int /*long*/ arg1); public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, double arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, char[] /**/ arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, NSPoint arg1); public static final native void objc_msgSend_stret(NSRange result, int /*long*/ id, int /*long*/ sel); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSAffineTransformStruct arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, float[] /**/ arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, float /*double*/ arg0, float /*double*/ arg1, float /*double*/ arg2, float /*double*/ arg3); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3); -public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSSize arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, double arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, boolean arg4); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, float /*double*/ arg1, float /*double*/ arg2); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, float /*double*/ arg0, float /*double*/ arg1); +public static final native void objc_msgSend_stret(NSRange result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0); +public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel); +public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, NSRange arg0, int /*long*/ arg1); public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, NSRect arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, NSRect arg1, int /*long*/ arg2, float /*double*/ arg3); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, boolean arg2, int /*long*/ arg3); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSSize arg0); +public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1); +public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0); public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, char[] /**/ arg0, NSRange arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, float[] /**/ arg0, int /*long*/ arg1, float /*double*/ arg2); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, boolean arg1); -public static final native int objc_msgSend(long id, long sel, float arg0, double arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, byte[] /**/ arg0, int /*long*/ arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, boolean arg5, boolean arg6, int /*long*/ arg7, int /*long*/ arg8, int /*long*/ arg9, int /*long*/ arg10); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0); -public static final native void objc_msgSend_stret(NSAffineTransformStruct result, int /*long*/ id, int /*long*/ sel); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, float /*double*/ arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, NSPoint arg1, NSPoint arg2); -public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5, int /*long*/ arg6); -public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, int /*long*/ arg1, float[] /**/ arg2); -public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSSize arg0, int /*long*/ arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int[] /**/ arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, float /*double*/ arg1, float /*double*/ arg2, float /*double*/ arg3); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0, int /*long*/ arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, NSRect arg1, int /*long*/ arg2, float /*double*/ arg3); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, float /*double*/ arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, char[] /**/ arg0, int /*long*/ arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, boolean arg0); -public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSSize arg0, boolean arg1, boolean arg2, int /*long*/ arg3); -public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel, NSPoint arg0); public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, boolean arg2); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0, NSPoint arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, boolean arg2); -public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, NSRange arg0, int /*long*/ arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3, int /*long*/ arg4); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1, int /*long*/ arg2, double arg3, int /*long*/ arg4, int /*long*/ arg5, short arg6, int /*long*/ arg7, int /*long*/ arg8); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, float /*double*/ arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSRange arg1); -public static final native int objc_msgSend(long id, long sel, int arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, byte[] /**/ arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int[] /**/ arg0, int /*long*/ arg1, int /*long*/ arg2); -public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel, NSPoint arg0, int /*long*/ arg1); public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, NSPoint arg1, int /*long*/ arg2); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, boolean arg0, int /*long*/ arg1); -public static final native void objc_msgSend_stret(NSRange result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0); -public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, NSRange arg2); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, int /*long*/ arg2); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, NSRange arg1, NSRect arg2); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, boolean arg1); -public static final native int objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, boolean arg5, boolean arg6, int /*long*/ arg7, int /*long*/ arg8, int /*long*/ arg9); -public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel); +public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSSize arg0); +public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSSize arg0, boolean arg1, boolean arg2, int /*long*/ arg3); +public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSSize arg0, int /*long*/ arg1); /** Sizeof natives */ public static final native int CGPoint_sizeof(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDataSource.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDataSource.java index adeaad77d9..46a14bf2f0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDataSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDataSource.java @@ -25,22 +25,22 @@ public WebDataSource(id id) { } public NSString pageTitle() { - int result = OS.objc_msgSend(this.id, OS.sel_pageTitle); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_pageTitle); return result != 0 ? new NSString(result) : null; } public WebDocumentRepresentation representation() { - int result = OS.objc_msgSend(this.id, OS.sel_representation); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_representation); return result != 0 ? new WebDocumentRepresentation(result) : null; } public NSMutableURLRequest request() { - int result = OS.objc_msgSend(this.id, OS.sel_request); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_request); return result != 0 ? new NSMutableURLRequest(result) : null; } public WebFrame webFrame() { - int result = OS.objc_msgSend(this.id, OS.sel_webFrame); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_webFrame); return result != 0 ? new WebFrame(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrame.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrame.java index 6d8006c0ca..af18d5deb2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrame.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrame.java @@ -25,12 +25,12 @@ public WebFrame(id id) { } public DOMDocument DOMDocument() { - int result = OS.objc_msgSend(this.id, OS.sel_DOMDocument); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_DOMDocument); return result != 0 ? new DOMDocument(result) : null; } public WebDataSource dataSource() { - int result = OS.objc_msgSend(this.id, OS.sel_dataSource); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dataSource); return result != 0 ? new WebDataSource(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrameView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrameView.java index 30f121f132..b80a184e53 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrameView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrameView.java @@ -33,7 +33,7 @@ public void printDocumentView() { } public NSPrintOperation printOperationWithPrintInfo(NSPrintInfo printInfo) { - int result = OS.objc_msgSend(this.id, OS.sel_printOperationWithPrintInfo_, printInfo != null ? printInfo.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_printOperationWithPrintInfo_, printInfo != null ? printInfo.id : 0); return result != 0 ? new NSPrintOperation(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java index 10c078246f..7aa70a9221 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java @@ -29,7 +29,7 @@ public void setJavaEnabled(boolean flag) { } public static WebPreferences standardPreferences() { - int result = OS.objc_msgSend(OS.class_WebPreferences, OS.sel_standardPreferences); + int /*long*/ result = OS.objc_msgSend(OS.class_WebPreferences, OS.sel_standardPreferences); return result != 0 ? new WebPreferences(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java index 4fb81a9088..a12aca6491 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java @@ -45,12 +45,12 @@ public boolean goForward() { } public WebView initWithFrame(NSRect frame, NSString frameName, NSString groupName) { - int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_frameName_groupName_, frame, frameName != null ? frameName.id : 0, groupName != null ? groupName.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_frameName_groupName_, frame, frameName != null ? frameName.id : 0, groupName != null ? groupName.id : 0); return result == this.id ? this : (result != 0 ? new WebView(result) : null); } public WebFrame mainFrame() { - int result = OS.objc_msgSend(this.id, OS.sel_mainFrame); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_mainFrame); return result != 0 ? new WebFrame(result) : null; } @@ -87,7 +87,7 @@ public void stopLoading(id sender) { } public NSString stringByEvaluatingJavaScriptFromString(NSString script) { - int result = OS.objc_msgSend(this.id, OS.sel_stringByEvaluatingJavaScriptFromString_, script != null ? script.id : 0); + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringByEvaluatingJavaScriptFromString_, script != null ? script.id : 0); return result != 0 ? new NSString(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java index 6e21a52c40..36d304e2cd 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java @@ -336,9 +336,9 @@ void checkGC (int mask) { if (data.transform != null) { size = data.transform.transformSize(size); } - double /*float*/ scaling = size.width; + float /*double*/ scaling = size.width; if (scaling < 0) scaling = -scaling; - double /*float*/ strokeWidth = data.lineWidth * scaling; + float /*double*/ strokeWidth = data.lineWidth * scaling; if (strokeWidth == 0 || ((int)strokeWidth % 2) == 1) { data.drawXOffset = 0.5f / scaling; } @@ -742,7 +742,7 @@ public void drawArc(int x, int y, int width, int height, int startAngle, int arc checkGC(DRAW); handle.saveGraphicsState(); NSAffineTransform transform = NSAffineTransform.transform(); - double /*float*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset; + float /*double*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset; transform.translateXBy(x + xOffset + width / 2f, y + yOffset + height / 2f); transform.scaleXBy(width / 2f, height / 2f); NSBezierPath path = data.path; @@ -1064,7 +1064,7 @@ public void drawPolygon(int[] pointArray) { if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (pointArray.length < 4) return; checkGC(DRAW); - double /*float*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset; + float /*double*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset; NSBezierPath path = data.path; NSPoint pt = new NSPoint(); pt.x = pointArray[0] + xOffset; @@ -1104,7 +1104,7 @@ public void drawPolyline(int[] pointArray) { if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (pointArray.length < 4) return; checkGC(DRAW); - double /*float*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset; + float /*double*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset; NSBezierPath path = data.path; NSPoint pt = new NSPoint(); pt.x = pointArray[0] + xOffset; @@ -1434,7 +1434,7 @@ public void fillArc(int x, int y, int width, int height, int startAngle, int arc checkGC(FILL); handle.saveGraphicsState(); NSAffineTransform transform = NSAffineTransform.transform(); - double /*float*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset; + float /*double*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset; transform.translateXBy(x + xOffset + width / 2f, y + yOffset + height / 2f); transform.scaleXBy(width / 2f, height / 2f); NSBezierPath path = data.path; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java index f5c73e54b7..fbc0f42e54 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java @@ -49,7 +49,7 @@ public final class GCData { public Image image; - public double /*float*/ drawXOffset, drawYOffset; + public float /*double*/ drawXOffset, drawYOffset; public NSRect paintRect; public NSBezierPath path; public NSAffineTransform transform, inverseTransform; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java index 67fc6e4031..09edf967ee 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java @@ -118,7 +118,7 @@ public Path (Device device, Path path, float flatness) { if (flatness == 0) { handle = new NSBezierPath(path.handle.copy().id); } else { - double /*float*/ defaultFlatness = NSBezierPath.defaultFlatness(); + float /*double*/ defaultFlatness = NSBezierPath.defaultFlatness(); NSBezierPath.setDefaultFlatness(flatness); handle = path.handle.bezierPathByFlatteningPath(); NSBezierPath.setDefaultFlatness(defaultFlatness); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java index 8345585235..69b111c0a9 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java @@ -724,7 +724,7 @@ void scrollWheel (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) { NSView view = scrollView != null ? scrollView : this.view; if (id == view.id) { NSEvent nsEvent = new NSEvent(theEvent); - double /*float*/ delta = nsEvent.deltaY(); + float /*double*/ delta = nsEvent.deltaY(); if (delta != 0) { if (hooks (SWT.MouseWheel) || filters (SWT.MouseWheel)) { if (!sendMouseEvent(nsEvent, SWT.MouseWheel, true)) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java index f9b1e40baa..53d1129512 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java @@ -2270,7 +2270,7 @@ boolean sendMouseEvent (NSEvent nsEvent, int type, boolean send) { break; case SWT.MouseWheel: event.detail = SWT.SCROLL_LINE; - double /*float*/ delta = nsEvent.deltaY(); + float /*double*/ delta = nsEvent.deltaY(); event.count = delta > 0 ? Math.max (1, (int)delta) : Math.min (-1, (int)delta); break; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java index 06eeda4930..1ea4abe17c 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java @@ -900,14 +900,14 @@ public Rectangle getBounds () { Rectangle getBounds (NSArray screens) { NSRect primaryFrame = new NSScreen(screens.objectAtIndex(0)).frame(); - double /*float*/ minX = Float.MAX_VALUE, maxX = Float.MIN_VALUE; - double /*float*/ minY = Float.MAX_VALUE, maxY = Float.MIN_VALUE; + float /*double*/ minX = Float.MAX_VALUE, maxX = Float.MIN_VALUE; + float /*double*/ minY = Float.MAX_VALUE, maxY = Float.MIN_VALUE; int /*long*/ count = screens.count(); for (int i = 0; i < count; i++) { NSScreen screen = new NSScreen(screens.objectAtIndex(i)); NSRect frame = screen.frame(); - double /*float*/ x1 = frame.x, x2 = frame.x + frame.width; - double /*float*/ y1 = primaryFrame.height - frame.y, y2 = primaryFrame.height - (frame.y + frame.height); + float /*double*/ x1 = frame.x, x2 = frame.x + frame.width; + float /*double*/ y1 = primaryFrame.height - frame.y, y2 = primaryFrame.height - (frame.y + frame.height); if (x1 < minX) minX = x1; if (x2 < minX) minX = x2; if (x1 > maxX) maxX = x1; @@ -956,7 +956,7 @@ public Rectangle getClientArea () { NSScreen screen = new NSScreen(screens.objectAtIndex(0)); NSRect frame = screen.frame(); NSRect visibleFrame = screen.visibleFrame(); - double /*float*/ y = frame.height - (visibleFrame.y + visibleFrame.height); + float /*double*/ y = frame.height - (visibleFrame.y + visibleFrame.height); return new Rectangle((int)visibleFrame.x, (int)y, (int)visibleFrame.width, (int)visibleFrame.height); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java index b6bb1b7b41..dc799157c1 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java @@ -490,7 +490,7 @@ void createHandle () { } display.cascadeWindow(window, screen); NSRect screenFrame = screen.frame(); - double /*float*/ width = screenFrame.width * 5 / 8, height = screenFrame.height * 5 / 8;; + float /*double*/ width = screenFrame.width * 5 / 8, height = screenFrame.height * 5 / 8;; NSRect frame = window.frame(); NSRect primaryFrame = primaryScreen.frame(); frame.y = primaryFrame.height - ((primaryFrame.height - (frame.y + frame.height)) + height); @@ -634,7 +634,7 @@ public int getAlpha () { public Rectangle getBounds () { checkWidget(); NSRect frame = window.frame(); - double /*float*/ y = display.getPrimaryFrame().height - (int)(frame.y + frame.height); + float /*double*/ y = display.getPrimaryFrame().height - (int)(frame.y + frame.height); return new Rectangle ((int)frame.x, (int)y, (int)frame.width, (int)frame.height); } @@ -702,7 +702,7 @@ public int getImeInputMode () { public Point getLocation () { checkWidget(); NSRect frame = window.frame(); - double /*float*/ y = display.getPrimaryFrame().height - (int)(frame.y + frame.height); + float /*double*/ y = display.getPrimaryFrame().height - (int)(frame.y + frame.height); return new Point ((int)frame.x, (int)y); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java index 36b3907092..bf1fa6761c 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java @@ -703,14 +703,14 @@ public boolean open () { tracking = true; window = (NSWindow)new NSWindow().alloc(); NSArray screens = NSScreen.screens(); - double /*float*/ minX = Float.MAX_VALUE, maxX = Float.MIN_VALUE; - double /*float*/ minY = Float.MAX_VALUE, maxY = Float.MIN_VALUE; + float /*double*/ minX = Float.MAX_VALUE, maxX = Float.MIN_VALUE; + float /*double*/ minY = Float.MAX_VALUE, maxY = Float.MIN_VALUE; int count = (int)/*64*/screens.count(); for (int i = 0; i < count; i++) { NSScreen screen = new NSScreen(screens.objectAtIndex(i)); NSRect frame = screen.frame(); - double /*float*/ x1 = frame.x, x2 = frame.x + frame.width; - double /*float*/ y1 = frame.y, y2 = frame.y + frame.height; + float /*double*/ x1 = frame.x, x2 = frame.x + frame.width; + float /*double*/ y1 = frame.y, y2 = frame.y + frame.height; if (x1 < minX) minX = x1; if (x2 < minX) minX = x2; if (x1 > maxX) maxX = x1; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java index 4aca800d8d..7714806168 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java @@ -337,7 +337,7 @@ public void setImage (Image image) { if (image != null && image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); super.setImage (image); view.setImage(image != null ? image.handle : null); - double /*float*/ width = image != null && visible ? image.handle.size().width + BORDER : 0; + float /*double*/ width = image != null && visible ? image.handle.size().width + BORDER : 0; item.setLength(width); } @@ -404,7 +404,7 @@ public void setVisible (boolean visible) { if (isDisposed ()) return; } this.visible = visible; - double /*float*/ width = image != null && visible ? image.handle.size().width + BORDER : 0; + float /*double*/ width = image != null && visible ? image.handle.size().width + BORDER : 0; item.setLength(width); if (!visible) sendEvent (SWT.Hide); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java index e75e0feb95..307c24bb1a 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java @@ -80,7 +80,7 @@ public class Tree extends Composite { TreeColumn sortColumn; int columnCount; int sortDirection; - double /*float*/ levelIndent; + float /*double*/ levelIndent; boolean ignoreExpand, ignoreSelect; /** |