From 2f42a694a040beadb46715d86b45bb678c89d78c Mon Sep 17 00:00:00 2001
From: Silenio Quarti
Date: Wed, 24 Aug 2011 15:45:29 -0400
Subject: Bug 349812 - Rotate gesture not working on 64bit build

---
 .../eclipse/swt/tools/internal/MacGenerator.java   | 19 +++++++++++++----
 .../Eclipse SWT PI/cocoa/library/os.c              | 24 +++++++++++-----------
 .../Eclipse SWT PI/cocoa/library/os.h              |  1 +
 .../Eclipse SWT PI/cocoa/library/os_stats.c        |  2 +-
 .../Eclipse SWT PI/cocoa/library/os_stats.h        |  2 +-
 .../eclipse/swt/internal/cocoa/NSBezierPath.java   |  4 ++--
 .../org/eclipse/swt/internal/cocoa/NSBox.java      |  4 ++--
 .../org/eclipse/swt/internal/cocoa/NSColor.java    |  8 ++++----
 .../eclipse/swt/internal/cocoa/NSColorPanel.java   |  4 ++--
 .../org/eclipse/swt/internal/cocoa/NSComboBox.java |  4 ++--
 .../org/eclipse/swt/internal/cocoa/NSEvent.java    | 10 ++++-----
 .../org/eclipse/swt/internal/cocoa/NSFont.java     | 16 +++++++--------
 .../eclipse/swt/internal/cocoa/NSFontPanel.java    |  4 ++--
 .../swt/internal/cocoa/NSLayoutManager.java        |  6 +++---
 .../org/eclipse/swt/internal/cocoa/NSNumber.java   |  4 ++--
 .../eclipse/swt/internal/cocoa/NSOpenPanel.java    |  4 ++--
 .../eclipse/swt/internal/cocoa/NSOutlineView.java  |  4 ++--
 .../org/eclipse/swt/internal/cocoa/NSPanel.java    |  4 ++--
 .../eclipse/swt/internal/cocoa/NSSavePanel.java    |  4 ++--
 .../org/eclipse/swt/internal/cocoa/NSScreen.java   |  4 ++--
 .../org/eclipse/swt/internal/cocoa/NSScroller.java |  6 +++---
 .../org/eclipse/swt/internal/cocoa/NSSlider.java   |  4 ++--
 .../eclipse/swt/internal/cocoa/NSStatusBar.java    |  4 ++--
 .../eclipse/swt/internal/cocoa/NSTableColumn.java  |  4 ++--
 .../eclipse/swt/internal/cocoa/NSTableView.java    |  4 ++--
 .../org/eclipse/swt/internal/cocoa/NSTextTab.java  |  4 ++--
 .../eclipse/swt/internal/cocoa/NSTypesetter.java   |  4 ++--
 .../org/eclipse/swt/internal/cocoa/NSWindow.java   |  6 +++---
 .../cocoa/org/eclipse/swt/internal/cocoa/OS.java   |  5 ++---
 .../swt/internal/cocoa/SFCertificatePanel.java     |  4 ++--
 .../internal/cocoa/SFCertificateTrustPanel.java    |  4 ++--
 .../cocoa/org/eclipse/swt/printing/Printer.java    |  2 +-
 32 files changed, 97 insertions(+), 86 deletions(-)

diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java
index edfc94cc71..8e28e84345 100644
--- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java	
+++ b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java	
@@ -235,8 +235,13 @@ void generateMethods(String className, ArrayList methods) {
 			out("OS.objc_msgSend_bool(");
 		} else if (returnNode != null && isFloatingPoint(returnNode)) {
 			out("\treturn ");
-			if (returnType.equals("float")) out("(float)");
-			out("OS.objc_msgSend_fpret(");
+			String type = getType(returnNode), type64 = getType64(returnNode);
+			if (type.equals(type64) && type.equals("float")) {
+				out("OS.objc_msgSend_floatret(");
+			} else {
+				if (returnType.equals("float")) out("(float /*double*/)");
+				out("OS.objc_msgSend_fpret(");
+			}
 		} else if (returnNode != null && isObject(returnNode)) {
 			out("\tint /*long*/ result = OS.objc_msgSend(");
 		} else {
@@ -1099,8 +1104,14 @@ String buildSend(Node method, boolean tags, boolean only64, boolean superCall) {
 		buffer.append(getJavaType(returnNode));
 		buffer.append(" result, ");
 	} else if (returnNode != null && isFloatingPoint(returnNode)) {
-		buffer.append("double ");
-		buffer.append(superCall ? "objc_msgSendSuper_fpret" : "objc_msgSend_fpret");
+		String type = getType(returnNode), type64 = getType64(returnNode);
+		if (type.equals(type64) && type.equals("float")) {
+			buffer.append("float ");
+			buffer.append(superCall ? "objc_msgSendSuper_floatret" : "objc_msgSend_floatret");
+		} else {
+			buffer.append("double ");
+			buffer.append(superCall ? "objc_msgSendSuper_fpret" : "objc_msgSend_fpret");
+		}
 		buffer.append("(");
 	} else if (returnNode != null && isBoolean(returnNode)) {
 		buffer.append("boolean ");
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
index c0b7c3501d..c9489cb283 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c	
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c	
@@ -8783,18 +8783,6 @@ fail:
 }
 #endif
 
-#ifndef NO_objc_1msgSend__JJFD
-JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJFD)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jfloat arg2, jdouble arg3)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJFD_FUNC);
-	rc = (jlong)((jlong (*)(jlong, jlong, jfloat, jdouble))objc_msgSend)(arg0, arg1, arg2, arg3);
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJFD_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_objc_1msgSend__JJI
 JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJI)
 	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2)
@@ -9890,6 +9878,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJS)(JNIEnv *env, jcla
 }
 #endif
 
+#ifndef NO_objc_1msgSend_1floatret
+JNIEXPORT jfloat JNICALL OS_NATIVE(objc_1msgSend_1floatret)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jfloat rc = 0;
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1floatret_FUNC);
+	rc = (jfloat)((jfloat (*)(jintLong, jintLong))objc_msgSend_floatret)(arg0, arg1);
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1floatret_FUNC);
+	return rc;
+}
+#endif
+
 #if (!defined(NO_objc_1msgSend_1fpret__II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1fpret__JJ) && defined(JNI64))
 #ifndef JNI64
 JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h
index b5cf6718cd..eab0260318 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h	
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h	
@@ -28,6 +28,7 @@ extern jint CPSSetProcessName(void *, jintLong);
 #define objc_msgSend_bool objc_msgSend
 #define objc_msgSendSuper_bool objc_msgSendSuper
 
+#define objc_msgSend_floatret objc_msgSend_fpret
 #ifndef __i386__
 #define objc_msgSend_fpret objc_msgSend
 #endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
index 276a229a4c..49ce35e8d6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c	
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c	
@@ -944,7 +944,6 @@ char * OS_nativeFunctionNames[] = {
 #else
 	"objc_1msgSend__JJ_3JII",
 #endif
-	"objc_1msgSend__JJFD",
 	"objc_1msgSend__JJI",
 	"objc_1msgSend__JJ_3I",
 	"objc_1msgSend__JJ_3JJJ",
@@ -1133,6 +1132,7 @@ char * OS_nativeFunctionNames[] = {
 #else
 	"objc_1msgSend_1bool__JJS",
 #endif
+	"objc_1msgSend_1floatret",
 #ifndef JNI64
 	"objc_1msgSend_1fpret__II",
 #else
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
index eb8dc916ad..1f4d61bedc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h	
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h	
@@ -952,7 +952,6 @@ typedef enum {
 #else
 	objc_1msgSend__JJ_3JII_FUNC,
 #endif
-	objc_1msgSend__JJFD_FUNC,
 	objc_1msgSend__JJI_FUNC,
 	objc_1msgSend__JJ_3I_FUNC,
 	objc_1msgSend__JJ_3JJJ_FUNC,
@@ -1141,6 +1140,7 @@ typedef enum {
 #else
 	objc_1msgSend_1bool__JJS_FUNC,
 #endif
+	objc_1msgSend_1floatret_FUNC,
 #ifndef JNI64
 	objc_1msgSend_1fpret__II_FUNC,
 #else
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 099699b0a1..142f2fa4b0 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -102,7 +102,7 @@ public void curveToPoint(NSPoint endPoint, NSPoint controlPoint1, NSPoint contro
 }
 
 public static float /*double*/ defaultFlatness() {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSBezierPath, OS.sel_defaultFlatness);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSBezierPath, OS.sel_defaultFlatness);
 }
 
 public int /*long*/ elementAtIndex(int /*long*/ index, int /*long*/ points) {
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 0594668bff..9d64fe3d77 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@ public NSBox(id id) {
 }
 
 public float /*double*/ borderWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_borderWidth);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_borderWidth);
 }
 
 public NSView contentView() {
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 aea601d9a2..a17f0eea62 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	
@@ -25,7 +25,7 @@ public NSColor(id id) {
 }
 
 public float /*double*/ alphaComponent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_alphaComponent);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_alphaComponent);
 }
 
 public static NSColor alternateSelectedControlColor() {
@@ -44,7 +44,7 @@ public static NSColor blackColor() {
 }
 
 public float /*double*/ blueComponent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_blueComponent);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_blueComponent);
 }
 
 public static NSColor clearColor() {
@@ -117,7 +117,7 @@ public void getComponents(float[] /*double[]*/ components) {
 }
 
 public float /*double*/ greenComponent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_greenComponent);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_greenComponent);
 }
 
 public int /*long*/ numberOfComponents() {
@@ -125,7 +125,7 @@ public int /*long*/ numberOfComponents() {
 }
 
 public float /*double*/ redComponent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_redComponent);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_redComponent);
 }
 
 public static NSColor secondarySelectedControlColor() {
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 150083e6d3..e1a8dbdddf 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -39,7 +39,7 @@ public static NSColorPanel sharedColorPanel() {
 }
 
 public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSColorPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSColorPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
 public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
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 5bbc012388..4b8b1e9f98 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -41,7 +41,7 @@ public void insertItemWithObjectValue(id object, int /*long*/ index) {
 }
 
 public float /*double*/ itemHeight() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_itemHeight);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_itemHeight);
 }
 
 public id itemObjectValueAtIndex(int /*long*/ index) {
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 e052654998..2ea5f36330 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -47,11 +47,11 @@ public int /*long*/ clickCount() {
 }
 
 public float /*double*/ deltaX() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_deltaX);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_deltaX);
 }
 
 public float /*double*/ deltaY() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_deltaY);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_deltaY);
 }
 
 public static NSEvent enterExitEventWithType(int /*long*/ type, NSPoint location, int /*long*/ flags, double time, int /*long*/ wNum, NSGraphicsContext context, int /*long*/ eNum, int /*long*/ tNum, int /*long*/ data) {
@@ -70,7 +70,7 @@ public NSPoint locationInWindow() {
 }
 
 public float /*double*/ magnification() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_magnification);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_magnification);
 }
 
 public int /*long*/ modifierFlags() {
@@ -89,7 +89,7 @@ public static NSEvent otherEventWithType(int /*long*/ type, NSPoint location, in
 }
 
 public float rotation() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rotation);
+	return OS.objc_msgSend_floatret(this.id, OS.sel_rotation);
 }
 
 public double timestamp() {
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 027f753949..7cc9c9a87d 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@ public NSFont(id id) {
 }
 
 public float /*double*/ ascender() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_ascender);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_ascender);
 }
 
 public static NSFont controlContentFontOfSize(float /*double*/ fontSize) {
@@ -34,7 +34,7 @@ public static NSFont controlContentFontOfSize(float /*double*/ fontSize) {
 }
 
 public float /*double*/ descender() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_descender);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_descender);
 }
 
 public NSString displayName() {
@@ -58,7 +58,7 @@ public static NSFont fontWithName(NSString fontName, float /*double*/ fontSize)
 }
 
 public float /*double*/ leading() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_leading);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_leading);
 }
 
 public static NSFont menuBarFontOfSize(float /*double*/ fontSize) {
@@ -72,11 +72,11 @@ public static NSFont menuFontOfSize(float /*double*/ fontSize) {
 }
 
 public float /*double*/ pointSize() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_pointSize);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_pointSize);
 }
 
 public static float /*double*/ smallSystemFontSize() {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_smallSystemFontSize);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_smallSystemFontSize);
 }
 
 public static NSFont systemFontOfSize(float /*double*/ fontSize) {
@@ -85,11 +85,11 @@ public static NSFont systemFontOfSize(float /*double*/ fontSize) {
 }
 
 public static float /*double*/ systemFontSize() {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSize);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSize);
 }
 
 public static float /*double*/ systemFontSizeForControlSize(int /*long*/ controlSize) {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSizeForControlSize_, controlSize);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSizeForControlSize_, controlSize);
 }
 
 }
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 c0fcb8d86c..c598113bfb 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -39,7 +39,7 @@ public static NSFontPanel sharedFontPanel() {
 }
 
 public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSFontPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSFontPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
 public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
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 0746eb617a..ed498d7178 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -43,11 +43,11 @@ public int /*long*/ characterIndexForGlyphAtIndex(int /*long*/ glyphIndex) {
 }
 
 public float /*double*/ defaultBaselineOffsetForFont(NSFont theFont) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_defaultBaselineOffsetForFont_, theFont != null ? theFont.id : 0);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_defaultBaselineOffsetForFont_, theFont != null ? theFont.id : 0);
 }
 
 public float /*double*/ defaultLineHeightForFont(NSFont theFont) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_defaultLineHeightForFont_, theFont != null ? theFont.id : 0);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_defaultLineHeightForFont_, theFont != null ? theFont.id : 0);
 }
 
 public void drawBackgroundForGlyphRange(NSRange glyphsToShow, NSPoint origin) {
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 461a374356..808c0210d2 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -33,7 +33,7 @@ public double doubleValue() {
 }
 
 public float floatValue() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_floatValue);
+	return OS.objc_msgSend_floatret(this.id, OS.sel_floatValue);
 }
 
 public int intValue() {
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 407eb00fe9..f647d3007c 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -52,7 +52,7 @@ public static NSSavePanel savePanel() {
 }
 
 public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSOpenPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSOpenPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
 public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
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 cbc470421a..4d7f03c884 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -47,7 +47,7 @@ public NSRect frameOfOutlineCellAtRow(int /*long*/ row) {
 }
 
 public float /*double*/ indentationPerLevel() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_indentationPerLevel);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_indentationPerLevel);
 }
 
 public boolean isItemExpanded(id item) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java
index bb7cd91df0..96c05dd459 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -41,7 +41,7 @@ public boolean worksWhenModal() {
 }
 
 public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
 public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
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 e5faa0bae2..abd433f928 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -67,7 +67,7 @@ public void validateVisibleColumns() {
 }
 
 public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSSavePanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSSavePanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
 public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
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 61f1535ada..ec04eff32f 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -50,7 +50,7 @@ public static NSArray screens() {
 }
 
 public float /*double*/ userSpaceScaleFactor() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_userSpaceScaleFactor);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_userSpaceScaleFactor);
 }
 
 public NSRect visibleFrame() {
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 d2b0f14454..d16367321d 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	
@@ -33,7 +33,7 @@ public int /*long*/ hitPart() {
 }
 
 public float /*double*/ knobProportion() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_knobProportion);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_knobProportion);
 }
 
 public NSRect rectForPart(int /*long*/ partCode) {
@@ -43,11 +43,11 @@ public NSRect rectForPart(int /*long*/ partCode) {
 }
 
 public static float /*double*/ scrollerWidth() {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidth);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidth);
 }
 
 public static float /*double*/ scrollerWidthForControlSize(int /*long*/ controlSize) {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidthForControlSize_, controlSize);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidthForControlSize_, controlSize);
 }
 
 public void setControlSize(int /*long*/ controlSize) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java
index b69a139b2f..4882423062 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@ public NSSlider(id id) {
 }
 
 public float /*double*/ knobThickness() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_knobThickness);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_knobThickness);
 }
 
 public double maxValue() {
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 6c96f802cc..6735c39516 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -39,7 +39,7 @@ public static NSStatusBar systemStatusBar() {
 }
 
 public float /*double*/ thickness() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_thickness);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_thickness);
 }
 
 }
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 ef36020bed..78298fad27 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -72,7 +72,7 @@ public void setWidth(float /*double*/ width) {
 }
 
 public float /*double*/ width() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_width);
+	return (float /*double*/)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/NSTableView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java
index 4bfd58338c..5bbd597dc5 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -149,7 +149,7 @@ public int /*long*/ rowAtPoint(NSPoint point) {
 }
 
 public float /*double*/ rowHeight() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rowHeight);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_rowHeight);
 }
 
 public NSRange rowsInRect(NSRect rect) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTab.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTab.java
index 5e9521651a..5c1169b13d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTab.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTab.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,7 +30,7 @@ public NSTextTab initWithType(int /*long*/ type, float /*double*/ loc) {
 }
 
 public float /*double*/ location() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_location);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_location);
 }
 
 public int /*long*/ tabStopType() {
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 082e4873f7..ef158f8d84 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	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@ public NSTypesetter(id id) {
 }
 
 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);
+	return (float /*double*/)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/NSWindow.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java
index 594056f08c..4ae0424c19 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	
@@ -29,7 +29,7 @@ public void addChildWindow(NSWindow childWin, int /*long*/ place) {
 }
 
 public float /*double*/ alphaValue() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_alphaValue);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_alphaValue);
 }
 
 public boolean areCursorRectsEnabled() {
@@ -199,7 +199,7 @@ public void makeKeyAndOrderFront(id sender) {
 }
 
 public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSWindow, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSWindow, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
 public NSSize minSize() {
@@ -363,7 +363,7 @@ public NSToolbar toolbar() {
 }
 
 public float /*double*/ userSpaceScaleFactor() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_userSpaceScaleFactor);
+	return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_userSpaceScaleFactor);
 }
 
 public int /*long*/ windowNumber() {
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 25326f7569..0ba6ac949b 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	
@@ -1828,7 +1828,6 @@ public static final int /*long*/ sel_setFill = sel_registerName("setFill");
 public static final int /*long*/ sel_setFillColor_ = sel_registerName("setFillColor:");
 public static final int /*long*/ sel_setFireDate_ = sel_registerName("setFireDate:");
 public static final int /*long*/ sel_setFirstLineHeadIndent_ = sel_registerName("setFirstLineHeadIndent:");
-public static final int /*long*/ sel_setFloatValue_knobProportion_ = sel_registerName("setFloatValue:knobProportion:");
 public static final int /*long*/ sel_setFloatingPanel_ = sel_registerName("setFloatingPanel:");
 public static final int /*long*/ sel_setFocusRingType_ = sel_registerName("setFocusRingType:");
 public static final int /*long*/ sel_setFont_ = sel_registerName("setFont:");
@@ -3778,6 +3777,8 @@ public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long
 /** @method flags=cast */
 public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1);
 /** @method flags=cast */
+public static final native float objc_msgSend_floatret(int /*long*/ id, int /*long*/ sel);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel);
 /**
  * @method flags=cast
@@ -4048,8 +4049,6 @@ public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long
 /** @method flags=cast */
 public static final native int objc_msgSend(int id, int sel, float arg0);
 /** @method flags=cast */
-public static final native long objc_msgSend(long id, long sel, float arg0, double arg1);
-/** @method flags=cast */
 public static final native long objc_msgSend(long id, long sel, int arg0);
 /** @method flags=cast */
 public static final native long objc_msgSend(long id, long sel, int[] arg0);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificatePanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificatePanel.java
index cfb9961581..147057bf35 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificatePanel.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificatePanel.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -33,7 +33,7 @@ public void setShowsHelp(boolean showsHelp) {
 }
 
 public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
-	return (float)OS.objc_msgSend_fpret(OS.class_SFCertificatePanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_SFCertificatePanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
 public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificateTrustPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificateTrustPanel.java
index 1a6cc5562e..776a533669 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificateTrustPanel.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificateTrustPanel.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,7 +34,7 @@ public static SFCertificateTrustPanel sharedCertificateTrustPanel() {
 }
 
 public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
-	return (float)OS.objc_msgSend_fpret(OS.class_SFCertificateTrustPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+	return (float /*double*/)OS.objc_msgSend_fpret(OS.class_SFCertificateTrustPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
 public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java
index 01d5ca2e0c..1682623ef8 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java	
@@ -362,7 +362,7 @@ protected void release () {
 
 float scalingFactor() {
 	NSNumber scale = new NSNumber(printInfo.dictionary().objectForKey(OS.NSPrintScalingFactor));
-	return OS.PTR_SIZEOF == 4 ? scale.floatValue() : (float)scale.doubleValue();
+	return scale.floatValue();
 }
 
 /**
-- 
cgit v1.2.3