260585 - Font and spacing is a little bit off compared to Carbon

9 files changed, 84 insertions, 29 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
index 913390a88e..25e78a77a9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
@@ -4992,9 +4992,9 @@
 <method selector="image">
 <retval></retval>
 </method>
-<method selector="imageRectForBounds:">
-<arg name="theRect"></arg>
-<retval></retval>
+<method selector="imageRectForBounds:" swt_gen="true">
+<arg name="theRect" swt_gen="true"></arg>
+<retval swt_gen="true"></retval>
 </method>
 <method selector="importsGraphics">
 <retval></retval>
@@ -5160,9 +5160,9 @@
 <arg name="flag"></arg>
 <retval></retval>
 </method>
-<method selector="setControlSize:">
-<arg name="size"></arg>
-<retval></retval>
+<method selector="setControlSize:" swt_gen="true">
+<arg name="size" swt_gen="true"></arg>
+<retval swt_gen="true"></retval>
 </method>
 <method selector="setControlTint:">
 <arg name="controlTint"></arg>
@@ -8279,9 +8279,9 @@
 <method selector="capHeight">
 <retval></retval>
 </method>
-<method class_method="true" selector="controlContentFontOfSize:">
-<arg name="fontSize"></arg>
-<retval></retval>
+<method class_method="true" selector="controlContentFontOfSize:" swt_gen="true">
+<arg name="fontSize" swt_gen="true"></arg>
+<retval swt_gen="true"></retval>
 </method>
 <method selector="coveredCharacterSet">
 <retval></retval>
@@ -16116,8 +16116,8 @@
 <method selector="animationDelay">
 <retval></retval>
 </method>
-<method selector="controlSize">
-<retval></retval>
+<method selector="controlSize" swt_gen="true">
+<retval swt_gen="true"></retval>
 </method>
 <method selector="controlTint">
 <retval></retval>
@@ -16152,9 +16152,9 @@
 <arg name="flag"></arg>
 <retval></retval>
 </method>
-<method selector="setControlSize:">
-<arg name="size"></arg>
-<retval></retval>
+<method selector="setControlSize:" swt_gen="true">
+<arg name="size" swt_gen="true"></arg>
+<retval swt_gen="true"></retval>
 </method>
 <method selector="setControlTint:">
 <arg name="tint"></arg>
@@ -17395,8 +17395,8 @@
 <method selector="checkSpaceForParts">
 <retval></retval>
 </method>
-<method selector="controlSize">
-<retval></retval>
+<method selector="controlSize" swt_gen="true">
+<retval swt_gen="true"></retval>
 </method>
 <method selector="controlTint">
 <retval></retval>
@@ -17434,17 +17434,17 @@
 <method class_method="true" selector="scrollerWidth" swt_gen="true">
 <retval swt_gen="true"></retval>
 </method>
-<method class_method="true" selector="scrollerWidthForControlSize:">
-<arg name="controlSize"></arg>
-<retval></retval>
+<method class_method="true" selector="scrollerWidthForControlSize:" swt_gen="true">
+<arg name="controlSize" swt_gen="true"></arg>
+<retval swt_gen="true"></retval>
 </method>
 <method selector="setArrowsPosition:">
 <arg name="where"></arg>
 <retval></retval>
 </method>
-<method selector="setControlSize:">
-<arg name="controlSize"></arg>
-<retval></retval>
+<method selector="setControlSize:" swt_gen="true">
+<arg name="controlSize" swt_gen="true"></arg>
+<retval swt_gen="true"></retval>
 </method>
 <method selector="setControlTint:">
 <arg name="controlTint"></arg>
@@ -17851,8 +17851,8 @@
 <method selector="isVertical">
 <retval></retval>
 </method>
-<method selector="knobThickness">
-<retval></retval>
+<method selector="knobThickness" swt_gen="true">
+<retval swt_gen="true"></retval>
 </method>
 <method selector="maxValue" swt_gen="true">
 <retval swt_gen="true"></retval>
@@ -18813,9 +18813,9 @@
 <arg name="allowTruncatedLabels"></arg>
 <retval></retval>
 </method>
-<method selector="setControlSize:">
-<arg name="controlSize"></arg>
-<retval></retval>
+<method selector="setControlSize:" swt_gen="true">
+<arg name="controlSize" swt_gen="true"></arg>
+<retval swt_gen="true"></retval>
 </method>
 <method selector="setControlTint:">
 <arg name="controlTint"></arg>
@@ -18913,8 +18913,8 @@
 </method>
 </class>
 <class name="NSTableColumn" swt_gen="mixed">
-<method selector="dataCell">
-<retval></retval>
+<method selector="dataCell" swt_gen="true">
+<retval swt_gen="true" swt_java_type="NSCell"></retval>
 </method>
 <method selector="dataCellForRow:">
 <arg name="row"></arg>
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 fa32990261..8f7fd52562 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
@@ -51,6 +51,12 @@ public NSFont font() {
 	return result != 0 ? new NSFont(result) : null;
 }
 
+public NSRect imageRectForBounds(NSRect theRect) {
+	NSRect result = new NSRect();
+	OS.objc_msgSend_stret(result, this.id, OS.sel_imageRectForBounds_, theRect);
+	return result;
+}
+
 public int /*long*/ nextState() {
 	return OS.objc_msgSend(this.id, OS.sel_nextState);
 }
@@ -63,6 +69,10 @@ public void setAttributedStringValue(NSAttributedString obj) {
 	OS.objc_msgSend(this.id, OS.sel_setAttributedStringValue_, obj != null ? obj.id : 0);
 }
 
+public void setControlSize(int /*long*/ size) {
+	OS.objc_msgSend(this.id, OS.sel_setControlSize_, size);
+}
+
 public void setFont(NSFont fontObj) {
 	OS.objc_msgSend(this.id, OS.sel_setFont_, fontObj != null ? fontObj.id : 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 fa3a32a53d..1fdee56b25 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
@@ -28,6 +28,11 @@ public float /*double*/ ascender() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_ascender);
 }
 
+public static NSFont controlContentFontOfSize(float /*double*/ fontSize) {
+	int /*long*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_controlContentFontOfSize_, fontSize);
+	return result != 0 ? new NSFont(result) : null;
+}
+
 public float /*double*/ descender() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_descender);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java
index cc813c8f6a..ee785f0c23 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java
@@ -24,6 +24,10 @@ public NSProgressIndicator(id id) {
 	super(id);
 }
 
+public int /*long*/ controlSize() {
+	return OS.objc_msgSend(this.id, OS.sel_controlSize);
+}
+
 public double doubleValue() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_doubleValue);
 }
@@ -36,6 +40,10 @@ public double minValue() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_minValue);
 }
 
+public void setControlSize(int /*long*/ size) {
+	OS.objc_msgSend(this.id, OS.sel_setControlSize_, size);
+}
+
 public void setDoubleValue(double doubleValue) {
 	OS.objc_msgSend(this.id, OS.sel_setDoubleValue_, doubleValue);
 }
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 d2a1861d78..c4f5487369 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,6 +24,10 @@ public NSScroller(id id) {
 	super(id);
 }
 
+public int /*long*/ controlSize() {
+	return OS.objc_msgSend(this.id, OS.sel_controlSize);
+}
+
 public int /*long*/ hitPart() {
 	return OS.objc_msgSend(this.id, OS.sel_hitPart);
 }
@@ -32,6 +36,14 @@ public static float /*double*/ scrollerWidth() {
 	return (float)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);
+}
+
+public void setControlSize(int /*long*/ controlSize) {
+	OS.objc_msgSend(this.id, OS.sel_setControlSize_, controlSize);
+}
+
 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/NSSlider.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java
index 909b7a4ae5..dc121e7899 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
@@ -24,6 +24,10 @@ public NSSlider(id id) {
 	super(id);
 }
 
+public float /*double*/ knobThickness() {
+	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_knobThickness);
+}
+
 public double maxValue() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_maxValue);
 }
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 2e02ca43bc..8f5a2761c3 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
@@ -57,6 +57,10 @@ public NSTabViewItem selectedTabViewItem() {
 	return result != 0 ? new NSTabViewItem(result) : null;
 }
 
+public void setControlSize(int /*long*/ controlSize) {
+	OS.objc_msgSend(this.id, OS.sel_setControlSize_, controlSize);
+}
+
 public void setDelegate(id anObject) {
 	OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0);
 }
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 863c7b93f0..2d54d9e3ab 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
@@ -24,6 +24,11 @@ public NSTableColumn(id id) {
 	super(id);
 }
 
+public NSCell dataCell() {
+	int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dataCell);
+	return result != 0 ? new NSCell(result) : null;
+}
+
 public NSTableHeaderCell headerCell() {
 	int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_headerCell);
 	return result != 0 ? new NSTableHeaderCell(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 e696014475..266b5b88a9 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
@@ -617,11 +617,13 @@ public static final int /*long*/ sel_contentSizeForFrameSize_hasHorizontalScroll
 public static final int /*long*/ sel_contentView = sel_registerName("contentView");
 public static final int /*long*/ sel_contentViewMargins = sel_registerName("contentViewMargins");
 public static final int /*long*/ sel_context = sel_registerName("context");
+public static final int /*long*/ sel_controlContentFontOfSize_ = sel_registerName("controlContentFontOfSize:");
 public static final int /*long*/ sel_controlDarkShadowColor = sel_registerName("controlDarkShadowColor");
 public static final int /*long*/ sel_controlHighlightColor = sel_registerName("controlHighlightColor");
 public static final int /*long*/ sel_controlLightHighlightColor = sel_registerName("controlLightHighlightColor");
 public static final int /*long*/ sel_controlPointBounds = sel_registerName("controlPointBounds");
 public static final int /*long*/ sel_controlShadowColor = sel_registerName("controlShadowColor");
+public static final int /*long*/ sel_controlSize = sel_registerName("controlSize");
 public static final int /*long*/ sel_controlTextColor = sel_registerName("controlTextColor");
 public static final int /*long*/ sel_convertBaseToScreen_ = sel_registerName("convertBaseToScreen:");
 public static final int /*long*/ sel_convertPoint_fromView_ = sel_registerName("convertPoint:fromView:");
@@ -654,6 +656,7 @@ public static final int /*long*/ sel_currentRunLoop = sel_registerName("currentR
 public static final int /*long*/ sel_currentThread = sel_registerName("currentThread");
 public static final int /*long*/ sel_curveToPoint_controlPoint1_controlPoint2_ = sel_registerName("curveToPoint:controlPoint1:controlPoint2:");
 public static final int /*long*/ sel_cut_ = sel_registerName("cut:");
+public static final int /*long*/ sel_dataCell = sel_registerName("dataCell");
 public static final int /*long*/ sel_dataForType_ = sel_registerName("dataForType:");
 public static final int /*long*/ sel_dataSource = sel_registerName("dataSource");
 public static final int /*long*/ sel_dataWithBytes_length_ = sel_registerName("dataWithBytes:length:");
@@ -809,6 +812,7 @@ public static final int /*long*/ sel_iconForFileType_ = sel_registerName("iconFo
 public static final int /*long*/ sel_ignore = sel_registerName("ignore");
 public static final int /*long*/ sel_ignoreModifierKeysWhileDragging = sel_registerName("ignoreModifierKeysWhileDragging");
 public static final int /*long*/ sel_imageInterpolation = sel_registerName("imageInterpolation");
+public static final int /*long*/ sel_imageRectForBounds_ = sel_registerName("imageRectForBounds:");
 public static final int /*long*/ sel_imageRepWithData_ = sel_registerName("imageRepWithData:");
 public static final int /*long*/ sel_imageablePageBounds = sel_registerName("imageablePageBounds");
 public static final int /*long*/ sel_increment = sel_registerName("increment");
@@ -891,6 +895,7 @@ public static final int /*long*/ sel_keyEquivalent = sel_registerName("keyEquiva
 public static final int /*long*/ sel_keyEquivalentModifierMask = sel_registerName("keyEquivalentModifierMask");
 public static final int /*long*/ sel_keyUp_ = sel_registerName("keyUp:");
 public static final int /*long*/ sel_keyWindow = sel_registerName("keyWindow");
+public static final int /*long*/ sel_knobThickness = sel_registerName("knobThickness");
 public static final int /*long*/ sel_lastPathComponent = sel_registerName("lastPathComponent");
 public static final int /*long*/ sel_leading = sel_registerName("leading");
 public static final int /*long*/ sel_length = sel_registerName("length");
@@ -1104,6 +1109,7 @@ public static final int /*long*/ sel_scrollRowToVisible_ = sel_registerName("scr
 public static final int /*long*/ sel_scrollToPoint_ = sel_registerName("scrollToPoint:");
 public static final int /*long*/ sel_scrollWheel_ = sel_registerName("scrollWheel:");
 public static final int /*long*/ sel_scrollerWidth = sel_registerName("scrollerWidth");
+public static final int /*long*/ sel_scrollerWidthForControlSize_ = sel_registerName("scrollerWidthForControlSize:");
 public static final int /*long*/ sel_searchButtonCell = sel_registerName("searchButtonCell");
 public static final int /*long*/ sel_secondOfMinute = sel_registerName("secondOfMinute");
 public static final int /*long*/ sel_secondarySelectedControlColor = sel_registerName("secondarySelectedControlColor");
@@ -1165,6 +1171,7 @@ public static final int /*long*/ sel_setCompositingOperation_ = sel_registerName
 public static final int /*long*/ sel_setContainerSize_ = sel_registerName("setContainerSize:");
 public static final int /*long*/ sel_setContentView_ = sel_registerName("setContentView:");
 public static final int /*long*/ sel_setContentViewMargins_ = sel_registerName("setContentViewMargins:");
+public static final int /*long*/ sel_setControlSize_ = sel_registerName("setControlSize:");
 public static final int /*long*/ sel_setCurrentContext_ = sel_registerName("setCurrentContext:");
 public static final int /*long*/ sel_setCurrentOperation_ = sel_registerName("setCurrentOperation:");
 public static final int /*long*/ sel_setData_forType_ = sel_registerName("setData:forType:");