211796 - Regenerate the PI ("Platform Interface") to better match cocoa

348 files changed, 2369 insertions, 44663 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CIColor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CIColor.java
deleted file mode 100644
index 8a12ce964d..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CIColor.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class CIColor extends NSObject {
-
-public CIColor() {
-	super();
-}
-
-public CIColor(int id) {
-	super(id);
-}
-
-public CIColor initWithColor(NSColor color) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithColor_1, color != null ? color.id : 0);
-	return result == this.id ? this : (result != 0 ? new CIColor(result) : null);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CIImage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CIImage.java
deleted file mode 100644
index 9b92ae1df6..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CIImage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class CIImage extends NSObject {
-
-public CIImage() {
-	super();
-}
-
-public CIImage(int id) {
-	super(id);
-}
-
-public void drawAtPoint(NSPoint point, NSRect fromRect, int op, float delta) {
-	OS.objc_msgSend(this.id, OS.sel_drawAtPoint_1fromRect_1operation_1fraction_1, point, fromRect, op, delta);
-}
-
-public void drawInRect(NSRect rect, NSRect fromRect, int op, float delta) {
-	OS.objc_msgSend(this.id, OS.sel_drawInRect_1fromRect_1operation_1fraction_1, rect, fromRect, op, delta);
-}
-
-public CIImage initWithBitmapImageRep(NSBitmapImageRep bitmapImageRep) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapImageRep_1, bitmapImageRep != null ? bitmapImageRep.id : 0);
-	return result == this.id ? this : (result != 0 ? new CIImage(result) : null);
-}
-
-}
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 7c044e80f3..c39eac8940 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,213 +16,17 @@ public DOMDocument() {
 	super();
 }
 
-public DOMDocument(int id) {
+public DOMDocument(int /*long*/ id) {
 	super(id);
 }
 
-//public NSURL URLWithAttributeString(NSString string) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_URLWithAttributeString_1, string != null ? string.id : 0);
-//	return result != 0 ? new NSURL(result) : null;
-//}
-
-//public DOMNode adoptNode(DOMNode source) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_adoptNode_1, source != null ? source.id : 0);
-//	return result != 0 ? new DOMNode(result) : null;
-//}
-
-//public DOMAttr createAttribute(NSString name) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createAttribute_1, name != null ? name.id : 0);
-//	return result != 0 ? new DOMAttr(result) : null;
-//}
-
-//public DOMAttr createAttributeNS__(NSString createAttributeNS, NSString ) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createAttributeNS_1_1, createAttributeNS != null ? createAttributeNS.id : 0,  != null ? .id : 0);
-//	return result != 0 ? new DOMAttr(result) : null;
-//}
-
-//public DOMAttr createAttributeNS_qualifiedName_(NSString namespaceURI, NSString qualifiedName) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createAttributeNS_1qualifiedName_1, namespaceURI != null ? namespaceURI.id : 0, qualifiedName != null ? qualifiedName.id : 0);
-//	return result != 0 ? new DOMAttr(result) : null;
-//}
-
-//public DOMCDATASection createCDATASection(NSString data) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createCDATASection_1, data != null ? data.id : 0);
-//	return result != 0 ? new DOMCDATASection(result) : null;
-//}
-
-//public DOMCSSStyleDeclaration createCSSStyleDeclaration() {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createCSSStyleDeclaration);
-//	return result != 0 ? new DOMCSSStyleDeclaration(result) : null;
-//}
-
-//public DOMComment createComment(NSString data) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createComment_1, data != null ? data.id : 0);
-//	return result != 0 ? new DOMComment(result) : null;
-//}
-
-//public DOMDocumentFragment createDocumentFragment() {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createDocumentFragment);
-//	return result != 0 ? new DOMDocumentFragment(result) : null;
-//}
-
-//public DOMElement createElement(NSString tagName) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createElement_1, tagName != null ? tagName.id : 0);
-//	return result != 0 ? new DOMElement(result) : null;
-//}
-
-//public DOMElement createElementNS__(NSString createElementNS, NSString ) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createElementNS_1_1, createElementNS != null ? createElementNS.id : 0,  != null ? .id : 0);
-//	return result != 0 ? new DOMElement(result) : null;
-//}
-
-//public DOMElement createElementNS_qualifiedName_(NSString namespaceURI, NSString qualifiedName) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createElementNS_1qualifiedName_1, namespaceURI != null ? namespaceURI.id : 0, qualifiedName != null ? qualifiedName.id : 0);
-//	return result != 0 ? new DOMElement(result) : null;
-//}
-
-//public DOMEntityReference createEntityReference(NSString name) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createEntityReference_1, name != null ? name.id : 0);
-//	return result != 0 ? new DOMEntityReference(result) : null;
-//}
-
-//public DOMEvent createEvent(NSString eventType) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createEvent_1, eventType != null ? eventType.id : 0);
-//	return result != 0 ? new DOMEvent(result) : null;
-//}
-
-//public DOMXPathExpression createExpression__(NSString createExpression, id  ) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createExpression_1_1, createExpression != null ? createExpression.id : 0,  != null ? .id : 0);
-//	return result != 0 ? new DOMXPathExpression(result) : null;
-//}
-
-//public DOMXPathExpression createExpression_resolver_(NSString expression, id  resolver) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createExpression_1resolver_1, expression != null ? expression.id : 0, resolver != null ? resolver.id : 0);
-//	return result != 0 ? new DOMXPathExpression(result) : null;
-//}
-
-//public id  createNSResolver(DOMNode nodeResolver) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createNSResolver_1, nodeResolver != null ? nodeResolver.id : 0);
-//	return result != 0 ? new id (result) : null;
-//}
-
-//public DOMNodeIterator createNodeIterator____(DOMNode createNodeIterator, int , id  , boolean ) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createNodeIterator_1_1_1_1, createNodeIterator != null ? createNodeIterator.id : 0, ,  != null ? .id : 0, );
-//	return result != 0 ? new DOMNodeIterator(result) : null;
-//}
-
-//public DOMNodeIterator createNodeIterator_whatToShow_filter_expandEntityReferences_(DOMNode root, int whatToShow, id  filter, boolean expandEntityReferences) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createNodeIterator_1whatToShow_1filter_1expandEntityReferences_1, root != null ? root.id : 0, whatToShow, filter != null ? filter.id : 0, expandEntityReferences);
-//	return result != 0 ? new DOMNodeIterator(result) : null;
-//}
-
-//public DOMProcessingInstruction createProcessingInstruction__(NSString createProcessingInstruction, NSString ) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createProcessingInstruction_1_1, createProcessingInstruction != null ? createProcessingInstruction.id : 0,  != null ? .id : 0);
-//	return result != 0 ? new DOMProcessingInstruction(result) : null;
-//}
-
-//public DOMProcessingInstruction createProcessingInstruction_data_(NSString target, NSString data) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createProcessingInstruction_1data_1, target != null ? target.id : 0, data != null ? data.id : 0);
-//	return result != 0 ? new DOMProcessingInstruction(result) : null;
-//}
-
-//public DOMRange createRange() {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createRange);
-//	return result != 0 ? new DOMRange(result) : null;
-//}
-
-//public DOMText createTextNode(NSString data) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createTextNode_1, data != null ? data.id : 0);
-//	return result != 0 ? new DOMText(result) : null;
-//}
-
-//public DOMTreeWalker createTreeWalker____(DOMNode createTreeWalker, int , id  , boolean ) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createTreeWalker_1_1_1_1, createTreeWalker != null ? createTreeWalker.id : 0, ,  != null ? .id : 0, );
-//	return result != 0 ? new DOMTreeWalker(result) : null;
-//}
-
-//public DOMTreeWalker createTreeWalker_whatToShow_filter_expandEntityReferences_(DOMNode root, int whatToShow, id  filter, boolean expandEntityReferences) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_createTreeWalker_1whatToShow_1filter_1expandEntityReferences_1, root != null ? root.id : 0, whatToShow, filter != null ? filter.id : 0, expandEntityReferences);
-//	return result != 0 ? new DOMTreeWalker(result) : null;
-//}
-
-//public DOMXPathResult evaluate_____(NSString evaluate, DOMNode , id  , short , DOMXPathResult ) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_evaluate_1_1_1_1_1, evaluate != null ? evaluate.id : 0,  != null ? .id : 0,  != null ? .id : 0, ,  != null ? .id : 0);
-//	return result != 0 ? new DOMXPathResult(result) : null;
-//}
-
-//public DOMXPathResult evaluate_contextNode_resolver_type_inResult_(NSString expression, DOMNode contextNode, id  resolver, short type, DOMXPathResult inResult) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_evaluate_1contextNode_1resolver_1type_1inResult_1, expression != null ? expression.id : 0, contextNode != null ? contextNode.id : 0, resolver != null ? resolver.id : 0, type, inResult != null ? inResult.id : 0);
-//	return result != 0 ? new DOMXPathResult(result) : null;
-//}
-
-//public DOMCSSStyleDeclaration getComputedStyle__(DOMElement getComputedStyle, NSString ) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_getComputedStyle_1_1, getComputedStyle != null ? getComputedStyle.id : 0,  != null ? .id : 0);
-//	return result != 0 ? new DOMCSSStyleDeclaration(result) : null;
-//}
-
-//public DOMCSSStyleDeclaration getComputedStyle_pseudoElement_(DOMElement element, NSString pseudoElement) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_getComputedStyle_1pseudoElement_1, element != null ? element.id : 0, pseudoElement != null ? pseudoElement.id : 0);
-//	return result != 0 ? new DOMCSSStyleDeclaration(result) : null;
-//}
-
-//public DOMElement getElementById(NSString elementId) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_getElementById_1, elementId != null ? elementId.id : 0);
-//	return result != 0 ? new DOMElement(result) : null;
-//}
-
-//public DOMNodeList getElementsByTagName(NSString tagname) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_getElementsByTagName_1, tagname != null ? tagname.id : 0);
-//	return result != 0 ? new DOMNodeList(result) : null;
-//}
-
-//public DOMNodeList getElementsByTagNameNS__(NSString getElementsByTagNameNS, NSString ) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_getElementsByTagNameNS_1_1, getElementsByTagNameNS != null ? getElementsByTagNameNS.id : 0,  != null ? .id : 0);
-//	return result != 0 ? new DOMNodeList(result) : null;
-//}
-
-//public DOMNodeList getElementsByTagNameNS_localName_(NSString namespaceURI, NSString localName) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_getElementsByTagNameNS_1localName_1, namespaceURI != null ? namespaceURI.id : 0, localName != null ? localName.id : 0);
-//	return result != 0 ? new DOMNodeList(result) : null;
-//}
-
-//public DOMCSSRuleList getMatchedCSSRules_pseudoElement_(DOMElement element, NSString pseudoElement) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_getMatchedCSSRules_1pseudoElement_1, element != null ? element.id : 0, pseudoElement != null ? pseudoElement.id : 0);
-//	return result != 0 ? new DOMCSSRuleList(result) : null;
-//}
-
-//public DOMCSSRuleList getMatchedCSSRules_pseudoElement_authorOnly_(DOMElement element, NSString pseudoElement, boolean authorOnly) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_getMatchedCSSRules_1pseudoElement_1authorOnly_1, element != null ? element.id : 0, pseudoElement != null ? pseudoElement.id : 0, authorOnly);
-//	return result != 0 ? new DOMCSSRuleList(result) : null;
-//}
-
-//public DOMCSSStyleDeclaration getOverrideStyle__(DOMElement getOverrideStyle, NSString ) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_getOverrideStyle_1_1, getOverrideStyle != null ? getOverrideStyle.id : 0,  != null ? .id : 0);
-//	return result != 0 ? new DOMCSSStyleDeclaration(result) : null;
-//}
-
-//public DOMCSSStyleDeclaration getOverrideStyle_pseudoElement_(DOMElement element, NSString pseudoElement) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_getOverrideStyle_1pseudoElement_1, element != null ? element.id : 0, pseudoElement != null ? pseudoElement.id : 0);
-//	return result != 0 ? new DOMCSSStyleDeclaration(result) : null;
-//}
-
-//public DOMNode importNode__(DOMNode importNode, boolean ) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_importNode_1_1, importNode != null ? importNode.id : 0, );
-//	return result != 0 ? new DOMNode(result) : null;
-//}
-
-//public DOMNode importNode_deep_(DOMNode importedNode, boolean deep) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_importNode_1deep_1, importedNode != null ? importedNode.id : 0, deep);
-//	return result != 0 ? new DOMNode(result) : null;
-//}
+public DOMDocument(id id) {
+	super(id);
+}
 
 public WebFrame webFrame() {
 	int result = OS.objc_msgSend(this.id, OS.sel_webFrame);
 	return result != 0 ? new WebFrame(result) : null;
 }
 
-/* DOMEventTarget */
-
-public void addEventListener_listener_useCapture(NSString type, id listener, boolean useCapture) {
-	OS.objc_msgSend(this.id, OS.sel_addEventListener_1listener_1useCapture_1, type != null ? type.id : 0, listener != null ? listener.id : 0, useCapture);
-}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMEvent.java
index 75d0e77c06..4c77150c3d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMEvent.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,54 +16,16 @@ public DOMEvent() {
 	super();
 }
 
-public DOMEvent(int id) {
+public DOMEvent(int /*long*/ id) {
 	super(id);
 }
 
-public boolean bubbles() {
-	return OS.objc_msgSend(this.id, OS.sel_bubbles) != 0;
-}
-
-public boolean cancelable() {
-	return OS.objc_msgSend(this.id, OS.sel_cancelable) != 0;
-}
-
-public id  currentTarget() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currentTarget);
-	return result != 0 ? new id (result) : null;
-}
-
-public short eventPhase() {
-	return (short)OS.objc_msgSend(this.id, OS.sel_eventPhase);
-}
-
-public void initEvent___(NSString initEvent, boolean canBubbleArg, boolean cancelableArg) {
-	OS.objc_msgSend(this.id, OS.sel_initEvent_1_1_1, initEvent != null ? initEvent.id : 0, canBubbleArg, cancelableArg);
-}
-
-public void initEvent_canBubbleArg_cancelableArg_(NSString eventTypeArg, boolean canBubbleArg, boolean cancelableArg) {
-	OS.objc_msgSend(this.id, OS.sel_initEvent_1canBubbleArg_1cancelableArg_1, eventTypeArg != null ? eventTypeArg.id : 0, canBubbleArg, cancelableArg);
+public DOMEvent(id id) {
+	super(id);
 }
 
 public void preventDefault() {
 	OS.objc_msgSend(this.id, OS.sel_preventDefault);
 }
 
-public void stopPropagation() {
-	OS.objc_msgSend(this.id, OS.sel_stopPropagation);
-}
-
-public id  target() {
-	int result = OS.objc_msgSend(this.id, OS.sel_target);
-	return result != 0 ? new id (result) : null;
-}
-
-public long timeStamp() {
-	return (long)OS.objc_msgSend(this.id, OS.sel_timeStamp);
-}
-
-public NSString type() {
-	int result = OS.objc_msgSend(this.id, OS.sel_type);
-	return result != 0 ? new NSString(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 d5a7433684..69e4d44cd3 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
@@ -1,22 +1,26 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
-public class DOMKeyboardEvent extends NSObject {
+public class DOMKeyboardEvent extends DOMUIEvent {
 
 public DOMKeyboardEvent() {
 	super();
 }
 
-public DOMKeyboardEvent(int id) {
+public DOMKeyboardEvent(int /*long*/ id) {
+	super(id);
+}
+
+public DOMKeyboardEvent(id id) {
 	super(id);
 }
 
@@ -32,26 +36,14 @@ public boolean ctrlKey() {
 	return OS.objc_msgSend(this.id, OS.sel_ctrlKey) != 0;
 }
 
-public boolean getModifierState(NSString keyIdentifierArg) {
-	return OS.objc_msgSend(this.id, OS.sel_getModifierState_1, keyIdentifierArg != null ? keyIdentifierArg.id : 0) != 0;
-}
-
 public int keyCode() {
 	return OS.objc_msgSend(this.id, OS.sel_keyCode);
 }
 
-public int keyLocation() {
-	return OS.objc_msgSend(this.id, OS.sel_keyLocation);
-}
-
 public boolean metaKey() {
 	return OS.objc_msgSend(this.id, OS.sel_metaKey) != 0;
 }
 
-public void preventDefault() {
-	OS.objc_msgSend(this.id, OS.sel_preventDefault);
-}
-
 public boolean shiftKey() {
 	return OS.objc_msgSend(this.id, OS.sel_shiftKey) != 0;
 }
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 0a3acd6ceb..5457d22bc6 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
@@ -1,22 +1,26 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
-public class DOMMouseEvent extends NSObject {
+public class DOMMouseEvent extends DOMUIEvent {
 
 public DOMMouseEvent() {
 	super();
 }
 
-public DOMMouseEvent(int id) {
+public DOMMouseEvent(int /*long*/ id) {
+	super(id);
+}
+
+public DOMMouseEvent(id id) {
 	super(id);
 }
 
@@ -40,35 +44,10 @@ public boolean ctrlKey() {
 	return OS.objc_msgSend(this.id, OS.sel_ctrlKey) != 0;
 }
 
-public int detail() {
-	return OS.objc_msgSend(this.id, OS.sel_detail);
-}
-
-//public void initMouseEvent_______________(NSString initMouseEvent, boolean canBubble, boolean cancelable, DOMAbstractView view, int detail, int screenX, int screenY, int clientX, int clientY, boolean ctrlKey, boolean altKey, boolean shiftKey, boolean metaKey, short button, id relatedTarget) {
-//	OS.objc_msgSend(this.id, OS.sel_initMouseEvent_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1, initMouseEvent != null ? initMouseEvent.id : 0, canBubble, cancelable, view != null ? view.id : 0, detail, screenX, screenY, clientX, clientY, ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget != null ? relatedTarget.id : 0);
-//}
-
-//public void initMouseEvent_canBubble_cancelable_view_detail_screenX_screenY_clientX_clientY_ctrlKey_altKey_shiftKey_metaKey_button_relatedTarget_(NSString type, boolean canBubble, boolean cancelable, DOMAbstractView view, int detail, int screenX, int screenY, int clientX, int clientY, boolean ctrlKey, boolean altKey, boolean shiftKey, boolean metaKey, short button, id  relatedTarget) {
-//	OS.objc_msgSend(this.id, OS.sel_initMouseEvent_1canBubble_1cancelable_1view_1detail_1screenX_1screenY_1clientX_1clientY_1ctrlKey_1altKey_1shiftKey_1metaKey_1button_1relatedTarget_1, type != null ? type.id : 0, canBubble, cancelable, view != null ? view.id : 0, detail, screenX, screenY, clientX, clientY, ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget != null ? relatedTarget.id : 0);
-//}
-
 public boolean metaKey() {
 	return OS.objc_msgSend(this.id, OS.sel_metaKey) != 0;
 }
 
-public id  relatedTarget() {
-	int result = OS.objc_msgSend(this.id, OS.sel_relatedTarget);
-	return result != 0 ? new id (result) : null;
-}
-
-public int screenX() {
-	return OS.objc_msgSend(this.id, OS.sel_screenX);
-}
-
-public int screenY() {
-	return OS.objc_msgSend(this.id, OS.sel_screenY);
-}
-
 public boolean shiftKey() {
 	return OS.objc_msgSend(this.id, OS.sel_shiftKey) != 0;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptWhoseTest.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java
index 631009fe75..882cdfc131 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptWhoseTest.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java
@@ -10,18 +10,22 @@
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
-public class NSScriptWhoseTest extends NSObject {
+public class DOMUIEvent extends DOMEvent {
 
-public NSScriptWhoseTest() {
+public DOMUIEvent() {
 	super();
 }
 
-public NSScriptWhoseTest(int id) {
+public DOMUIEvent(int /*long*/ id) {
 	super(id);
 }
 
-public boolean isTrue() {
-	return OS.objc_msgSend(this.id, OS.sel_isTrue) != 0;
+public DOMUIEvent(id id) {
+	super(id);
+}
+
+public int detail() {
+	return 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 c2b0ed229a..d6b1834b9c 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,7 +16,11 @@ public DOMWheelEvent() {
 	super();
 }
 
-public DOMWheelEvent(int id) {
+public DOMWheelEvent(int /*long*/ id) {
+	super(id);
+}
+
+public DOMWheelEvent(id id) {
 	super(id);
 }
 
@@ -36,22 +40,10 @@ public boolean ctrlKey() {
 	return OS.objc_msgSend(this.id, OS.sel_ctrlKey) != 0;
 }
 
-public boolean isHorizontal() {
-	return OS.objc_msgSend(this.id, OS.sel_isHorizontal) != 0;
-}
-
 public boolean metaKey() {
 	return OS.objc_msgSend(this.id, OS.sel_metaKey) != 0;
 }
 
-public int screenX() {
-	return OS.objc_msgSend(this.id, OS.sel_screenX);
-}
-
-public int screenY() {
-	return OS.objc_msgSend(this.id, OS.sel_screenY);
-}
-
 public boolean shiftKey() {
 	return OS.objc_msgSend(this.id, OS.sel_shiftKey) != 0;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSATSTypesetter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSATSTypesetter.java
deleted file mode 100644
index 7f1983e7b0..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSATSTypesetter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSATSTypesetter extends NSTypesetter {
-
-public NSATSTypesetter() {
-	super();
-}
-
-public NSATSTypesetter(int id) {
-	super(id);
-}
-
-public NSRect lineFragmentRectForProposedRect(NSRect proposedRect, int remainingRect) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentRectForProposedRect_1remainingRect_1, proposedRect, remainingRect);
-	return result;
-}
-
-public static id sharedTypesetter() {
-	int result = OS.objc_msgSend(OS.class_NSATSTypesetter, OS.sel_sharedTypesetter);
-	return result != 0 ? new id(result) : null;
-}
-
-}
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 9a70d5e4c9..2bf078247a 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
@@ -16,95 +16,20 @@ public NSActionCell() {
 	super();
 }
 
-public NSActionCell(int id) {
+public NSActionCell(int /*long*/ id) {
 	super(id);
 }
 
-public int action() {
-	return OS.objc_msgSend(this.id, OS.sel_action);
-}
-
-public NSView controlView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_controlView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public double doubleValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_doubleValue);
-}
-
-public float floatValue() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_floatValue);
-}
-
-public int intValue() {
-	return OS.objc_msgSend(this.id, OS.sel_intValue);
-}
-
-public int integerValue() {
-	return OS.objc_msgSend(this.id, OS.sel_integerValue);
-}
-
-public void setAction(int aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_setAction_1, aSelector);
+public NSActionCell(id id) {
+	super(id);
 }
 
 public void setAlignment(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setAlignment_1, mode);
-}
-
-public void setBezeled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBezeled_1, flag);
-}
-
-public void setBordered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBordered_1, flag);
-}
-
-public void setControlView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setControlView_1, view != null ? view.id : 0);
-}
-
-public void setEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEnabled_1, flag);
-}
-
-public void setFloatingPointFormat(boolean autoRange, int leftDigits, int rightDigits) {
-	OS.objc_msgSend(this.id, OS.sel_setFloatingPointFormat_1left_1right_1, autoRange, leftDigits, rightDigits);
-}
-
-public void setFont(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setFont_1, fontObj != null ? fontObj.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setAlignment_, mode);
 }
 
 public void setImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1, image != null ? image.id : 0);
-}
-
-public void setObjectValue(id obj) {
-	OS.objc_msgSend(this.id, OS.sel_setObjectValue_1, obj != null ? obj.id : 0);
-}
-
-public void setTag(int anInt) {
-	OS.objc_msgSend(this.id, OS.sel_setTag_1, anInt);
-}
-
-public void setTarget(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setTarget_1, anObject != null ? anObject.id : 0);
-}
-
-public NSString stringValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringValue);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int tag() {
-	return OS.objc_msgSend(this.id, OS.sel_tag);
-}
-
-public id target() {
-	int result = OS.objc_msgSend(this.id, OS.sel_target);
-	return result != 0 ? new id(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setImage_, image != null ? image.id : 0);
 }
 
 }
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 6fd06b3c3b..4cf95eaae1 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
@@ -16,12 +16,12 @@ public NSAffineTransform() {
 	super();
 }
 
-public NSAffineTransform(int id) {
+public NSAffineTransform(int /*long*/ id) {
 	super(id);
 }
 
-public void appendTransform(NSAffineTransform transform) {
-	OS.objc_msgSend(this.id, OS.sel_appendTransform_1, transform != null ? transform.id : 0);
+public NSAffineTransform(id id) {
+	super(id);
 }
 
 public void concat() {
@@ -29,7 +29,7 @@ public void concat() {
 }
 
 public NSAffineTransform initWithTransform(NSAffineTransform transform) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithTransform_1, transform != null ? transform.id : 0);
+	int 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);
 }
 
@@ -38,23 +38,15 @@ public void invert() {
 }
 
 public void prependTransform(NSAffineTransform transform) {
-	OS.objc_msgSend(this.id, OS.sel_prependTransform_1, transform != null ? transform.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_prependTransform_, transform != null ? transform.id : 0);
 }
 
 public void rotateByDegrees(float angle) {
-	OS.objc_msgSend(this.id, OS.sel_rotateByDegrees_1, angle);
-}
-
-public void rotateByRadians(float angle) {
-	OS.objc_msgSend(this.id, OS.sel_rotateByRadians_1, angle);
-}
-
-public void scaleBy(float scale) {
-	OS.objc_msgSend(this.id, OS.sel_scaleBy_1, scale);
+	OS.objc_msgSend(this.id, OS.sel_rotateByDegrees_, angle);
 }
 
 public void scaleXBy(float scaleX, float scaleY) {
-	OS.objc_msgSend(this.id, OS.sel_scaleXBy_1yBy_1, scaleX, scaleY);
+	OS.objc_msgSend(this.id, OS.sel_scaleXBy_yBy_, scaleX, scaleY);
 }
 
 public void set() {
@@ -62,7 +54,7 @@ public void set() {
 }
 
 public void setTransformStruct(NSAffineTransformStruct transformStruct) {
-	OS.objc_msgSend(this.id, OS.sel_setTransformStruct_1, transformStruct);
+	OS.objc_msgSend(this.id, OS.sel_setTransformStruct_, transformStruct);
 }
 
 public static NSAffineTransform transform() {
@@ -70,20 +62,15 @@ public static NSAffineTransform transform() {
 	return result != 0 ? new NSAffineTransform(result) : null;
 }
 
-public NSBezierPath transformBezierPath(NSBezierPath aPath) {
-	int result = OS.objc_msgSend(this.id, OS.sel_transformBezierPath_1, aPath != null ? aPath.id : 0);
-	return result != 0 ? new NSBezierPath(result) : null;
-}
-
 public NSPoint transformPoint(NSPoint aPoint) {
 	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_transformPoint_1, aPoint);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_transformPoint_, aPoint);
 	return result;
 }
 
 public NSSize transformSize(NSSize aSize) {
 	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_transformSize_1, aSize);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_transformSize_, aSize);
 	return result;
 }
 
@@ -94,7 +81,7 @@ public NSAffineTransformStruct transformStruct() {
 }
 
 public void translateXBy(float deltaX, float deltaY) {
-	OS.objc_msgSend(this.id, OS.sel_translateXBy_1yBy_1, deltaX, 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/NSAffineTransformStruct.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java
index 6664a37108..3143c22c9a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java
@@ -13,4 +13,5 @@ package org.eclipse.swt.internal.cocoa;
 public class NSAffineTransformStruct {
 	public float m11, m12, m21, m22;
 	public float tX, tY;
+	public static final int sizeof = OS.NSAffineTransformStruct_sizeof();
 }
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 f9428a5119..58f09993fe 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
@@ -16,128 +16,30 @@ public NSAlert() {
 	super();
 }
 
-public NSAlert(int id) {
+public NSAlert(int /*long*/ id) {
 	super(id);
 }
 
-public NSView accessoryView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_accessoryView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public NSButton addButtonWithTitle(NSString title) {
-	int result = OS.objc_msgSend(this.id, OS.sel_addButtonWithTitle_1, title != null ? title.id : 0);
-	return result != 0 ? new NSButton(result) : null;
-}
-
-public int alertStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_alertStyle);
-}
-
-public static NSAlert alertWithError(NSError error) {
-	int result = OS.objc_msgSend(OS.class_NSAlert, OS.sel_alertWithError_1, error != null ? error.id : 0);
-	return result != 0 ? new NSAlert(result) : null;
+public NSAlert(id id) {
+	super(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_1defaultButton_1alternateButton_1otherButton_1informativeTextWithFormat_1, 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 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 void beginSheetModalForWindow(NSWindow window, id delegate, int didEndSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_beginSheetModalForWindow_1modalDelegate_1didEndSelector_1contextInfo_1, window != null ? window.id : 0, delegate != null ? delegate.id : 0, didEndSelector, contextInfo);
-}
-
-public NSArray buttons() {
-	int result = OS.objc_msgSend(this.id, OS.sel_buttons);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString helpAnchor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_helpAnchor);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSImage icon() {
-	int result = OS.objc_msgSend(this.id, OS.sel_icon);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSString informativeText() {
-	int result = OS.objc_msgSend(this.id, OS.sel_informativeText);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void layout() {
-	OS.objc_msgSend(this.id, OS.sel_layout);
-}
-
-public NSString messageText() {
-	int result = OS.objc_msgSend(this.id, OS.sel_messageText);
-	return result != 0 ? new NSString(result) : null;
-}
-
 public int runModal() {
 	return OS.objc_msgSend(this.id, OS.sel_runModal);
 }
 
-public void setAccessoryView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setAccessoryView_1, view != null ? view.id : 0);
-}
-
 public void setAlertStyle(int style) {
-	OS.objc_msgSend(this.id, OS.sel_setAlertStyle_1, style);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setHelpAnchor(NSString anchor) {
-	OS.objc_msgSend(this.id, OS.sel_setHelpAnchor_1, anchor != null ? anchor.id : 0);
-}
-
-public void setIcon(NSImage icon) {
-	OS.objc_msgSend(this.id, OS.sel_setIcon_1, icon != null ? icon.id : 0);
-}
-
-public void setInformativeText(NSString informativeText) {
-	OS.objc_msgSend(this.id, OS.sel_setInformativeText_1, informativeText != null ? informativeText.id : 0);
-}
-
-public void setMessageText(NSString messageText) {
-	OS.objc_msgSend(this.id, OS.sel_setMessageText_1, messageText != null ? messageText.id : 0);
-}
-
-public void setShowsHelp(boolean showsHelp) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsHelp_1, showsHelp);
-}
-
-public void setShowsSuppressionButton(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsSuppressionButton_1, flag);
-}
-
-public boolean showsHelp() {
-	return OS.objc_msgSend(this.id, OS.sel_showsHelp) != 0;
-}
-
-public boolean showsSuppressionButton() {
-	return OS.objc_msgSend(this.id, OS.sel_showsSuppressionButton) != 0;
-}
-
-public NSButton suppressionButton() {
-	int result = OS.objc_msgSend(this.id, OS.sel_suppressionButton);
-	return result != 0 ? new NSButton(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setAlertStyle_, style);
 }
 
-public id window() {
+public NSWindow window() {
 	int result = OS.objc_msgSend(this.id, OS.sel_window);
-	return result != 0 ? new id(result) : null;
+	return result != 0 ? new NSWindow(result) : null;
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAnimation.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAnimation.java
deleted file mode 100644
index e9df2fd29d..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAnimation.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSAnimation extends NSObject {
-
-public NSAnimation() {
-	super();
-}
-
-public NSAnimation(int id) {
-	super(id);
-}
-
-public void addProgressMark(float progressMark) {
-	OS.objc_msgSend(this.id, OS.sel_addProgressMark_1, progressMark);
-}
-
-public int animationBlockingMode() {
-	return OS.objc_msgSend(this.id, OS.sel_animationBlockingMode);
-}
-
-public int animationCurve() {
-	return OS.objc_msgSend(this.id, OS.sel_animationCurve);
-}
-
-public void clearStartAnimation() {
-	OS.objc_msgSend(this.id, OS.sel_clearStartAnimation);
-}
-
-public void clearStopAnimation() {
-	OS.objc_msgSend(this.id, OS.sel_clearStopAnimation);
-}
-
-public float currentProgress() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_currentProgress);
-}
-
-public float currentValue() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_currentValue);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public double duration() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_duration);
-}
-
-public float frameRate() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_frameRate);
-}
-
-public NSAnimation initWithDuration(double duration, int animationCurve) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDuration_1animationCurve_1, duration, animationCurve);
-	return result == this.id ? this : (result != 0 ? new NSAnimation(result) : null);
-}
-
-public boolean isAnimating() {
-	return OS.objc_msgSend(this.id, OS.sel_isAnimating) != 0;
-}
-
-public NSArray progressMarks() {
-	int result = OS.objc_msgSend(this.id, OS.sel_progressMarks);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void removeProgressMark(float progressMark) {
-	OS.objc_msgSend(this.id, OS.sel_removeProgressMark_1, progressMark);
-}
-
-public NSArray runLoopModesForAnimating() {
-	int result = OS.objc_msgSend(this.id, OS.sel_runLoopModesForAnimating);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void setAnimationBlockingMode(int animationBlockingMode) {
-	OS.objc_msgSend(this.id, OS.sel_setAnimationBlockingMode_1, animationBlockingMode);
-}
-
-public void setAnimationCurve(int curve) {
-	OS.objc_msgSend(this.id, OS.sel_setAnimationCurve_1, curve);
-}
-
-public void setCurrentProgress(float progress) {
-	OS.objc_msgSend(this.id, OS.sel_setCurrentProgress_1, progress);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setDuration(double duration) {
-	OS.objc_msgSend(this.id, OS.sel_setDuration_1, duration);
-}
-
-public void setFrameRate(float framesPerSecond) {
-	OS.objc_msgSend(this.id, OS.sel_setFrameRate_1, framesPerSecond);
-}
-
-public void setProgressMarks(NSArray progressMarks) {
-	OS.objc_msgSend(this.id, OS.sel_setProgressMarks_1, progressMarks != null ? progressMarks.id : 0);
-}
-
-public void startAnimation() {
-	OS.objc_msgSend(this.id, OS.sel_startAnimation);
-}
-
-public void startWhenAnimation(NSAnimation animation, float startProgress) {
-	OS.objc_msgSend(this.id, OS.sel_startWhenAnimation_1reachesProgress_1, animation != null ? animation.id : 0, startProgress);
-}
-
-public void stopAnimation() {
-	OS.objc_msgSend(this.id, OS.sel_stopAnimation);
-}
-
-public void stopWhenAnimation(NSAnimation animation, float stopProgress) {
-	OS.objc_msgSend(this.id, OS.sel_stopWhenAnimation_1reachesProgress_1, animation != null ? animation.id : 0, stopProgress);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAnimationContext.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAnimationContext.java
deleted file mode 100644
index 25bb0d42b4..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAnimationContext.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSAnimationContext extends NSObject {
-
-public NSAnimationContext() {
-	super();
-}
-
-public NSAnimationContext(int id) {
-	super(id);
-}
-
-public static void beginGrouping() {
-	OS.objc_msgSend(OS.class_NSAnimationContext, OS.sel_beginGrouping);
-}
-
-public static NSAnimationContext currentContext() {
-	int result = OS.objc_msgSend(OS.class_NSAnimationContext, OS.sel_currentContext);
-	return result != 0 ? new NSAnimationContext(result) : null;
-}
-
-public double duration() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_duration);
-}
-
-public static void endGrouping() {
-	OS.objc_msgSend(OS.class_NSAnimationContext, OS.sel_endGrouping);
-}
-
-public void setDuration(double duration) {
-	OS.objc_msgSend(this.id, OS.sel_setDuration_1, duration);
-}
-
-}
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 88e1a73c94..17a02d64a8 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
@@ -16,97 +16,12 @@ public NSAppleEventDescriptor() {
 	super();
 }
 
-public NSAppleEventDescriptor(int id) {
+public NSAppleEventDescriptor(int /*long*/ id) {
 	super(id);
 }
 
-public int aeDesc() {
-	return OS.objc_msgSend(this.id, OS.sel_aeDesc);
-}
-
-public static NSAppleEventDescriptor appleEventWithEventClass(int eventClass, int eventID, NSAppleEventDescriptor targetDescriptor, short returnID, int transactionID) {
-	int result = OS.objc_msgSend(OS.class_NSAppleEventDescriptor, OS.sel_appleEventWithEventClass_1eventID_1targetDescriptor_1returnID_1transactionID_1, eventClass, eventID, targetDescriptor != null ? targetDescriptor.id : 0, returnID, transactionID);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public NSAppleEventDescriptor attributeDescriptorForKeyword(int keyword) {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributeDescriptorForKeyword_1, keyword);
-	return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null);
-}
-
-public boolean booleanValue() {
-	return OS.objc_msgSend(this.id, OS.sel_booleanValue) != 0;
-}
-
-public NSAppleEventDescriptor coerceToDescriptorType(int descriptorType) {
-	int result = OS.objc_msgSend(this.id, OS.sel_coerceToDescriptorType_1, descriptorType);
-	return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null);
-}
-
-public NSData data() {
-	int result = OS.objc_msgSend(this.id, OS.sel_data);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSAppleEventDescriptor descriptorAtIndex(int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptorAtIndex_1, index);
-	return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null);
-}
-
-public NSAppleEventDescriptor descriptorForKeyword(int keyword) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptorForKeyword_1, keyword);
-	return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null);
-}
-
-public int descriptorType() {
-	return OS.objc_msgSend(this.id, OS.sel_descriptorType);
-}
-
-public static NSAppleEventDescriptor descriptorWithBoolean(boolean b) {
-	int result = OS.objc_msgSend(OS.class_NSAppleEventDescriptor, OS.sel_descriptorWithBoolean_1, b);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public static NSAppleEventDescriptor static_descriptorWithDescriptorType_bytes_length_(int descriptorType, int bytes, int byteCount) {
-	int result = OS.objc_msgSend(OS.class_NSAppleEventDescriptor, OS.sel_descriptorWithDescriptorType_1bytes_1length_1, descriptorType, bytes, byteCount);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public static NSAppleEventDescriptor static_descriptorWithDescriptorType_data_(int descriptorType, NSData data) {
-	int result = OS.objc_msgSend(OS.class_NSAppleEventDescriptor, OS.sel_descriptorWithDescriptorType_1data_1, descriptorType, data != null ? data.id : 0);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public static NSAppleEventDescriptor descriptorWithEnumCode(int enumerator) {
-	int result = OS.objc_msgSend(OS.class_NSAppleEventDescriptor, OS.sel_descriptorWithEnumCode_1, enumerator);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public static NSAppleEventDescriptor descriptorWithInt32(int signedInt) {
-	int result = OS.objc_msgSend(OS.class_NSAppleEventDescriptor, OS.sel_descriptorWithInt32_1, signedInt);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public static NSAppleEventDescriptor descriptorWithString(NSString string) {
-	int result = OS.objc_msgSend(OS.class_NSAppleEventDescriptor, OS.sel_descriptorWithString_1, string != null ? string.id : 0);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public static NSAppleEventDescriptor descriptorWithTypeCode(int typeCode) {
-	int result = OS.objc_msgSend(OS.class_NSAppleEventDescriptor, OS.sel_descriptorWithTypeCode_1, typeCode);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public int enumCodeValue() {
-	return OS.objc_msgSend(this.id, OS.sel_enumCodeValue);
-}
-
-public int eventClass() {
-	return OS.objc_msgSend(this.id, OS.sel_eventClass);
-}
-
-public int eventID() {
-	return OS.objc_msgSend(this.id, OS.sel_eventID);
+public NSAppleEventDescriptor(id id) {
+	super(id);
 }
 
 public NSAppleEventDescriptor initListDescriptor() {
@@ -114,106 +29,4 @@ public NSAppleEventDescriptor initListDescriptor() {
 	return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null);
 }
 
-public NSAppleEventDescriptor initRecordDescriptor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_initRecordDescriptor);
-	return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null);
-}
-
-public NSAppleEventDescriptor initWithAEDescNoCopy(int aeDesc) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithAEDescNoCopy_1, aeDesc);
-	return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null);
-}
-
-public NSAppleEventDescriptor initWithDescriptorType_bytes_length_(int descriptorType, int bytes, int byteCount) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDescriptorType_1bytes_1length_1, descriptorType, bytes, byteCount);
-	return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null);
-}
-
-public NSAppleEventDescriptor initWithDescriptorType_data_(int descriptorType, NSData data) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDescriptorType_1data_1, descriptorType, data != null ? data.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null);
-}
-
-public NSAppleEventDescriptor initWithEventClass(int eventClass, int eventID, NSAppleEventDescriptor targetDescriptor, short returnID, int transactionID) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithEventClass_1eventID_1targetDescriptor_1returnID_1transactionID_1, eventClass, eventID, targetDescriptor != null ? targetDescriptor.id : 0, returnID, transactionID);
-	return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null);
-}
-
-public void insertDescriptor(NSAppleEventDescriptor descriptor, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertDescriptor_1atIndex_1, descriptor != null ? descriptor.id : 0, index);
-}
-
-public int int32Value() {
-	return OS.objc_msgSend(this.id, OS.sel_int32Value);
-}
-
-public int keywordForDescriptorAtIndex(int index) {
-	return OS.objc_msgSend(this.id, OS.sel_keywordForDescriptorAtIndex_1, index);
-}
-
-public static NSAppleEventDescriptor listDescriptor() {
-	int result = OS.objc_msgSend(OS.class_NSAppleEventDescriptor, OS.sel_listDescriptor);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public static NSAppleEventDescriptor nullDescriptor() {
-	int result = OS.objc_msgSend(OS.class_NSAppleEventDescriptor, OS.sel_nullDescriptor);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public int numberOfItems() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfItems);
-}
-
-public NSAppleEventDescriptor paramDescriptorForKeyword(int keyword) {
-	int result = OS.objc_msgSend(this.id, OS.sel_paramDescriptorForKeyword_1, keyword);
-	return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null);
-}
-
-public static NSAppleEventDescriptor recordDescriptor() {
-	int result = OS.objc_msgSend(OS.class_NSAppleEventDescriptor, OS.sel_recordDescriptor);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public void removeDescriptorAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeDescriptorAtIndex_1, index);
-}
-
-public void removeDescriptorWithKeyword(int keyword) {
-	OS.objc_msgSend(this.id, OS.sel_removeDescriptorWithKeyword_1, keyword);
-}
-
-public void removeParamDescriptorWithKeyword(int keyword) {
-	OS.objc_msgSend(this.id, OS.sel_removeParamDescriptorWithKeyword_1, keyword);
-}
-
-public short returnID() {
-	return (short)OS.objc_msgSend(this.id, OS.sel_returnID);
-}
-
-public void setAttributeDescriptor(NSAppleEventDescriptor descriptor, int keyword) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributeDescriptor_1forKeyword_1, descriptor != null ? descriptor.id : 0, keyword);
-}
-
-public void setDescriptor(NSAppleEventDescriptor descriptor, int keyword) {
-	OS.objc_msgSend(this.id, OS.sel_setDescriptor_1forKeyword_1, descriptor != null ? descriptor.id : 0, keyword);
-}
-
-public void setParamDescriptor(NSAppleEventDescriptor descriptor, int keyword) {
-	OS.objc_msgSend(this.id, OS.sel_setParamDescriptor_1forKeyword_1, descriptor != null ? descriptor.id : 0, keyword);
-}
-
-public NSString stringValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringValue);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int transactionID() {
-	return OS.objc_msgSend(this.id, OS.sel_transactionID);
-}
-
-public int typeCodeValue() {
-	return OS.objc_msgSend(this.id, OS.sel_typeCodeValue);
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventManager.java
deleted file mode 100644
index 16d4dfbcc2..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventManager.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSAppleEventManager extends NSObject {
-
-public NSAppleEventManager() {
-	super();
-}
-
-public NSAppleEventManager(int id) {
-	super(id);
-}
-
-public NSAppleEventDescriptor appleEventForSuspensionID(int suspensionID) {
-	int result = OS.objc_msgSend(this.id, OS.sel_appleEventForSuspensionID_1, suspensionID);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public NSAppleEventDescriptor currentAppleEvent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currentAppleEvent);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public NSAppleEventDescriptor currentReplyAppleEvent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currentReplyAppleEvent);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public short dispatchRawAppleEvent(int theAppleEvent, int theReply, int handlerRefCon) {
-	return (short)OS.objc_msgSend(this.id, OS.sel_dispatchRawAppleEvent_1withRawReply_1handlerRefCon_1, theAppleEvent, theReply, handlerRefCon);
-}
-
-public void removeEventHandlerForEventClass(int eventClass, int eventID) {
-	OS.objc_msgSend(this.id, OS.sel_removeEventHandlerForEventClass_1andEventID_1, eventClass, eventID);
-}
-
-public NSAppleEventDescriptor replyAppleEventForSuspensionID(int suspensionID) {
-	int result = OS.objc_msgSend(this.id, OS.sel_replyAppleEventForSuspensionID_1, suspensionID);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public void resumeWithSuspensionID(int suspensionID) {
-	OS.objc_msgSend(this.id, OS.sel_resumeWithSuspensionID_1, suspensionID);
-}
-
-public void setCurrentAppleEventAndReplyEventWithSuspensionID(int suspensionID) {
-	OS.objc_msgSend(this.id, OS.sel_setCurrentAppleEventAndReplyEventWithSuspensionID_1, suspensionID);
-}
-
-public void setEventHandler(id handler, int handleEventSelector, int eventClass, int eventID) {
-	OS.objc_msgSend(this.id, OS.sel_setEventHandler_1andSelector_1forEventClass_1andEventID_1, handler != null ? handler.id : 0, handleEventSelector, eventClass, eventID);
-}
-
-public static NSAppleEventManager sharedAppleEventManager() {
-	int result = OS.objc_msgSend(OS.class_NSAppleEventManager, OS.sel_sharedAppleEventManager);
-	return result != 0 ? new NSAppleEventManager(result) : null;
-}
-
-public int suspendCurrentAppleEvent() {
-	return OS.objc_msgSend(this.id, OS.sel_suspendCurrentAppleEvent);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleScript.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleScript.java
deleted file mode 100644
index 1f2d198790..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleScript.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSAppleScript extends NSObject {
-
-public NSAppleScript() {
-	super();
-}
-
-public NSAppleScript(int id) {
-	super(id);
-}
-
-public boolean compileAndReturnError(int errorInfo) {
-	return OS.objc_msgSend(this.id, OS.sel_compileAndReturnError_1, errorInfo) != 0;
-}
-
-public NSAppleEventDescriptor executeAndReturnError(int errorInfo) {
-	int result = OS.objc_msgSend(this.id, OS.sel_executeAndReturnError_1, errorInfo);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public NSAppleEventDescriptor executeAppleEvent(NSAppleEventDescriptor event, int errorInfo) {
-	int result = OS.objc_msgSend(this.id, OS.sel_executeAppleEvent_1error_1, event != null ? event.id : 0, errorInfo);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public NSAppleScript initWithContentsOfURL(NSURL url, int errorInfo) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1error_1, url != null ? url.id : 0, errorInfo);
-	return result != 0 ? this : null;
-}
-
-public NSAppleScript initWithSource(NSString source) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithSource_1, source != null ? source.id : 0);
-	return result != 0 ? this : null;
-}
-
-public boolean isCompiled() {
-	return OS.objc_msgSend(this.id, OS.sel_isCompiled) != 0;
-}
-
-public NSString source() {
-	int result = OS.objc_msgSend(this.id, OS.sel_source);
-	return result != 0 ? new NSString(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 2f38a157bc..d6915cd065 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,58 +16,16 @@ public NSApplication() {
 	super();
 }
 
-public NSApplication(int id) {
+public NSApplication(int /*long*/ id) {
 	super(id);
 }
 
-public void abortModal() {
-	OS.objc_msgSend(this.id, OS.sel_abortModal);
-}
-
-public void activateContextHelpMode(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_activateContextHelpMode_1, sender != null ? sender.id : 0);
+public NSApplication(id id) {
+	super(id);
 }
 
 public void activateIgnoringOtherApps(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_activateIgnoringOtherApps_1, flag);
-}
-
-public void addWindowsItem(NSWindow win, NSString aString, boolean isFilename) {
-	OS.objc_msgSend(this.id, OS.sel_addWindowsItem_1title_1filename_1, win != null ? win.id : 0, aString != null ? aString.id : 0, isFilename);
-}
-
-public NSImage applicationIconImage() {
-	int result = OS.objc_msgSend(this.id, OS.sel_applicationIconImage);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public void arrangeInFront(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_arrangeInFront_1, sender != null ? sender.id : 0);
-}
-
-public int beginModalSessionForWindow_(NSWindow theWindow) {
-	return OS.objc_msgSend(this.id, OS.sel_beginModalSessionForWindow_1, theWindow != null ? theWindow.id : 0);
-}
-
-public int beginModalSessionForWindow_relativeToWindow_(NSWindow theWindow, NSWindow docWindow) {
-	return OS.objc_msgSend(this.id, OS.sel_beginModalSessionForWindow_1relativeToWindow_1, theWindow != null ? theWindow.id : 0, docWindow != null ? docWindow.id : 0);
-}
-
-public void beginSheet(NSWindow sheet, NSWindow docWindow, id modalDelegate, int didEndSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_beginSheet_1modalForWindow_1modalDelegate_1didEndSelector_1contextInfo_1, sheet != null ? sheet.id : 0, docWindow != null ? docWindow.id : 0, modalDelegate != null ? modalDelegate.id : 0, didEndSelector, contextInfo);
-}
-
-public void cancelUserAttentionRequest(int request) {
-	OS.objc_msgSend(this.id, OS.sel_cancelUserAttentionRequest_1, request);
-}
-
-public void changeWindowsItem(NSWindow win, NSString aString, boolean isFilename) {
-	OS.objc_msgSend(this.id, OS.sel_changeWindowsItem_1title_1filename_1, win != null ? win.id : 0, aString != null ? aString.id : 0, isFilename);
-}
-
-public NSGraphicsContext context() {
-	int result = OS.objc_msgSend(this.id, OS.sel_context);
-	return result != 0 ? new NSGraphicsContext(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_activateIgnoringOtherApps_, flag);
 }
 
 public NSEvent currentEvent() {
@@ -75,62 +33,16 @@ public NSEvent currentEvent() {
 	return result != 0 ? new NSEvent(result) : null;
 }
 
-public void deactivate() {
-	OS.objc_msgSend(this.id, OS.sel_deactivate);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public static void detachDrawingThread(int selector, id target, id argument) {
-	OS.objc_msgSend(OS.class_NSApplication, OS.sel_detachDrawingThread_1toTarget_1withObject_1, selector, target != null ? target.id : 0, argument != null ? argument.id : 0);
-}
-
-public void discardEventsMatchingMask(int mask, NSEvent lastEvent) {
-	OS.objc_msgSend(this.id, OS.sel_discardEventsMatchingMask_1beforeEvent_1, mask, lastEvent != null ? lastEvent.id : 0);
-}
-
-public NSDockTile dockTile() {
-	int result = OS.objc_msgSend(this.id, OS.sel_dockTile);
-	return result != 0 ? new NSDockTile(result) : null;
-}
-
-public void endModalSession(int session) {
-	OS.objc_msgSend(this.id, OS.sel_endModalSession_1, session);
-}
-
-public void endSheet_(NSWindow sheet) {
-	OS.objc_msgSend(this.id, OS.sel_endSheet_1, sheet != null ? sheet.id : 0);
-}
-
-public void endSheet_returnCode_(NSWindow sheet, int returnCode) {
-	OS.objc_msgSend(this.id, OS.sel_endSheet_1returnCode_1, sheet != null ? sheet.id : 0, returnCode);
-}
-
 public void finishLaunching() {
 	OS.objc_msgSend(this.id, OS.sel_finishLaunching);
 }
 
 public void hide(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_hide_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_hide_, sender != null ? sender.id : 0);
 }
 
 public void hideOtherApplications(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_hideOtherApplications_1, sender != null ? sender.id : 0);
-}
-
-public boolean isActive() {
-	return OS.objc_msgSend(this.id, OS.sel_isActive) != 0;
-}
-
-public boolean isHidden() {
-	return OS.objc_msgSend(this.id, OS.sel_isHidden) != 0;
-}
-
-public boolean isRunning() {
-	return OS.objc_msgSend(this.id, OS.sel_isRunning) != 0;
+	OS.objc_msgSend(this.id, OS.sel_hideOtherApplications_, sender != null ? sender.id : 0);
 }
 
 public NSWindow keyWindow() {
@@ -143,49 +55,13 @@ public NSMenu mainMenu() {
 	return result != 0 ? new NSMenu(result) : null;
 }
 
-public NSWindow mainWindow() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mainWindow);
-	return result != 0 ? new NSWindow(result) : null;
-}
-
-public NSWindow makeWindowsPerform(int aSelector, boolean flag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_makeWindowsPerform_1inOrder_1, aSelector, flag);
-	return result != 0 ? new NSWindow(result) : null;
-}
-
-public void miniaturizeAll(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_miniaturizeAll_1, sender != null ? sender.id : 0);
-}
-
-public NSWindow modalWindow() {
-	int result = OS.objc_msgSend(this.id, OS.sel_modalWindow);
-	return result != 0 ? new NSWindow(result) : null;
-}
-
 public NSEvent nextEventMatchingMask(int mask, NSDate expiration, NSString mode, boolean deqFlag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_nextEventMatchingMask_1untilDate_1inMode_1dequeue_1, mask, expiration != null ? expiration.id : 0, mode != null ? mode.id : 0, 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);
 	return result != 0 ? new NSEvent(result) : null;
 }
 
-public void orderFrontCharacterPalette(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_orderFrontCharacterPalette_1, sender != null ? sender.id : 0);
-}
-
-public void orderFrontColorPanel(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_orderFrontColorPanel_1, sender != null ? sender.id : 0);
-}
-
 public void orderFrontStandardAboutPanel(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_orderFrontStandardAboutPanel_1, sender != null ? sender.id : 0);
-}
-
-public void orderFrontStandardAboutPanelWithOptions(NSDictionary optionsDictionary) {
-	OS.objc_msgSend(this.id, OS.sel_orderFrontStandardAboutPanelWithOptions_1, optionsDictionary != null ? optionsDictionary.id : 0);
-}
-
-public NSArray orderedDocuments() {
-	int result = OS.objc_msgSend(this.id, OS.sel_orderedDocuments);
-	return result != 0 ? new NSArray(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_orderFrontStandardAboutPanel_, sender != null ? sender.id : 0);
 }
 
 public NSArray orderedWindows() {
@@ -193,102 +69,20 @@ public NSArray orderedWindows() {
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public void postEvent(NSEvent event, boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_postEvent_1atStart_1, event != null ? event.id : 0, flag);
-}
-
-public void preventWindowOrdering() {
-	OS.objc_msgSend(this.id, OS.sel_preventWindowOrdering);
-}
-
-public void registerServicesMenuSendTypes(NSArray sendTypes, NSArray returnTypes) {
-	OS.objc_msgSend(this.id, OS.sel_registerServicesMenuSendTypes_1returnTypes_1, sendTypes != null ? sendTypes.id : 0, returnTypes != null ? returnTypes.id : 0);
-}
-
-public void removeWindowsItem(NSWindow win) {
-	OS.objc_msgSend(this.id, OS.sel_removeWindowsItem_1, win != null ? win.id : 0);
-}
-
-public void replyToApplicationShouldTerminate(boolean shouldTerminate) {
-	OS.objc_msgSend(this.id, OS.sel_replyToApplicationShouldTerminate_1, shouldTerminate);
-}
-
-public void replyToOpenOrPrint(int reply) {
-	OS.objc_msgSend(this.id, OS.sel_replyToOpenOrPrint_1, reply);
-}
-
-public void reportException(NSException theException) {
-	OS.objc_msgSend(this.id, OS.sel_reportException_1, theException != null ? theException.id : 0);
-}
-
-public int requestUserAttention(int requestType) {
-	return OS.objc_msgSend(this.id, OS.sel_requestUserAttention_1, requestType);
-}
-
 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_1, theWindow != null ? theWindow.id : 0);
-}
-
-public int runModalForWindow_relativeToWindow_(NSWindow theWindow, NSWindow docWindow) {
-	return OS.objc_msgSend(this.id, OS.sel_runModalForWindow_1relativeToWindow_1, theWindow != null ? theWindow.id : 0, docWindow != null ? docWindow.id : 0);
-}
-
-public int runModalSession(int session) {
-	return OS.objc_msgSend(this.id, OS.sel_runModalSession_1, session);
-}
-
-public void runPageLayout(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_runPageLayout_1, sender != null ? sender.id : 0);
-}
-
-public boolean sendAction(int theAction, id theTarget, id sender) {
-	return OS.objc_msgSend(this.id, OS.sel_sendAction_1to_1from_1, theAction, theTarget != null ? theTarget.id : 0, sender != null ? sender.id : 0) != 0;
+public int runModalForWindow(NSWindow theWindow) {
+	return OS.objc_msgSend(this.id, OS.sel_runModalForWindow_, theWindow != null ? theWindow.id : 0);
 }
 
 public void sendEvent(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_sendEvent_1, theEvent != null ? theEvent.id : 0);
-}
-
-public NSMenu servicesMenu() {
-	int result = OS.objc_msgSend(this.id, OS.sel_servicesMenu);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
-public id servicesProvider() {
-	int result = OS.objc_msgSend(this.id, OS.sel_servicesProvider);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setApplicationIconImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setApplicationIconImage_1, image != null ? image.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_sendEvent_, theEvent != null ? theEvent.id : 0);
 }
 
 public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public void setMainMenu(NSMenu aMenu) {
-	OS.objc_msgSend(this.id, OS.sel_setMainMenu_1, aMenu != null ? aMenu.id : 0);
-}
-
-public void setServicesMenu(NSMenu aMenu) {
-	OS.objc_msgSend(this.id, OS.sel_setServicesMenu_1, aMenu != null ? aMenu.id : 0);
-}
-
-public void setServicesProvider(id provider) {
-	OS.objc_msgSend(this.id, OS.sel_setServicesProvider_1, provider != null ? provider.id : 0);
-}
-
-public void setWindowsMenu(NSMenu aMenu) {
-	OS.objc_msgSend(this.id, OS.sel_setWindowsMenu_1, aMenu != null ? aMenu.id : 0);
-}
-
-public void setWindowsNeedUpdate(boolean needUpdate) {
-	OS.objc_msgSend(this.id, OS.sel_setWindowsNeedUpdate_1, needUpdate);
+	OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0);
 }
 
 public static NSApplication sharedApplication() {
@@ -296,68 +90,16 @@ public static NSApplication sharedApplication() {
 	return result != 0 ? new NSApplication(result) : null;
 }
 
-public void showHelp(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_showHelp_1, sender != null ? sender.id : 0);
-}
-
 public void stop(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_stop_1, sender != null ? sender.id : 0);
-}
-
-public void stopModal() {
-	OS.objc_msgSend(this.id, OS.sel_stopModal);
-}
-
-public void stopModalWithCode(int returnCode) {
-	OS.objc_msgSend(this.id, OS.sel_stopModalWithCode_1, returnCode);
-}
-
-public id targetForAction_(int theAction) {
-	int result = OS.objc_msgSend(this.id, OS.sel_targetForAction_1, theAction);
-	return result != 0 ? new id(result) : null;
-}
-
-public id targetForAction_to_from_(int theAction, id theTarget, id sender) {
-	int result = OS.objc_msgSend(this.id, OS.sel_targetForAction_1to_1from_1, theAction, theTarget != null ? theTarget.id : 0, sender != null ? sender.id : 0);
-	return result != 0 ? new id(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_stop_, sender != null ? sender.id : 0);
 }
 
 public void terminate(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_terminate_1, sender != null ? sender.id : 0);
-}
-
-public boolean tryToPerform(int anAction, id anObject) {
-	return OS.objc_msgSend(this.id, OS.sel_tryToPerform_1with_1, anAction, anObject != null ? anObject.id : 0) != 0;
-}
-
-public void unhide(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_unhide_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_terminate_, sender != null ? sender.id : 0);
 }
 
 public void unhideAllApplications(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_unhideAllApplications_1, sender != null ? sender.id : 0);
-}
-
-public void unhideWithoutActivation() {
-	OS.objc_msgSend(this.id, OS.sel_unhideWithoutActivation);
-}
-
-public void updateWindows() {
-	OS.objc_msgSend(this.id, OS.sel_updateWindows);
-}
-
-public void updateWindowsItem(NSWindow win) {
-	OS.objc_msgSend(this.id, OS.sel_updateWindowsItem_1, win != null ? win.id : 0);
-}
-
-public id validRequestorForSendType(NSString sendType, NSString returnType) {
-	int result = OS.objc_msgSend(this.id, OS.sel_validRequestorForSendType_1returnType_1, sendType != null ? sendType.id : 0, returnType != null ? returnType.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSWindow windowWithWindowNumber(int windowNum) {
-	int result = OS.objc_msgSend(this.id, OS.sel_windowWithWindowNumber_1, windowNum);
-	return result != 0 ? new NSWindow(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_unhideAllApplications_, sender != null ? sender.id : 0);
 }
 
 public NSArray windows() {
@@ -365,9 +107,4 @@ public NSArray windows() {
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public NSMenu windowsMenu() {
-	int result = OS.objc_msgSend(this.id, OS.sel_windowsMenu);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArchiver.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArchiver.java
deleted file mode 100644
index fc6cf83941..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArchiver.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSArchiver extends NSObject {
-
-public NSArchiver() {
-	super();
-}
-
-public NSArchiver(int id) {
-	super(id);
-}
-
-public static boolean archiveRootObject(id rootObject, NSString path) {
-	return OS.objc_msgSend(OS.class_NSArchiver, OS.sel_archiveRootObject_1toFile_1, rootObject != null ? rootObject.id : 0, path != null ? path.id : 0) != 0;
-}
-
-public static NSData archivedDataWithRootObject(id rootObject) {
-	int result = OS.objc_msgSend(OS.class_NSArchiver, OS.sel_archivedDataWithRootObject_1, rootObject != null ? rootObject.id : 0);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSMutableData archiverData() {
-	int result = OS.objc_msgSend(this.id, OS.sel_archiverData);
-	return result != 0 ? new NSMutableData(result) : null;
-}
-
-public NSString classNameEncodedForTrueClassName(NSString trueName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_classNameEncodedForTrueClassName_1, trueName != null ? trueName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void encodeClassName(NSString trueName, NSString inArchiveName) {
-	OS.objc_msgSend(this.id, OS.sel_encodeClassName_1intoClassName_1, trueName != null ? trueName.id : 0, inArchiveName != null ? inArchiveName.id : 0);
-}
-
-public void encodeConditionalObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_encodeConditionalObject_1, object != null ? object.id : 0);
-}
-
-public void encodeRootObject(id rootObject) {
-	OS.objc_msgSend(this.id, OS.sel_encodeRootObject_1, rootObject != null ? rootObject.id : 0);
-}
-
-public NSArchiver initForWritingWithMutableData(NSMutableData mdata) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initForWritingWithMutableData_1, mdata != null ? mdata.id : 0);
-	return result != 0 ? this : null;
-}
-
-public void replaceObject(id object, id newObject) {
-	OS.objc_msgSend(this.id, OS.sel_replaceObject_1withObject_1, object != null ? object.id : 0, newObject != null ? newObject.id : 0);
-}
-
-}
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 0941b10350..08461410f4 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,251 +16,26 @@ public NSArray() {
 	super();
 }
 
-public NSArray(int id) {
+public NSArray(int /*long*/ id) {
 	super(id);
 }
 
-public void addObserver_forKeyPath_options_context_(NSObject observer, NSString keyPath, int options, int context) {
-	OS.objc_msgSend(this.id, OS.sel_addObserver_1forKeyPath_1options_1context_1, observer != null ? observer.id : 0, keyPath != null ? keyPath.id : 0, options, context);
-}
-
-public void addObserver_toObjectsAtIndexes_forKeyPath_options_context_(NSObject observer, NSIndexSet indexes, NSString keyPath, int options, int context) {
-	OS.objc_msgSend(this.id, OS.sel_addObserver_1toObjectsAtIndexes_1forKeyPath_1options_1context_1, observer != null ? observer.id : 0, indexes != null ? indexes.id : 0, keyPath != null ? keyPath.id : 0, options, context);
-}
-
-public static id array() {
-	int result = OS.objc_msgSend(OS.class_NSArray, OS.sel_array);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSArray arrayByAddingObject(id anObject) {
-	int result = OS.objc_msgSend(this.id, OS.sel_arrayByAddingObject_1, anObject != null ? anObject.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSArray(result) : null);
-}
-
-public NSArray arrayByAddingObjectsFromArray(NSArray otherArray) {
-	int result = OS.objc_msgSend(this.id, OS.sel_arrayByAddingObjectsFromArray_1, otherArray != null ? otherArray.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSArray(result) : null);
-}
-
-public static id arrayWithArray(NSArray array) {
-	int result = OS.objc_msgSend(OS.class_NSArray, OS.sel_arrayWithArray_1, array != null ? array.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id arrayWithContentsOfFile(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSArray, OS.sel_arrayWithContentsOfFile_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id arrayWithContentsOfURL(NSURL url) {
-	int result = OS.objc_msgSend(OS.class_NSArray, OS.sel_arrayWithContentsOfURL_1, url != null ? url.id : 0);
-	return result != 0 ? new id(result) : null;
+public NSArray(id id) {
+	super(id);
 }
 
 public static NSArray arrayWithObject(id anObject) {
-	int result = OS.objc_msgSend(OS.class_NSArray, OS.sel_arrayWithObject_1, anObject != null ? anObject.id : 0);
+	int result = OS.objc_msgSend(OS.class_NSArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0);
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public static id static_arrayWithObjects_(id arrayWithObjects) {
-	int result = OS.objc_msgSend(OS.class_NSArray, OS.sel_arrayWithObjects_1, arrayWithObjects != null ? arrayWithObjects.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_arrayWithObjects_count_(int objects, int cnt) {
-	int result = OS.objc_msgSend(OS.class_NSArray, OS.sel_arrayWithObjects_1count_1, objects, cnt);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString componentsJoinedByString(NSString separator) {
-	int result = OS.objc_msgSend(this.id, OS.sel_componentsJoinedByString_1, separator != null ? separator.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean containsObject(id anObject) {
-	return OS.objc_msgSend(this.id, OS.sel_containsObject_1, anObject != null ? anObject.id : 0) != 0;
-}
-
 public int count() {
 	return OS.objc_msgSend(this.id, OS.sel_count);
 }
 
-public NSString description() {
-	int result = OS.objc_msgSend(this.id, OS.sel_description);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString descriptionWithLocale_(id locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptionWithLocale_1, locale != null ? locale.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString descriptionWithLocale_indent_(id locale, int level) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptionWithLocale_1indent_1, locale != null ? locale.id : 0, level);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSArray filteredArrayUsingPredicate(NSPredicate predicate) {
-	int result = OS.objc_msgSend(this.id, OS.sel_filteredArrayUsingPredicate_1, predicate != null ? predicate.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSArray(result) : null);
-}
-
-public id firstObjectCommonWithArray(NSArray otherArray) {
-	int result = OS.objc_msgSend(this.id, OS.sel_firstObjectCommonWithArray_1, otherArray != null ? otherArray.id : 0);
+public id objectAtIndex(int index) {
+	int result = OS.objc_msgSend(this.id, OS.sel_objectAtIndex_, index);
 	return result != 0 ? new id(result) : null;
 }
 
-public void getObjects_(int objects) {
-	OS.objc_msgSend(this.id, OS.sel_getObjects_1, objects);
-}
-
-public void getObjects_range_(int objects, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_getObjects_1range_1, objects, range);
-}
-
-public int indexOfObject_(id anObject) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfObject_1, anObject != null ? anObject.id : 0);
-}
-
-public int indexOfObject_inRange_(id anObject, NSRange range) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfObject_1inRange_1, anObject != null ? anObject.id : 0, range);
-}
-
-public int indexOfObjectIdenticalTo_(id anObject) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfObjectIdenticalTo_1, anObject != null ? anObject.id : 0);
-}
-
-public int indexOfObjectIdenticalTo_inRange_(id anObject, NSRange range) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfObjectIdenticalTo_1inRange_1, anObject != null ? anObject.id : 0, range);
-}
-
-public NSArray initWithArray_(NSArray array) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithArray_1, array != null ? array.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSArray initWithArray_copyItems_(NSArray array, boolean flag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithArray_1copyItems_1, array != null ? array.id : 0, flag);
-	return result != 0 ? this : null;
-}
-
-public NSArray initWithContentsOfFile(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_1, path != null ? path.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSArray initWithContentsOfURL(NSURL url) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1, url != null ? url.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSArray initWithObjects_(id initWithObjects) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithObjects_1, initWithObjects != null ? initWithObjects.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSArray initWithObjects_count_(int objects, int cnt) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithObjects_1count_1, objects, cnt);
-	return result != 0 ? this : null;
-}
-
-public boolean isEqualToArray(NSArray otherArray) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualToArray_1, otherArray != null ? otherArray.id : 0) != 0;
-}
-
-public id lastObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_lastObject);
-	return result != 0 ? new id(result) : null;
-}
-
-public void makeObjectsPerformSelector_(int aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_makeObjectsPerformSelector_1, aSelector);
-}
-
-public void makeObjectsPerformSelector_withObject_(int aSelector, id argument) {
-	OS.objc_msgSend(this.id, OS.sel_makeObjectsPerformSelector_1withObject_1, aSelector, argument != null ? argument.id : 0);
-}
-
-public int objectAtIndex(int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectAtIndex_1, index);
-	return result;
-//	return result != 0 ? new id(result) : null;
-}
-
-public NSEnumerator objectEnumerator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
-	return result != 0 ? new NSEnumerator(result) : null;
-}
-
-public NSArray objectsAtIndexes(NSIndexSet indexes) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectsAtIndexes_1, indexes != null ? indexes.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSArray(result) : null);
-}
-
-public NSArray pathsMatchingExtensions(NSArray filterTypes) {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathsMatchingExtensions_1, filterTypes != null ? filterTypes.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSArray(result) : null);
-}
-
-public void removeObserver_forKeyPath_(NSObject observer, NSString keyPath) {
-	OS.objc_msgSend(this.id, OS.sel_removeObserver_1forKeyPath_1, observer != null ? observer.id : 0, keyPath != null ? keyPath.id : 0);
-}
-
-public void removeObserver_fromObjectsAtIndexes_forKeyPath_(NSObject observer, NSIndexSet indexes, NSString keyPath) {
-	OS.objc_msgSend(this.id, OS.sel_removeObserver_1fromObjectsAtIndexes_1forKeyPath_1, observer != null ? observer.id : 0, indexes != null ? indexes.id : 0, keyPath != null ? keyPath.id : 0);
-}
-
-public NSEnumerator reverseObjectEnumerator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_reverseObjectEnumerator);
-	return result != 0 ? new NSEnumerator(result) : null;
-}
-
-public void setValue(id value, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_setValue_1forKey_1, value != null ? value.id : 0, key != null ? key.id : 0);
-}
-
-public NSData sortedArrayHint() {
-	int result = OS.objc_msgSend(this.id, OS.sel_sortedArrayHint);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSArray sortedArrayUsingDescriptors(NSArray sortDescriptors) {
-	int result = OS.objc_msgSend(this.id, OS.sel_sortedArrayUsingDescriptors_1, sortDescriptors != null ? sortDescriptors.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSArray(result) : null);
-}
-
-public NSArray sortedArrayUsingFunction_context_(int comparator, int context) {
-	int result = OS.objc_msgSend(this.id, OS.sel_sortedArrayUsingFunction_1context_1, comparator, context);
-	return result == this.id ? this : (result != 0 ? new NSArray(result) : null);
-}
-
-public NSArray sortedArrayUsingFunction_context_hint_(int comparator, int context, NSData hint) {
-	int result = OS.objc_msgSend(this.id, OS.sel_sortedArrayUsingFunction_1context_1hint_1, comparator, context, hint != null ? hint.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSArray(result) : null);
-}
-
-public NSArray sortedArrayUsingSelector(int comparator) {
-	int result = OS.objc_msgSend(this.id, OS.sel_sortedArrayUsingSelector_1, comparator);
-	return result == this.id ? this : (result != 0 ? new NSArray(result) : null);
-}
-
-public NSArray subarrayWithRange(NSRange range) {
-	int result = OS.objc_msgSend(this.id, OS.sel_subarrayWithRange_1, range);
-	return result == this.id ? this : (result != 0 ? new NSArray(result) : null);
-}
-
-public id valueForKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueForKey_1, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean writeToFile(NSString path, boolean useAuxiliaryFile) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToFile_1atomically_1, path != null ? path.id : 0, useAuxiliaryFile) != 0;
-}
-
-public boolean writeToURL(NSURL url, boolean atomically) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToURL_1atomically_1, url != null ? url.id : 0, atomically) != 0;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArrayController.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArrayController.java
deleted file mode 100644
index 9cadc240d2..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArrayController.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSArrayController extends NSObjectController {
-
-public NSArrayController() {
-	super();
-}
-
-public NSArrayController(int id) {
-	super(id);
-}
-
-public void add(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_add_1, sender != null ? sender.id : 0);
-}
-
-public void addObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_addObject_1, object != null ? object.id : 0);
-}
-
-public void addObjects(NSArray objects) {
-	OS.objc_msgSend(this.id, OS.sel_addObjects_1, objects != null ? objects.id : 0);
-}
-
-public boolean addSelectedObjects(NSArray objects) {
-	return OS.objc_msgSend(this.id, OS.sel_addSelectedObjects_1, objects != null ? objects.id : 0) != 0;
-}
-
-public boolean addSelectionIndexes(NSIndexSet indexes) {
-	return OS.objc_msgSend(this.id, OS.sel_addSelectionIndexes_1, indexes != null ? indexes.id : 0) != 0;
-}
-
-public boolean alwaysUsesMultipleValuesMarker() {
-	return OS.objc_msgSend(this.id, OS.sel_alwaysUsesMultipleValuesMarker) != 0;
-}
-
-public NSArray arrangeObjects(NSArray objects) {
-	int result = OS.objc_msgSend(this.id, OS.sel_arrangeObjects_1, objects != null ? objects.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id arrangedObjects() {
-	int result = OS.objc_msgSend(this.id, OS.sel_arrangedObjects);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSArray automaticRearrangementKeyPaths() {
-	int result = OS.objc_msgSend(this.id, OS.sel_automaticRearrangementKeyPaths);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean automaticallyRearrangesObjects() {
-	return OS.objc_msgSend(this.id, OS.sel_automaticallyRearrangesObjects) != 0;
-}
-
-public boolean avoidsEmptySelection() {
-	return OS.objc_msgSend(this.id, OS.sel_avoidsEmptySelection) != 0;
-}
-
-public boolean canInsert() {
-	return OS.objc_msgSend(this.id, OS.sel_canInsert) != 0;
-}
-
-public boolean canSelectNext() {
-	return OS.objc_msgSend(this.id, OS.sel_canSelectNext) != 0;
-}
-
-public boolean canSelectPrevious() {
-	return OS.objc_msgSend(this.id, OS.sel_canSelectPrevious) != 0;
-}
-
-public boolean clearsFilterPredicateOnInsertion() {
-	return OS.objc_msgSend(this.id, OS.sel_clearsFilterPredicateOnInsertion) != 0;
-}
-
-public void didChangeArrangementCriteria() {
-	OS.objc_msgSend(this.id, OS.sel_didChangeArrangementCriteria);
-}
-
-public NSPredicate filterPredicate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_filterPredicate);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public void insert(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_insert_1, sender != null ? sender.id : 0);
-}
-
-public void insertObject(id object, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertObject_1atArrangedObjectIndex_1, object != null ? object.id : 0, index);
-}
-
-public void insertObjects(NSArray objects, NSIndexSet indexes) {
-	OS.objc_msgSend(this.id, OS.sel_insertObjects_1atArrangedObjectIndexes_1, objects != null ? objects.id : 0, indexes != null ? indexes.id : 0);
-}
-
-public boolean preservesSelection() {
-	return OS.objc_msgSend(this.id, OS.sel_preservesSelection) != 0;
-}
-
-public void rearrangeObjects() {
-	OS.objc_msgSend(this.id, OS.sel_rearrangeObjects);
-}
-
-public void remove(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_remove_1, sender != null ? sender.id : 0);
-}
-
-public void removeObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_removeObject_1, object != null ? object.id : 0);
-}
-
-public void removeObjectAtArrangedObjectIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectAtArrangedObjectIndex_1, index);
-}
-
-public void removeObjects(NSArray objects) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjects_1, objects != null ? objects.id : 0);
-}
-
-public void removeObjectsAtArrangedObjectIndexes(NSIndexSet indexes) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectsAtArrangedObjectIndexes_1, indexes != null ? indexes.id : 0);
-}
-
-public boolean removeSelectedObjects(NSArray objects) {
-	return OS.objc_msgSend(this.id, OS.sel_removeSelectedObjects_1, objects != null ? objects.id : 0) != 0;
-}
-
-public boolean removeSelectionIndexes(NSIndexSet indexes) {
-	return OS.objc_msgSend(this.id, OS.sel_removeSelectionIndexes_1, indexes != null ? indexes.id : 0) != 0;
-}
-
-public void selectNext(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectNext_1, sender != null ? sender.id : 0);
-}
-
-public void selectPrevious(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectPrevious_1, sender != null ? sender.id : 0);
-}
-
-public NSArray selectedObjects() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedObjects);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public int selectionIndex() {
-	return OS.objc_msgSend(this.id, OS.sel_selectionIndex);
-}
-
-public NSIndexSet selectionIndexes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectionIndexes);
-	return result != 0 ? new NSIndexSet(result) : null;
-}
-
-public boolean selectsInsertedObjects() {
-	return OS.objc_msgSend(this.id, OS.sel_selectsInsertedObjects) != 0;
-}
-
-public void setAlwaysUsesMultipleValuesMarker(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAlwaysUsesMultipleValuesMarker_1, flag);
-}
-
-public void setAutomaticallyRearrangesObjects(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutomaticallyRearrangesObjects_1, flag);
-}
-
-public void setAvoidsEmptySelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAvoidsEmptySelection_1, flag);
-}
-
-public void setClearsFilterPredicateOnInsertion(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setClearsFilterPredicateOnInsertion_1, flag);
-}
-
-public void setFilterPredicate(NSPredicate filterPredicate) {
-	OS.objc_msgSend(this.id, OS.sel_setFilterPredicate_1, filterPredicate != null ? filterPredicate.id : 0);
-}
-
-public void setPreservesSelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setPreservesSelection_1, flag);
-}
-
-public boolean setSelectedObjects(NSArray objects) {
-	return OS.objc_msgSend(this.id, OS.sel_setSelectedObjects_1, objects != null ? objects.id : 0) != 0;
-}
-
-public boolean setSelectionIndex(int index) {
-	return OS.objc_msgSend(this.id, OS.sel_setSelectionIndex_1, index) != 0;
-}
-
-public boolean setSelectionIndexes(NSIndexSet indexes) {
-	return OS.objc_msgSend(this.id, OS.sel_setSelectionIndexes_1, indexes != null ? indexes.id : 0) != 0;
-}
-
-public void setSelectsInsertedObjects(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectsInsertedObjects_1, flag);
-}
-
-public void setSortDescriptors(NSArray sortDescriptors) {
-	OS.objc_msgSend(this.id, OS.sel_setSortDescriptors_1, sortDescriptors != null ? sortDescriptors.id : 0);
-}
-
-public NSArray sortDescriptors() {
-	int result = OS.objc_msgSend(this.id, OS.sel_sortDescriptors);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAssertionHandler.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAssertionHandler.java
deleted file mode 100644
index f15bfcd3d6..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAssertionHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSAssertionHandler extends NSObject {
-
-public NSAssertionHandler() {
-	super();
-}
-
-public NSAssertionHandler(int id) {
-	super(id);
-}
-
-public static NSAssertionHandler currentHandler() {
-	int result = OS.objc_msgSend(OS.class_NSAssertionHandler, OS.sel_currentHandler);
-	return result != 0 ? new NSAssertionHandler(result) : null;
-}
-
-public void handleFailureInFunction(NSString functionName, NSString fileName, int line, NSString description) {
-	OS.objc_msgSend(this.id, OS.sel_handleFailureInFunction_1file_1lineNumber_1description_1, functionName != null ? functionName.id : 0, fileName != null ? fileName.id : 0, line, description != null ? description.id : 0);
-}
-
-public void handleFailureInMethod(int selector, id object, NSString fileName, int line, NSString description) {
-	OS.objc_msgSend(this.id, OS.sel_handleFailureInMethod_1object_1file_1lineNumber_1description_1, selector, object != null ? object.id : 0, fileName != null ? fileName.id : 0, line, description != null ? description.id : 0);
-}
-
-}
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 b4b593c86b..ea74e2f9ee 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,90 +16,65 @@ public NSAttributedString() {
 	super();
 }
 
-public NSAttributedString(int id) {
+public NSAttributedString(int /*long*/ id) {
 	super(id);
 }
 
-public id attribute_atIndex_effectiveRange_(NSString attrName, int location, int range) {
-	int result = OS.objc_msgSend(this.id, OS.sel_attribute_1atIndex_1effectiveRange_1, attrName != null ? attrName.id : 0, location, range);
-	return result != 0 ? new id(result) : null;
-}
-
-public id attribute_atIndex_longestEffectiveRange_inRange_(NSString attrName, int location, int range, NSRange rangeLimit) {
-	int result = OS.objc_msgSend(this.id, OS.sel_attribute_1atIndex_1longestEffectiveRange_1inRange_1, attrName != null ? attrName.id : 0, location, range, rangeLimit);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSAttributedString attributedSubstringFromRange(NSRange range) {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedSubstringFromRange_1, range);
-	return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null);
-}
-
-public NSDictionary attributesAtIndex_effectiveRange_(int location, int range) {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributesAtIndex_1effectiveRange_1, location, range);
-	return result != 0 ? new NSDictionary(result) : null;
+public NSAttributedString(id id) {
+	super(id);
 }
 
-public NSDictionary attributesAtIndex_longestEffectiveRange_inRange_(int location, int range, NSRange rangeLimit) {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributesAtIndex_1longestEffectiveRange_1inRange_1, location, range, rangeLimit);
+public NSDictionary attributesAtIndex(int location, int range, NSRange rangeLimit) {
+	int result = OS.objc_msgSend(this.id, OS.sel_attributesAtIndex_longestEffectiveRange_inRange_, location, range, rangeLimit);
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
-public NSAttributedString initWithAttributedString(NSAttributedString attrStr) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithAttributedString_1, attrStr != null ? attrStr.id : 0);
-	return result != 0 ? this : null;
+public NSRange doubleClickAtIndex(int location) {
+	NSRange result = new NSRange();
+	OS.objc_msgSend_stret(result, this.id, OS.sel_doubleClickAtIndex_, location);
+	return result;
 }
 
-public NSAttributedString initWithString_(NSString str) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithString_1, str != null ? str.id : 0);
-	return result != 0 ? this : null;
+public void drawAtPoint(NSPoint point) {
+	OS.objc_msgSend(this.id, OS.sel_drawAtPoint_, point);
 }
 
-public NSAttributedString initWithString_attributes_(NSString str, NSDictionary attrs) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithString_1attributes_1, str != null ? str.id : 0, attrs != null ? attrs.id : 0);
-	return result != 0 ? this : null;
+public void drawInRect(NSRect rect) {
+	OS.objc_msgSend(this.id, OS.sel_drawInRect_, rect);
 }
 
-public boolean isEqualToAttributedString(NSAttributedString other) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualToAttributedString_1, other != null ? other.id : 0) != 0;
+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);
+	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 nextWordFromIndex(int location, boolean isForward) {
+	return OS.objc_msgSend(this.id, OS.sel_nextWordFromIndex_forward_, location, isForward);
 }
 
-public NSString string() {
-	int result = OS.objc_msgSend(this.id, OS.sel_string);
-	return result != 0 ? new NSString(result) : null;
-}
-
-
 public NSSize size() {
 	NSSize result = new NSSize();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_size);
 	return result;
 }
 
-public void drawAtPoint(NSPoint pt) {
-	OS.objc_msgSend(id, OS.sel_drawAtPoint_, pt);
-}
-
-public void drawInRect(NSRect rect) {
-	OS.objc_msgSend(id, OS.sel_drawInRect_1, rect);
+public NSAttributedString attributedSubstringFromRange(NSRange range) {
+	int result = OS.objc_msgSend(this.id, OS.sel_attributedSubstringFromRange_, range);
+	return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null);
 }
 
-public void drawInRect(NSRect rect, int options) {
-	OS.objc_msgSend(id, OS.sel_drawInRect_1, rect, options);
+public NSAttributedString initWithString(NSString str) {
+	int 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 nextWordFromIndex(int index, boolean forward) {
-	return OS.objc_msgSend(id, OS.sel_nextWordFromIndex_1forward_1, index, forward);
+public int length() {
+	return OS.objc_msgSend(this.id, OS.sel_length);
 }
 
-public NSRange doubleClickAtIndex(int index) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, id, OS.sel_doubleClickAtIndex_1, index);
-	return result;
+public NSString string() {
+	int 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/NSAutoreleasePool.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java
index 7efe2bbddd..09daf2c26f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java
@@ -16,64 +16,16 @@ public NSAutoreleasePool() {
 	super();
 }
 
-public NSAutoreleasePool(int id) {
+public NSAutoreleasePool(int /*long*/ id) {
 	super(id);
 }
 
-public void addObject_(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_addObject_1, anObject != null ? anObject.id : 0);
-}
-
-public static int autoreleasedObjectCount() {
-	return OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_autoreleasedObjectCount);
-}
-
-public void drain() {
-	OS.objc_msgSend(this.id, OS.sel_drain);
+public NSAutoreleasePool(id id) {
+	super(id);
 }
 
 public static void enableFreedObjectCheck(boolean enable) {
-	OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_enableFreedObjectCheck_1, enable);
-}
-
-public static void enableRelease(boolean enable) {
-	OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_enableRelease_1, enable);
-}
-
-public static int poolCountHighWaterMark() {
-	return OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_poolCountHighWaterMark);
-}
-
-public static int poolCountHighWaterResolution() {
-	return OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_poolCountHighWaterResolution);
-}
-
-public static void resetTotalAutoreleasedObjects() {
-	OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_resetTotalAutoreleasedObjects);
-}
-
-public static void setPoolCountHighWaterMark(int count) {
-	OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_setPoolCountHighWaterMark_1, count);
-}
-
-public static void setPoolCountHighWaterResolution(int res) {
-	OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_setPoolCountHighWaterResolution_1, res);
-}
-
-public static void showPools() {
-	OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_showPools);
-}
-
-public static void static_addObject_(id anObject) {
-	OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_addObject_1, anObject != null ? anObject.id : 0);
-}
-
-public static int topAutoreleasePoolCount() {
-	return OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_topAutoreleasePoolCount);
-}
-
-public static int totalAutoreleasedObjects() {
-	return OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_totalAutoreleasedObjects);
+	OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_enableFreedObjectCheck_, enable);
 }
 
 }
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 5d01559bb1..fde2cfa77a 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,7 +16,11 @@ public NSBezierPath() {
 	super();
 }
 
-public NSBezierPath(int id) {
+public NSBezierPath(int /*long*/ id) {
+	super(id);
+}
+
+public NSBezierPath(id id) {
 	super(id);
 }
 
@@ -25,47 +29,31 @@ public void addClip() {
 }
 
 public void appendBezierPath(NSBezierPath path) {
-	OS.objc_msgSend(this.id, OS.sel_appendBezierPath_1, path != null ? path.id : 0);
-}
-
-public void appendBezierPathWithArcFromPoint(NSPoint point1, NSPoint point2, float radius) {
-	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithArcFromPoint_1toPoint_1radius_1, point1, point2, radius);
+	OS.objc_msgSend(this.id, OS.sel_appendBezierPath_, path != null ? path.id : 0);
 }
 
-public void appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_(NSPoint center, float radius, float startAngle, float endAngle) {
-	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithArcWithCenter_1radius_1startAngle_1endAngle_1, center, radius, startAngle, endAngle);
+public void appendBezierPathWithArcWithCenter(NSPoint center, float radius, float startAngle, float endAngle) {
+	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_, center, radius, startAngle, endAngle);
 }
 
-public void appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_(NSPoint center, float radius, float startAngle, float endAngle, boolean clockwise) {
-	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithArcWithCenter_1radius_1startAngle_1endAngle_1clockwise_1, center, radius, startAngle, endAngle, clockwise);
-}
-
-public void appendBezierPathWithGlyph(int glyph, NSFont font) {
-	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithGlyph_1inFont_1, glyph, font != null ? font.id : 0);
+public void appendBezierPathWithArcWithCenter(NSPoint center, float radius, float startAngle, float 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) {
-	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithGlyphs_1count_1inFont_1, glyphs, count, font != null ? font.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithGlyphs_count_inFont_, glyphs, count, font != null ? font.id : 0);
 }
 
 public void appendBezierPathWithOvalInRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithOvalInRect_1, rect);
-}
-
-public void appendBezierPathWithPackedGlyphs(int packedGlyphs) {
-	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithPackedGlyphs_1, packedGlyphs);
-}
-
-public void appendBezierPathWithPoints(int points, int count) {
-	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithPoints_1count_1, points, count);
+	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithOvalInRect_, rect);
 }
 
 public void appendBezierPathWithRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithRect_1, rect);
+	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithRect_, rect);
 }
 
 public void appendBezierPathWithRoundedRect(NSRect rect, float xRadius, float yRadius) {
-	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithRoundedRect_1xRadius_1yRadius_1, rect, xRadius, yRadius);
+	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithRoundedRect_xRadius_yRadius_, rect, xRadius, yRadius);
 }
 
 public static NSBezierPath bezierPath() {
@@ -78,23 +66,8 @@ public NSBezierPath bezierPathByFlatteningPath() {
 	return result == this.id ? this : (result != 0 ? new NSBezierPath(result) : null);
 }
 
-public NSBezierPath bezierPathByReversingPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_bezierPathByReversingPath);
-	return result == this.id ? this : (result != 0 ? new NSBezierPath(result) : null);
-}
-
-public static NSBezierPath bezierPathWithOvalInRect(NSRect rect) {
-	int result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPathWithOvalInRect_1, rect);
-	return result != 0 ? new NSBezierPath(result) : null;
-}
-
 public static NSBezierPath bezierPathWithRect(NSRect rect) {
-	int result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPathWithRect_1, rect);
-	return result != 0 ? new NSBezierPath(result) : null;
-}
-
-public static NSBezierPath bezierPathWithRoundedRect(NSRect rect, float xRadius, float yRadius) {
-	int result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPathWithRoundedRect_1xRadius_1yRadius_1, rect, xRadius, yRadius);
+	int result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPathWithRect_, rect);
 	return result != 0 ? new NSBezierPath(result) : null;
 }
 
@@ -104,20 +77,12 @@ public NSRect bounds() {
 	return result;
 }
 
-public boolean cachesBezierPath() {
-	return OS.objc_msgSend(this.id, OS.sel_cachesBezierPath) != 0;
-}
-
-public static void clipRect(NSRect rect) {
-	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_clipRect_1, rect);
-}
-
 public void closePath() {
 	OS.objc_msgSend(this.id, OS.sel_closePath);
 }
 
 public boolean containsPoint(NSPoint point) {
-	return OS.objc_msgSend(this.id, OS.sel_containsPoint_1, point) != 0;
+	return OS.objc_msgSend(this.id, OS.sel_containsPoint_, point) != 0;
 }
 
 public NSRect controlPointBounds() {
@@ -133,43 +98,15 @@ public NSPoint currentPoint() {
 }
 
 public void curveToPoint(NSPoint endPoint, NSPoint controlPoint1, NSPoint controlPoint2) {
-	OS.objc_msgSend(this.id, OS.sel_curveToPoint_1controlPoint1_1controlPoint2_1, endPoint, controlPoint1, controlPoint2);
+	OS.objc_msgSend(this.id, OS.sel_curveToPoint_controlPoint1_controlPoint2_, endPoint, controlPoint1, controlPoint2);
 }
 
 public static float defaultFlatness() {
 	return (float)OS.objc_msgSend_fpret(OS.class_NSBezierPath, OS.sel_defaultFlatness);
 }
 
-public static int defaultLineCapStyle() {
-	return OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_defaultLineCapStyle);
-}
-
-public static int defaultLineJoinStyle() {
-	return OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_defaultLineJoinStyle);
-}
-
-public static float defaultLineWidth() {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSBezierPath, OS.sel_defaultLineWidth);
-}
-
-public static float defaultMiterLimit() {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSBezierPath, OS.sel_defaultMiterLimit);
-}
-
-public static int defaultWindingRule() {
-	return OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_defaultWindingRule);
-}
-
-public static void drawPackedGlyphs(int packedGlyphs, NSPoint point) {
-	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_drawPackedGlyphs_1atPoint_1, packedGlyphs, point);
-}
-
-public int elementAtIndex_(int index) {
-	return OS.objc_msgSend(this.id, OS.sel_elementAtIndex_1, index);
-}
-
-public int elementAtIndex_associatedPoints_(int index, int points) {
-	return OS.objc_msgSend(this.id, OS.sel_elementAtIndex_1associatedPoints_1, index, points);
+public int elementAtIndex(int index, int points) {
+	return OS.objc_msgSend(this.id, OS.sel_elementAtIndex_associatedPoints_, index, points);
 }
 
 public int elementCount() {
@@ -181,143 +118,67 @@ public void fill() {
 }
 
 public static void fillRect(NSRect rect) {
-	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_fillRect_1, rect);
-}
-
-public float flatness() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_flatness);
-}
-
-public void getLineDash(int pattern, int count, int phase) {
-	OS.objc_msgSend(this.id, OS.sel_getLineDash_1count_1phase_1, pattern, count, phase);
+	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_fillRect_, rect);
 }
 
 public boolean isEmpty() {
 	return OS.objc_msgSend(this.id, OS.sel_isEmpty) != 0;
 }
 
-public int lineCapStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_lineCapStyle);
-}
-
-public int lineJoinStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_lineJoinStyle);
-}
-
 public void lineToPoint(NSPoint point) {
-	OS.objc_msgSend(this.id, OS.sel_lineToPoint_1, point);
-}
-
-public float lineWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_lineWidth);
-}
-
-public float miterLimit() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_miterLimit);
+	OS.objc_msgSend(this.id, OS.sel_lineToPoint_, point);
 }
 
 public void moveToPoint(NSPoint point) {
-	OS.objc_msgSend(this.id, OS.sel_moveToPoint_1, point);
-}
-
-public void relativeCurveToPoint(NSPoint endPoint, NSPoint controlPoint1, NSPoint controlPoint2) {
-	OS.objc_msgSend(this.id, OS.sel_relativeCurveToPoint_1controlPoint1_1controlPoint2_1, endPoint, controlPoint1, controlPoint2);
-}
-
-public void relativeLineToPoint(NSPoint point) {
-	OS.objc_msgSend(this.id, OS.sel_relativeLineToPoint_1, point);
-}
-
-public void relativeMoveToPoint(NSPoint point) {
-	OS.objc_msgSend(this.id, OS.sel_relativeMoveToPoint_1, point);
+	OS.objc_msgSend(this.id, OS.sel_moveToPoint_, point);
 }
 
 public void removeAllPoints() {
 	OS.objc_msgSend(this.id, OS.sel_removeAllPoints);
 }
 
-public void setAssociatedPoints(int points, int index) {
-	OS.objc_msgSend(this.id, OS.sel_setAssociatedPoints_1atIndex_1, points, index);
-}
-
-public void setCachesBezierPath(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCachesBezierPath_1, flag);
-}
-
 public void setClip() {
 	OS.objc_msgSend(this.id, OS.sel_setClip);
 }
 
 public static void setDefaultFlatness(float flatness) {
-	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultFlatness_1, flatness);
-}
-
-public static void setDefaultLineCapStyle(int lineCapStyle) {
-	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultLineCapStyle_1, lineCapStyle);
-}
-
-public static void setDefaultLineJoinStyle(int lineJoinStyle) {
-	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultLineJoinStyle_1, lineJoinStyle);
-}
-
-public static void setDefaultLineWidth(float lineWidth) {
-	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultLineWidth_1, lineWidth);
-}
-
-public static void setDefaultMiterLimit(float limit) {
-	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultMiterLimit_1, limit);
-}
-
-public static void setDefaultWindingRule(int windingRule) {
-	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultWindingRule_1, windingRule);
-}
-
-public void setFlatness(float flatness) {
-	OS.objc_msgSend(this.id, OS.sel_setFlatness_1, flatness);
+	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultFlatness_, flatness);
 }
 
 public void setLineCapStyle(int lineCapStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setLineCapStyle_1, lineCapStyle);
+	OS.objc_msgSend(this.id, OS.sel_setLineCapStyle_, lineCapStyle);
 }
 
 public void setLineDash(float[] pattern, int count, float phase) {
-	OS.objc_msgSend(this.id, OS.sel_setLineDash_1count_1phase_1, pattern, count, phase);
+	OS.objc_msgSend(this.id, OS.sel_setLineDash_count_phase_, pattern, count, phase);
 }
 
 public void setLineJoinStyle(int lineJoinStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setLineJoinStyle_1, lineJoinStyle);
+	OS.objc_msgSend(this.id, OS.sel_setLineJoinStyle_, lineJoinStyle);
 }
 
 public void setLineWidth(float lineWidth) {
-	OS.objc_msgSend(this.id, OS.sel_setLineWidth_1, lineWidth);
+	OS.objc_msgSend(this.id, OS.sel_setLineWidth_, lineWidth);
 }
 
 public void setMiterLimit(float miterLimit) {
-	OS.objc_msgSend(this.id, OS.sel_setMiterLimit_1, miterLimit);
+	OS.objc_msgSend(this.id, OS.sel_setMiterLimit_, miterLimit);
 }
 
 public void setWindingRule(int windingRule) {
-	OS.objc_msgSend(this.id, OS.sel_setWindingRule_1, windingRule);
+	OS.objc_msgSend(this.id, OS.sel_setWindingRule_, windingRule);
 }
 
 public void stroke() {
 	OS.objc_msgSend(this.id, OS.sel_stroke);
 }
 
-public static void strokeLineFromPoint(NSPoint point1, NSPoint point2) {
-	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_strokeLineFromPoint_1toPoint_1, point1, point2);
-}
-
 public static void strokeRect(NSRect rect) {
-	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_strokeRect_1, rect);
+	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_strokeRect_, rect);
 }
 
 public void transformUsingAffineTransform(NSAffineTransform transform) {
-	OS.objc_msgSend(this.id, OS.sel_transformUsingAffineTransform_1, transform != null ? transform.id : 0);
-}
-
-public int windingRule() {
-	return OS.objc_msgSend(this.id, OS.sel_windingRule);
+	OS.objc_msgSend(this.id, OS.sel_transformUsingAffineTransform_, transform != null ? transform.id : 0);
 }
 
 }
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 35cd2b772c..ed97cd5ba6 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,42 +16,18 @@ public NSBitmapImageRep() {
 	super();
 }
 
-public NSBitmapImageRep(int id) {
+public NSBitmapImageRep(int /*long*/ id) {
 	super(id);
 }
 
-public int CGImage() {
-	return OS.objc_msgSend(this.id, OS.sel_CGImage);
-}
-
-public NSData TIFFRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentation);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public static NSData static_TIFFRepresentationOfImageRepsInArray_(NSArray array) {
-	int result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_TIFFRepresentationOfImageRepsInArray_1, array != null ? array.id : 0);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public static NSData static_TIFFRepresentationOfImageRepsInArray_usingCompression_factor_(NSArray array, int comp, float factor) {
-	int result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_TIFFRepresentationOfImageRepsInArray_1usingCompression_1factor_1, array != null ? array.id : 0, comp, factor);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSData TIFFRepresentationUsingCompression(int comp, float factor) {
-	int result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentationUsingCompression_1factor_1, comp, factor);
-	return result != 0 ? new NSData(result) : null;
+public NSBitmapImageRep(id id) {
+	super(id);
 }
 
 public int bitmapData() {
 	return OS.objc_msgSend(this.id, OS.sel_bitmapData);
 }
 
-public int bitmapFormat() {
-	return OS.objc_msgSend(this.id, OS.sel_bitmapFormat);
-}
-
 public int bitsPerPixel() {
 	return OS.objc_msgSend(this.id, OS.sel_bitsPerPixel);
 }
@@ -64,130 +40,22 @@ public int bytesPerRow() {
 	return OS.objc_msgSend(this.id, OS.sel_bytesPerRow);
 }
 
-public boolean canBeCompressedUsing(int compression) {
-	return OS.objc_msgSend(this.id, OS.sel_canBeCompressedUsing_1, compression) != 0;
-}
-
-public NSColor colorAtX(int x, int y) {
-	int result = OS.objc_msgSend(this.id, OS.sel_colorAtX_1y_1, x, y);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public void colorizeByMappingGray(float midPoint, NSColor midPointColor, NSColor shadowColor, NSColor lightColor) {
-	OS.objc_msgSend(this.id, OS.sel_colorizeByMappingGray_1toColor_1blackMapping_1whiteMapping_1, midPoint, midPointColor != null ? midPointColor.id : 0, shadowColor != null ? shadowColor.id : 0, lightColor != null ? lightColor.id : 0);
+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);
+	return result == this.id ? this : (result != 0 ? new NSBitmapImageRep(result) : null);
 }
 
-public void getBitmapDataPlanes(int data) {
-	OS.objc_msgSend(this.id, OS.sel_getBitmapDataPlanes_1, data);
-}
-
-public void getCompression(int compression, int factor) {
-	OS.objc_msgSend(this.id, OS.sel_getCompression_1factor_1, compression, factor);
-}
-
-public void getPixel(int p, int x, int y) {
-	OS.objc_msgSend(this.id, OS.sel_getPixel_1atX_1y_1, p, x, y);
-}
-
-public static void getTIFFCompressionTypes(int list, int numTypes) {
-	OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_getTIFFCompressionTypes_1count_1, list, numTypes);
-}
-
-public static id imageRepWithData(NSData data) {
-	int result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_imageRepWithData_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSArray imageRepsWithData(NSData data) {
-	int result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_imageRepsWithData_1, data != null ? data.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public int incrementalLoadFromData(NSData data, boolean complete) {
-	return OS.objc_msgSend(this.id, OS.sel_incrementalLoadFromData_1complete_1, data != null ? data.id : 0, complete);
-}
-
-public NSBitmapImageRep initForIncrementalLoad() {
-	int result = OS.objc_msgSend(this.id, OS.sel_initForIncrementalLoad);
-	return result != 0 ? this : null;
-}
-
-public NSBitmapImageRep initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(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_1pixelsWide_1pixelsHigh_1bitsPerSample_1samplesPerPixel_1hasAlpha_1isPlanar_1colorSpaceName_1bitmapFormat_1bytesPerRow_1bitsPerPixel_1, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, bitmapFormat, rBytes, pBits);
-	return result != 0 ? this : null;
-}
-
-public NSBitmapImageRep initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_(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_1pixelsWide_1pixelsHigh_1bitsPerSample_1samplesPerPixel_1hasAlpha_1isPlanar_1colorSpaceName_1bytesPerRow_1bitsPerPixel_1, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, rBytes, pBits);
-	return result != 0 ? this : null;
-}
-
-public NSBitmapImageRep initWithCGImage(int cgImage) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCGImage_1, cgImage);
-	return result != 0 ? this : null;
-}
-
-public NSBitmapImageRep initWithCIImage(CIImage ciImage) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCIImage_1, ciImage != null ? ciImage.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSBitmapImageRep initWithData(NSData data) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_1, data != null ? data.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSBitmapImageRep initWithFocusedViewRect(NSRect rect) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFocusedViewRect_1, rect);
-	return result != 0 ? this : 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);
+	return result == this.id ? this : (result != 0 ? new NSBitmapImageRep(result) : null);
 }
 
 public boolean isPlanar() {
 	return OS.objc_msgSend(this.id, OS.sel_isPlanar) != 0;
 }
 
-public static NSString localizedNameForTIFFCompressionType(int compression) {
-	int result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_localizedNameForTIFFCompressionType_1, compression);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int numberOfPlanes() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfPlanes);
-}
-
-public static NSData representationOfImageRepsInArray(NSArray imageReps, int storageType, NSDictionary properties) {
-	int result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_representationOfImageRepsInArray_1usingType_1properties_1, imageReps != null ? imageReps.id : 0, storageType, properties != null ? properties.id : 0);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSData representationUsingType(int storageType, NSDictionary properties) {
-	int result = OS.objc_msgSend(this.id, OS.sel_representationUsingType_1properties_1, storageType, properties != null ? properties.id : 0);
-	return result != 0 ? new NSData(result) : null;
-}
-
 public int samplesPerPixel() {
 	return OS.objc_msgSend(this.id, OS.sel_samplesPerPixel);
 }
 
-public void setColor(NSColor color, int x, int y) {
-	OS.objc_msgSend(this.id, OS.sel_setColor_1atX_1y_1, color != null ? color.id : 0, x, y);
-}
-
-public void setCompression(int compression, float factor) {
-	OS.objc_msgSend(this.id, OS.sel_setCompression_1factor_1, compression, factor);
-}
-
-public void setPixel(int p, int x, int y) {
-	OS.objc_msgSend(this.id, OS.sel_setPixel_1atX_1y_1, p, x, y);
-}
-
-public void setProperty(NSString property, id value) {
-	OS.objc_msgSend(this.id, OS.sel_setProperty_1withValue_1, property != null ? property.id : 0, value != null ? value.id : 0);
-}
-
-public id valueForProperty(NSString property) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueForProperty_1, property != null ? property.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/NSBox.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java
index 1700e2e83b..8fa9bd7880 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
@@ -16,36 +16,12 @@ public NSBox() {
 	super();
 }
 
-public NSBox(int id) {
+public NSBox(int /*long*/ id) {
 	super(id);
 }
 
-public NSColor borderColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_borderColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSRect borderRect() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_borderRect);
-	return result;
-}
-
-public int borderType() {
-	return OS.objc_msgSend(this.id, OS.sel_borderType);
-}
-
-public float borderWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_borderWidth);
-}
-
-public int boxType() {
-	return OS.objc_msgSend(this.id, OS.sel_boxType);
-}
-
-public NSView contentView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_contentView);
-	return result != 0 ? new NSView(result) : null;
+public NSBox(id id) {
+	super(id);
 }
 
 public NSSize contentViewMargins() {
@@ -54,102 +30,40 @@ public NSSize contentViewMargins() {
 	return result;
 }
 
-public float cornerRadius() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_cornerRadius);
-}
-
-public NSColor fillColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fillColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public boolean isTransparent() {
-	return OS.objc_msgSend(this.id, OS.sel_isTransparent) != 0;
-}
-
-public void setBorderColor(NSColor borderColor) {
-	OS.objc_msgSend(this.id, OS.sel_setBorderColor_1, borderColor != null ? borderColor.id : 0);
-}
-
 public void setBorderType(int aType) {
-	OS.objc_msgSend(this.id, OS.sel_setBorderType_1, aType);
+	OS.objc_msgSend(this.id, OS.sel_setBorderType_, aType);
 }
 
 public void setBorderWidth(float borderWidth) {
-	OS.objc_msgSend(this.id, OS.sel_setBorderWidth_1, borderWidth);
+	OS.objc_msgSend(this.id, OS.sel_setBorderWidth_, borderWidth);
 }
 
 public void setBoxType(int boxType) {
-	OS.objc_msgSend(this.id, OS.sel_setBoxType_1, boxType);
+	OS.objc_msgSend(this.id, OS.sel_setBoxType_, boxType);
 }
 
 public void setContentView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_setContentView_1, aView != null ? aView.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setContentView_, aView != null ? aView.id : 0);
 }
 
 public void setContentViewMargins(NSSize offsetSize) {
-	OS.objc_msgSend(this.id, OS.sel_setContentViewMargins_1, offsetSize);
-}
-
-public void setCornerRadius(float cornerRadius) {
-	OS.objc_msgSend(this.id, OS.sel_setCornerRadius_1, cornerRadius);
-}
-
-public void setFillColor(NSColor fillColor) {
-	OS.objc_msgSend(this.id, OS.sel_setFillColor_1, fillColor != null ? fillColor.id : 0);
-}
-
-public void setFrameFromContentFrame(NSRect contentFrame) {
-	OS.objc_msgSend(this.id, OS.sel_setFrameFromContentFrame_1, contentFrame);
+	OS.objc_msgSend(this.id, OS.sel_setContentViewMargins_, offsetSize);
 }
 
 public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, aString != null ? aString.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0);
 }
 
 public void setTitleFont(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleFont_1, fontObj != null ? fontObj.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setTitleFont_, fontObj != null ? fontObj.id : 0);
 }
 
 public void setTitlePosition(int aPosition) {
-	OS.objc_msgSend(this.id, OS.sel_setTitlePosition_1, aPosition);
-}
-
-public void setTitleWithMnemonic(NSString stringWithAmpersand) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleWithMnemonic_1, stringWithAmpersand != null ? stringWithAmpersand.id : 0);
-}
-
-public void setTransparent(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setTransparent_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setTitlePosition_, aPosition);
 }
 
 public void sizeToFit() {
 	OS.objc_msgSend(this.id, OS.sel_sizeToFit);
 }
 
-public NSString title() {
-	int result = OS.objc_msgSend(this.id, OS.sel_title);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSCell titleCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_titleCell);
-	return result != 0 ? new NSCell(result) : null;
-}
-
-public NSFont titleFont() {
-	int result = OS.objc_msgSend(this.id, OS.sel_titleFont);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public int titlePosition() {
-	return OS.objc_msgSend(this.id, OS.sel_titlePosition);
-}
-
-public NSRect titleRect() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_titleRect);
-	return result;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowser.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowser.java
deleted file mode 100644
index 407df55a9c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowser.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSBrowser extends NSControl {
-
-public NSBrowser() {
-	super();
-}
-
-public NSBrowser(int id) {
-	super(id);
-}
-
-public boolean acceptsArrowKeys() {
-	return OS.objc_msgSend(this.id, OS.sel_acceptsArrowKeys) != 0;
-}
-
-public void addColumn() {
-	OS.objc_msgSend(this.id, OS.sel_addColumn);
-}
-
-public boolean allowsBranchSelection() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsBranchSelection) != 0;
-}
-
-public boolean allowsEmptySelection() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsEmptySelection) != 0;
-}
-
-public boolean allowsMultipleSelection() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsMultipleSelection) != 0;
-}
-
-public boolean allowsTypeSelect() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsTypeSelect) != 0;
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public boolean canDragRowsWithIndexes(NSIndexSet rowIndexes, int column, NSEvent event) {
-	return OS.objc_msgSend(this.id, OS.sel_canDragRowsWithIndexes_1inColumn_1withEvent_1, rowIndexes != null ? rowIndexes.id : 0, column, event != null ? event.id : 0) != 0;
-}
-
-public static int cellClass() {
-	return OS.objc_msgSend(OS.class_NSBrowser, OS.sel_cellClass);
-}
-
-public id cellPrototype() {
-	int result = OS.objc_msgSend(this.id, OS.sel_cellPrototype);
-	return result != 0 ? new id(result) : null;
-}
-
-public float columnContentWidthForColumnWidth(float columnWidth) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_columnContentWidthForColumnWidth_1, columnWidth);
-}
-
-public int columnOfMatrix(NSMatrix matrix) {
-	return OS.objc_msgSend(this.id, OS.sel_columnOfMatrix_1, matrix != null ? matrix.id : 0);
-}
-
-public int columnResizingType() {
-	return OS.objc_msgSend(this.id, OS.sel_columnResizingType);
-}
-
-public float columnWidthForColumnContentWidth(float columnContentWidth) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_columnWidthForColumnContentWidth_1, columnContentWidth);
-}
-
-public NSString columnsAutosaveName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_columnsAutosaveName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void displayAllColumns() {
-	OS.objc_msgSend(this.id, OS.sel_displayAllColumns);
-}
-
-public void displayColumn(int column) {
-	OS.objc_msgSend(this.id, OS.sel_displayColumn_1, column);
-}
-
-public void doClick(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_doClick_1, sender != null ? sender.id : 0);
-}
-
-public void doDoubleClick(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_doDoubleClick_1, sender != null ? sender.id : 0);
-}
-
-public int doubleAction() {
-	return OS.objc_msgSend(this.id, OS.sel_doubleAction);
-}
-
-public NSImage draggingImageForRowsWithIndexes(NSIndexSet rowIndexes, int column, NSEvent event, int dragImageOffset) {
-	int result = OS.objc_msgSend(this.id, OS.sel_draggingImageForRowsWithIndexes_1inColumn_1withEvent_1offset_1, rowIndexes != null ? rowIndexes.id : 0, column, event != null ? event.id : 0, dragImageOffset);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public void drawTitleOfColumn(int column, NSRect aRect) {
-	OS.objc_msgSend(this.id, OS.sel_drawTitleOfColumn_1inRect_1, column, aRect);
-}
-
-public int firstVisibleColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_firstVisibleColumn);
-}
-
-public NSRect frameOfColumn(int column) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_frameOfColumn_1, column);
-	return result;
-}
-
-public NSRect frameOfInsideOfColumn(int column) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_frameOfInsideOfColumn_1, column);
-	return result;
-}
-
-public boolean hasHorizontalScroller() {
-	return OS.objc_msgSend(this.id, OS.sel_hasHorizontalScroller) != 0;
-}
-
-public boolean isLoaded() {
-	return OS.objc_msgSend(this.id, OS.sel_isLoaded) != 0;
-}
-
-public boolean isTitled() {
-	return OS.objc_msgSend(this.id, OS.sel_isTitled) != 0;
-}
-
-public int lastColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_lastColumn);
-}
-
-public int lastVisibleColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_lastVisibleColumn);
-}
-
-public void loadColumnZero() {
-	OS.objc_msgSend(this.id, OS.sel_loadColumnZero);
-}
-
-public id loadedCellAtRow(int row, int col) {
-	int result = OS.objc_msgSend(this.id, OS.sel_loadedCellAtRow_1column_1, row, col);
-	return result != 0 ? new id(result) : null;
-}
-
-public int matrixClass() {
-	return OS.objc_msgSend(this.id, OS.sel_matrixClass);
-}
-
-public NSMatrix matrixInColumn(int column) {
-	int result = OS.objc_msgSend(this.id, OS.sel_matrixInColumn_1, column);
-	return result != 0 ? new NSMatrix(result) : null;
-}
-
-public int maxVisibleColumns() {
-	return OS.objc_msgSend(this.id, OS.sel_maxVisibleColumns);
-}
-
-public float minColumnWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_minColumnWidth);
-}
-
-public int numberOfVisibleColumns() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfVisibleColumns);
-}
-
-public NSString path() {
-	int result = OS.objc_msgSend(this.id, OS.sel_path);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString pathSeparator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathSeparator);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString pathToColumn(int column) {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathToColumn_1, column);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean prefersAllColumnUserResizing() {
-	return OS.objc_msgSend(this.id, OS.sel_prefersAllColumnUserResizing) != 0;
-}
-
-public void reloadColumn(int column) {
-	OS.objc_msgSend(this.id, OS.sel_reloadColumn_1, column);
-}
-
-public static void removeSavedColumnsWithAutosaveName(NSString name) {
-	OS.objc_msgSend(OS.class_NSBrowser, OS.sel_removeSavedColumnsWithAutosaveName_1, name != null ? name.id : 0);
-}
-
-public boolean reusesColumns() {
-	return OS.objc_msgSend(this.id, OS.sel_reusesColumns) != 0;
-}
-
-public void scrollColumnToVisible(int column) {
-	OS.objc_msgSend(this.id, OS.sel_scrollColumnToVisible_1, column);
-}
-
-public void scrollColumnsLeftBy(int shiftAmount) {
-	OS.objc_msgSend(this.id, OS.sel_scrollColumnsLeftBy_1, shiftAmount);
-}
-
-public void scrollColumnsRightBy(int shiftAmount) {
-	OS.objc_msgSend(this.id, OS.sel_scrollColumnsRightBy_1, shiftAmount);
-}
-
-public void scrollViaScroller(NSScroller sender) {
-	OS.objc_msgSend(this.id, OS.sel_scrollViaScroller_1, sender != null ? sender.id : 0);
-}
-
-public void selectAll(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectAll_1, sender != null ? sender.id : 0);
-}
-
-public void selectRow(int row, int column) {
-	OS.objc_msgSend(this.id, OS.sel_selectRow_1inColumn_1, row, column);
-}
-
-public void selectRowIndexes(NSIndexSet indexes, int column) {
-	OS.objc_msgSend(this.id, OS.sel_selectRowIndexes_1inColumn_1, indexes != null ? indexes.id : 0, column);
-}
-
-public id selectedCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedCell);
-	return result != 0 ? new id(result) : null;
-}
-
-public id selectedCellInColumn(int column) {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedCellInColumn_1, column);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSArray selectedCells() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedCells);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public int selectedColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_selectedColumn);
-}
-
-public int selectedRowInColumn(int column) {
-	return OS.objc_msgSend(this.id, OS.sel_selectedRowInColumn_1, column);
-}
-
-public NSIndexSet selectedRowIndexesInColumn(int column) {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedRowIndexesInColumn_1, column);
-	return result != 0 ? new NSIndexSet(result) : null;
-}
-
-public boolean sendAction() {
-	return OS.objc_msgSend(this.id, OS.sel_sendAction) != 0;
-}
-
-public boolean sendsActionOnArrowKeys() {
-	return OS.objc_msgSend(this.id, OS.sel_sendsActionOnArrowKeys) != 0;
-}
-
-public boolean separatesColumns() {
-	return OS.objc_msgSend(this.id, OS.sel_separatesColumns) != 0;
-}
-
-public void setAcceptsArrowKeys(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAcceptsArrowKeys_1, flag);
-}
-
-public void setAllowsBranchSelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsBranchSelection_1, flag);
-}
-
-public void setAllowsEmptySelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsEmptySelection_1, flag);
-}
-
-public void setAllowsMultipleSelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsMultipleSelection_1, flag);
-}
-
-public void setAllowsTypeSelect(boolean value) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsTypeSelect_1, value);
-}
-
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-//public void setCellClass(int factoryId) {
-//	OS.objc_msgSend(this.id, OS.sel_setCellClass_1, factoryId);
-//}
-
-public void setCellPrototype(NSCell aCell) {
-	OS.objc_msgSend(this.id, OS.sel_setCellPrototype_1, aCell != null ? aCell.id : 0);
-}
-
-public void setColumnResizingType(int columnResizingType) {
-	OS.objc_msgSend(this.id, OS.sel_setColumnResizingType_1, columnResizingType);
-}
-
-public void setColumnsAutosaveName(NSString name) {
-	OS.objc_msgSend(this.id, OS.sel_setColumnsAutosaveName_1, name != null ? name.id : 0);
-}
-
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public void setDoubleAction(int aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_setDoubleAction_1, aSelector);
-}
-
-public void setDraggingSourceOperationMask(int mask, boolean isLocal) {
-	OS.objc_msgSend(this.id, OS.sel_setDraggingSourceOperationMask_1forLocal_1, mask, isLocal);
-}
-
-public void setHasHorizontalScroller(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHasHorizontalScroller_1, flag);
-}
-
-public void setLastColumn(int column) {
-	OS.objc_msgSend(this.id, OS.sel_setLastColumn_1, column);
-}
-
-public void setMatrixClass(int factoryId) {
-	OS.objc_msgSend(this.id, OS.sel_setMatrixClass_1, factoryId);
-}
-
-public void setMaxVisibleColumns(int columnCount) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxVisibleColumns_1, columnCount);
-}
-
-public void setMinColumnWidth(float columnWidth) {
-	OS.objc_msgSend(this.id, OS.sel_setMinColumnWidth_1, columnWidth);
-}
-
-public boolean setPath(NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_setPath_1, path != null ? path.id : 0) != 0;
-}
-
-public void setPathSeparator(NSString newString) {
-	OS.objc_msgSend(this.id, OS.sel_setPathSeparator_1, newString != null ? newString.id : 0);
-}
-
-public void setPrefersAllColumnUserResizing(boolean prefersAllColumnResizing) {
-	OS.objc_msgSend(this.id, OS.sel_setPrefersAllColumnUserResizing_1, prefersAllColumnResizing);
-}
-
-public void setReusesColumns(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setReusesColumns_1, flag);
-}
-
-public void setSendsActionOnArrowKeys(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSendsActionOnArrowKeys_1, flag);
-}
-
-public void setSeparatesColumns(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSeparatesColumns_1, flag);
-}
-
-public void setTakesTitleFromPreviousColumn(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setTakesTitleFromPreviousColumn_1, flag);
-}
-
-public void setTitle(NSString aString, int column) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1ofColumn_1, aString != null ? aString.id : 0, column);
-}
-
-public void setTitled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setTitled_1, flag);
-}
-
-public void setWidth(float columnWidth, int columnIndex) {
-	OS.objc_msgSend(this.id, OS.sel_setWidth_1ofColumn_1, columnWidth, columnIndex);
-}
-
-public boolean takesTitleFromPreviousColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_takesTitleFromPreviousColumn) != 0;
-}
-
-public void tile() {
-	OS.objc_msgSend(this.id, OS.sel_tile);
-}
-
-public NSRect titleFrameOfColumn(int column) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_titleFrameOfColumn_1, column);
-	return result;
-}
-
-public float titleHeight() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_titleHeight);
-}
-
-public NSString titleOfColumn(int column) {
-	int result = OS.objc_msgSend(this.id, OS.sel_titleOfColumn_1, column);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void updateScroller() {
-	OS.objc_msgSend(this.id, OS.sel_updateScroller);
-}
-
-public void validateVisibleColumns() {
-	OS.objc_msgSend(this.id, OS.sel_validateVisibleColumns);
-}
-
-public float widthOfColumn(int column) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_widthOfColumn_1, column);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java
index b25ef2ffcc..243a3d2c22 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,65 +16,16 @@ public NSBrowserCell() {
 	super();
 }
 
-public NSBrowserCell(int id) {
+public NSBrowserCell(int /*long*/ id) {
 	super(id);
 }
 
-public NSImage alternateImage() {
-	int result = OS.objc_msgSend(this.id, OS.sel_alternateImage);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public static NSImage branchImage() {
-	int result = OS.objc_msgSend(OS.class_NSBrowserCell, OS.sel_branchImage);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSColor highlightColorInView(NSView controlView) {
-	int result = OS.objc_msgSend(this.id, OS.sel_highlightColorInView_1, controlView != null ? controlView.id : 0);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSImage highlightedBranchImage() {
-	int result = OS.objc_msgSend(OS.class_NSBrowserCell, OS.sel_highlightedBranchImage);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSImage image() {
-	int result = OS.objc_msgSend(this.id, OS.sel_image);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public boolean isLeaf() {
-	return OS.objc_msgSend(this.id, OS.sel_isLeaf) != 0;
-}
-
-public boolean isLoaded() {
-	return OS.objc_msgSend(this.id, OS.sel_isLoaded) != 0;
-}
-
-public void reset() {
-	OS.objc_msgSend(this.id, OS.sel_reset);
-}
-
-public void set() {
-	OS.objc_msgSend(this.id, OS.sel_set);
-}
-
-public void setAlternateImage(NSImage newAltImage) {
-	OS.objc_msgSend(this.id, OS.sel_setAlternateImage_1, newAltImage != null ? newAltImage.id : 0);
-}
-
-public void setImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1, image != null ? image.id : 0);
+public NSBrowserCell(id id) {
+	super(id);
 }
 
 public void setLeaf(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setLeaf_1, flag);
-}
-
-public void setLoaded(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setLoaded_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setLeaf_, flag);
 }
 
 }
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 03a91d1634..696d56a469 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,28 +16,16 @@ public NSBundle() {
 	super();
 }
 
-public NSBundle(int id) {
+public NSBundle(int /*long*/ id) {
 	super(id);
 }
 
-public static NSArray allBundles() {
-	int result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_allBundles);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray allFrameworks() {
-	int result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_allFrameworks);
-	return result != 0 ? new NSArray(result) : null;
+public NSBundle(id id) {
+	super(id);
 }
 
-public NSString builtInPlugInsPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_builtInPlugInsPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSBundle bundleForClass(int aClass) {
-	int result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleForClass_1, aClass);
-	return result != 0 ? new NSBundle(result) : null;
+public static boolean loadNibFile(NSString fileName, NSDictionary context, int 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() {
@@ -50,171 +38,19 @@ public NSString bundlePath() {
 	return result != 0 ? new NSString(result) : null;
 }
 
-public static NSBundle bundleWithIdentifier(NSString identifier) {
-	int result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithIdentifier_1, identifier != null ? identifier.id : 0);
-	return result != 0 ? new NSBundle(result) : null;
-}
-
 public static NSBundle bundleWithPath(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithPath_1, path != null ? path.id : 0);
+	int result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithPath_, path != null ? path.id : 0);
 	return result != 0 ? new NSBundle(result) : null;
 }
 
-public int classNamed(NSString className) {
-	return OS.objc_msgSend(this.id, OS.sel_classNamed_1, className != null ? className.id : 0);
-}
-
-public NSString developmentLocalization() {
-	int result = OS.objc_msgSend(this.id, OS.sel_developmentLocalization);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSArray executableArchitectures() {
-	int result = OS.objc_msgSend(this.id, OS.sel_executableArchitectures);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString executablePath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_executablePath);
-	return result != 0 ? new NSString(result) : null;
-}
-
 public NSDictionary infoDictionary() {
 	int result = OS.objc_msgSend(this.id, OS.sel_infoDictionary);
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
-public NSBundle initWithPath(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithPath_1, path != null ? path.id : 0);
-	return result != 0 ? this : null;
-}
-
-public boolean isLoaded() {
-	return OS.objc_msgSend(this.id, OS.sel_isLoaded) != 0;
-}
-
-//public boolean load() {
-//	return OS.objc_msgSend(this.id, OS.sel_load) != 0;
-//}
-
-public boolean loadAndReturnError(int error) {
-	return OS.objc_msgSend(this.id, OS.sel_loadAndReturnError_1, error) != 0;
-}
-
-public NSArray localizations() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizations);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSDictionary localizedInfoDictionary() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedInfoDictionary);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSString localizedStringForKey(NSString key, NSString value, NSString tableName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedStringForKey_1value_1table_1, key != null ? key.id : 0, value != null ? value.id : 0, tableName != null ? tableName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSBundle mainBundle() {
-	int result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_mainBundle);
-	return result != 0 ? new NSBundle(result) : null;
-}
-
 public id objectForInfoDictionaryKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectForInfoDictionaryKey_1, key != null ? key.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_objectForInfoDictionaryKey_, key != null ? key.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
-public NSString pathForAuxiliaryExecutable(NSString executableName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathForAuxiliaryExecutable_1, executableName != null ? executableName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString pathForResource_ofType_(NSString name, NSString ext) {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathForResource_1ofType_1, name != null ? name.id : 0, ext != null ? ext.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString pathForResource_ofType_inDirectory_(NSString name, NSString ext, NSString subpath) {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathForResource_1ofType_1inDirectory_1, name != null ? name.id : 0, ext != null ? ext.id : 0, subpath != null ? subpath.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSString static_pathForResource_ofType_inDirectory_(NSString name, NSString ext, NSString bundlePath) {
-	int result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_pathForResource_1ofType_1inDirectory_1, name != null ? name.id : 0, ext != null ? ext.id : 0, bundlePath != null ? bundlePath.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString pathForResource_ofType_inDirectory_forLocalization_(NSString name, NSString ext, NSString subpath, NSString localizationName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathForResource_1ofType_1inDirectory_1forLocalization_1, name != null ? name.id : 0, ext != null ? ext.id : 0, subpath != null ? subpath.id : 0, localizationName != null ? localizationName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSArray static_pathsForResourcesOfType_inDirectory_(NSString ext, NSString bundlePath) {
-	int result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_pathsForResourcesOfType_1inDirectory_1, ext != null ? ext.id : 0, bundlePath != null ? bundlePath.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray pathsForResourcesOfType_inDirectory_(NSString ext, NSString subpath) {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathsForResourcesOfType_1inDirectory_1, ext != null ? ext.id : 0, subpath != null ? subpath.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray pathsForResourcesOfType_inDirectory_forLocalization_(NSString ext, NSString subpath, NSString localizationName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathsForResourcesOfType_1inDirectory_1forLocalization_1, ext != null ? ext.id : 0, subpath != null ? subpath.id : 0, localizationName != null ? localizationName.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray preferredLocalizations() {
-	int result = OS.objc_msgSend(this.id, OS.sel_preferredLocalizations);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray static_preferredLocalizationsFromArray_(NSArray localizationsArray) {
-	int result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_preferredLocalizationsFromArray_1, localizationsArray != null ? localizationsArray.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray static_preferredLocalizationsFromArray_forPreferences_(NSArray localizationsArray, NSArray preferencesArray) {
-	int result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_preferredLocalizationsFromArray_1forPreferences_1, localizationsArray != null ? localizationsArray.id : 0, preferencesArray != null ? preferencesArray.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean preflightAndReturnError(int error) {
-	return OS.objc_msgSend(this.id, OS.sel_preflightAndReturnError_1, error) != 0;
-}
-
-public int principalClass() {
-	return OS.objc_msgSend(this.id, OS.sel_principalClass);
-}
-
-public NSString privateFrameworksPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_privateFrameworksPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString resourcePath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_resourcePath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString sharedFrameworksPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_sharedFrameworksPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString sharedSupportPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_sharedSupportPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean unload() {
-	return OS.objc_msgSend(this.id, OS.sel_unload) != 0;
-}
-
-public static boolean loadNibFile(id fileName, id dict, id zone) {
-	return OS.objc_msgSend(OS.class_NSBundle, OS.sel_loadNibFile_1externalNameTable_1withZone_1, fileName.id, dict.id, 0) != 0;
-}
-
 }
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 01c67943d9..6d4cef3225 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
@@ -16,172 +16,52 @@ public NSButton() {
 	super();
 }
 
-public NSButton(int id) {
+public NSButton(int /*long*/ id) {
 	super(id);
 }
 
-public boolean allowsMixedState() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsMixedState) != 0;
-}
-
-public NSImage alternateImage() {
-	int result = OS.objc_msgSend(this.id, OS.sel_alternateImage);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSString alternateTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_alternateTitle);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSAttributedString attributedAlternateTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedAlternateTitle);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public NSAttributedString attributedTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedTitle);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public int bezelStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_bezelStyle);
-}
-
-public void getPeriodicDelay(int delay, int interval) {
-	OS.objc_msgSend(this.id, OS.sel_getPeriodicDelay_1interval_1, delay, interval);
-}
-
-public void highlight(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_highlight_1, flag);
-}
-
-public NSImage image() {
-	int result = OS.objc_msgSend(this.id, OS.sel_image);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public int imagePosition() {
-	return OS.objc_msgSend(this.id, OS.sel_imagePosition);
-}
-
-public boolean isBordered() {
-	return OS.objc_msgSend(this.id, OS.sel_isBordered) != 0;
-}
-
-public boolean isTransparent() {
-	return OS.objc_msgSend(this.id, OS.sel_isTransparent) != 0;
-}
-
-public NSString keyEquivalent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keyEquivalent);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int keyEquivalentModifierMask() {
-	return OS.objc_msgSend(this.id, OS.sel_keyEquivalentModifierMask);
-}
-
-public boolean performKeyEquivalent(NSEvent key) {
-	return OS.objc_msgSend(this.id, OS.sel_performKeyEquivalent_1, key != null ? key.id : 0) != 0;
+public NSButton(id id) {
+	super(id);
 }
 
 public void setAllowsMixedState(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsMixedState_1, flag);
-}
-
-public void setAlternateImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setAlternateImage_1, image != null ? image.id : 0);
-}
-
-public void setAlternateTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setAlternateTitle_1, aString != null ? aString.id : 0);
-}
-
-public void setAttributedAlternateTitle(NSAttributedString obj) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedAlternateTitle_1, obj != null ? obj.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setAllowsMixedState_, flag);
 }
 
 public void setAttributedTitle(NSAttributedString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedTitle_1, aString != null ? aString.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setAttributedTitle_, aString != null ? aString.id : 0);
 }
 
 public void setBezelStyle(int bezelStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setBezelStyle_1, bezelStyle);
+	OS.objc_msgSend(this.id, OS.sel_setBezelStyle_, bezelStyle);
 }
 
 public void setBordered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBordered_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setBordered_, flag);
 }
 
 public void setButtonType(int aType) {
-	OS.objc_msgSend(this.id, OS.sel_setButtonType_1, aType);
+	OS.objc_msgSend(this.id, OS.sel_setButtonType_, aType);
 }
 
 public void setImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1, image != null ? image.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setImage_, image != null ? image.id : 0);
 }
 
 public void setImagePosition(int aPosition) {
-	OS.objc_msgSend(this.id, OS.sel_setImagePosition_1, aPosition);
-}
-
-public void setKeyEquivalent(NSString charCode) {
-	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalent_1, charCode != null ? charCode.id : 0);
-}
-
-public void setKeyEquivalentModifierMask(int mask) {
-	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalentModifierMask_1, mask);
-}
-
-public void setNextState() {
-	OS.objc_msgSend(this.id, OS.sel_setNextState);
-}
-
-public void setPeriodicDelay(float delay, float interval) {
-	OS.objc_msgSend(this.id, OS.sel_setPeriodicDelay_1interval_1, delay, interval);
-}
-
-public void setShowsBorderOnlyWhileMouseInside(boolean show) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsBorderOnlyWhileMouseInside_1, show);
-}
-
-public void setSound(NSSound aSound) {
-	OS.objc_msgSend(this.id, OS.sel_setSound_1, aSound != null ? aSound.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setImagePosition_, aPosition);
 }
 
 public void setState(int value) {
-	OS.objc_msgSend(this.id, OS.sel_setState_1, value);
+	OS.objc_msgSend(this.id, OS.sel_setState_, value);
 }
 
 public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, aString != null ? aString.id : 0);
-}
-
-public void setTitleWithMnemonic(NSString stringWithAmpersand) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleWithMnemonic_1, stringWithAmpersand != null ? stringWithAmpersand.id : 0);
-}
-
-public void setTransparent(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setTransparent_1, flag);
-}
-
-public boolean showsBorderOnlyWhileMouseInside() {
-	return OS.objc_msgSend(this.id, OS.sel_showsBorderOnlyWhileMouseInside) != 0;
-}
-
-public NSSound sound() {
-	int result = OS.objc_msgSend(this.id, OS.sel_sound);
-	return result != 0 ? new NSSound(result) : null;
+	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 NSString title() {
-	int 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/NSButtonCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java
index 780d37aa87..b24d5f781f 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
@@ -16,235 +16,24 @@ public NSButtonCell() {
 	super();
 }
 
-public NSButtonCell(int id) {
+public NSButtonCell(int /*long*/ id) {
 	super(id);
 }
 
-public NSImage alternateImage() {
-	int result = OS.objc_msgSend(this.id, OS.sel_alternateImage);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSString alternateMnemonic() {
-	int result = OS.objc_msgSend(this.id, OS.sel_alternateMnemonic);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int alternateMnemonicLocation() {
-	return OS.objc_msgSend(this.id, OS.sel_alternateMnemonicLocation);
-}
-
-public NSString alternateTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_alternateTitle);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSAttributedString attributedAlternateTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedAlternateTitle);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public NSAttributedString attributedTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedTitle);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public int bezelStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_bezelStyle);
-}
-
-public void drawBezelWithFrame(NSRect frame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_drawBezelWithFrame_1inView_1, frame, controlView != null ? controlView.id : 0);
-}
-
-public void drawImage(NSImage image, NSRect frame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_drawImage_1withFrame_1inView_1, image != null ? image.id : 0, frame, controlView != null ? controlView.id : 0);
-}
-
-public NSRect drawTitle(NSAttributedString title, NSRect frame, NSView controlView) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_drawTitle_1withFrame_1inView_1, title != null ? title.id : 0, frame, controlView != null ? controlView.id : 0);
-	return result;
-}
-
-public void getPeriodicDelay(int delay, int interval) {
-	OS.objc_msgSend(this.id, OS.sel_getPeriodicDelay_1interval_1, delay, interval);
-}
-
-public int gradientType() {
-	return OS.objc_msgSend(this.id, OS.sel_gradientType);
-}
-
-public int highlightsBy() {
-	return OS.objc_msgSend(this.id, OS.sel_highlightsBy);
-}
-
-public boolean imageDimsWhenDisabled() {
-	return OS.objc_msgSend(this.id, OS.sel_imageDimsWhenDisabled) != 0;
-}
-
-public int imagePosition() {
-	return OS.objc_msgSend(this.id, OS.sel_imagePosition);
-}
-
-public int imageScaling() {
-	return OS.objc_msgSend(this.id, OS.sel_imageScaling);
-}
-
-public boolean isOpaque() {
-	return OS.objc_msgSend(this.id, OS.sel_isOpaque) != 0;
-}
-
-public boolean isTransparent() {
-	return OS.objc_msgSend(this.id, OS.sel_isTransparent) != 0;
-}
-
-public NSString keyEquivalent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keyEquivalent);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSFont keyEquivalentFont() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keyEquivalentFont);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public int keyEquivalentModifierMask() {
-	return OS.objc_msgSend(this.id, OS.sel_keyEquivalentModifierMask);
-}
-
-public void mouseEntered(NSEvent event) {
-	OS.objc_msgSend(this.id, OS.sel_mouseEntered_1, event != null ? event.id : 0);
-}
-
-public void mouseExited(NSEvent event) {
-	OS.objc_msgSend(this.id, OS.sel_mouseExited_1, event != null ? event.id : 0);
-}
-
-public void performClick(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_performClick_1, sender != null ? sender.id : 0);
-}
-
-public void setAlternateImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setAlternateImage_1, image != null ? image.id : 0);
-}
-
-public void setAlternateMnemonicLocation(int location) {
-	OS.objc_msgSend(this.id, OS.sel_setAlternateMnemonicLocation_1, location);
-}
-
-public void setAlternateTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setAlternateTitle_1, aString != null ? aString.id : 0);
-}
-
-public void setAlternateTitleWithMnemonic(NSString stringWithAmpersand) {
-	OS.objc_msgSend(this.id, OS.sel_setAlternateTitleWithMnemonic_1, stringWithAmpersand != null ? stringWithAmpersand.id : 0);
-}
-
-public void setAttributedAlternateTitle(NSAttributedString obj) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedAlternateTitle_1, obj != null ? obj.id : 0);
-}
-
-public void setAttributedTitle(NSAttributedString obj) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedTitle_1, obj != null ? obj.id : 0);
+public NSButtonCell(id id) {
+	super(id);
 }
 
 public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setBezelStyle(int bezelStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setBezelStyle_1, bezelStyle);
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
 }
 
 public void setButtonType(int aType) {
-	OS.objc_msgSend(this.id, OS.sel_setButtonType_1, aType);
-}
-
-public void setFont(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setFont_1, fontObj != null ? fontObj.id : 0);
-}
-
-public void setGradientType(int type) {
-	OS.objc_msgSend(this.id, OS.sel_setGradientType_1, type);
-}
-
-public void setHighlightsBy(int aType) {
-	OS.objc_msgSend(this.id, OS.sel_setHighlightsBy_1, aType);
-}
-
-public void setImageDimsWhenDisabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setImageDimsWhenDisabled_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setButtonType_, aType);
 }
 
 public void setImagePosition(int aPosition) {
-	OS.objc_msgSend(this.id, OS.sel_setImagePosition_1, aPosition);
-}
-
-public void setImageScaling(int scaling) {
-	OS.objc_msgSend(this.id, OS.sel_setImageScaling_1, scaling);
-}
-
-public void setKeyEquivalent(NSString aKeyEquivalent) {
-	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalent_1, aKeyEquivalent != null ? aKeyEquivalent.id : 0);
-}
-
-public void setKeyEquivalentFont_(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalentFont_1, fontObj != null ? fontObj.id : 0);
-}
-
-public void setKeyEquivalentFont_size_(NSString fontName, float fontSize) {
-	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalentFont_1size_1, fontName != null ? fontName.id : 0, fontSize);
-}
-
-public void setKeyEquivalentModifierMask(int mask) {
-	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalentModifierMask_1, mask);
-}
-
-public void setPeriodicDelay(float delay, float interval) {
-	OS.objc_msgSend(this.id, OS.sel_setPeriodicDelay_1interval_1, delay, interval);
-}
-
-public void setShowsBorderOnlyWhileMouseInside(boolean show) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsBorderOnlyWhileMouseInside_1, show);
-}
-
-public void setShowsStateBy(int aType) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsStateBy_1, aType);
-}
-
-public void setSound(NSSound aSound) {
-	OS.objc_msgSend(this.id, OS.sel_setSound_1, aSound != null ? aSound.id : 0);
-}
-
-public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, aString != null ? aString.id : 0);
-}
-
-public void setTitleWithMnemonic(NSString stringWithAmpersand) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleWithMnemonic_1, stringWithAmpersand != null ? stringWithAmpersand.id : 0);
-}
-
-public void setTransparent(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setTransparent_1, flag);
-}
-
-public boolean showsBorderOnlyWhileMouseInside() {
-	return OS.objc_msgSend(this.id, OS.sel_showsBorderOnlyWhileMouseInside) != 0;
-}
-
-public int showsStateBy() {
-	return OS.objc_msgSend(this.id, OS.sel_showsStateBy);
-}
-
-public NSSound sound() {
-	int result = OS.objc_msgSend(this.id, OS.sel_sound);
-	return result != 0 ? new NSSound(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setImagePosition_, aPosition);
 }
 
 public NSString title() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCIImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCIImageRep.java
deleted file mode 100644
index 571eb3e77b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCIImageRep.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCIImageRep extends NSImageRep {
-
-public NSCIImageRep() {
-	super();
-}
-
-public NSCIImageRep(int id) {
-	super(id);
-}
-
-public CIImage CIImage() {
-	int result = OS.objc_msgSend(this.id, OS.sel_CIImage);
-	return result != 0 ? new CIImage(result) : null;
-}
-
-public static id imageRepWithCIImage(CIImage image) {
-	int result = OS.objc_msgSend(OS.class_NSCIImageRep, OS.sel_imageRepWithCIImage_1, image != null ? image.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSCIImageRep initWithCIImage(CIImage image) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCIImage_1, image != null ? image.id : 0);
-	return result != 0 ? this : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCachedImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCachedImageRep.java
deleted file mode 100644
index b07239a547..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCachedImageRep.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCachedImageRep extends NSImageRep {
-
-public NSCachedImageRep() {
-	super();
-}
-
-public NSCachedImageRep(int id) {
-	super(id);
-}
-
-public NSCachedImageRep initWithSize(NSSize size, int depth, boolean flag, boolean alpha) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithSize_1depth_1separate_1alpha_1, size, depth, flag, alpha);
-	return result != 0 ? this : null;
-}
-
-public NSCachedImageRep initWithWindow(NSWindow win, NSRect rect) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithWindow_1rect_1, win != null ? win.id : 0, rect);
-	return result != 0 ? this : null;
-}
-
-public NSRect rect() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rect);
-	return result;
-}
-
-public NSWindow window() {
-	int 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/NSCachedURLResponse.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCachedURLResponse.java
deleted file mode 100644
index 484025d370..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCachedURLResponse.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCachedURLResponse extends NSObject {
-
-public NSCachedURLResponse() {
-	super();
-}
-
-public NSCachedURLResponse(int id) {
-	super(id);
-}
-
-public NSData data() {
-	int result = OS.objc_msgSend(this.id, OS.sel_data);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSCachedURLResponse initWithResponse_data_(NSURLResponse response, NSData data) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithResponse_1data_1, response != null ? response.id : 0, data != null ? data.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSCachedURLResponse initWithResponse_data_userInfo_storagePolicy_(NSURLResponse response, NSData data, NSDictionary userInfo, int storagePolicy) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithResponse_1data_1userInfo_1storagePolicy_1, response != null ? response.id : 0, data != null ? data.id : 0, userInfo != null ? userInfo.id : 0, storagePolicy);
-	return result != 0 ? this : null;
-}
-
-public NSURLResponse response() {
-	int result = OS.objc_msgSend(this.id, OS.sel_response);
-	return result != 0 ? new NSURLResponse(result) : null;
-}
-
-public int storagePolicy() {
-	return OS.objc_msgSend(this.id, OS.sel_storagePolicy);
-}
-
-public NSDictionary userInfo() {
-	int 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/NSCalendar.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendar.java
deleted file mode 100644
index 25c001eaa7..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendar.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCalendar extends NSObject {
-
-public NSCalendar() {
-	super();
-}
-
-public NSCalendar(int id) {
-	super(id);
-}
-
-public static id autoupdatingCurrentCalendar() {
-	int result = OS.objc_msgSend(OS.class_NSCalendar, OS.sel_autoupdatingCurrentCalendar);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString calendarIdentifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_calendarIdentifier);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSDateComponents components_fromDate_(int unitFlags, NSDate date) {
-	int result = OS.objc_msgSend(this.id, OS.sel_components_1fromDate_1, unitFlags, date != null ? date.id : 0);
-	return result != 0 ? new NSDateComponents(result) : null;
-}
-
-public NSDateComponents components_fromDate_toDate_options_(int unitFlags, NSDate startingDate, NSDate resultDate, int opts) {
-	int result = OS.objc_msgSend(this.id, OS.sel_components_1fromDate_1toDate_1options_1, unitFlags, startingDate != null ? startingDate.id : 0, resultDate != null ? resultDate.id : 0, opts);
-	return result != 0 ? new NSDateComponents(result) : null;
-}
-
-public static id currentCalendar() {
-	int result = OS.objc_msgSend(OS.class_NSCalendar, OS.sel_currentCalendar);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSDate dateByAddingComponents(NSDateComponents comps, NSDate date, int opts) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dateByAddingComponents_1toDate_1options_1, comps != null ? comps.id : 0, date != null ? date.id : 0, opts);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public NSDate dateFromComponents(NSDateComponents comps) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dateFromComponents_1, comps != null ? comps.id : 0);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public int firstWeekday() {
-	return OS.objc_msgSend(this.id, OS.sel_firstWeekday);
-}
-
-public NSCalendar initWithCalendarIdentifier(NSString ident) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCalendarIdentifier_1, ident != null ? ident.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSLocale locale() {
-	int result = OS.objc_msgSend(this.id, OS.sel_locale);
-	return result != 0 ? new NSLocale(result) : null;
-}
-
-public NSRange maximumRangeOfUnit(int unit) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_maximumRangeOfUnit_1, unit);
-	return result;
-}
-
-public int minimumDaysInFirstWeek() {
-	return OS.objc_msgSend(this.id, OS.sel_minimumDaysInFirstWeek);
-}
-
-public NSRange minimumRangeOfUnit(int unit) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_minimumRangeOfUnit_1, unit);
-	return result;
-}
-
-public int ordinalityOfUnit(int smaller, int larger, NSDate date) {
-	return OS.objc_msgSend(this.id, OS.sel_ordinalityOfUnit_1inUnit_1forDate_1, smaller, larger, date != null ? date.id : 0);
-}
-
-public NSRange rangeOfUnit_inUnit_forDate_(int smaller, int larger, NSDate date) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeOfUnit_1inUnit_1forDate_1, smaller, larger, date != null ? date.id : 0);
-	return result;
-}
-
-public boolean rangeOfUnit_startDate_interval_forDate_(int unit, int datep, int tip, NSDate date) {
-	return OS.objc_msgSend(this.id, OS.sel_rangeOfUnit_1startDate_1interval_1forDate_1, unit, datep, tip, date != null ? date.id : 0) != 0;
-}
-
-public void setFirstWeekday(int weekday) {
-	OS.objc_msgSend(this.id, OS.sel_setFirstWeekday_1, weekday);
-}
-
-public void setLocale(NSLocale locale) {
-	OS.objc_msgSend(this.id, OS.sel_setLocale_1, locale != null ? locale.id : 0);
-}
-
-public void setMinimumDaysInFirstWeek(int mdw) {
-	OS.objc_msgSend(this.id, OS.sel_setMinimumDaysInFirstWeek_1, mdw);
-}
-
-public void setTimeZone(NSTimeZone tz) {
-	OS.objc_msgSend(this.id, OS.sel_setTimeZone_1, tz != null ? tz.id : 0);
-}
-
-public NSTimeZone timeZone() {
-	int result = OS.objc_msgSend(this.id, OS.sel_timeZone);
-	return result != 0 ? new NSTimeZone(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 85b711d2f1..587b36fd11 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,7 +16,11 @@ public NSCalendarDate() {
 	super();
 }
 
-public NSCalendarDate(int id) {
+public NSCalendarDate(int /*long*/ id) {
+	super(id);
+}
+
+public NSCalendarDate(id id) {
 	super(id);
 }
 
@@ -25,91 +29,19 @@ public static NSCalendarDate calendarDate() {
 	return result != 0 ? new NSCalendarDate(result) : null;
 }
 
-public NSString calendarFormat() {
-	int result = OS.objc_msgSend(this.id, OS.sel_calendarFormat);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSCalendarDate dateByAddingYears(int year, int month, int day, int hour, int minute, int second) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dateByAddingYears_1months_1days_1hours_1minutes_1seconds_1, year, month, day, hour, minute, second);
-	return result == this.id ? this : (result != 0 ? new NSCalendarDate(result) : null);
-}
-
-public static id static_dateWithString_calendarFormat_(NSString description, NSString format) {
-	int result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithString_1calendarFormat_1, description != null ? description.id : 0, format != null ? format.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_dateWithString_calendarFormat_locale_(NSString description, NSString format, id locale) {
-	int result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithString_1calendarFormat_1locale_1, description != null ? description.id : 0, format != null ? format.id : 0, locale != null ? locale.id : 0);
-	return result != 0 ? new id(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_1month_1day_1hour_1minute_1second_1timeZone_1, year, month, day, hour, minute, second, aTimeZone != null ? aTimeZone.id : 0);
+	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);
 	return result != 0 ? new NSCalendarDate(result) : null;
 }
 
-public int dayOfCommonEra() {
-	return OS.objc_msgSend(this.id, OS.sel_dayOfCommonEra);
-}
-
 public int dayOfMonth() {
 	return OS.objc_msgSend(this.id, OS.sel_dayOfMonth);
 }
 
-public int dayOfWeek() {
-	return OS.objc_msgSend(this.id, OS.sel_dayOfWeek);
-}
-
-public int dayOfYear() {
-	return OS.objc_msgSend(this.id, OS.sel_dayOfYear);
-}
-
-public NSString description() {
-	int result = OS.objc_msgSend(this.id, OS.sel_description);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString descriptionWithCalendarFormat_(NSString format) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptionWithCalendarFormat_1, format != null ? format.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString descriptionWithCalendarFormat_locale_(NSString format, id locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptionWithCalendarFormat_1locale_1, format != null ? format.id : 0, locale != null ? locale.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString descriptionWithLocale(id locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptionWithLocale_1, locale != null ? locale.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
 public int hourOfDay() {
 	return OS.objc_msgSend(this.id, OS.sel_hourOfDay);
 }
 
-public NSCalendarDate initWithString_(NSString description) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithString_1, description != null ? description.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSCalendarDate initWithString_calendarFormat_(NSString description, NSString format) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithString_1calendarFormat_1, description != null ? description.id : 0, format != null ? format.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSCalendarDate initWithString_calendarFormat_locale_(NSString description, NSString format, id locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithString_1calendarFormat_1locale_1, description != null ? description.id : 0, format != null ? format.id : 0, locale != null ? locale.id : 0);
-	return result != 0 ? this : null;
-}
-
-public id initWithYear(int year, int month, int day, int hour, int minute, int second, NSTimeZone aTimeZone) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithYear_1month_1day_1hour_1minute_1second_1timeZone_1, year, month, day, hour, minute, second, aTimeZone != null ? aTimeZone.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
 public int minuteOfHour() {
 	return OS.objc_msgSend(this.id, OS.sel_minuteOfHour);
 }
@@ -122,14 +54,6 @@ public int secondOfMinute() {
 	return OS.objc_msgSend(this.id, OS.sel_secondOfMinute);
 }
 
-public void setCalendarFormat(NSString format) {
-	OS.objc_msgSend(this.id, OS.sel_setCalendarFormat_1, format != null ? format.id : 0);
-}
-
-public void setTimeZone(NSTimeZone aTimeZone) {
-	OS.objc_msgSend(this.id, OS.sel_setTimeZone_1, aTimeZone != null ? aTimeZone.id : 0);
-}
-
 public NSTimeZone timeZone() {
 	int result = OS.objc_msgSend(this.id, OS.sel_timeZone);
 	return result != 0 ? new NSTimeZone(result) : null;
@@ -139,8 +63,14 @@ public int yearOfCommonEra() {
 	return OS.objc_msgSend(this.id, OS.sel_yearOfCommonEra);
 }
 
-public void years(int yp, int mop, int dp, int hp, int mip, int sp, NSCalendarDate date) {
-	OS.objc_msgSend(this.id, OS.sel_years_1months_1days_1hours_1minutes_1seconds_1sinceDate_1, yp, mop, dp, hp, mip, sp, date != null ? date.id : 0);
+public static NSDate dateWithTimeIntervalSinceNow(double secs) {
+	int 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);
+	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 2bba1b09e8..dcf8ea2120 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,580 +16,42 @@ public NSCell() {
 	super();
 }
 
-public NSCell(int id) {
+public NSCell(int /*long*/ id) {
 	super(id);
 }
 
-public boolean acceptsFirstResponder() {
-	return OS.objc_msgSend(this.id, OS.sel_acceptsFirstResponder) != 0;
-}
-
-public int action() {
-	return OS.objc_msgSend(this.id, OS.sel_action);
-}
-
-public int alignment() {
-	return OS.objc_msgSend(this.id, OS.sel_alignment);
-}
-
-public boolean allowsEditingTextAttributes() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsEditingTextAttributes) != 0;
-}
-
-public boolean allowsMixedState() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsMixedState) != 0;
-}
-
-public boolean allowsUndo() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsUndo) != 0;
-}
-
-public NSAttributedString attributedStringValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedStringValue);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public int backgroundStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_backgroundStyle);
-}
-
-public int baseWritingDirection() {
-	return OS.objc_msgSend(this.id, OS.sel_baseWritingDirection);
-}
-
-public void calcDrawInfo(NSRect aRect) {
-	OS.objc_msgSend(this.id, OS.sel_calcDrawInfo_1, aRect);
-}
-
-public int cellAttribute(int aParameter) {
-	return OS.objc_msgSend(this.id, OS.sel_cellAttribute_1, aParameter);
-}
-
-public NSSize cellSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_cellSize);
-	return result;
-}
-
-public NSSize cellSizeForBounds(NSRect aRect) {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_cellSizeForBounds_1, aRect);
-	return result;
-}
-
-public int compare(id otherCell) {
-	return OS.objc_msgSend(this.id, OS.sel_compare_1, otherCell != null ? otherCell.id : 0);
-}
-
-public boolean continueTracking(NSPoint lastPoint, NSPoint currentPoint, NSView controlView) {
-	return OS.objc_msgSend(this.id, OS.sel_continueTracking_1at_1inView_1, lastPoint, currentPoint, controlView != null ? controlView.id : 0) != 0;
-}
-
-public int controlSize() {
-	return OS.objc_msgSend(this.id, OS.sel_controlSize);
-}
-
-public int controlTint() {
-	return OS.objc_msgSend(this.id, OS.sel_controlTint);
-}
-
-public NSView controlView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_controlView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public static int defaultFocusRingType() {
-	return OS.objc_msgSend(OS.class_NSCell, OS.sel_defaultFocusRingType);
-}
-
-public static NSMenu defaultMenu() {
-	int result = OS.objc_msgSend(OS.class_NSCell, OS.sel_defaultMenu);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
-public double doubleValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_doubleValue);
+public NSCell(id id) {
+	super(id);
 }
 
 public void drawInteriorWithFrame(NSRect cellFrame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_drawInteriorWithFrame_1inView_1, cellFrame, controlView != null ? controlView.id : 0);
-}
-
-public void drawWithExpansionFrame(NSRect cellFrame, NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_drawWithExpansionFrame_1inView_1, cellFrame, view != null ? view.id : 0);
-}
-
-public void drawWithFrame(NSRect cellFrame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_drawWithFrame_1inView_1, cellFrame, controlView != null ? controlView.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_drawInteriorWithFrame_inView_, cellFrame, controlView != null ? controlView.id : 0);
 }
 
 public NSRect drawingRectForBounds(NSRect theRect) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_drawingRectForBounds_1, theRect);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_drawingRectForBounds_, theRect);
 	return result;
 }
 
-public void editWithFrame(NSRect aRect, NSView controlView, NSText textObj, id anObject, NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_editWithFrame_1inView_1editor_1delegate_1event_1, aRect, controlView != null ? controlView.id : 0, textObj != null ? textObj.id : 0, anObject != null ? anObject.id : 0, theEvent != null ? theEvent.id : 0);
-}
-
-public void endEditing(NSText textObj) {
-	OS.objc_msgSend(this.id, OS.sel_endEditing_1, textObj != null ? textObj.id : 0);
-}
-
-public int entryType() {
-	return OS.objc_msgSend(this.id, OS.sel_entryType);
-}
-
-public NSRect expansionFrameWithFrame(NSRect cellFrame, NSView view) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_expansionFrameWithFrame_1inView_1, cellFrame, view != null ? view.id : 0);
-	return result;
-}
-
-public float floatValue() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_floatValue);
-}
-
-public int focusRingType() {
-	return OS.objc_msgSend(this.id, OS.sel_focusRingType);
-}
-
-public NSFont font() {
-	int result = OS.objc_msgSend(this.id, OS.sel_font);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public id formatter() {
-	int result = OS.objc_msgSend(this.id, OS.sel_formatter);
-	return result != 0 ? new id(result) : null;
-}
-
-public void getPeriodicDelay(int delay, int interval) {
-	OS.objc_msgSend(this.id, OS.sel_getPeriodicDelay_1interval_1, delay, interval);
-}
-
-public boolean hasValidObjectValue() {
-	return OS.objc_msgSend(this.id, OS.sel_hasValidObjectValue) != 0;
-}
-
-public void highlight(boolean flag, NSRect cellFrame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_highlight_1withFrame_1inView_1, flag, cellFrame, controlView != null ? controlView.id : 0);
-}
-
-public NSColor highlightColorWithFrame(NSRect cellFrame, NSView controlView) {
-	int result = OS.objc_msgSend(this.id, OS.sel_highlightColorWithFrame_1inView_1, cellFrame, controlView != null ? controlView.id : 0);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public int hitTestForEvent(NSEvent event, NSRect cellFrame, NSView controlView) {
-	return OS.objc_msgSend(this.id, OS.sel_hitTestForEvent_1inRect_1ofView_1, event != null ? event.id : 0, cellFrame, controlView != null ? controlView.id : 0);
-}
-
-public NSImage image() {
-	int result = OS.objc_msgSend(this.id, OS.sel_image);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSRect imageRectForBounds(NSRect theRect) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_imageRectForBounds_1, theRect);
-	return result;
-}
-
-public boolean importsGraphics() {
-	return OS.objc_msgSend(this.id, OS.sel_importsGraphics) != 0;
-}
-
-public NSCell initImageCell(NSImage image) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initImageCell_1, image != null ? image.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSCell initTextCell(NSString aString) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initTextCell_1, aString != null ? aString.id : 0);
-	return result != 0 ? this : null;
-}
-
-public int intValue() {
-	return OS.objc_msgSend(this.id, OS.sel_intValue);
-}
-
-public int integerValue() {
-	return OS.objc_msgSend(this.id, OS.sel_integerValue);
-}
-
-public int interiorBackgroundStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_interiorBackgroundStyle);
-}
-
-public boolean isBezeled() {
-	return OS.objc_msgSend(this.id, OS.sel_isBezeled) != 0;
-}
-
-public boolean isBordered() {
-	return OS.objc_msgSend(this.id, OS.sel_isBordered) != 0;
-}
-
-public boolean isContinuous() {
-	return OS.objc_msgSend(this.id, OS.sel_isContinuous) != 0;
-}
-
-public boolean isEditable() {
-	return OS.objc_msgSend(this.id, OS.sel_isEditable) != 0;
-}
-
-public boolean isEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isEnabled) != 0;
-}
-
-public boolean isEntryAcceptable(NSString aString) {
-	return OS.objc_msgSend(this.id, OS.sel_isEntryAcceptable_1, aString != null ? aString.id : 0) != 0;
-}
-
-public boolean isHighlighted() {
-	return OS.objc_msgSend(this.id, OS.sel_isHighlighted) != 0;
-}
-
-public boolean isOpaque() {
-	return OS.objc_msgSend(this.id, OS.sel_isOpaque) != 0;
-}
-
-public boolean isScrollable() {
-	return OS.objc_msgSend(this.id, OS.sel_isScrollable) != 0;
-}
-
-public boolean isSelectable() {
-	return OS.objc_msgSend(this.id, OS.sel_isSelectable) != 0;
-}
-
-public NSString keyEquivalent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keyEquivalent);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int lineBreakMode() {
-	return OS.objc_msgSend(this.id, OS.sel_lineBreakMode);
-}
-
-public NSMenu menu() {
-	int result = OS.objc_msgSend(this.id, OS.sel_menu);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
-public NSMenu menuForEvent(NSEvent event, NSRect cellFrame, NSView view) {
-	int result = OS.objc_msgSend(this.id, OS.sel_menuForEvent_1inRect_1ofView_1, event != null ? event.id : 0, cellFrame, view != null ? view.id : 0);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
-public NSString mnemonic() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mnemonic);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int mnemonicLocation() {
-	return OS.objc_msgSend(this.id, OS.sel_mnemonicLocation);
-}
-
-public int mouseDownFlags() {
-	return OS.objc_msgSend(this.id, OS.sel_mouseDownFlags);
-}
-
-public int nextState() {
-	return OS.objc_msgSend(this.id, OS.sel_nextState);
-}
-
-public id objectValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectValue);
-	return result != 0 ? new id(result) : null;
-}
-
-public void performClick(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_performClick_1, sender != null ? sender.id : 0);
-}
-
-public static boolean prefersTrackingUntilMouseUp() {
-	return OS.objc_msgSend(OS.class_NSCell, OS.sel_prefersTrackingUntilMouseUp) != 0;
-}
-
-public boolean refusesFirstResponder() {
-	return OS.objc_msgSend(this.id, OS.sel_refusesFirstResponder) != 0;
-}
-
-public id representedObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_representedObject);
-	return result != 0 ? new id(result) : null;
-}
-
-public void resetCursorRect(NSRect cellFrame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_resetCursorRect_1inView_1, cellFrame, controlView != null ? controlView.id : 0);
-}
-
-public void selectWithFrame(NSRect aRect, NSView controlView, NSText textObj, id anObject, int selStart, int selLength) {
-	OS.objc_msgSend(this.id, OS.sel_selectWithFrame_1inView_1editor_1delegate_1start_1length_1, aRect, controlView != null ? controlView.id : 0, textObj != null ? textObj.id : 0, anObject != null ? anObject.id : 0, selStart, selLength);
-}
-
-public int sendActionOn(int mask) {
-	return OS.objc_msgSend(this.id, OS.sel_sendActionOn_1, mask);
-}
-
-public boolean sendsActionOnEndEditing() {
-	return OS.objc_msgSend(this.id, OS.sel_sendsActionOnEndEditing) != 0;
-}
-
-public void setAction(int aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_setAction_1, aSelector);
-}
-
-public void setAlignment(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setAlignment_1, mode);
-}
-
-public void setAllowsEditingTextAttributes(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsEditingTextAttributes_1, flag);
-}
-
 public void setAllowsMixedState(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsMixedState_1, flag);
-}
-
-public void setAllowsUndo(boolean allowsUndo) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsUndo_1, allowsUndo);
+	OS.objc_msgSend(this.id, OS.sel_setAllowsMixedState_, flag);
 }
 
 public void setAttributedStringValue(NSAttributedString obj) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedStringValue_1, obj != null ? obj.id : 0);
-}
-
-public void setBackgroundStyle(int style) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundStyle_1, style);
-}
-
-public void setBaseWritingDirection(int writingDirection) {
-	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_1, writingDirection);
-}
-
-public void setBezeled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBezeled_1, flag);
-}
-
-public void setBordered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBordered_1, flag);
-}
-
-public void setCellAttribute(int aParameter, int value) {
-	OS.objc_msgSend(this.id, OS.sel_setCellAttribute_1to_1, aParameter, value);
-}
-
-public void setContinuous(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setContinuous_1, flag);
-}
-
-public void setControlSize(int size) {
-	OS.objc_msgSend(this.id, OS.sel_setControlSize_1, size);
-}
-
-public void setControlTint(int controlTint) {
-	OS.objc_msgSend(this.id, OS.sel_setControlTint_1, controlTint);
-}
-
-public void setControlView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setControlView_1, view != null ? view.id : 0);
-}
-
-public void setDoubleValue(double aDouble) {
-	OS.objc_msgSend(this.id, OS.sel_setDoubleValue_1, aDouble);
-}
-
-public void setEditable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEditable_1, flag);
-}
-
-public void setEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEnabled_1, flag);
-}
-
-public void setEntryType(int aType) {
-	OS.objc_msgSend(this.id, OS.sel_setEntryType_1, aType);
-}
-
-public void setFloatValue(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setFloatValue_1, aFloat);
-}
-
-public void setFloatingPointFormat(boolean autoRange, int leftDigits, int rightDigits) {
-	OS.objc_msgSend(this.id, OS.sel_setFloatingPointFormat_1left_1right_1, autoRange, leftDigits, rightDigits);
-}
-
-public void setFocusRingType(int focusRingType) {
-	OS.objc_msgSend(this.id, OS.sel_setFocusRingType_1, focusRingType);
-}
-
-public void setFont(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setFont_1, fontObj != null ? fontObj.id : 0);
-}
-
-public void setFormatter(NSFormatter newFormatter) {
-	OS.objc_msgSend(this.id, OS.sel_setFormatter_1, newFormatter != null ? newFormatter.id : 0);
-}
-
-public void setHighlighted(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHighlighted_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setAttributedStringValue_, obj != null ? obj.id : 0);
 }
 
 public void setImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1, image != null ? image.id : 0);
-}
-
-public void setImportsGraphics(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setImportsGraphics_1, flag);
-}
-
-public void setIntValue(int anInt) {
-	OS.objc_msgSend(this.id, OS.sel_setIntValue_1, anInt);
-}
-
-public void setIntegerValue(int anInteger) {
-	OS.objc_msgSend(this.id, OS.sel_setIntegerValue_1, anInteger);
-}
-
-public void setLineBreakMode(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setLineBreakMode_1, mode);
-}
-
-public void setMenu(NSMenu aMenu) {
-	OS.objc_msgSend(this.id, OS.sel_setMenu_1, aMenu != null ? aMenu.id : 0);
-}
-
-public void setMnemonicLocation(int location) {
-	OS.objc_msgSend(this.id, OS.sel_setMnemonicLocation_1, location);
-}
-
-public void setNextState() {
-	OS.objc_msgSend(this.id, OS.sel_setNextState);
-}
-
-public void setObjectValue(id  obj) {
-	OS.objc_msgSend(this.id, OS.sel_setObjectValue_1, obj != null ? obj.id : 0);
-}
-
-public void setRefusesFirstResponder(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setRefusesFirstResponder_1, flag);
-}
-
-public void setRepresentedObject(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setRepresentedObject_1, anObject != null ? anObject.id : 0);
-}
-
-public void setScrollable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setScrollable_1, flag);
-}
-
-public void setSelectable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectable_1, flag);
-}
-
-public void setSendsActionOnEndEditing(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSendsActionOnEndEditing_1, flag);
-}
-
-public void setShowsFirstResponder(boolean showFR) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsFirstResponder_1, showFR);
-}
-
-public void setState(int value) {
-	OS.objc_msgSend(this.id, OS.sel_setState_1, value);
-}
-
-public void setStringValue(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setStringValue_1, aString != null ? aString.id : 0);
-}
-
-public void setTag(int anInt) {
-	OS.objc_msgSend(this.id, OS.sel_setTag_1, anInt);
-}
-
-public void setTarget(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setTarget_1, anObject != null ? anObject.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setImage_, image != null ? image.id : 0);
 }
 
 public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, aString != null ? aString.id : 0);
-}
-
-public void setTitleWithMnemonic(NSString stringWithAmpersand) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleWithMnemonic_1, stringWithAmpersand != null ? stringWithAmpersand.id : 0);
-}
-
-public void setTruncatesLastVisibleLine(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setTruncatesLastVisibleLine_1, flag);
-}
-
-public void setType(int aType) {
-	OS.objc_msgSend(this.id, OS.sel_setType_1, aType);
-}
-
-public NSText setUpFieldEditorAttributes(NSText textObj) {
-	int result = OS.objc_msgSend(this.id, OS.sel_setUpFieldEditorAttributes_1, textObj != null ? textObj.id : 0);
-	return result != 0 ? new NSText(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0);
 }
 
 public void setWraps(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setWraps_1, flag);
-}
-
-public boolean showsFirstResponder() {
-	return OS.objc_msgSend(this.id, OS.sel_showsFirstResponder) != 0;
-}
-
-public boolean startTrackingAt(NSPoint startPoint, NSView controlView) {
-	return OS.objc_msgSend(this.id, OS.sel_startTrackingAt_1inView_1, startPoint, controlView != null ? controlView.id : 0) != 0;
-}
-
-public int state() {
-	return OS.objc_msgSend(this.id, OS.sel_state);
-}
-
-public void stopTracking(NSPoint lastPoint, NSPoint stopPoint, NSView controlView, boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_stopTracking_1at_1inView_1mouseIsUp_1, lastPoint, stopPoint, controlView != null ? controlView.id : 0, flag);
-}
-
-public NSString stringValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringValue);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int tag() {
-	return OS.objc_msgSend(this.id, OS.sel_tag);
-}
-
-public void takeDoubleValueFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeDoubleValueFrom_1, sender != null ? sender.id : 0);
-}
-
-public void takeFloatValueFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeFloatValueFrom_1, sender != null ? sender.id : 0);
-}
-
-public void takeIntValueFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeIntValueFrom_1, sender != null ? sender.id : 0);
-}
-
-public void takeIntegerValueFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeIntegerValueFrom_1, sender != null ? sender.id : 0);
-}
-
-public void takeObjectValueFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeObjectValueFrom_1, sender != null ? sender.id : 0);
-}
-
-public void takeStringValueFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeStringValueFrom_1, sender != null ? sender.id : 0);
-}
-
-public id target() {
-	int result = OS.objc_msgSend(this.id, OS.sel_target);
-	return result != 0 ? new id(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setWraps_, flag);
 }
 
 public NSString title() {
@@ -597,28 +59,6 @@ public NSString title() {
 	return result != 0 ? new NSString(result) : null;
 }
 
-public NSRect titleRectForBounds(NSRect theRect) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_titleRectForBounds_1, theRect);
-	return result;
-}
-
-public boolean trackMouse(NSEvent theEvent, NSRect cellFrame, NSView controlView, boolean flag) {
-	return OS.objc_msgSend(this.id, OS.sel_trackMouse_1inRect_1ofView_1untilMouseUp_1, theEvent != null ? theEvent.id : 0, cellFrame, controlView != null ? controlView.id : 0, flag) != 0;
-}
-
-public boolean truncatesLastVisibleLine() {
-	return OS.objc_msgSend(this.id, OS.sel_truncatesLastVisibleLine) != 0;
-}
-
-public int type() {
-	return OS.objc_msgSend(this.id, OS.sel_type);
-}
-
-public boolean wantsNotificationForMarkedText() {
-	return OS.objc_msgSend(this.id, OS.sel_wantsNotificationForMarkedText) != 0;
-}
-
 public boolean wraps() {
 	return OS.objc_msgSend(this.id, OS.sel_wraps) != 0;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java
deleted file mode 100644
index 9fe13dbfed..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCharacterSet extends NSObject {
-
-public NSCharacterSet() {
-	super();
-}
-
-public NSCharacterSet(int id) {
-	super(id);
-}
-
-public static id alphanumericCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_alphanumericCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSData bitmapRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_bitmapRepresentation);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public static id capitalizedLetterCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_capitalizedLetterCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean characterIsMember(short aCharacter) {
-	return OS.objc_msgSend(this.id, OS.sel_characterIsMember_1, aCharacter) != 0;
-}
-
-public static id characterSetWithBitmapRepresentation(NSData data) {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_characterSetWithBitmapRepresentation_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id characterSetWithCharactersInString(NSString aString) {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_characterSetWithCharactersInString_1, aString != null ? aString.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id characterSetWithContentsOfFile(NSString fName) {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_characterSetWithContentsOfFile_1, fName != null ? fName.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id characterSetWithRange(NSRange aRange) {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_characterSetWithRange_1, aRange);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id controlCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_controlCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id decimalDigitCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_decimalDigitCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id decomposableCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_decomposableCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean hasMemberInPlane(byte thePlane) {
-	return OS.objc_msgSend(this.id, OS.sel_hasMemberInPlane_1, thePlane) != 0;
-}
-
-public static id illegalCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_illegalCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSCharacterSet invertedSet() {
-	int result = OS.objc_msgSend(this.id, OS.sel_invertedSet);
-	return result == this.id ? this : (result != 0 ? new NSCharacterSet(result) : null);
-}
-
-public boolean isSupersetOfSet(NSCharacterSet theOtherSet) {
-	return OS.objc_msgSend(this.id, OS.sel_isSupersetOfSet_1, theOtherSet != null ? theOtherSet.id : 0) != 0;
-}
-
-public static id letterCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_letterCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean longCharacterIsMember(int theLongChar) {
-	return OS.objc_msgSend(this.id, OS.sel_longCharacterIsMember_1, theLongChar) != 0;
-}
-
-public static id lowercaseLetterCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_lowercaseLetterCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id newlineCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_newlineCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id nonBaseCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_nonBaseCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id punctuationCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_punctuationCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id symbolCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_symbolCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id uppercaseLetterCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_uppercaseLetterCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id whitespaceAndNewlineCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_whitespaceAndNewlineCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id whitespaceCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_whitespaceCharacterSet);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClassDescription.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClassDescription.java
deleted file mode 100644
index aa5e25ac1d..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClassDescription.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSClassDescription extends NSObject {
-
-public NSClassDescription() {
-	super();
-}
-
-public NSClassDescription(int id) {
-	super(id);
-}
-
-public NSArray attributeKeys() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributeKeys);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSClassDescription classDescriptionForClass(int aClass) {
-	int result = OS.objc_msgSend(OS.class_NSClassDescription, OS.sel_classDescriptionForClass_1, aClass);
-	return result != 0 ? new NSClassDescription(result) : null;
-}
-
-public static void invalidateClassDescriptionCache() {
-	OS.objc_msgSend(OS.class_NSClassDescription, OS.sel_invalidateClassDescriptionCache);
-}
-
-public NSString inverseForRelationshipKey(NSString relationshipKey) {
-	int result = OS.objc_msgSend(this.id, OS.sel_inverseForRelationshipKey_1, relationshipKey != null ? relationshipKey.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static void registerClassDescription(NSClassDescription description, int aClass) {
-	OS.objc_msgSend(OS.class_NSClassDescription, OS.sel_registerClassDescription_1forClass_1, description != null ? description.id : 0, aClass);
-}
-
-public NSArray toManyRelationshipKeys() {
-	int result = OS.objc_msgSend(this.id, OS.sel_toManyRelationshipKeys);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray toOneRelationshipKeys() {
-	int result = OS.objc_msgSend(this.id, OS.sel_toOneRelationshipKeys);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java
index 636b36fee9..0cd59063f8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java
@@ -16,85 +16,16 @@ public NSClipView() {
 	super();
 }
 
-public NSClipView(int id) {
+public NSClipView(int /*long*/ id) {
 	super(id);
 }
 
-public boolean autoscroll(NSEvent theEvent) {
-	return OS.objc_msgSend(this.id, OS.sel_autoscroll_1, theEvent != null ? theEvent.id : 0) != 0;
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSPoint constrainScrollPoint(NSPoint newOrigin) {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_constrainScrollPoint_1, newOrigin);
-	return result;
-}
-
-public boolean copiesOnScroll() {
-	return OS.objc_msgSend(this.id, OS.sel_copiesOnScroll) != 0;
-}
-
-public NSCursor documentCursor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_documentCursor);
-	return result != 0 ? new NSCursor(result) : null;
-}
-
-public NSRect documentRect() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_documentRect);
-	return result;
-}
-
-public id documentView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_documentView);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSRect documentVisibleRect() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_documentVisibleRect);
-	return result;
-}
-
-public boolean drawsBackground() {
-	return OS.objc_msgSend(this.id, OS.sel_drawsBackground) != 0;
+public NSClipView(id id) {
+	super(id);
 }
 
 public void scrollToPoint(NSPoint newOrigin) {
-	OS.objc_msgSend(this.id, OS.sel_scrollToPoint_1, newOrigin);
-}
-
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setCopiesOnScroll(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCopiesOnScroll_1, flag);
-}
-
-public void setDocumentCursor(NSCursor anObj) {
-	OS.objc_msgSend(this.id, OS.sel_setDocumentCursor_1, anObj != null ? anObj.id : 0);
-}
-
-public void setDocumentView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_setDocumentView_1, aView != null ? aView.id : 0);
-}
-
-public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_1, flag);
-}
-
-public void viewBoundsChanged(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_viewBoundsChanged_1, notification != null ? notification.id : 0);
-}
-
-public void viewFrameChanged(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_viewFrameChanged_1, notification != null ? notification.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_scrollToPoint_, newOrigin);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCloneCommand.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCloneCommand.java
deleted file mode 100644
index 211a89f109..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCloneCommand.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCloneCommand extends NSScriptCommand {
-
-public NSCloneCommand() {
-	super();
-}
-
-public NSCloneCommand(int id) {
-	super(id);
-}
-
-public NSScriptObjectSpecifier keySpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keySpecifier);
-	return result != 0 ? new NSScriptObjectSpecifier(result) : null;
-}
-
-public void setReceiversSpecifier(NSScriptObjectSpecifier receiversRef) {
-	OS.objc_msgSend(this.id, OS.sel_setReceiversSpecifier_1, receiversRef != null ? receiversRef.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCloseCommand.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCloseCommand.java
deleted file mode 100644
index cad1cd68e6..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCloseCommand.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCloseCommand extends NSScriptCommand {
-
-public NSCloseCommand() {
-	super();
-}
-
-public NSCloseCommand(int id) {
-	super(id);
-}
-
-public int saveOptions() {
-	return OS.objc_msgSend(this.id, OS.sel_saveOptions);
-}
-
-}
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 0e2e950f08..c3350f1f92 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,253 +16,16 @@ public NSCoder() {
 	super();
 }
 
-public NSCoder(int id) {
+public NSCoder(int /*long*/ id) {
 	super(id);
 }
 
-public boolean allowsKeyedCoding() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsKeyedCoding) != 0;
-}
-
-public boolean containsValueForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_containsValueForKey_1, key != null ? key.id : 0) != 0;
-}
-
-public void decodeArrayOfObjCType(int itemType, int count, int array) {
-	OS.objc_msgSend(this.id, OS.sel_decodeArrayOfObjCType_1count_1at_1, itemType, count, array);
-}
-
-public boolean decodeBoolForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_decodeBoolForKey_1, key != null ? key.id : 0) != 0;
-}
-
-public int decodeBytesForKey(NSString key, int lengthp) {
-	return OS.objc_msgSend(this.id, OS.sel_decodeBytesForKey_1returnedLength_1, key != null ? key.id : 0, lengthp);
-}
-
-public int decodeBytesWithReturnedLength(int lengthp) {
-	return OS.objc_msgSend(this.id, OS.sel_decodeBytesWithReturnedLength_1, lengthp);
-}
-
-public NSData decodeDataObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_decodeDataObject);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public double decodeDoubleForKey(NSString key) {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_decodeDoubleForKey_1, key != null ? key.id : 0);
-}
-
-public float decodeFloatForKey(NSString key) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_decodeFloatForKey_1, key != null ? key.id : 0);
-}
-
-public int decodeInt32ForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_decodeInt32ForKey_1, key != null ? key.id : 0);
-}
-
-public long decodeInt64ForKey(NSString key) {
-	return (long)OS.objc_msgSend(this.id, OS.sel_decodeInt64ForKey_1, key != null ? key.id : 0);
-}
-
-public int decodeIntForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_decodeIntForKey_1, key != null ? key.id : 0);
-}
-
-public int decodeIntegerForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_decodeIntegerForKey_1, key != null ? key.id : 0);
-}
-
-public id decodeNXObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_decodeNXObject);
-	return result != 0 ? new id(result) : null;
-}
-
-public id decodeObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_decodeObject);
-	return result != 0 ? new id(result) : null;
-}
-
-public id decodeObjectForKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decodeObjectForKey_1, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSPoint decodePoint() {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_decodePoint);
-	return result;
-}
-
-public NSPoint decodePointForKey(NSString key) {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_decodePointForKey_1, key != null ? key.id : 0);
-	return result;
-}
-
-public id decodePropertyList() {
-	int result = OS.objc_msgSend(this.id, OS.sel_decodePropertyList);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSRect decodeRect() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_decodeRect);
-	return result;
-}
-
-public NSRect decodeRectForKey(NSString key) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_decodeRectForKey_1, key != null ? key.id : 0);
-	return result;
-}
-
-public NSSize decodeSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_decodeSize);
-	return result;
-}
-
-public NSSize decodeSizeForKey(NSString key) {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_decodeSizeForKey_1, key != null ? key.id : 0);
-	return result;
-}
-
-public void decodeValueOfObjCType(int type, int data) {
-	OS.objc_msgSend(this.id, OS.sel_decodeValueOfObjCType_1at_1, type, data);
-}
-
-public void decodeValuesOfObjCTypes(int decodeValuesOfObjCTypes) {
-	OS.objc_msgSend(this.id, OS.sel_decodeValuesOfObjCTypes_1, decodeValuesOfObjCTypes);
-}
-
-public void encodeArrayOfObjCType(int type, int count, int array) {
-	OS.objc_msgSend(this.id, OS.sel_encodeArrayOfObjCType_1count_1at_1, type, count, array);
-}
-
-public void encodeBool(boolean boolv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeBool_1forKey_1, boolv, key != null ? key.id : 0);
-}
-
-public void encodeBycopyObject(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_encodeBycopyObject_1, anObject != null ? anObject.id : 0);
-}
-
-public void encodeByrefObject(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_encodeByrefObject_1, anObject != null ? anObject.id : 0);
-}
-
-public void encodeBytes_length_(int byteaddr, int length) {
-	OS.objc_msgSend(this.id, OS.sel_encodeBytes_1length_1, byteaddr, length);
-}
-
-public void encodeBytes_length_forKey_(int bytesp, int lenv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeBytes_1length_1forKey_1, bytesp, lenv, key != null ? key.id : 0);
-}
-
-public void encodeConditionalObject_(id object) {
-	OS.objc_msgSend(this.id, OS.sel_encodeConditionalObject_1, object != null ? object.id : 0);
-}
-
-public void encodeConditionalObject_forKey_(id objv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeConditionalObject_1forKey_1, objv != null ? objv.id : 0, key != null ? key.id : 0);
-}
-
-public void encodeDataObject(NSData data) {
-	OS.objc_msgSend(this.id, OS.sel_encodeDataObject_1, data != null ? data.id : 0);
-}
-
-public void encodeDouble(double realv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeDouble_1forKey_1, realv, key != null ? key.id : 0);
-}
-
-public void encodeFloat(float realv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeFloat_1forKey_1, realv, key != null ? key.id : 0);
-}
-
-public void encodeInt32(int intv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeInt32_1forKey_1, intv, key != null ? key.id : 0);
-}
-
-public void encodeInt64(long intv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeInt64_1forKey_1, intv, key != null ? key.id : 0);
-}
-
-public void encodeInt(int intv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeInt_1forKey_1, intv, key != null ? key.id : 0);
-}
-
-public void encodeInteger(int intv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeInteger_1forKey_1, intv, key != null ? key.id : 0);
-}
-
-public void encodeNXObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_encodeNXObject_1, object != null ? object.id : 0);
-}
-
-public void encodeObject_(id object) {
-	OS.objc_msgSend(this.id, OS.sel_encodeObject_1, object != null ? object.id : 0);
-}
-
-public void encodeObject_forKey_(id objv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeObject_1forKey_1, objv != null ? objv.id : 0, key != null ? key.id : 0);
-}
-
-public void encodePoint_(NSPoint point) {
-	OS.objc_msgSend(this.id, OS.sel_encodePoint_1, point);
-}
-
-public void encodePoint_forKey_(NSPoint point, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodePoint_1forKey_1, point, key != null ? key.id : 0);
-}
-
-public void encodePropertyList(id aPropertyList) {
-	OS.objc_msgSend(this.id, OS.sel_encodePropertyList_1, aPropertyList != null ? aPropertyList.id : 0);
-}
-
-public void encodeRect_(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_encodeRect_1, rect);
-}
-
-public void encodeRect_forKey_(NSRect rect, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeRect_1forKey_1, rect, key != null ? key.id : 0);
-}
-
-public void encodeRootObject(id rootObject) {
-	OS.objc_msgSend(this.id, OS.sel_encodeRootObject_1, rootObject != null ? rootObject.id : 0);
-}
-
-public void encodeSize_(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_encodeSize_1, size);
-}
-
-public void encodeSize_forKey_(NSSize size, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeSize_1forKey_1, size, key != null ? key.id : 0);
-}
-
-public void encodeValueOfObjCType(int type, int addr) {
-	OS.objc_msgSend(this.id, OS.sel_encodeValueOfObjCType_1at_1, type, addr);
-}
-
-public void encodeValuesOfObjCTypes(int encodeValuesOfObjCTypes) {
-	OS.objc_msgSend(this.id, OS.sel_encodeValuesOfObjCTypes_1, encodeValuesOfObjCTypes);
-}
-
-public int objectZone() {
-	return OS.objc_msgSend(this.id, OS.sel_objectZone);
-}
-
-public void setObjectZone(int zone) {
-	OS.objc_msgSend(this.id, OS.sel_setObjectZone_1, zone);
+public NSCoder(id id) {
+	super(id);
 }
 
 public int systemVersion() {
 	return OS.objc_msgSend(this.id, OS.sel_systemVersion);
 }
 
-public int versionForClassName(NSString className) {
-	return OS.objc_msgSend(this.id, OS.sel_versionForClassName_1, className != null ? className.id : 0);
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCollectionView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCollectionView.java
deleted file mode 100644
index 127bbe1623..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCollectionView.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCollectionView extends NSView {
-
-public NSCollectionView() {
-	super();
-}
-
-public NSCollectionView(int id) {
-	super(id);
-}
-
-public boolean allowsMultipleSelection() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsMultipleSelection) != 0;
-}
-
-public NSArray backgroundColors() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColors);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray content() {
-	int result = OS.objc_msgSend(this.id, OS.sel_content);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean isFirstResponder() {
-	return OS.objc_msgSend(this.id, OS.sel_isFirstResponder) != 0;
-}
-
-public boolean isSelectable() {
-	return OS.objc_msgSend(this.id, OS.sel_isSelectable) != 0;
-}
-
-public NSCollectionViewItem itemPrototype() {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemPrototype);
-	return result != 0 ? new NSCollectionViewItem(result) : null;
-}
-
-public NSSize maxItemSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_maxItemSize);
-	return result;
-}
-
-public int maxNumberOfColumns() {
-	return OS.objc_msgSend(this.id, OS.sel_maxNumberOfColumns);
-}
-
-public int maxNumberOfRows() {
-	return OS.objc_msgSend(this.id, OS.sel_maxNumberOfRows);
-}
-
-public NSSize minItemSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_minItemSize);
-	return result;
-}
-
-public NSCollectionViewItem newItemForRepresentedObject(id object) {
-	int result = OS.objc_msgSend(this.id, OS.sel_newItemForRepresentedObject_1, object != null ? object.id : 0);
-	return result != 0 ? new NSCollectionViewItem(result) : null;
-}
-
-public NSIndexSet selectionIndexes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectionIndexes);
-	return result != 0 ? new NSIndexSet(result) : null;
-}
-
-public void setAllowsMultipleSelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsMultipleSelection_1, flag);
-}
-
-public void setBackgroundColors(NSArray colors) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColors_1, colors != null ? colors.id : 0);
-}
-
-public void setContent(NSArray content) {
-	OS.objc_msgSend(this.id, OS.sel_setContent_1, content != null ? content.id : 0);
-}
-
-public void setItemPrototype(NSCollectionViewItem prototype) {
-	OS.objc_msgSend(this.id, OS.sel_setItemPrototype_1, prototype != null ? prototype.id : 0);
-}
-
-public void setMaxItemSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxItemSize_1, size);
-}
-
-public void setMaxNumberOfColumns(int number) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxNumberOfColumns_1, number);
-}
-
-public void setMaxNumberOfRows(int number) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxNumberOfRows_1, number);
-}
-
-public void setMinItemSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setMinItemSize_1, size);
-}
-
-public void setSelectable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectable_1, flag);
-}
-
-public void setSelectionIndexes(NSIndexSet indexes) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectionIndexes_1, indexes != null ? indexes.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCollectionViewItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCollectionViewItem.java
deleted file mode 100644
index 549668010e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCollectionViewItem.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCollectionViewItem extends NSObject {
-
-public NSCollectionViewItem() {
-	super();
-}
-
-public NSCollectionViewItem(int id) {
-	super(id);
-}
-
-public NSCollectionView collectionView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_collectionView);
-	return result != 0 ? new NSCollectionView(result) : null;
-}
-
-public boolean isSelected() {
-	return OS.objc_msgSend(this.id, OS.sel_isSelected) != 0;
-}
-
-public id representedObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_representedObject);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setRepresentedObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_setRepresentedObject_1, object != null ? object.id : 0);
-}
-
-public void setSelected(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelected_1, flag);
-}
-
-public void setView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setView_1, view != null ? view.id : 0);
-}
-
-public NSView view() {
-	int result = OS.objc_msgSend(this.id, OS.sel_view);
-	return result != 0 ? new NSView(result) : null;
-}
-
-}
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 b28e47271a..5519341702 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,22 +16,16 @@ public NSColor() {
 	super();
 }
 
-public NSColor(int id) {
+public NSColor(int /*long*/ id) {
 	super(id);
 }
 
-public float alphaComponent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_alphaComponent);
-}
-
-public static NSColor alternateSelectedControlColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_alternateSelectedControlColor);
-	return result != 0 ? new NSColor(result) : null;
+public NSColor(id id) {
+	super(id);
 }
 
-public static NSColor alternateSelectedControlTextColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_alternateSelectedControlTextColor);
-	return result != 0 ? new NSColor(result) : null;
+public float alphaComponent() {
+	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_alphaComponent);
 }
 
 public static NSColor blackColor() {
@@ -39,155 +33,32 @@ public static NSColor blackColor() {
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public float blackComponent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_blackComponent);
-}
-
-public NSColor blendedColorWithFraction(float fraction, NSColor color) {
-	int result = OS.objc_msgSend(this.id, OS.sel_blendedColorWithFraction_1ofColor_1, fraction, color != null ? color.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSColor(result) : null);
-}
-
-public static NSColor blueColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_blueColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
 public float blueComponent() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_blueComponent);
 }
 
-public float brightnessComponent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_brightnessComponent);
-}
-
-public static NSColor brownColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_brownColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSString catalogNameComponent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_catalogNameComponent);
-	return result != 0 ? new NSString(result) : null;
-}
-
 public static NSColor clearColor() {
 	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_clearColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public static NSColor colorForControlTint(int controlTint) {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorForControlTint_1, controlTint);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor colorFromPasteboard(NSPasteboard pasteBoard) {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorFromPasteboard_1, pasteBoard != null ? pasteBoard.id : 0);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSString colorNameComponent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_colorNameComponent);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSColorSpace colorSpace() {
-	int result = OS.objc_msgSend(this.id, OS.sel_colorSpace);
-	return result != 0 ? new NSColorSpace(result) : null;
-}
-
-public NSString colorSpaceName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_colorSpaceName);
-	return result != 0 ? new NSString(result) : null;
-}
-
 public NSColor colorUsingColorSpace(NSColorSpace space) {
-	int result = OS.objc_msgSend(this.id, OS.sel_colorUsingColorSpace_1, space != null ? space.id : 0);
+	int 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_1, colorSpace != null ? colorSpace.id : 0);
+public NSColor colorUsingColorSpaceName(NSString colorSpace) {
+	int 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 NSColor colorUsingColorSpaceName_device_(NSString colorSpace, NSDictionary deviceDescription) {
-	int result = OS.objc_msgSend(this.id, OS.sel_colorUsingColorSpaceName_1device_1, colorSpace != null ? colorSpace.id : 0, deviceDescription != null ? deviceDescription.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSColor(result) : null);
-}
-
-public NSColor colorWithAlphaComponent(float alpha) {
-	int result = OS.objc_msgSend(this.id, OS.sel_colorWithAlphaComponent_1, alpha);
-	return result == this.id ? this : (result != 0 ? new NSColor(result) : null);
-}
-
-public static NSColor colorWithCIColor(CIColor color) {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithCIColor_1, color != null ? color.id : 0);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor colorWithCalibratedHue(float hue, float saturation, float brightness, float alpha) {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithCalibratedHue_1saturation_1brightness_1alpha_1, hue, saturation, brightness, alpha);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor colorWithCalibratedRed(float red, float green, float blue, float alpha) {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithCalibratedRed_1green_1blue_1alpha_1, red, green, blue, alpha);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor colorWithCalibratedWhite(float white, float alpha) {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithCalibratedWhite_1alpha_1, white, alpha);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor colorWithCatalogName(NSString listName, NSString colorName) {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithCatalogName_1colorName_1, listName != null ? listName.id : 0, colorName != null ? colorName.id : 0);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor colorWithColorSpace(NSColorSpace space, int components, int numberOfComponents) {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithColorSpace_1components_1count_1, space != null ? space.id : 0, components, numberOfComponents);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor colorWithDeviceCyan(float cyan, float magenta, float yellow, float black, float alpha) {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithDeviceCyan_1magenta_1yellow_1black_1alpha_1, cyan, magenta, yellow, black, alpha);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor colorWithDeviceHue(float hue, float saturation, float brightness, float alpha) {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithDeviceHue_1saturation_1brightness_1alpha_1, hue, saturation, brightness, alpha);
-	return 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_1green_1blue_1alpha_1, red, green, blue, alpha);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor colorWithDeviceWhite(float white, float alpha) {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithDeviceWhite_1alpha_1, white, alpha);
+	int 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_1, image != null ? image.id : 0);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSArray controlAlternatingRowBackgroundColors() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlAlternatingRowBackgroundColors);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSColor controlBackgroundColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlBackgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor controlColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlColor);
+	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithPatternImage_, image != null ? image.id : 0);
 	return result != 0 ? new NSColor(result) : null;
 }
 
@@ -216,201 +87,32 @@ public static NSColor controlTextColor() {
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public static int currentControlTint() {
-	return OS.objc_msgSend(OS.class_NSColor, OS.sel_currentControlTint);
-}
-
-public static NSColor cyanColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_cyanColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public float cyanComponent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_cyanComponent);
-}
-
-public static NSColor darkGrayColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_darkGrayColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
 public static NSColor disabledControlTextColor() {
 	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_disabledControlTextColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public void drawSwatchInRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_drawSwatchInRect_1, rect);
-}
-
 public void getComponents(float[] components) {
-	OS.objc_msgSend(this.id, OS.sel_getComponents_1, components);
-}
-
-public void getCyan(int cyan, int magenta, int yellow, int black, int alpha) {
-	OS.objc_msgSend(this.id, OS.sel_getCyan_1magenta_1yellow_1black_1alpha_1, cyan, magenta, yellow, black, alpha);
-}
-
-public void getHue(int hue, int saturation, int brightness, int alpha) {
-	OS.objc_msgSend(this.id, OS.sel_getHue_1saturation_1brightness_1alpha_1, hue, saturation, brightness, alpha);
-}
-
-public void getRed(int red, int green, int blue, int alpha) {
-	OS.objc_msgSend(this.id, OS.sel_getRed_1green_1blue_1alpha_1, red, green, blue, alpha);
-}
-
-public void getWhite(int white, int alpha) {
-	OS.objc_msgSend(this.id, OS.sel_getWhite_1alpha_1, white, alpha);
-}
-
-public static NSColor grayColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_grayColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor greenColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_greenColor);
-	return result != 0 ? new NSColor(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_getComponents_, components);
 }
 
 public float greenComponent() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_greenComponent);
 }
 
-public static NSColor gridColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_gridColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor headerColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_headerColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor headerTextColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_headerTextColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor highlightColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_highlightColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSColor highlightWithLevel(float val) {
-	int result = OS.objc_msgSend(this.id, OS.sel_highlightWithLevel_1, val);
-	return result == this.id ? this : (result != 0 ? new NSColor(result) : null);
-}
-
-public float hueComponent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_hueComponent);
-}
-
-public static boolean ignoresAlpha() {
-	return OS.objc_msgSend(OS.class_NSColor, OS.sel_ignoresAlpha) != 0;
-}
-
-public static NSColor keyboardFocusIndicatorColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_keyboardFocusIndicatorColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor knobColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_knobColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor lightGrayColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_lightGrayColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSString localizedCatalogNameComponent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedCatalogNameComponent);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString localizedColorNameComponent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedColorNameComponent);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSColor magentaColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_magentaColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public float magentaComponent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_magentaComponent);
-}
-
 public int numberOfComponents() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfComponents);
 }
 
-public static NSColor orangeColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_orangeColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSImage patternImage() {
-	int result = OS.objc_msgSend(this.id, OS.sel_patternImage);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public static NSColor purpleColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_purpleColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor redColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_redColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
 public float redComponent() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_redComponent);
 }
 
-public float saturationComponent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_saturationComponent);
-}
-
-public static NSColor scrollBarColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_scrollBarColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
 public static NSColor secondarySelectedControlColor() {
 	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_secondarySelectedControlColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public static NSColor selectedControlColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedControlColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor selectedControlTextColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedControlTextColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor selectedKnobColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedKnobColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor selectedMenuItemColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedMenuItemColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public static NSColor selectedMenuItemTextColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedMenuItemTextColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
 public static NSColor selectedTextBackgroundColor() {
 	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedTextBackgroundColor);
 	return result != 0 ? new NSColor(result) : null;
@@ -429,24 +131,10 @@ public void setFill() {
 	OS.objc_msgSend(this.id, OS.sel_setFill);
 }
 
-public static void setIgnoresAlpha(boolean flag) {
-	OS.objc_msgSend(OS.class_NSColor, OS.sel_setIgnoresAlpha_1, flag);
-}
-
 public void setStroke() {
 	OS.objc_msgSend(this.id, OS.sel_setStroke);
 }
 
-public static NSColor shadowColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_shadowColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSColor shadowWithLevel(float val) {
-	int result = OS.objc_msgSend(this.id, OS.sel_shadowWithLevel_1, val);
-	return result == this.id ? this : (result != 0 ? new NSColor(result) : null);
-}
-
 public static NSColor textBackgroundColor() {
 	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_textBackgroundColor);
 	return result != 0 ? new NSColor(result) : null;
@@ -457,15 +145,6 @@ public static NSColor textColor() {
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public static NSColor whiteColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_whiteColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public float whiteComponent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_whiteComponent);
-}
-
 public static NSColor windowBackgroundColor() {
 	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowBackgroundColor);
 	return result != 0 ? new NSColor(result) : null;
@@ -481,17 +160,4 @@ public static NSColor windowFrameTextColor() {
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public void writeToPasteboard(NSPasteboard pasteBoard) {
-	OS.objc_msgSend(this.id, OS.sel_writeToPasteboard_1, pasteBoard != null ? pasteBoard.id : 0);
-}
-
-public static NSColor yellowColor() {
-	int result = OS.objc_msgSend(OS.class_NSColor, OS.sel_yellowColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public float yellowComponent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_yellowComponent);
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java
deleted file mode 100644
index 93453de9b5..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSColorList extends NSObject {
-
-public NSColorList() {
-	super();
-}
-
-public NSColorList(int id) {
-	super(id);
-}
-
-public NSArray allKeys() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allKeys);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray availableColorLists() {
-	int result = OS.objc_msgSend(OS.class_NSColorList, OS.sel_availableColorLists);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSColorList colorListNamed(NSString name) {
-	int result = OS.objc_msgSend(OS.class_NSColorList, OS.sel_colorListNamed_1, name != null ? name.id : 0);
-	return result != 0 ? new NSColorList(result) : null;
-}
-
-public NSColor colorWithKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_colorWithKey_1, key != null ? key.id : 0);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSColorList initWithName_(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithName_1, name != null ? name.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSColorList initWithName_fromFile_(NSString name, NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithName_1fromFile_1, name != null ? name.id : 0, path != null ? path.id : 0);
-	return result != 0 ? this : null;
-}
-
-public void insertColor(NSColor color, NSString key, int loc) {
-	OS.objc_msgSend(this.id, OS.sel_insertColor_1key_1atIndex_1, color != null ? color.id : 0, key != null ? key.id : 0, loc);
-}
-
-public boolean isEditable() {
-	return OS.objc_msgSend(this.id, OS.sel_isEditable) != 0;
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void removeColorWithKey(NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_removeColorWithKey_1, key != null ? key.id : 0);
-}
-
-public void removeFile() {
-	OS.objc_msgSend(this.id, OS.sel_removeFile);
-}
-
-public void setColor(NSColor color, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_setColor_1forKey_1, color != null ? color.id : 0, key != null ? key.id : 0);
-}
-
-public boolean writeToFile(NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToFile_1, path != null ? path.id : 0) != 0;
-}
-
-}
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 f9d11388b9..ac20fd7a9c 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
@@ -16,21 +16,12 @@ public NSColorPanel() {
 	super();
 }
 
-public NSColorPanel(int id) {
+public NSColorPanel(int /*long*/ id) {
 	super(id);
 }
 
-public NSView accessoryView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_accessoryView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public float alpha() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_alpha);
-}
-
-public void attachColorList(NSColorList colorList) {
-	OS.objc_msgSend(this.id, OS.sel_attachColorList_1, colorList != null ? colorList.id : 0);
+public NSColorPanel(id id) {
+	super(id);
 }
 
 public NSColor color() {
@@ -38,56 +29,8 @@ public NSColor color() {
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public void detachColorList(NSColorList colorList) {
-	OS.objc_msgSend(this.id, OS.sel_detachColorList_1, colorList != null ? colorList.id : 0);
-}
-
-public static boolean dragColor(NSColor color, NSEvent theEvent, NSView sourceView) {
-	return OS.objc_msgSend(OS.class_NSColorPanel, OS.sel_dragColor_1withEvent_1fromView_1, color != null ? color.id : 0, theEvent != null ? theEvent.id : 0, sourceView != null ? sourceView.id : 0) != 0;
-}
-
-public boolean isContinuous() {
-	return OS.objc_msgSend(this.id, OS.sel_isContinuous) != 0;
-}
-
-public int mode() {
-	return OS.objc_msgSend(this.id, OS.sel_mode);
-}
-
-public void setAccessoryView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_setAccessoryView_1, aView != null ? aView.id : 0);
-}
-
-public void setAction(int aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_setAction_1, aSelector);
-}
-
 public void setColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setColor_1, color != null ? color.id : 0);
-}
-
-public void setContinuous(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setContinuous_1, flag);
-}
-
-public void setMode(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setMode_1, mode);
-}
-
-public static void setPickerMask(int mask) {
-	OS.objc_msgSend(OS.class_NSColorPanel, OS.sel_setPickerMask_1, mask);
-}
-
-public static void setPickerMode(int mode) {
-	OS.objc_msgSend(OS.class_NSColorPanel, OS.sel_setPickerMode_1, mode);
-}
-
-public void setShowsAlpha(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsAlpha_1, flag);
-}
-
-public void setTarget(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setTarget_1, anObject != null ? anObject.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setColor_, color != null ? color.id : 0);
 }
 
 public static NSColorPanel sharedColorPanel() {
@@ -95,12 +38,4 @@ public static NSColorPanel sharedColorPanel() {
 	return result != 0 ? new NSColorPanel(result) : null;
 }
 
-public static boolean sharedColorPanelExists() {
-	return OS.objc_msgSend(OS.class_NSColorPanel, OS.sel_sharedColorPanelExists) != 0;
-}
-
-public boolean showsAlpha() {
-	return OS.objc_msgSend(this.id, OS.sel_showsAlpha) != 0;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPicker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPicker.java
deleted file mode 100644
index fdfbe90f72..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPicker.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSColorPicker extends NSObject {
-
-public NSColorPicker() {
-	super();
-}
-
-public NSColorPicker(int id) {
-	super(id);
-}
-
-public void attachColorList(NSColorList colorList) {
-	OS.objc_msgSend(this.id, OS.sel_attachColorList_1, colorList != null ? colorList.id : 0);
-}
-
-public NSString buttonToolTip() {
-	int result = OS.objc_msgSend(this.id, OS.sel_buttonToolTip);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSColorPanel colorPanel() {
-	int result = OS.objc_msgSend(this.id, OS.sel_colorPanel);
-	return result != 0 ? new NSColorPanel(result) : null;
-}
-
-public void detachColorList(NSColorList colorList) {
-	OS.objc_msgSend(this.id, OS.sel_detachColorList_1, colorList != null ? colorList.id : 0);
-}
-
-public NSColorPicker initWithPickerMask(int mask, NSColorPanel owningColorPanel) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithPickerMask_1colorPanel_1, mask, owningColorPanel != null ? owningColorPanel.id : 0);
-	return result != 0 ? this : null;
-}
-
-public void insertNewButtonImage(NSImage newButtonImage, NSButtonCell buttonCell) {
-	OS.objc_msgSend(this.id, OS.sel_insertNewButtonImage_1in_1, newButtonImage != null ? newButtonImage.id : 0, buttonCell != null ? buttonCell.id : 0);
-}
-
-public NSSize minContentSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_minContentSize);
-	return result;
-}
-
-public NSImage provideNewButtonImage() {
-	int result = OS.objc_msgSend(this.id, OS.sel_provideNewButtonImage);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public void setMode(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setMode_1, mode);
-}
-
-public void viewSizeChanged(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_viewSizeChanged_1, sender != null ? sender.id : 0);
-}
-
-}
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 335333427c..f8a34777bd 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,40 +16,12 @@ public NSColorSpace() {
 	super();
 }
 
-public NSColorSpace(int id) {
+public NSColorSpace(int /*long*/ id) {
 	super(id);
 }
 
-public int CGColorSpace() {
-	return OS.objc_msgSend(this.id, OS.sel_CGColorSpace);
-}
-
-public NSData ICCProfileData() {
-	int result = OS.objc_msgSend(this.id, OS.sel_ICCProfileData);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public static NSColorSpace adobeRGB1998ColorSpace() {
-	int result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_adobeRGB1998ColorSpace);
-	return result != 0 ? new NSColorSpace(result) : null;
-}
-
-public int colorSpaceModel() {
-	return OS.objc_msgSend(this.id, OS.sel_colorSpaceModel);
-}
-
-public int colorSyncProfile() {
-	return OS.objc_msgSend(this.id, OS.sel_colorSyncProfile);
-}
-
-public static NSColorSpace deviceCMYKColorSpace() {
-	int result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_deviceCMYKColorSpace);
-	return result != 0 ? new NSColorSpace(result) : null;
-}
-
-public static NSColorSpace deviceGrayColorSpace() {
-	int result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_deviceGrayColorSpace);
-	return result != 0 ? new NSColorSpace(result) : null;
+public NSColorSpace(id id) {
+	super(id);
 }
 
 public static NSColorSpace deviceRGBColorSpace() {
@@ -57,48 +29,4 @@ public static NSColorSpace deviceRGBColorSpace() {
 	return result != 0 ? new NSColorSpace(result) : null;
 }
 
-public static NSColorSpace genericCMYKColorSpace() {
-	int result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_genericCMYKColorSpace);
-	return result != 0 ? new NSColorSpace(result) : null;
-}
-
-public static NSColorSpace genericGrayColorSpace() {
-	int result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_genericGrayColorSpace);
-	return result != 0 ? new NSColorSpace(result) : null;
-}
-
-public static NSColorSpace genericRGBColorSpace() {
-	int result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_genericRGBColorSpace);
-	return result != 0 ? new NSColorSpace(result) : null;
-}
-
-public NSColorSpace initWithCGColorSpace(int cgColorSpace) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCGColorSpace_1, cgColorSpace);
-	return result != 0 ? this : null;
-}
-
-public NSColorSpace initWithColorSyncProfile(int prof) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithColorSyncProfile_1, prof);
-	return result != 0 ? this : null;
-}
-
-public NSColorSpace initWithICCProfileData(NSData iccData) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithICCProfileData_1, iccData != null ? iccData.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSString localizedName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int numberOfColorComponents() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfColorComponents);
-}
-
-public static NSColorSpace sRGBColorSpace() {
-	int result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_sRGBColorSpace);
-	return result != 0 ? new NSColorSpace(result) : null;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorWell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorWell.java
deleted file mode 100644
index 4984331bff..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorWell.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSColorWell extends NSControl {
-
-public NSColorWell() {
-	super();
-}
-
-public NSColorWell(int id) {
-	super(id);
-}
-
-public void activate(boolean exclusive) {
-	OS.objc_msgSend(this.id, OS.sel_activate_1, exclusive);
-}
-
-public NSColor color() {
-	int result = OS.objc_msgSend(this.id, OS.sel_color);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public void deactivate() {
-	OS.objc_msgSend(this.id, OS.sel_deactivate);
-}
-
-public void drawWellInside(NSRect insideRect) {
-	OS.objc_msgSend(this.id, OS.sel_drawWellInside_1, insideRect);
-}
-
-public boolean isActive() {
-	return OS.objc_msgSend(this.id, OS.sel_isActive) != 0;
-}
-
-public boolean isBordered() {
-	return OS.objc_msgSend(this.id, OS.sel_isBordered) != 0;
-}
-
-public void setBordered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBordered_1, flag);
-}
-
-public void setColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setColor_1, color != null ? color.id : 0);
-}
-
-public void takeColorFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeColorFrom_1, sender != null ? sender.id : 0);
-}
-
-}
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 7916abfcfc..fb9a9b1c31 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,37 +16,20 @@ public NSComboBox() {
 	super();
 }
 
-public NSComboBox(int id) {
+public NSComboBox(int /*long*/ id) {
 	super(id);
 }
 
-public void addItemWithObjectValue(id object) {
-	OS.objc_msgSend(this.id, OS.sel_addItemWithObjectValue_1, object != null ? object.id : 0);
-}
-
-public void addItemsWithObjectValues(NSArray objects) {
-	OS.objc_msgSend(this.id, OS.sel_addItemsWithObjectValues_1, objects != null ? objects.id : 0);
-}
-
-public boolean completes() {
-	return OS.objc_msgSend(this.id, OS.sel_completes) != 0;
+public NSComboBox(id id) {
+	super(id);
 }
 
-public id dataSource() {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataSource);
-	return result != 0 ? new id(result) : null;
+public void addItemWithObjectValue(id object) {
+	OS.objc_msgSend(this.id, OS.sel_addItemWithObjectValue_, object != null ? object.id : 0);
 }
 
 public void deselectItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_deselectItemAtIndex_1, index);
-}
-
-public boolean hasVerticalScroller() {
-	return OS.objc_msgSend(this.id, OS.sel_hasVerticalScroller) != 0;
-}
-
-public int indexOfItemWithObjectValue(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithObjectValue_1, object != null ? object.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_deselectItemAtIndex_, index);
 }
 
 public int indexOfSelectedItem() {
@@ -54,30 +37,12 @@ public int indexOfSelectedItem() {
 }
 
 public void insertItemWithObjectValue(id object, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertItemWithObjectValue_1atIndex_1, object != null ? object.id : 0, index);
-}
-
-public NSSize intercellSpacing() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_intercellSpacing);
-	return result;
-}
-
-public boolean isButtonBordered() {
-	return OS.objc_msgSend(this.id, OS.sel_isButtonBordered) != 0;
-}
-
-public float itemHeight() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_itemHeight);
-}
-
-public int itemObjectValueAtIndex(int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemObjectValueAtIndex_1, index);
-	return result != 0 ? result : 0;
+	OS.objc_msgSend(this.id, OS.sel_insertItemWithObjectValue_atIndex_, object != null ? object.id : 0, index);
 }
 
-public void noteNumberOfItemsChanged() {
-	OS.objc_msgSend(this.id, OS.sel_noteNumberOfItemsChanged);
+public id itemObjectValueAtIndex(int index) {
+	int result = OS.objc_msgSend(this.id, OS.sel_itemObjectValueAtIndex_, index);
+	return result != 0 ? new id(result) : null;
 }
 
 public int numberOfItems() {
@@ -88,82 +53,20 @@ public int numberOfVisibleItems() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfVisibleItems);
 }
 
-public id objectValueOfSelectedItem() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectValueOfSelectedItem);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSArray objectValues() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectValues);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void reloadData() {
-	OS.objc_msgSend(this.id, OS.sel_reloadData);
-}
-
 public void removeAllItems() {
 	OS.objc_msgSend(this.id, OS.sel_removeAllItems);
 }
 
 public void removeItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_1, index);
-}
-
-public void removeItemWithObjectValue(id object) {
-	OS.objc_msgSend(this.id, OS.sel_removeItemWithObjectValue_1, object != null ? object.id : 0);
-}
-
-public void scrollItemAtIndexToTop(int index) {
-	OS.objc_msgSend(this.id, OS.sel_scrollItemAtIndexToTop_1, index);
-}
-
-public void scrollItemAtIndexToVisible(int index) {
-	OS.objc_msgSend(this.id, OS.sel_scrollItemAtIndexToVisible_1, index);
+	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index);
 }
 
 public void selectItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_1, index);
-}
-
-public void selectItemWithObjectValue(id object) {
-	OS.objc_msgSend(this.id, OS.sel_selectItemWithObjectValue_1, object != null ? object.id : 0);
-}
-
-public void setButtonBordered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setButtonBordered_1, flag);
-}
-
-public void setCompletes(boolean completes) {
-	OS.objc_msgSend(this.id, OS.sel_setCompletes_1, completes);
-}
-
-public void setDataSource(id aSource) {
-	OS.objc_msgSend(this.id, OS.sel_setDataSource_1, aSource != null ? aSource.id : 0);
-}
-
-public void setHasVerticalScroller(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHasVerticalScroller_1, flag);
-}
-
-public void setIntercellSpacing(NSSize aSize) {
-	OS.objc_msgSend(this.id, OS.sel_setIntercellSpacing_1, aSize);
-}
-
-public void setItemHeight(float itemHeight) {
-	OS.objc_msgSend(this.id, OS.sel_setItemHeight_1, itemHeight);
+	OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_, index);
 }
 
 public void setNumberOfVisibleItems(int visibleItems) {
-	OS.objc_msgSend(this.id, OS.sel_setNumberOfVisibleItems_1, visibleItems);
-}
-
-public void setUsesDataSource(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesDataSource_1, flag);
-}
-
-public boolean usesDataSource() {
-	return OS.objc_msgSend(this.id, OS.sel_usesDataSource) != 0;
+	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/NSComboBoxCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBoxCell.java
deleted file mode 100644
index addc661414..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBoxCell.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSComboBoxCell extends NSTextFieldCell {
-
-public NSComboBoxCell() {
-	super();
-}
-
-public NSComboBoxCell(int id) {
-	super(id);
-}
-
-public void addItemWithObjectValue(id object) {
-	OS.objc_msgSend(this.id, OS.sel_addItemWithObjectValue_1, object != null ? object.id : 0);
-}
-
-public void addItemsWithObjectValues(NSArray objects) {
-	OS.objc_msgSend(this.id, OS.sel_addItemsWithObjectValues_1, objects != null ? objects.id : 0);
-}
-
-public NSString completedString(NSString string) {
-	int result = OS.objc_msgSend(this.id, OS.sel_completedString_1, string != null ? string.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean completes() {
-	return OS.objc_msgSend(this.id, OS.sel_completes) != 0;
-}
-
-public id dataSource() {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataSource);
-	return result != 0 ? new id(result) : null;
-}
-
-public void deselectItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_deselectItemAtIndex_1, index);
-}
-
-public boolean hasVerticalScroller() {
-	return OS.objc_msgSend(this.id, OS.sel_hasVerticalScroller) != 0;
-}
-
-public int indexOfItemWithObjectValue(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithObjectValue_1, object != null ? object.id : 0);
-}
-
-public int indexOfSelectedItem() {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfSelectedItem);
-}
-
-public void insertItemWithObjectValue(id object, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertItemWithObjectValue_1atIndex_1, object != null ? object.id : 0, index);
-}
-
-public NSSize intercellSpacing() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_intercellSpacing);
-	return result;
-}
-
-public boolean isButtonBordered() {
-	return OS.objc_msgSend(this.id, OS.sel_isButtonBordered) != 0;
-}
-
-public float itemHeight() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_itemHeight);
-}
-
-public id itemObjectValueAtIndex(int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemObjectValueAtIndex_1, index);
-	return result != 0 ? new id(result) : null;
-}
-
-public void noteNumberOfItemsChanged() {
-	OS.objc_msgSend(this.id, OS.sel_noteNumberOfItemsChanged);
-}
-
-public int numberOfItems() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfItems);
-}
-
-public int numberOfVisibleItems() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfVisibleItems);
-}
-
-public id objectValueOfSelectedItem() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectValueOfSelectedItem);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSArray objectValues() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectValues);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void reloadData() {
-	OS.objc_msgSend(this.id, OS.sel_reloadData);
-}
-
-public void removeAllItems() {
-	OS.objc_msgSend(this.id, OS.sel_removeAllItems);
-}
-
-public void removeItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_1, index);
-}
-
-public void removeItemWithObjectValue(id object) {
-	OS.objc_msgSend(this.id, OS.sel_removeItemWithObjectValue_1, object != null ? object.id : 0);
-}
-
-public void scrollItemAtIndexToTop(int index) {
-	OS.objc_msgSend(this.id, OS.sel_scrollItemAtIndexToTop_1, index);
-}
-
-public void scrollItemAtIndexToVisible(int index) {
-	OS.objc_msgSend(this.id, OS.sel_scrollItemAtIndexToVisible_1, index);
-}
-
-public void selectItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_1, index);
-}
-
-public void selectItemWithObjectValue(id object) {
-	OS.objc_msgSend(this.id, OS.sel_selectItemWithObjectValue_1, object != null ? object.id : 0);
-}
-
-public void setButtonBordered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setButtonBordered_1, flag);
-}
-
-public void setCompletes(boolean completes) {
-	OS.objc_msgSend(this.id, OS.sel_setCompletes_1, completes);
-}
-
-public void setDataSource(id aSource) {
-	OS.objc_msgSend(this.id, OS.sel_setDataSource_1, aSource != null ? aSource.id : 0);
-}
-
-public void setHasVerticalScroller(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHasVerticalScroller_1, flag);
-}
-
-public void setIntercellSpacing(NSSize aSize) {
-	OS.objc_msgSend(this.id, OS.sel_setIntercellSpacing_1, aSize);
-}
-
-public void setItemHeight(float itemHeight) {
-	OS.objc_msgSend(this.id, OS.sel_setItemHeight_1, itemHeight);
-}
-
-public void setNumberOfVisibleItems(int visibleItems) {
-	OS.objc_msgSend(this.id, OS.sel_setNumberOfVisibleItems_1, visibleItems);
-}
-
-public void setUsesDataSource(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesDataSource_1, flag);
-}
-
-public boolean usesDataSource() {
-	return OS.objc_msgSend(this.id, OS.sel_usesDataSource) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComparisonPredicate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComparisonPredicate.java
deleted file mode 100644
index 9b95777f09..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComparisonPredicate.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSComparisonPredicate extends NSPredicate {
-
-public NSComparisonPredicate() {
-	super();
-}
-
-public NSComparisonPredicate(int id) {
-	super(id);
-}
-
-public int comparisonPredicateModifier() {
-	return OS.objc_msgSend(this.id, OS.sel_comparisonPredicateModifier);
-}
-
-public int customSelector() {
-	return OS.objc_msgSend(this.id, OS.sel_customSelector);
-}
-
-public NSComparisonPredicate initWithLeftExpression_rightExpression_customSelector_(NSExpression lhs, NSExpression rhs, int selector) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithLeftExpression_1rightExpression_1customSelector_1, lhs != null ? lhs.id : 0, rhs != null ? rhs.id : 0, selector);
-	return result != 0 ? this : null;
-}
-
-public NSComparisonPredicate initWithLeftExpression_rightExpression_modifier_type_options_(NSExpression lhs, NSExpression rhs, int modifier, int type, int options) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithLeftExpression_1rightExpression_1modifier_1type_1options_1, lhs != null ? lhs.id : 0, rhs != null ? rhs.id : 0, modifier, type, options);
-	return result != 0 ? this : null;
-}
-
-public NSExpression leftExpression() {
-	int result = OS.objc_msgSend(this.id, OS.sel_leftExpression);
-	return result != 0 ? new NSExpression(result) : null;
-}
-
-public int options() {
-	return OS.objc_msgSend(this.id, OS.sel_options);
-}
-
-public int predicateOperatorType() {
-	return OS.objc_msgSend(this.id, OS.sel_predicateOperatorType);
-}
-
-public static NSPredicate static_predicateWithLeftExpression_rightExpression_customSelector_(NSExpression lhs, NSExpression rhs, int selector) {
-	int result = OS.objc_msgSend(OS.class_NSComparisonPredicate, OS.sel_predicateWithLeftExpression_1rightExpression_1customSelector_1, lhs != null ? lhs.id : 0, rhs != null ? rhs.id : 0, selector);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public static NSPredicate static_predicateWithLeftExpression_rightExpression_modifier_type_options_(NSExpression lhs, NSExpression rhs, int modifier, int type, int options) {
-	int result = OS.objc_msgSend(OS.class_NSComparisonPredicate, OS.sel_predicateWithLeftExpression_1rightExpression_1modifier_1type_1options_1, lhs != null ? lhs.id : 0, rhs != null ? rhs.id : 0, modifier, type, options);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public NSExpression rightExpression() {
-	int result = OS.objc_msgSend(this.id, OS.sel_rightExpression);
-	return result != 0 ? new NSExpression(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCompoundPredicate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCompoundPredicate.java
deleted file mode 100644
index ab78db8dde..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCompoundPredicate.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCompoundPredicate extends NSPredicate {
-
-public NSCompoundPredicate() {
-	super();
-}
-
-public NSCompoundPredicate(int id) {
-	super(id);
-}
-
-public static NSPredicate andPredicateWithSubpredicates(NSArray subpredicates) {
-	int result = OS.objc_msgSend(OS.class_NSCompoundPredicate, OS.sel_andPredicateWithSubpredicates_1, subpredicates != null ? subpredicates.id : 0);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public int compoundPredicateType() {
-	return OS.objc_msgSend(this.id, OS.sel_compoundPredicateType);
-}
-
-public id initWithType(int type, NSArray subpredicates) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithType_1subpredicates_1, type, subpredicates != null ? subpredicates.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSPredicate notPredicateWithSubpredicate(NSPredicate predicate) {
-	int result = OS.objc_msgSend(OS.class_NSCompoundPredicate, OS.sel_notPredicateWithSubpredicate_1, predicate != null ? predicate.id : 0);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public static NSPredicate orPredicateWithSubpredicates(NSArray subpredicates) {
-	int result = OS.objc_msgSend(OS.class_NSCompoundPredicate, OS.sel_orPredicateWithSubpredicates_1, subpredicates != null ? subpredicates.id : 0);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public NSArray subpredicates() {
-	int result = OS.objc_msgSend(this.id, OS.sel_subpredicates);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCondition.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCondition.java
deleted file mode 100644
index c385a7b054..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCondition.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCondition extends NSObject {
-
-public NSCondition() {
-	super();
-}
-
-public NSCondition(int id) {
-	super(id);
-}
-
-public void broadcast() {
-	OS.objc_msgSend(this.id, OS.sel_broadcast);
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setName(NSString n) {
-	OS.objc_msgSend(this.id, OS.sel_setName_1, n != null ? n.id : 0);
-}
-
-public void signal() {
-	OS.objc_msgSend(this.id, OS.sel_signal);
-}
-
-public boolean waitUntilDate(NSDate limit) {
-	return OS.objc_msgSend(this.id, OS.sel_waitUntilDate_1, limit != null ? limit.id : 0) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSConditionLock.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSConditionLock.java
deleted file mode 100644
index 939502c7d7..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSConditionLock.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSConditionLock extends NSObject {
-
-public NSConditionLock() {
-	super();
-}
-
-public NSConditionLock(int id) {
-	super(id);
-}
-
-public int condition() {
-	return OS.objc_msgSend(this.id, OS.sel_condition);
-}
-
-public id initWithCondition(int condition) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCondition_1, condition);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean lockBeforeDate(NSDate limit) {
-	return OS.objc_msgSend(this.id, OS.sel_lockBeforeDate_1, limit != null ? limit.id : 0) != 0;
-}
-
-public void lockWhenCondition_(int condition) {
-	OS.objc_msgSend(this.id, OS.sel_lockWhenCondition_1, condition);
-}
-
-public boolean lockWhenCondition_beforeDate_(int condition, NSDate limit) {
-	return OS.objc_msgSend(this.id, OS.sel_lockWhenCondition_1beforeDate_1, condition, limit != null ? limit.id : 0) != 0;
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setName(NSString n) {
-	OS.objc_msgSend(this.id, OS.sel_setName_1, n != null ? n.id : 0);
-}
-
-public boolean tryLock() {
-	return OS.objc_msgSend(this.id, OS.sel_tryLock) != 0;
-}
-
-public boolean tryLockWhenCondition(int condition) {
-	return OS.objc_msgSend(this.id, OS.sel_tryLockWhenCondition_1, condition) != 0;
-}
-
-public void unlockWithCondition(int condition) {
-	OS.objc_msgSend(this.id, OS.sel_unlockWithCondition_1, condition);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSConnection.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSConnection.java
deleted file mode 100644
index 633cfba6ef..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSConnection.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSConnection extends NSObject {
-
-public NSConnection() {
-	super();
-}
-
-public NSConnection(int id) {
-	super(id);
-}
-
-public void addRequestMode(NSString rmode) {
-	OS.objc_msgSend(this.id, OS.sel_addRequestMode_1, rmode != null ? rmode.id : 0);
-}
-
-public void addRunLoop(NSRunLoop runloop) {
-	OS.objc_msgSend(this.id, OS.sel_addRunLoop_1, runloop != null ? runloop.id : 0);
-}
-
-public static NSArray allConnections() {
-	int result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_allConnections);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static id connectionWithReceivePort(NSPort receivePort, NSPort sendPort) {
-	int result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_connectionWithReceivePort_1sendPort_1, receivePort != null ? receivePort.id : 0, sendPort != null ? sendPort.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_connectionWithRegisteredName_host_(NSString name, NSString hostName) {
-	int result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_connectionWithRegisteredName_1host_1, name != null ? name.id : 0, hostName != null ? hostName.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_connectionWithRegisteredName_host_usingNameServer_(NSString name, NSString hostName, NSPortNameServer server) {
-	int result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_connectionWithRegisteredName_1host_1usingNameServer_1, name != null ? name.id : 0, hostName != null ? hostName.id : 0, server != null ? server.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id currentConversation() {
-	int result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_currentConversation);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSConnection defaultConnection() {
-	int result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_defaultConnection);
-	return result != 0 ? new NSConnection(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void enableMultipleThreads() {
-	OS.objc_msgSend(this.id, OS.sel_enableMultipleThreads);
-}
-
-public boolean independentConversationQueueing() {
-	return OS.objc_msgSend(this.id, OS.sel_independentConversationQueueing) != 0;
-}
-
-public id initWithReceivePort(NSPort receivePort, NSPort sendPort) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithReceivePort_1sendPort_1, receivePort != null ? receivePort.id : 0, sendPort != null ? sendPort.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void invalidate() {
-	OS.objc_msgSend(this.id, OS.sel_invalidate);
-}
-
-public boolean isValid() {
-	return OS.objc_msgSend(this.id, OS.sel_isValid) != 0;
-}
-
-public NSArray localObjects() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localObjects);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean multipleThreadsEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_multipleThreadsEnabled) != 0;
-}
-
-public NSPort receivePort() {
-	int result = OS.objc_msgSend(this.id, OS.sel_receivePort);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public boolean registerName_(NSString name) {
-	return OS.objc_msgSend(this.id, OS.sel_registerName_1, name != null ? name.id : 0) != 0;
-}
-
-public boolean registerName_withNameServer_(NSString name, NSPortNameServer server) {
-	return OS.objc_msgSend(this.id, OS.sel_registerName_1withNameServer_1, name != null ? name.id : 0, server != null ? server.id : 0) != 0;
-}
-
-public NSArray remoteObjects() {
-	int result = OS.objc_msgSend(this.id, OS.sel_remoteObjects);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void removeRequestMode(NSString rmode) {
-	OS.objc_msgSend(this.id, OS.sel_removeRequestMode_1, rmode != null ? rmode.id : 0);
-}
-
-public void removeRunLoop(NSRunLoop runloop) {
-	OS.objc_msgSend(this.id, OS.sel_removeRunLoop_1, runloop != null ? runloop.id : 0);
-}
-
-public double replyTimeout() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_replyTimeout);
-}
-
-public NSArray requestModes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_requestModes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public double requestTimeout() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_requestTimeout);
-}
-
-public id rootObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_rootObject);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSDistantObject rootProxy() {
-	int result = OS.objc_msgSend(this.id, OS.sel_rootProxy);
-	return result != 0 ? new NSDistantObject(result) : null;
-}
-
-public static NSDistantObject static_rootProxyForConnectionWithRegisteredName_host_(NSString name, NSString hostName) {
-	int result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_rootProxyForConnectionWithRegisteredName_1host_1, name != null ? name.id : 0, hostName != null ? hostName.id : 0);
-	return result != 0 ? new NSDistantObject(result) : null;
-}
-
-public static NSDistantObject static_rootProxyForConnectionWithRegisteredName_host_usingNameServer_(NSString name, NSString hostName, NSPortNameServer server) {
-	int result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_rootProxyForConnectionWithRegisteredName_1host_1usingNameServer_1, name != null ? name.id : 0, hostName != null ? hostName.id : 0, server != null ? server.id : 0);
-	return result != 0 ? new NSDistantObject(result) : null;
-}
-
-public void runInNewThread() {
-	OS.objc_msgSend(this.id, OS.sel_runInNewThread);
-}
-
-public NSPort sendPort() {
-	int result = OS.objc_msgSend(this.id, OS.sel_sendPort);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public static id static_serviceConnectionWithName_rootObject_(NSString name, id root) {
-	int result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_serviceConnectionWithName_1rootObject_1, name != null ? name.id : 0, root != null ? root.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_serviceConnectionWithName_rootObject_usingNameServer_(NSString name, id root, NSPortNameServer server) {
-	int result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_serviceConnectionWithName_1rootObject_1usingNameServer_1, name != null ? name.id : 0, root != null ? root.id : 0, server != null ? server.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public void setIndependentConversationQueueing(boolean yorn) {
-	OS.objc_msgSend(this.id, OS.sel_setIndependentConversationQueueing_1, yorn);
-}
-
-public void setReplyTimeout(double ti) {
-	OS.objc_msgSend(this.id, OS.sel_setReplyTimeout_1, ti);
-}
-
-public void setRequestTimeout(double ti) {
-	OS.objc_msgSend(this.id, OS.sel_setRequestTimeout_1, ti);
-}
-
-public void setRootObject(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setRootObject_1, anObject != null ? anObject.id : 0);
-}
-
-public NSDictionary statistics() {
-	int result = OS.objc_msgSend(this.id, OS.sel_statistics);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-}
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 181578145f..b122f3c621 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,42 +16,21 @@ public NSControl() {
 	super();
 }
 
-public NSControl(int id) {
+public NSControl(int /*long*/ id) {
 	super(id);
 }
 
-public boolean abortEditing() {
-	return OS.objc_msgSend(this.id, OS.sel_abortEditing) != 0;
+public NSControl(id id) {
+	super(id);
 }
 
 public int action() {
 	return OS.objc_msgSend(this.id, OS.sel_action);
 }
 
-public int alignment() {
-	return OS.objc_msgSend(this.id, OS.sel_alignment);
-}
-
-public NSAttributedString attributedStringValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedStringValue);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public int baseWritingDirection() {
-	return OS.objc_msgSend(this.id, OS.sel_baseWritingDirection);
-}
-
-public void calcSize() {
-	OS.objc_msgSend(this.id, OS.sel_calcSize);
-}
-
-public int cell() {
+public NSCell cell() {
 	int result = OS.objc_msgSend(this.id, OS.sel_cell);
-	return result != 0 ? result : 0;
-}
-
-public static int cellClass() {
-	return OS.objc_msgSend(OS.class_NSControl, OS.sel_cellClass);
+	return result != 0 ? new NSCell(result) : null;
 }
 
 public NSText currentEditor() {
@@ -63,14 +42,6 @@ public double doubleValue() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_doubleValue);
 }
 
-public void drawCell(NSCell aCell) {
-	OS.objc_msgSend(this.id, OS.sel_drawCell_1, aCell != null ? aCell.id : 0);
-}
-
-public void drawCellInside(NSCell aCell) {
-	OS.objc_msgSend(this.id, OS.sel_drawCellInside_1, aCell != null ? aCell.id : 0);
-}
-
 public float floatValue() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_floatValue);
 }
@@ -80,209 +51,41 @@ public NSFont font() {
 	return result != 0 ? new NSFont(result) : null;
 }
 
-public id formatter() {
-	int result = OS.objc_msgSend(this.id, OS.sel_formatter);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean ignoresMultiClick() {
-	return OS.objc_msgSend(this.id, OS.sel_ignoresMultiClick) != 0;
-}
-
-public int intValue() {
-	return OS.objc_msgSend(this.id, OS.sel_intValue);
-}
-
-public int integerValue() {
-	return OS.objc_msgSend(this.id, OS.sel_integerValue);
-}
-
-public boolean isContinuous() {
-	return OS.objc_msgSend(this.id, OS.sel_isContinuous) != 0;
-}
-
-public boolean isEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isEnabled) != 0;
-}
-
-public void mouseDown(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_mouseDown_1, theEvent != null ? theEvent.id : 0);
-}
-
-public id objectValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectValue);
-	return result != 0 ? new id(result) : null;
-}
-
-public void performClick(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_performClick_1, sender != null ? sender.id : 0);
-}
-
-public boolean refusesFirstResponder() {
-	return OS.objc_msgSend(this.id, OS.sel_refusesFirstResponder) != 0;
-}
-
-public void selectCell(NSCell aCell) {
-	OS.objc_msgSend(this.id, OS.sel_selectCell_1, aCell != null ? aCell.id : 0);
-}
-
-public id selectedCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedCell);
-	return result != 0 ? new id(result) : null;
-}
-
-public int selectedTag() {
-	return OS.objc_msgSend(this.id, OS.sel_selectedTag);
-}
-
 public boolean sendAction(int theAction, id theTarget) {
-	return OS.objc_msgSend(this.id, OS.sel_sendAction_1to_1, theAction, theTarget != null ? theTarget.id : 0) != 0;
-}
-
-public int sendActionOn(int mask) {
-	return OS.objc_msgSend(this.id, OS.sel_sendActionOn_1, mask);
+	return OS.objc_msgSend(this.id, OS.sel_sendAction_to_, theAction, theTarget != null ? theTarget.id : 0) != 0;
 }
 
 public void setAction(int aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_setAction_1, aSelector);
+	OS.objc_msgSend(this.id, OS.sel_setAction_, aSelector);
 }
 
 public void setAlignment(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setAlignment_1, mode);
-}
-
-public void setAttributedStringValue(NSAttributedString obj) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedStringValue_1, obj != null ? obj.id : 0);
-}
-
-public void setBaseWritingDirection(int writingDirection) {
-	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_1, writingDirection);
-}
-
-public void setCell(NSCell aCell) {
-	OS.objc_msgSend(this.id, OS.sel_setCell_1, aCell != null ? aCell.id : 0);
-}
-
-public static void setCellClass(int factoryId) {
-	OS.objc_msgSend(OS.class_NSControl, OS.sel_setCellClass_1, factoryId);
-}
-
-public void setContinuous(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setContinuous_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setAlignment_, mode);
 }
 
 public void setDoubleValue(double aDouble) {
-	OS.objc_msgSend(this.id, OS.sel_setDoubleValue_1, aDouble);
+	OS.objc_msgSend(this.id, OS.sel_setDoubleValue_, aDouble);
 }
 
 public void setEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEnabled_1, flag);
-}
-
-public void setFloatValue(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setFloatValue_1, aFloat);
-}
-
-public void setFloatingPointFormat(boolean autoRange, int leftDigits, int rightDigits) {
-	OS.objc_msgSend(this.id, OS.sel_setFloatingPointFormat_1left_1right_1, autoRange, leftDigits, rightDigits);
+	OS.objc_msgSend(this.id, OS.sel_setEnabled_, flag);
 }
 
 public void setFont(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setFont_1, fontObj != null ? fontObj.id : 0);
-}
-
-public void setFormatter(NSFormatter newFormatter) {
-	OS.objc_msgSend(this.id, OS.sel_setFormatter_1, newFormatter != null ? newFormatter.id : 0);
-}
-
-public void setIgnoresMultiClick(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setIgnoresMultiClick_1, flag);
-}
-
-public void setIntValue(int anInt) {
-	OS.objc_msgSend(this.id, OS.sel_setIntValue_1, anInt);
-}
-
-public void setIntegerValue(int anInteger) {
-	OS.objc_msgSend(this.id, OS.sel_setIntegerValue_1, anInteger);
-}
-
-public void setNeedsDisplay() {
-	OS.objc_msgSend(this.id, OS.sel_setNeedsDisplay);
-}
-
-public void setObjectValue(id obj) {
-	OS.objc_msgSend(this.id, OS.sel_setObjectValue_1, obj != null ? obj.id : 0);
-}
-
-public void setRefusesFirstResponder(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setRefusesFirstResponder_1, flag);
-}
-
-public void setStringValue(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setStringValue_1, aString != null ? aString.id : 0);
-}
-
-public void setTag(int anInt) {
-	OS.objc_msgSend(this.id, OS.sel_setTag_1, anInt);
+	OS.objc_msgSend(this.id, OS.sel_setFont_, fontObj != null ? fontObj.id : 0);
 }
 
 public void setTarget(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setTarget_1, anObject != null ? anObject.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setTarget_, anObject != null ? anObject.id : 0);
 }
 
 public void sizeToFit() {
 	OS.objc_msgSend(this.id, OS.sel_sizeToFit);
 }
 
-public NSString stringValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringValue);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int tag() {
-	return OS.objc_msgSend(this.id, OS.sel_tag);
-}
-
-public void takeDoubleValueFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeDoubleValueFrom_1, sender != null ? sender.id : 0);
-}
-
-public void takeFloatValueFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeFloatValueFrom_1, sender != null ? sender.id : 0);
-}
-
-public void takeIntValueFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeIntValueFrom_1, sender != null ? sender.id : 0);
-}
-
-public void takeIntegerValueFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeIntegerValueFrom_1, sender != null ? sender.id : 0);
-}
-
-public void takeObjectValueFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeObjectValueFrom_1, sender != null ? sender.id : 0);
-}
-
-public void takeStringValueFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeStringValueFrom_1, sender != null ? sender.id : 0);
-}
-
 public id target() {
 	int result = OS.objc_msgSend(this.id, OS.sel_target);
 	return result != 0 ? new id(result) : null;
 }
 
-public void updateCell(NSCell aCell) {
-	OS.objc_msgSend(this.id, OS.sel_updateCell_1, aCell != null ? aCell.id : 0);
-}
-
-public void updateCellInside(NSCell aCell) {
-	OS.objc_msgSend(this.id, OS.sel_updateCellInside_1, aCell != null ? aCell.id : 0);
-}
-
-public void validateEditing() {
-	OS.objc_msgSend(this.id, OS.sel_validateEditing);
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSController.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSController.java
deleted file mode 100644
index ed5c9e3a8e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSController extends NSObject {
-
-public NSController() {
-	super();
-}
-
-public NSController(int id) {
-	super(id);
-}
-
-public boolean commitEditing() {
-	return OS.objc_msgSend(this.id, OS.sel_commitEditing) != 0;
-}
-
-public void commitEditingWithDelegate(id delegate, int didCommitSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_commitEditingWithDelegate_1didCommitSelector_1contextInfo_1, delegate != null ? delegate.id : 0, didCommitSelector, contextInfo);
-}
-
-public void discardEditing() {
-	OS.objc_msgSend(this.id, OS.sel_discardEditing);
-}
-
-public boolean isEditing() {
-	return OS.objc_msgSend(this.id, OS.sel_isEditing) != 0;
-}
-
-public void objectDidBeginEditing(id editor) {
-	OS.objc_msgSend(this.id, OS.sel_objectDidBeginEditing_1, editor != null ? editor.id : 0);
-}
-
-public void objectDidEndEditing(id editor) {
-	OS.objc_msgSend(this.id, OS.sel_objectDidEndEditing_1, editor != null ? editor.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCountedSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCountedSet.java
deleted file mode 100644
index 8ffd7b47ef..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCountedSet.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCountedSet extends NSMutableSet {
-
-public NSCountedSet() {
-	super();
-}
-
-public NSCountedSet(int id) {
-	super(id);
-}
-
-public void addObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_addObject_1, object != null ? object.id : 0);
-}
-
-public int countForObject(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_countForObject_1, object != null ? object.id : 0);
-}
-
-public NSCountedSet initWithSet(NSSet set) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithSet_1, set != null ? set.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSEnumerator objectEnumerator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
-	return result != 0 ? new NSEnumerator(result) : null;
-}
-
-public void removeObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_removeObject_1, object != null ? object.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCreateCommand.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCreateCommand.java
deleted file mode 100644
index 16555dd25b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCreateCommand.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCreateCommand extends NSScriptCommand {
-
-public NSCreateCommand() {
-	super();
-}
-
-public NSCreateCommand(int id) {
-	super(id);
-}
-
-public NSScriptClassDescription createClassDescription() {
-	int result = OS.objc_msgSend(this.id, OS.sel_createClassDescription);
-	return result != 0 ? new NSScriptClassDescription(result) : null;
-}
-
-public NSDictionary resolvedKeyDictionary() {
-	int result = OS.objc_msgSend(this.id, OS.sel_resolvedKeyDictionary);
-	return result != 0 ? new NSDictionary(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 996c81eba1..3fe808a4c0 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,7 +16,11 @@ public NSCursor() {
 	super();
 }
 
-public NSCursor(int id) {
+public NSCursor(int /*long*/ id) {
+	super(id);
+}
+
+public NSCursor(id id) {
 	super(id);
 }
 
@@ -30,70 +34,14 @@ public static NSCursor arrowCursor() {
 	return result != 0 ? new NSCursor(result) : null;
 }
 
-public static NSCursor closedHandCursor() {
-	int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_closedHandCursor);
-	return result != 0 ? new NSCursor(result) : null;
-}
-
 public static NSCursor crosshairCursor() {
 	int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_crosshairCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
-public static NSCursor currentCursor() {
-	int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_currentCursor);
-	return result != 0 ? new NSCursor(result) : null;
-}
-
-public static NSCursor disappearingItemCursor() {
-	int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_disappearingItemCursor);
-	return result != 0 ? new NSCursor(result) : null;
-}
-
-public static void hide() {
-	OS.objc_msgSend(OS.class_NSCursor, OS.sel_hide);
-}
-
-public NSPoint hotSpot() {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_hotSpot);
-	return result;
-}
-
-public NSImage image() {
-	int result = OS.objc_msgSend(this.id, OS.sel_image);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSCursor initWithImage_foregroundColorHint_backgroundColorHint_hotSpot_(NSImage newImage, NSColor fg, NSColor bg, NSPoint hotSpot) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithImage_1foregroundColorHint_1backgroundColorHint_1hotSpot_1, newImage != null ? newImage.id : 0, fg != null ? fg.id : 0, bg != null ? bg.id : 0, hotSpot);
-	return result != 0 ? this : null;
-}
-
-public NSCursor initWithImage_hotSpot_(NSImage newImage, NSPoint aPoint) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithImage_1hotSpot_1, newImage != null ? newImage.id : 0, aPoint);
-	return result != 0 ? this : null;
-}
-
-public boolean isSetOnMouseEntered() {
-	return OS.objc_msgSend(this.id, OS.sel_isSetOnMouseEntered) != 0;
-}
-
-public boolean isSetOnMouseExited() {
-	return OS.objc_msgSend(this.id, OS.sel_isSetOnMouseExited) != 0;
-}
-
-public void mouseEntered(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_mouseEntered_1, theEvent != null ? theEvent.id : 0);
-}
-
-public void mouseExited(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_mouseExited_1, theEvent != null ? theEvent.id : 0);
-}
-
-public static NSCursor openHandCursor() {
-	int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_openHandCursor);
-	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);
+	return result == this.id ? this : (result != 0 ? new NSCursor(result) : null);
 }
 
 public static NSCursor pointingHandCursor() {
@@ -101,18 +49,6 @@ public static NSCursor pointingHandCursor() {
 	return result != 0 ? new NSCursor(result) : null;
 }
 
-public void pop() {
-	OS.objc_msgSend(this.id, OS.sel_pop);
-}
-
-public static void static_pop() {
-	OS.objc_msgSend(OS.class_NSCursor, OS.sel_pop);
-}
-
-public void push() {
-	OS.objc_msgSend(this.id, OS.sel_push);
-}
-
 public static NSCursor resizeDownCursor() {
 	int result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeDownCursor);
 	return result != 0 ? new NSCursor(result) : null;
@@ -148,19 +84,11 @@ public void set() {
 }
 
 public static void setHiddenUntilMouseMoves(boolean flag) {
-	OS.objc_msgSend(OS.class_NSCursor, OS.sel_setHiddenUntilMouseMoves_1, flag);
+	OS.objc_msgSend(OS.class_NSCursor, OS.sel_setHiddenUntilMouseMoves_, flag);
 }
 
 public void setOnMouseEntered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setOnMouseEntered_1, flag);
-}
-
-public void setOnMouseExited(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setOnMouseExited_1, flag);
-}
-
-public static void unhide() {
-	OS.objc_msgSend(OS.class_NSCursor, OS.sel_unhide);
+	OS.objc_msgSend(this.id, OS.sel_setOnMouseEntered_, flag);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCustomImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCustomImageRep.java
deleted file mode 100644
index 11ca16eabc..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCustomImageRep.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSCustomImageRep extends NSImageRep {
-
-public NSCustomImageRep() {
-	super();
-}
-
-public NSCustomImageRep(int id) {
-	super(id);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public int drawSelector() {
-	return OS.objc_msgSend(this.id, OS.sel_drawSelector);
-}
-
-public NSCustomImageRep initWithDrawSelector(int aMethod, id anObject) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDrawSelector_1delegate_1, aMethod, anObject != null ? anObject.id : 0);
-	return result != 0 ? this : 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 48302c5ed6..fcfe3b280c 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,162 +16,33 @@ public NSData() {
 	super();
 }
 
-public NSData(int id) {
+public NSData(int /*long*/ id) {
 	super(id);
 }
 
-public int bytes() {
-	return OS.objc_msgSend(this.id, OS.sel_bytes);
-}
-
-public static id data() {
-	int result = OS.objc_msgSend(OS.class_NSData, OS.sel_data);
-	return result != 0 ? new id(result) : null;
+public NSData(id id) {
+	super(id);
 }
 
-public static NSData dataWithBytes(int bytes, int length) {
-	int result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithBytes_1length_1, bytes, length);
-	return result != 0 ? new NSData(result) : null;
+public int bytes() {
+	return 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_1length_1, bytes, length);
+	int result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithBytes_length_, bytes, length);
 	return result != 0 ? new NSData(result) : null;
 }
 
-public static id static_dataWithBytesNoCopy_length_(int bytes, int length) {
-	int result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithBytesNoCopy_1length_1, bytes, length);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_dataWithBytesNoCopy_length_freeWhenDone_(int bytes, int length, boolean b) {
-	int result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithBytesNoCopy_1length_1freeWhenDone_1, bytes, length, b);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_dataWithContentsOfFile_(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithContentsOfFile_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_dataWithContentsOfFile_options_error_(NSString path, int readOptionsMask, int errorPtr) {
-	int result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithContentsOfFile_1options_1error_1, path != null ? path.id : 0, readOptionsMask, errorPtr);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id dataWithContentsOfMappedFile(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithContentsOfMappedFile_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_dataWithContentsOfURL_(NSURL url) {
-	int result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithContentsOfURL_1, url != null ? url.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_dataWithContentsOfURL_options_error_(NSURL url, int readOptionsMask, int errorPtr) {
-	int result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithContentsOfURL_1options_1error_1, url != null ? url.id : 0, readOptionsMask, errorPtr);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id dataWithData(NSData data) {
-	int result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithData_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString description() {
-	int result = OS.objc_msgSend(this.id, OS.sel_description);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void getBytes_(int buffer) {
-	OS.objc_msgSend(this.id, OS.sel_getBytes_1, buffer);
-}
-
-public void getBytes_(byte[] buffer) {
-	OS.objc_msgSend(this.id, OS.sel_getBytes_1, buffer);
-}
-
-public void getBytes_length_(int buffer, int length) {
-	OS.objc_msgSend(this.id, OS.sel_getBytes_1length_1, buffer, length);
+public void getBytes(byte[] buffer) {
+	OS.objc_msgSend(this.id, OS.sel_getBytes_, buffer);
 }
 
-public void getBytes_range_(int buffer, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_getBytes_1range_1, buffer, range);
-}
-
-public NSData initWithBytes(int bytes, int length) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithBytes_1length_1, bytes, length);
-	return result != 0 ? this : null;
-}
-
-public NSData initWithBytesNoCopy_length_(int bytes, int length) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithBytesNoCopy_1length_1, bytes, length);
-	return result != 0 ? this : null;
-}
-
-public NSData initWithBytesNoCopy_length_freeWhenDone_(int bytes, int length, boolean b) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithBytesNoCopy_1length_1freeWhenDone_1, bytes, length, b);
-	return result != 0 ? this : null;
-}
-
-public NSData initWithContentsOfFile_(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_1, path != null ? path.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSData initWithContentsOfFile_options_error_(NSString path, int readOptionsMask, int errorPtr) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_1options_1error_1, path != null ? path.id : 0, readOptionsMask, errorPtr);
-	return result != 0 ? this : null;
-}
-
-public NSData initWithContentsOfMappedFile(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfMappedFile_1, path != null ? path.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSData initWithContentsOfURL_(NSURL url) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1, url != null ? url.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSData initWithContentsOfURL_options_error_(NSURL url, int readOptionsMask, int errorPtr) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1options_1error_1, url != null ? url.id : 0, readOptionsMask, errorPtr);
-	return result != 0 ? this : null;
-}
-
-public NSData initWithData(NSData data) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_1, data != null ? data.id : 0);
-	return result != 0 ? this : null;
-}
-
-public boolean isEqualToData(NSData other) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualToData_1, other != null ? other.id : 0) != 0;
+public void getBytes(int buffer, int 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 NSData subdataWithRange(NSRange range) {
-	int result = OS.objc_msgSend(this.id, OS.sel_subdataWithRange_1, range);
-	return result == this.id ? this : (result != 0 ? new NSData(result) : null);
-}
-
-public boolean writeToFile_atomically_(NSString path, boolean useAuxiliaryFile) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToFile_1atomically_1, path != null ? path.id : 0, useAuxiliaryFile) != 0;
-}
-
-public boolean writeToFile_options_error_(NSString path, int writeOptionsMask, int errorPtr) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToFile_1options_1error_1, path != null ? path.id : 0, writeOptionsMask, errorPtr) != 0;
-}
-
-public boolean writeToURL_atomically_(NSURL url, boolean atomically) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToURL_1atomically_1, url != null ? url.id : 0, atomically) != 0;
-}
-
-public boolean writeToURL_options_error_(NSURL url, int writeOptionsMask, int errorPtr) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToURL_1options_1error_1, url != null ? url.id : 0, writeOptionsMask, errorPtr) != 0;
-}
-
 }
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 9e792d33c0..05e5e146f0 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,136 +16,27 @@ public NSDate() {
 	super();
 }
 
-public NSDate(int id) {
+public NSDate(int /*long*/ id) {
 	super(id);
 }
 
-public id addTimeInterval(double seconds) {
-	int result = OS.objc_msgSend(this.id, OS.sel_addTimeInterval_1, seconds);
-	return result != 0 ? new id(result) : null;
-}
-
-public int compare(NSDate other) {
-	return OS.objc_msgSend(this.id, OS.sel_compare_1, other != null ? other.id : 0);
-}
-
-public static NSDate date() {
-	int result = OS.objc_msgSend(OS.class_NSDate, OS.sel_date);
-	return result != 0 ? new NSDate(result) : null;
+public NSDate(id id) {
+	super(id);
 }
 
 public NSCalendarDate dateWithCalendarFormat(NSString format, NSTimeZone aTimeZone) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dateWithCalendarFormat_1timeZone_1, format != null ? format.id : 0, aTimeZone != null ? aTimeZone.id : 0);
+	int 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 id static_dateWithNaturalLanguageString_(NSString string) {
-	int result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithNaturalLanguageString_1, string != null ? string.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_dateWithNaturalLanguageString_locale_(NSString string, id locale) {
-	int result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithNaturalLanguageString_1locale_1, string != null ? string.id : 0, locale != null ? locale.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id dateWithString(NSString aString) {
-	int result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithString_1, aString != null ? aString.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id dateWithTimeIntervalSince1970(double secs) {
-	int result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithTimeIntervalSince1970_1, secs);
-	return result != 0 ? new id(result) : null;
-}
-
 public static NSDate dateWithTimeIntervalSinceNow(double secs) {
-	int result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithTimeIntervalSinceNow_1, secs);
+	int result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithTimeIntervalSinceNow_, secs);
 	return result != 0 ? new NSDate(result) : null;
 }
 
-public static id dateWithTimeIntervalSinceReferenceDate(double secs) {
-	int result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithTimeIntervalSinceReferenceDate_1, secs);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString description() {
-	int result = OS.objc_msgSend(this.id, OS.sel_description);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString descriptionWithCalendarFormat(NSString format, NSTimeZone aTimeZone, id locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptionWithCalendarFormat_1timeZone_1locale_1, format != null ? format.id : 0, aTimeZone != null ? aTimeZone.id : 0, locale != null ? locale.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString descriptionWithLocale(id locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptionWithLocale_1, locale != null ? locale.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
 public static NSDate distantFuture() {
 	int result = OS.objc_msgSend(OS.class_NSDate, OS.sel_distantFuture);
 	return result != 0 ? new NSDate(result) : null;
 }
 
-public static NSDate distantPast() {
-	int result = OS.objc_msgSend(OS.class_NSDate, OS.sel_distantPast);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public NSDate earlierDate(NSDate anotherDate) {
-	int result = OS.objc_msgSend(this.id, OS.sel_earlierDate_1, anotherDate != null ? anotherDate.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSDate(result) : null);
-}
-
-public NSDate initWithString(NSString description) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithString_1, description != null ? description.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSDate initWithTimeInterval(double secsToBeAdded, NSDate anotherDate) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithTimeInterval_1sinceDate_1, secsToBeAdded, anotherDate != null ? anotherDate.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSDate initWithTimeIntervalSinceNow(double secsToBeAddedToNow) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithTimeIntervalSinceNow_1, secsToBeAddedToNow);
-	return result != 0 ? this : null;
-}
-
-public NSDate initWithTimeIntervalSinceReferenceDate(double secsToBeAdded) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithTimeIntervalSinceReferenceDate_1, secsToBeAdded);
-	return result != 0 ? this : null;
-}
-
-public boolean isEqualToDate(NSDate otherDate) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualToDate_1, otherDate != null ? otherDate.id : 0) != 0;
-}
-
-public NSDate laterDate(NSDate anotherDate) {
-	int result = OS.objc_msgSend(this.id, OS.sel_laterDate_1, anotherDate != null ? anotherDate.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSDate(result) : null);
-}
-
-public double timeIntervalSince1970() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_timeIntervalSince1970);
-}
-
-public double timeIntervalSinceDate(NSDate anotherDate) {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_timeIntervalSinceDate_1, anotherDate != null ? anotherDate.id : 0);
-}
-
-public double timeIntervalSinceNow() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_timeIntervalSinceNow);
-}
-
-public static double static_timeIntervalSinceReferenceDate() {
-	return OS.objc_msgSend_fpret(OS.class_NSDate, OS.sel_timeIntervalSinceReferenceDate);
-}
-
-public double timeIntervalSinceReferenceDate() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_timeIntervalSinceReferenceDate);
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDateComponents.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDateComponents.java
deleted file mode 100644
index 8ac1e167e8..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDateComponents.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDateComponents extends NSObject {
-
-public NSDateComponents() {
-	super();
-}
-
-public NSDateComponents(int id) {
-	super(id);
-}
-
-public int day() {
-	return OS.objc_msgSend(this.id, OS.sel_day);
-}
-
-public int era() {
-	return OS.objc_msgSend(this.id, OS.sel_era);
-}
-
-public int hour() {
-	return OS.objc_msgSend(this.id, OS.sel_hour);
-}
-
-public int minute() {
-	return OS.objc_msgSend(this.id, OS.sel_minute);
-}
-
-public int month() {
-	return OS.objc_msgSend(this.id, OS.sel_month);
-}
-
-public int second() {
-	return OS.objc_msgSend(this.id, OS.sel_second);
-}
-
-public void setDay(int v) {
-	OS.objc_msgSend(this.id, OS.sel_setDay_1, v);
-}
-
-public void setEra(int v) {
-	OS.objc_msgSend(this.id, OS.sel_setEra_1, v);
-}
-
-public void setHour(int v) {
-	OS.objc_msgSend(this.id, OS.sel_setHour_1, v);
-}
-
-public void setMinute(int v) {
-	OS.objc_msgSend(this.id, OS.sel_setMinute_1, v);
-}
-
-public void setMonth(int v) {
-	OS.objc_msgSend(this.id, OS.sel_setMonth_1, v);
-}
-
-public void setSecond(int v) {
-	OS.objc_msgSend(this.id, OS.sel_setSecond_1, v);
-}
-
-public void setWeek(int v) {
-	OS.objc_msgSend(this.id, OS.sel_setWeek_1, v);
-}
-
-public void setWeekday(int v) {
-	OS.objc_msgSend(this.id, OS.sel_setWeekday_1, v);
-}
-
-public void setWeekdayOrdinal(int v) {
-	OS.objc_msgSend(this.id, OS.sel_setWeekdayOrdinal_1, v);
-}
-
-public void setYear(int v) {
-	OS.objc_msgSend(this.id, OS.sel_setYear_1, v);
-}
-
-public int week() {
-	return OS.objc_msgSend(this.id, OS.sel_week);
-}
-
-public int weekday() {
-	return OS.objc_msgSend(this.id, OS.sel_weekday);
-}
-
-public int weekdayOrdinal() {
-	return OS.objc_msgSend(this.id, OS.sel_weekdayOrdinal);
-}
-
-public int year() {
-	return OS.objc_msgSend(this.id, OS.sel_year);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDateFormatter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDateFormatter.java
deleted file mode 100644
index 7809f8213f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDateFormatter.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDateFormatter extends NSFormatter {
-
-public NSDateFormatter() {
-	super();
-}
-
-public NSDateFormatter(int id) {
-	super(id);
-}
-
-public NSString AMSymbol() {
-	int result = OS.objc_msgSend(this.id, OS.sel_AMSymbol);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString PMSymbol() {
-	int result = OS.objc_msgSend(this.id, OS.sel_PMSymbol);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean allowsNaturalLanguage() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsNaturalLanguage) != 0;
-}
-
-public NSCalendar calendar() {
-	int result = OS.objc_msgSend(this.id, OS.sel_calendar);
-	return result != 0 ? new NSCalendar(result) : null;
-}
-
-public NSString dateFormat() {
-	int result = OS.objc_msgSend(this.id, OS.sel_dateFormat);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSDate dateFromString(NSString string) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dateFromString_1, string != null ? string.id : 0);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public int dateStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_dateStyle);
-}
-
-public NSDate defaultDate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_defaultDate);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public static int defaultFormatterBehavior() {
-	return OS.objc_msgSend(OS.class_NSDateFormatter, OS.sel_defaultFormatterBehavior);
-}
-
-public NSArray eraSymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_eraSymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public int formatterBehavior() {
-	return OS.objc_msgSend(this.id, OS.sel_formatterBehavior);
-}
-
-public boolean generatesCalendarDates() {
-	return OS.objc_msgSend(this.id, OS.sel_generatesCalendarDates) != 0;
-}
-
-public boolean getObjectValue(int obj, NSString string, int rangep, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_getObjectValue_1forString_1range_1error_1, obj, string != null ? string.id : 0, rangep, error) != 0;
-}
-
-public NSDate gregorianStartDate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_gregorianStartDate);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public id initWithDateFormat(NSString format, boolean flag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDateFormat_1allowNaturalLanguage_1, format != null ? format.id : 0, flag);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isLenient() {
-	return OS.objc_msgSend(this.id, OS.sel_isLenient) != 0;
-}
-
-public NSLocale locale() {
-	int result = OS.objc_msgSend(this.id, OS.sel_locale);
-	return result != 0 ? new NSLocale(result) : null;
-}
-
-public NSArray longEraSymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_longEraSymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray monthSymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_monthSymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray quarterSymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_quarterSymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void setAMSymbol(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setAMSymbol_1, string != null ? string.id : 0);
-}
-
-public void setCalendar(NSCalendar calendar) {
-	OS.objc_msgSend(this.id, OS.sel_setCalendar_1, calendar != null ? calendar.id : 0);
-}
-
-public void setDateFormat(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setDateFormat_1, string != null ? string.id : 0);
-}
-
-public void setDateStyle(int style) {
-	OS.objc_msgSend(this.id, OS.sel_setDateStyle_1, style);
-}
-
-public void setDefaultDate(NSDate date) {
-	OS.objc_msgSend(this.id, OS.sel_setDefaultDate_1, date != null ? date.id : 0);
-}
-
-public static void setDefaultFormatterBehavior(int behavior) {
-	OS.objc_msgSend(OS.class_NSDateFormatter, OS.sel_setDefaultFormatterBehavior_1, behavior);
-}
-
-public void setEraSymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setEraSymbols_1, array != null ? array.id : 0);
-}
-
-public void setFormatterBehavior(int behavior) {
-	OS.objc_msgSend(this.id, OS.sel_setFormatterBehavior_1, behavior);
-}
-
-public void setGeneratesCalendarDates(boolean b) {
-	OS.objc_msgSend(this.id, OS.sel_setGeneratesCalendarDates_1, b);
-}
-
-public void setGregorianStartDate(NSDate date) {
-	OS.objc_msgSend(this.id, OS.sel_setGregorianStartDate_1, date != null ? date.id : 0);
-}
-
-public void setLenient(boolean b) {
-	OS.objc_msgSend(this.id, OS.sel_setLenient_1, b);
-}
-
-public void setLocale(NSLocale locale) {
-	OS.objc_msgSend(this.id, OS.sel_setLocale_1, locale != null ? locale.id : 0);
-}
-
-public void setLongEraSymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setLongEraSymbols_1, array != null ? array.id : 0);
-}
-
-public void setMonthSymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setMonthSymbols_1, array != null ? array.id : 0);
-}
-
-public void setPMSymbol(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPMSymbol_1, string != null ? string.id : 0);
-}
-
-public void setQuarterSymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setQuarterSymbols_1, array != null ? array.id : 0);
-}
-
-public void setShortMonthSymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setShortMonthSymbols_1, array != null ? array.id : 0);
-}
-
-public void setShortQuarterSymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setShortQuarterSymbols_1, array != null ? array.id : 0);
-}
-
-public void setShortStandaloneMonthSymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setShortStandaloneMonthSymbols_1, array != null ? array.id : 0);
-}
-
-public void setShortStandaloneQuarterSymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setShortStandaloneQuarterSymbols_1, array != null ? array.id : 0);
-}
-
-public void setShortStandaloneWeekdaySymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setShortStandaloneWeekdaySymbols_1, array != null ? array.id : 0);
-}
-
-public void setShortWeekdaySymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setShortWeekdaySymbols_1, array != null ? array.id : 0);
-}
-
-public void setStandaloneMonthSymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setStandaloneMonthSymbols_1, array != null ? array.id : 0);
-}
-
-public void setStandaloneQuarterSymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setStandaloneQuarterSymbols_1, array != null ? array.id : 0);
-}
-
-public void setStandaloneWeekdaySymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setStandaloneWeekdaySymbols_1, array != null ? array.id : 0);
-}
-
-public void setTimeStyle(int style) {
-	OS.objc_msgSend(this.id, OS.sel_setTimeStyle_1, style);
-}
-
-public void setTimeZone(NSTimeZone tz) {
-	OS.objc_msgSend(this.id, OS.sel_setTimeZone_1, tz != null ? tz.id : 0);
-}
-
-public void setTwoDigitStartDate(NSDate date) {
-	OS.objc_msgSend(this.id, OS.sel_setTwoDigitStartDate_1, date != null ? date.id : 0);
-}
-
-public void setVeryShortMonthSymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setVeryShortMonthSymbols_1, array != null ? array.id : 0);
-}
-
-public void setVeryShortStandaloneMonthSymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setVeryShortStandaloneMonthSymbols_1, array != null ? array.id : 0);
-}
-
-public void setVeryShortStandaloneWeekdaySymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setVeryShortStandaloneWeekdaySymbols_1, array != null ? array.id : 0);
-}
-
-public void setVeryShortWeekdaySymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setVeryShortWeekdaySymbols_1, array != null ? array.id : 0);
-}
-
-public void setWeekdaySymbols(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setWeekdaySymbols_1, array != null ? array.id : 0);
-}
-
-public NSArray shortMonthSymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_shortMonthSymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray shortQuarterSymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_shortQuarterSymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray shortStandaloneMonthSymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_shortStandaloneMonthSymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray shortStandaloneQuarterSymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_shortStandaloneQuarterSymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray shortStandaloneWeekdaySymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_shortStandaloneWeekdaySymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray shortWeekdaySymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_shortWeekdaySymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray standaloneMonthSymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_standaloneMonthSymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray standaloneQuarterSymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_standaloneQuarterSymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray standaloneWeekdaySymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_standaloneWeekdaySymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString stringFromDate(NSDate date) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringFromDate_1, date != null ? date.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int timeStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_timeStyle);
-}
-
-public NSTimeZone timeZone() {
-	int result = OS.objc_msgSend(this.id, OS.sel_timeZone);
-	return result != 0 ? new NSTimeZone(result) : null;
-}
-
-public NSDate twoDigitStartDate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_twoDigitStartDate);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public NSArray veryShortMonthSymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_veryShortMonthSymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray veryShortStandaloneMonthSymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_veryShortStandaloneMonthSymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray veryShortStandaloneWeekdaySymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_veryShortStandaloneWeekdaySymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray veryShortWeekdaySymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_veryShortWeekdaySymbols);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray weekdaySymbols() {
-	int result = OS.objc_msgSend(this.id, OS.sel_weekdaySymbols);
-	return result != 0 ? new NSArray(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 a51965544f..382a4d2667 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
@@ -16,30 +16,12 @@ public NSDatePicker() {
 	super();
 }
 
-public NSDatePicker(int id) {
+public NSDatePicker(int /*long*/ id) {
 	super(id);
 }
 
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSCalendar calendar() {
-	int result = OS.objc_msgSend(this.id, OS.sel_calendar);
-	return result != 0 ? new NSCalendar(result) : null;
-}
-
-public int datePickerElements() {
-	return OS.objc_msgSend(this.id, OS.sel_datePickerElements);
-}
-
-public int datePickerMode() {
-	return OS.objc_msgSend(this.id, OS.sel_datePickerMode);
-}
-
-public int datePickerStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_datePickerStyle);
+public NSDatePicker(id id) {
+	super(id);
 }
 
 public NSDate dateValue() {
@@ -47,114 +29,28 @@ public NSDate dateValue() {
 	return result != 0 ? new NSDate(result) : null;
 }
 
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean drawsBackground() {
-	return OS.objc_msgSend(this.id, OS.sel_drawsBackground) != 0;
-}
-
-public boolean isBezeled() {
-	return OS.objc_msgSend(this.id, OS.sel_isBezeled) != 0;
-}
-
-public boolean isBordered() {
-	return OS.objc_msgSend(this.id, OS.sel_isBordered) != 0;
-}
-
-public NSLocale locale() {
-	int result = OS.objc_msgSend(this.id, OS.sel_locale);
-	return result != 0 ? new NSLocale(result) : null;
-}
-
-public NSDate maxDate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_maxDate);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public NSDate minDate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_minDate);
-	return result != 0 ? new NSDate(result) : null;
-}
-
 public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setBezeled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBezeled_1, flag);
-}
-
-public void setBordered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBordered_1, flag);
-}
-
-public void setCalendar(NSCalendar newCalendar) {
-	OS.objc_msgSend(this.id, OS.sel_setCalendar_1, newCalendar != null ? newCalendar.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
 }
 
 public void setDatePickerElements(int elementFlags) {
-	OS.objc_msgSend(this.id, OS.sel_setDatePickerElements_1, elementFlags);
-}
-
-public void setDatePickerMode(int newMode) {
-	OS.objc_msgSend(this.id, OS.sel_setDatePickerMode_1, newMode);
+	OS.objc_msgSend(this.id, OS.sel_setDatePickerElements_, elementFlags);
 }
 
 public void setDatePickerStyle(int newStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setDatePickerStyle_1, newStyle);
+	OS.objc_msgSend(this.id, OS.sel_setDatePickerStyle_, newStyle);
 }
 
 public void setDateValue(NSDate newStartDate) {
-	OS.objc_msgSend(this.id, OS.sel_setDateValue_1, newStartDate != null ? newStartDate.id : 0);
-}
-
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setDateValue_, newStartDate != null ? newStartDate.id : 0);
 }
 
 public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_1, flag);
-}
-
-public void setLocale(NSLocale newLocale) {
-	OS.objc_msgSend(this.id, OS.sel_setLocale_1, newLocale != null ? newLocale.id : 0);
-}
-
-public void setMaxDate(NSDate date) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxDate_1, date != null ? date.id : 0);
-}
-
-public void setMinDate(NSDate date) {
-	OS.objc_msgSend(this.id, OS.sel_setMinDate_1, date != null ? date.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, flag);
 }
 
 public void setTextColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setTextColor_1, color != null ? color.id : 0);
-}
-
-public void setTimeInterval(double newTimeInterval) {
-	OS.objc_msgSend(this.id, OS.sel_setTimeInterval_1, newTimeInterval);
-}
-
-public void setTimeZone(NSTimeZone newTimeZone) {
-	OS.objc_msgSend(this.id, OS.sel_setTimeZone_1, newTimeZone != null ? newTimeZone.id : 0);
-}
-
-public NSColor textColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public double timeInterval() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_timeInterval);
-}
-
-public NSTimeZone timeZone() {
-	int result = OS.objc_msgSend(this.id, OS.sel_timeZone);
-	return result != 0 ? new NSTimeZone(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setTextColor_, color != null ? color.id : 0);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePickerCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePickerCell.java
deleted file mode 100644
index 08519d045d..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePickerCell.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDatePickerCell extends NSActionCell {
-
-public NSDatePickerCell() {
-	super();
-}
-
-public NSDatePickerCell(int id) {
-	super(id);
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSCalendar calendar() {
-	int result = OS.objc_msgSend(this.id, OS.sel_calendar);
-	return result != 0 ? new NSCalendar(result) : null;
-}
-
-public int datePickerElements() {
-	return OS.objc_msgSend(this.id, OS.sel_datePickerElements);
-}
-
-public int datePickerMode() {
-	return OS.objc_msgSend(this.id, OS.sel_datePickerMode);
-}
-
-public int datePickerStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_datePickerStyle);
-}
-
-public NSDate dateValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_dateValue);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean drawsBackground() {
-	return OS.objc_msgSend(this.id, OS.sel_drawsBackground) != 0;
-}
-
-public NSLocale locale() {
-	int result = OS.objc_msgSend(this.id, OS.sel_locale);
-	return result != 0 ? new NSLocale(result) : null;
-}
-
-public NSDate maxDate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_maxDate);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public NSDate minDate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_minDate);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setCalendar(NSCalendar newCalendar) {
-	OS.objc_msgSend(this.id, OS.sel_setCalendar_1, newCalendar != null ? newCalendar.id : 0);
-}
-
-public void setDatePickerElements(int elementFlags) {
-	OS.objc_msgSend(this.id, OS.sel_setDatePickerElements_1, elementFlags);
-}
-
-public void setDatePickerMode(int newMode) {
-	OS.objc_msgSend(this.id, OS.sel_setDatePickerMode_1, newMode);
-}
-
-public void setDatePickerStyle(int newStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setDatePickerStyle_1, newStyle);
-}
-
-public void setDateValue(NSDate newStartDate) {
-	OS.objc_msgSend(this.id, OS.sel_setDateValue_1, newStartDate != null ? newStartDate.id : 0);
-}
-
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_1, flag);
-}
-
-public void setLocale(NSLocale newLocale) {
-	OS.objc_msgSend(this.id, OS.sel_setLocale_1, newLocale != null ? newLocale.id : 0);
-}
-
-public void setMaxDate(NSDate date) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxDate_1, date != null ? date.id : 0);
-}
-
-public void setMinDate(NSDate date) {
-	OS.objc_msgSend(this.id, OS.sel_setMinDate_1, date != null ? date.id : 0);
-}
-
-public void setTextColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setTextColor_1, color != null ? color.id : 0);
-}
-
-public void setTimeInterval(double newTimeInterval) {
-	OS.objc_msgSend(this.id, OS.sel_setTimeInterval_1, newTimeInterval);
-}
-
-public void setTimeZone(NSTimeZone newTimeZone) {
-	OS.objc_msgSend(this.id, OS.sel_setTimeZone_1, newTimeZone != null ? newTimeZone.id : 0);
-}
-
-public NSColor textColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public double timeInterval() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_timeInterval);
-}
-
-public NSTimeZone timeZone() {
-	int result = OS.objc_msgSend(this.id, OS.sel_timeZone);
-	return result != 0 ? new NSTimeZone(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDecimal.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDecimal.java
deleted file mode 100644
index a31bcbce0a..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDecimal.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDecimal {
-	public int _exponent;
-	public int _length;
-	public int _isNegative;
-	public int _isCompact;
-	public int _reserved;
-	public short[] _mantissa = new short[OS.NSDecimalMaxSize];
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDecimalNumber.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDecimalNumber.java
deleted file mode 100644
index 80062ad163..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDecimalNumber.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDecimalNumber extends NSNumber {
-
-public NSDecimalNumber() {
-	super();
-}
-
-public NSDecimalNumber(int id) {
-	super(id);
-}
-
-public int compare(NSNumber decimalNumber) {
-	return OS.objc_msgSend(this.id, OS.sel_compare_1, decimalNumber != null ? decimalNumber.id : 0);
-}
-
-public NSDecimalNumber decimalNumberByAdding_(NSDecimalNumber decimalNumber) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalNumberByAdding_1, decimalNumber != null ? decimalNumber.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSDecimalNumber(result) : null);
-}
-
-public NSDecimalNumber decimalNumberByAdding_withBehavior_(NSDecimalNumber decimalNumber, id  behavior) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalNumberByAdding_1withBehavior_1, decimalNumber != null ? decimalNumber.id : 0, behavior != null ? behavior.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSDecimalNumber(result) : null);
-}
-
-public NSDecimalNumber decimalNumberByDividingBy_(NSDecimalNumber decimalNumber) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalNumberByDividingBy_1, decimalNumber != null ? decimalNumber.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSDecimalNumber(result) : null);
-}
-
-public NSDecimalNumber decimalNumberByDividingBy_withBehavior_(NSDecimalNumber decimalNumber, id  behavior) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalNumberByDividingBy_1withBehavior_1, decimalNumber != null ? decimalNumber.id : 0, behavior != null ? behavior.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSDecimalNumber(result) : null);
-}
-
-public NSDecimalNumber decimalNumberByMultiplyingBy_(NSDecimalNumber decimalNumber) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalNumberByMultiplyingBy_1, decimalNumber != null ? decimalNumber.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSDecimalNumber(result) : null);
-}
-
-public NSDecimalNumber decimalNumberByMultiplyingBy_withBehavior_(NSDecimalNumber decimalNumber, id  behavior) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalNumberByMultiplyingBy_1withBehavior_1, decimalNumber != null ? decimalNumber.id : 0, behavior != null ? behavior.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSDecimalNumber(result) : null);
-}
-
-public NSDecimalNumber decimalNumberByMultiplyingByPowerOf10_(short power) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalNumberByMultiplyingByPowerOf10_1, power);
-	return result == this.id ? this : (result != 0 ? new NSDecimalNumber(result) : null);
-}
-
-public NSDecimalNumber decimalNumberByMultiplyingByPowerOf10_withBehavior_(short power, id  behavior) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalNumberByMultiplyingByPowerOf10_1withBehavior_1, power, behavior != null ? behavior.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSDecimalNumber(result) : null);
-}
-
-public NSDecimalNumber decimalNumberByRaisingToPower_(int power) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalNumberByRaisingToPower_1, power);
-	return result == this.id ? this : (result != 0 ? new NSDecimalNumber(result) : null);
-}
-
-public NSDecimalNumber decimalNumberByRaisingToPower_withBehavior_(int power, id  behavior) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalNumberByRaisingToPower_1withBehavior_1, power, behavior != null ? behavior.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSDecimalNumber(result) : null);
-}
-
-public NSDecimalNumber decimalNumberByRoundingAccordingToBehavior(id  behavior) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalNumberByRoundingAccordingToBehavior_1, behavior != null ? behavior.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSDecimalNumber(result) : null);
-}
-
-public NSDecimalNumber decimalNumberBySubtracting_(NSDecimalNumber decimalNumber) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalNumberBySubtracting_1, decimalNumber != null ? decimalNumber.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSDecimalNumber(result) : null);
-}
-
-public NSDecimalNumber decimalNumberBySubtracting_withBehavior_(NSDecimalNumber decimalNumber, id  behavior) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalNumberBySubtracting_1withBehavior_1, decimalNumber != null ? decimalNumber.id : 0, behavior != null ? behavior.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSDecimalNumber(result) : null);
-}
-
-public static NSDecimalNumber decimalNumberWithDecimal(NSDecimal dcm) {
-	int result = OS.objc_msgSend(OS.class_NSDecimalNumber, OS.sel_decimalNumberWithDecimal_1, dcm);
-	return result != 0 ? new NSDecimalNumber(result) : null;
-}
-
-public static NSDecimalNumber decimalNumberWithMantissa(long mantissa, short exponent, boolean flag) {
-	int result = OS.objc_msgSend(OS.class_NSDecimalNumber, OS.sel_decimalNumberWithMantissa_1exponent_1isNegative_1, mantissa, exponent, flag);
-	return result != 0 ? new NSDecimalNumber(result) : null;
-}
-
-public static NSDecimalNumber static_decimalNumberWithString_(NSString numberValue) {
-	int result = OS.objc_msgSend(OS.class_NSDecimalNumber, OS.sel_decimalNumberWithString_1, numberValue != null ? numberValue.id : 0);
-	return result != 0 ? new NSDecimalNumber(result) : null;
-}
-
-public static NSDecimalNumber static_decimalNumberWithString_locale_(NSString numberValue, id locale) {
-	int result = OS.objc_msgSend(OS.class_NSDecimalNumber, OS.sel_decimalNumberWithString_1locale_1, numberValue != null ? numberValue.id : 0, locale != null ? locale.id : 0);
-	return result != 0 ? new NSDecimalNumber(result) : null;
-}
-
-public NSDecimal decimalValue() {
-	NSDecimal result = new NSDecimal();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_decimalValue);
-	return result;
-}
-
-public static id  defaultBehavior() {
-	int result = OS.objc_msgSend(OS.class_NSDecimalNumber, OS.sel_defaultBehavior);
-	return result != 0 ? new id (result) : null;
-}
-
-public NSString descriptionWithLocale(id locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptionWithLocale_1, locale != null ? locale.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public double doubleValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_doubleValue);
-}
-
-public id initWithDecimal(NSDecimal dcm) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDecimal_1, dcm);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithMantissa(long mantissa, short exponent, boolean flag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithMantissa_1exponent_1isNegative_1, mantissa, exponent, flag);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithString_(NSString numberValue) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithString_1, numberValue != null ? numberValue.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithString_locale_(NSString numberValue, id locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithString_1locale_1, numberValue != null ? numberValue.id : 0, locale != null ? locale.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSDecimalNumber maximumDecimalNumber() {
-	int result = OS.objc_msgSend(OS.class_NSDecimalNumber, OS.sel_maximumDecimalNumber);
-	return result != 0 ? new NSDecimalNumber(result) : null;
-}
-
-public static NSDecimalNumber minimumDecimalNumber() {
-	int result = OS.objc_msgSend(OS.class_NSDecimalNumber, OS.sel_minimumDecimalNumber);
-	return result != 0 ? new NSDecimalNumber(result) : null;
-}
-
-public static NSDecimalNumber notANumber() {
-	int result = OS.objc_msgSend(OS.class_NSDecimalNumber, OS.sel_notANumber);
-	return result != 0 ? new NSDecimalNumber(result) : null;
-}
-
-public int objCType() {
-	return OS.objc_msgSend(this.id, OS.sel_objCType);
-}
-
-public static NSDecimalNumber one() {
-	int result = OS.objc_msgSend(OS.class_NSDecimalNumber, OS.sel_one);
-	return result != 0 ? new NSDecimalNumber(result) : null;
-}
-
-public static void setDefaultBehavior(id  behavior) {
-	OS.objc_msgSend(OS.class_NSDecimalNumber, OS.sel_setDefaultBehavior_1, behavior != null ? behavior.id : 0);
-}
-
-public static NSDecimalNumber zero() {
-	int result = OS.objc_msgSend(OS.class_NSDecimalNumber, OS.sel_zero);
-	return result != 0 ? new NSDecimalNumber(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDecimalNumberHandler.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDecimalNumberHandler.java
deleted file mode 100644
index efe8c632d2..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDecimalNumberHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDecimalNumberHandler extends NSObject {
-
-public NSDecimalNumberHandler() {
-	super();
-}
-
-public NSDecimalNumberHandler(int id) {
-	super(id);
-}
-
-public static id decimalNumberHandlerWithRoundingMode(int roundingMode, short scale, boolean exact, boolean overflow, boolean underflow, boolean divideByZero) {
-	int result = OS.objc_msgSend(OS.class_NSDecimalNumberHandler, OS.sel_decimalNumberHandlerWithRoundingMode_1scale_1raiseOnExactness_1raiseOnOverflow_1raiseOnUnderflow_1raiseOnDivideByZero_1, roundingMode, scale, exact, overflow, underflow, divideByZero);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id defaultDecimalNumberHandler() {
-	int result = OS.objc_msgSend(OS.class_NSDecimalNumberHandler, OS.sel_defaultDecimalNumberHandler);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithRoundingMode(int roundingMode, short scale, boolean exact, boolean overflow, boolean underflow, boolean divideByZero) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithRoundingMode_1scale_1raiseOnExactness_1raiseOnOverflow_1raiseOnUnderflow_1raiseOnDivideByZero_1, roundingMode, scale, exact, overflow, underflow, divideByZero);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDeleteCommand.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDeleteCommand.java
deleted file mode 100644
index 4f151c6740..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDeleteCommand.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDeleteCommand extends NSScriptCommand {
-
-public NSDeleteCommand() {
-	super();
-}
-
-public NSDeleteCommand(int id) {
-	super(id);
-}
-
-public NSScriptObjectSpecifier keySpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keySpecifier);
-	return result != 0 ? new NSScriptObjectSpecifier(result) : null;
-}
-
-public void setReceiversSpecifier(NSScriptObjectSpecifier receiversRef) {
-	OS.objc_msgSend(this.id, OS.sel_setReceiversSpecifier_1, receiversRef != null ? receiversRef.id : 0);
-}
-
-}
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 b2bc2e96c9..6832a36c6a 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
@@ -16,22 +16,16 @@ public NSDictionary() {
 	super();
 }
 
-public NSDictionary(int id) {
+public NSDictionary(int /*long*/ id) {
 	super(id);
 }
 
-public NSArray allKeys() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allKeys);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray allKeysForObject(id anObject) {
-	int result = OS.objc_msgSend(this.id, OS.sel_allKeysForObject_1, anObject != null ? anObject.id : 0);
-	return result != 0 ? new NSArray(result) : null;
+public NSDictionary(id id) {
+	super(id);
 }
 
-public NSArray allValues() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allValues);
+public NSArray allKeys() {
+	int result = OS.objc_msgSend(this.id, OS.sel_allKeys);
 	return result != 0 ? new NSArray(result) : null;
 }
 
@@ -39,188 +33,9 @@ public int count() {
 	return OS.objc_msgSend(this.id, OS.sel_count);
 }
 
-public NSString description() {
-	int result = OS.objc_msgSend(this.id, OS.sel_description);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString descriptionInStringsFileFormat() {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptionInStringsFileFormat);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString descriptionWithLocale_(id locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptionWithLocale_1, locale != null ? locale.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString descriptionWithLocale_indent_(id locale, int level) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptionWithLocale_1indent_1, locale != null ? locale.id : 0, level);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static id dictionary() {
-	int result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionary);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id dictionaryWithContentsOfFile(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionaryWithContentsOfFile_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id dictionaryWithContentsOfURL(NSURL url) {
-	int result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionaryWithContentsOfURL_1, url != null ? url.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id dictionaryWithDictionary(NSDictionary dict) {
-	int result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionaryWithDictionary_1, dict != null ? dict.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id dictionaryWithObject(id object, id key) {
-	int result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionaryWithObject_1forKey_1, object != null ? object.id : 0, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_dictionaryWithObjects_forKeys_(NSArray objects, NSArray keys) {
-	int result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionaryWithObjects_1forKeys_1, objects != null ? objects.id : 0, keys != null ? keys.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_dictionaryWithObjects_forKeys_count_(int objects, int keys, int cnt) {
-	int result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionaryWithObjects_1forKeys_1count_1, objects, keys, cnt);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id dictionaryWithObjectsAndKeys(id dictionaryWithObjectsAndKeys) {
-	int result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionaryWithObjectsAndKeys_1, dictionaryWithObjectsAndKeys != null ? dictionaryWithObjectsAndKeys.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSDate fileCreationDate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileCreationDate);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public boolean fileExtensionHidden() {
-	return OS.objc_msgSend(this.id, OS.sel_fileExtensionHidden) != 0;
-}
-
-public NSNumber fileGroupOwnerAccountID() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileGroupOwnerAccountID);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public NSString fileGroupOwnerAccountName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileGroupOwnerAccountName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int fileHFSCreatorCode() {
-	return OS.objc_msgSend(this.id, OS.sel_fileHFSCreatorCode);
-}
-
-public int fileHFSTypeCode() {
-	return OS.objc_msgSend(this.id, OS.sel_fileHFSTypeCode);
-}
-
-public boolean fileIsAppendOnly() {
-	return OS.objc_msgSend(this.id, OS.sel_fileIsAppendOnly) != 0;
-}
-
-public boolean fileIsImmutable() {
-	return OS.objc_msgSend(this.id, OS.sel_fileIsImmutable) != 0;
-}
-
-public NSDate fileModificationDate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileModificationDate);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public NSNumber fileOwnerAccountID() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileOwnerAccountID);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public NSString fileOwnerAccountName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileOwnerAccountName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int filePosixPermissions() {
-	return OS.objc_msgSend(this.id, OS.sel_filePosixPermissions);
-}
-
-public long fileSize() {
-	return (long)OS.objc_msgSend(this.id, OS.sel_fileSize);
-}
-
-public int fileSystemFileNumber() {
-	return OS.objc_msgSend(this.id, OS.sel_fileSystemFileNumber);
-}
-
-public int fileSystemNumber() {
-	return OS.objc_msgSend(this.id, OS.sel_fileSystemNumber);
-}
-
-public NSString fileType() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileType);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void getObjects(int objects, int keys) {
-	OS.objc_msgSend(this.id, OS.sel_getObjects_1andKeys_1, objects, keys);
-}
-
-public id initWithContentsOfFile(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithContentsOfURL(NSURL url) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1, url != null ? url.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithDictionary_(NSDictionary otherDictionary) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDictionary_1, otherDictionary != null ? otherDictionary.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithDictionary_copyItems_(NSDictionary otherDictionary, boolean flag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDictionary_1copyItems_1, otherDictionary != null ? otherDictionary.id : 0, flag);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithObjects_forKeys_(NSArray objects, NSArray keys) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithObjects_1forKeys_1, objects != null ? objects.id : 0, keys != null ? keys.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithObjects_forKeys_count_(int objects, int keys, int cnt) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithObjects_1forKeys_1count_1, objects, keys, cnt);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithObjectsAndKeys(id initWithObjectsAndKeys) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithObjectsAndKeys_1, initWithObjectsAndKeys != null ? initWithObjectsAndKeys.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isEqualToDictionary(NSDictionary otherDictionary) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualToDictionary_1, otherDictionary != null ? otherDictionary.id : 0) != 0;
-}
-
-public NSEnumerator keyEnumerator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keyEnumerator);
-	return result != 0 ? new NSEnumerator(result) : null;
-}
-
-public NSArray keysSortedByValueUsingSelector(int comparator) {
-	int result = OS.objc_msgSend(this.id, OS.sel_keysSortedByValueUsingSelector_1, comparator);
-	return result != 0 ? new NSArray(result) : null;
+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);
+	return result != 0 ? new NSDictionary(result) : null;
 }
 
 public NSEnumerator objectEnumerator() {
@@ -229,26 +44,13 @@ public NSEnumerator objectEnumerator() {
 }
 
 public id objectForKey(id aKey) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectForKey_1, aKey != null ? aKey.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_objectForKey_, aKey != null ? aKey.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
-public NSArray objectsForKeys(NSArray keys, id marker) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectsForKeys_1notFoundMarker_1, keys != null ? keys.id : 0, marker != null ? marker.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
 public id valueForKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueForKey_1, key != null ? key.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_valueForKey_, key != null ? key.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
-public boolean writeToFile(NSString path, boolean useAuxiliaryFile) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToFile_1atomically_1, path != null ? path.id : 0, useAuxiliaryFile) != 0;
-}
-
-public boolean writeToURL(NSURL url, boolean atomically) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToURL_1atomically_1, url != null ? url.id : 0, atomically) != 0;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionaryController.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionaryController.java
deleted file mode 100644
index 469f32b2f5..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionaryController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDictionaryController extends NSArrayController {
-
-public NSDictionaryController() {
-	super();
-}
-
-public NSDictionaryController(int id) {
-	super(id);
-}
-
-public NSArray excludedKeys() {
-	int result = OS.objc_msgSend(this.id, OS.sel_excludedKeys);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray includedKeys() {
-	int result = OS.objc_msgSend(this.id, OS.sel_includedKeys);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString initialKey() {
-	int result = OS.objc_msgSend(this.id, OS.sel_initialKey);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id initialValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_initialValue);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSDictionary localizedKeyDictionary() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedKeyDictionary);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSString localizedKeyTable() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedKeyTable);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id newObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_newObject);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setExcludedKeys(NSArray keys) {
-	OS.objc_msgSend(this.id, OS.sel_setExcludedKeys_1, keys != null ? keys.id : 0);
-}
-
-public void setIncludedKeys(NSArray keys) {
-	OS.objc_msgSend(this.id, OS.sel_setIncludedKeys_1, keys != null ? keys.id : 0);
-}
-
-public void setInitialKey(NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_setInitialKey_1, key != null ? key.id : 0);
-}
-
-public void setInitialValue(id value) {
-	OS.objc_msgSend(this.id, OS.sel_setInitialValue_1, value != null ? value.id : 0);
-}
-
-public void setLocalizedKeyDictionary(NSDictionary dictionary) {
-	OS.objc_msgSend(this.id, OS.sel_setLocalizedKeyDictionary_1, dictionary != null ? dictionary.id : 0);
-}
-
-public void setLocalizedKeyTable(NSString stringsFileName) {
-	OS.objc_msgSend(this.id, OS.sel_setLocalizedKeyTable_1, stringsFileName != null ? stringsFileName.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDirectoryEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDirectoryEnumerator.java
index 9f48241af8..87b20641d2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDirectoryEnumerator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDirectoryEnumerator.java
@@ -16,18 +16,12 @@ public NSDirectoryEnumerator() {
 	super();
 }
 
-public NSDirectoryEnumerator(int id) {
+public NSDirectoryEnumerator(int /*long*/ id) {
 	super(id);
 }
 
-public NSDictionary directoryAttributes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_directoryAttributes);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDictionary fileAttributes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileAttributes);
-	return result != 0 ? new NSDictionary(result) : null;
+public NSDirectoryEnumerator(id id) {
+	super(id);
 }
 
 public void skipDescendents() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDistantObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDistantObject.java
deleted file mode 100644
index c0ab25f06a..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDistantObject.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDistantObject extends NSProxy {
-
-public NSDistantObject() {
-	super();
-}
-
-public NSDistantObject(int id) {
-	super(id);
-}
-
-public NSConnection connectionForProxy() {
-	int result = OS.objc_msgSend(this.id, OS.sel_connectionForProxy);
-	return result != 0 ? new NSConnection(result) : null;
-}
-
-public id initWithLocal(id target, NSConnection connection) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithLocal_1connection_1, target != null ? target.id : 0, connection != null ? connection.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithTarget(id target, NSConnection connection) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithTarget_1connection_1, target != null ? target.id : 0, connection != null ? connection.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSDistantObject proxyWithLocal(id target, NSConnection connection) {
-	int result = OS.objc_msgSend(OS.class_NSDistantObject, OS.sel_proxyWithLocal_1connection_1, target != null ? target.id : 0, connection != null ? connection.id : 0);
-	return result != 0 ? new NSDistantObject(result) : null;
-}
-
-public static NSDistantObject proxyWithTarget(id target, NSConnection connection) {
-	int result = OS.objc_msgSend(OS.class_NSDistantObject, OS.sel_proxyWithTarget_1connection_1, target != null ? target.id : 0, connection != null ? connection.id : 0);
-	return result != 0 ? new NSDistantObject(result) : null;
-}
-
-//PUBLIC VOID SETPROTOCOLFORPROXY(PROTOCOL PROTO) {
-//	OS.OBJC_MSGSEND(THIS.ID, OS.SEL_SETPROTOCOLFORPROXY_1, PROTO != NULL ? PROTO.ID : 0);
-//}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDistantObjectRequest.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDistantObjectRequest.java
deleted file mode 100644
index 450312eeb9..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDistantObjectRequest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDistantObjectRequest extends NSObject {
-
-public NSDistantObjectRequest() {
-	super();
-}
-
-public NSDistantObjectRequest(int id) {
-	super(id);
-}
-
-public NSConnection connection() {
-	int result = OS.objc_msgSend(this.id, OS.sel_connection);
-	return result != 0 ? new NSConnection(result) : null;
-}
-
-public id conversation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_conversation);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSInvocation invocation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_invocation);
-	return result != 0 ? new NSInvocation(result) : null;
-}
-
-public void replyWithException(NSException exception) {
-	OS.objc_msgSend(this.id, OS.sel_replyWithException_1, exception != null ? exception.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDistributedLock.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDistributedLock.java
deleted file mode 100644
index 6067b736f9..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDistributedLock.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDistributedLock extends NSObject {
-
-public NSDistributedLock() {
-	super();
-}
-
-public NSDistributedLock(int id) {
-	super(id);
-}
-
-public void breakLock() {
-	OS.objc_msgSend(this.id, OS.sel_breakLock);
-}
-
-public id initWithPath(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithPath_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSDate lockDate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_lockDate);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public static NSDistributedLock lockWithPath(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSDistributedLock, OS.sel_lockWithPath_1, path != null ? path.id : 0);
-	return result != 0 ? new NSDistributedLock(result) : null;
-}
-
-public boolean tryLock() {
-	return OS.objc_msgSend(this.id, OS.sel_tryLock) != 0;
-}
-
-public void unlock() {
-	OS.objc_msgSend(this.id, OS.sel_unlock);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDistributedNotificationCenter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDistributedNotificationCenter.java
deleted file mode 100644
index f2a2cbffad..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDistributedNotificationCenter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDistributedNotificationCenter extends NSNotificationCenter {
-
-public NSDistributedNotificationCenter() {
-	super();
-}
-
-public NSDistributedNotificationCenter(int id) {
-	super(id);
-}
-
-public void addObserver_selector_name_object_(id observer, int aSelector, NSString aName, NSString anObject) {
-	OS.objc_msgSend(this.id, OS.sel_addObserver_1selector_1name_1object_1, observer != null ? observer.id : 0, aSelector, aName != null ? aName.id : 0, anObject != null ? anObject.id : 0);
-}
-
-public void addObserver_selector_name_object_suspensionBehavior_(id observer, int selector, NSString name, NSString object, int suspensionBehavior) {
-	OS.objc_msgSend(this.id, OS.sel_addObserver_1selector_1name_1object_1suspensionBehavior_1, observer != null ? observer.id : 0, selector, name != null ? name.id : 0, object != null ? object.id : 0, suspensionBehavior);
-}
-
-public static NSNotificationCenter defaultCenter() {
-	int result = OS.objc_msgSend(OS.class_NSDistributedNotificationCenter, OS.sel_defaultCenter);
-	return result != 0 ? new NSNotificationCenter(result) : null;
-}
-
-public static NSDistributedNotificationCenter notificationCenterForType(NSString notificationCenterType) {
-	int result = OS.objc_msgSend(OS.class_NSDistributedNotificationCenter, OS.sel_notificationCenterForType_1, notificationCenterType != null ? notificationCenterType.id : 0);
-	return result != 0 ? new NSDistributedNotificationCenter(result) : null;
-}
-
-public void postNotificationName_object_(NSString aName, NSString anObject) {
-	OS.objc_msgSend(this.id, OS.sel_postNotificationName_1object_1, aName != null ? aName.id : 0, anObject != null ? anObject.id : 0);
-}
-
-public void postNotificationName_object_userInfo_(NSString aName, NSString anObject, NSDictionary aUserInfo) {
-	OS.objc_msgSend(this.id, OS.sel_postNotificationName_1object_1userInfo_1, aName != null ? aName.id : 0, anObject != null ? anObject.id : 0, aUserInfo != null ? aUserInfo.id : 0);
-}
-
-public void postNotificationName_object_userInfo_deliverImmediately_(NSString name, NSString object, NSDictionary userInfo, boolean deliverImmediately) {
-	OS.objc_msgSend(this.id, OS.sel_postNotificationName_1object_1userInfo_1deliverImmediately_1, name != null ? name.id : 0, object != null ? object.id : 0, userInfo != null ? userInfo.id : 0, deliverImmediately);
-}
-
-public void postNotificationName_object_userInfo_options_(NSString name, NSString object, NSDictionary userInfo, int options) {
-	OS.objc_msgSend(this.id, OS.sel_postNotificationName_1object_1userInfo_1options_1, name != null ? name.id : 0, object != null ? object.id : 0, userInfo != null ? userInfo.id : 0, options);
-}
-
-public void removeObserver(id observer, NSString aName, NSString anObject) {
-	OS.objc_msgSend(this.id, OS.sel_removeObserver_1name_1object_1, observer != null ? observer.id : 0, aName != null ? aName.id : 0, anObject != null ? anObject.id : 0);
-}
-
-public void setSuspended(boolean suspended) {
-	OS.objc_msgSend(this.id, OS.sel_setSuspended_1, suspended);
-}
-
-public boolean suspended() {
-	return OS.objc_msgSend(this.id, OS.sel_suspended) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java
deleted file mode 100644
index b7cdea6634..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDockTile extends NSObject {
-
-public NSDockTile() {
-	super();
-}
-
-public NSDockTile(int id) {
-	super(id);
-}
-
-public NSString badgeLabel() {
-	int result = OS.objc_msgSend(this.id, OS.sel_badgeLabel);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSView contentView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_contentView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public void display() {
-	OS.objc_msgSend(this.id, OS.sel_display);
-}
-
-public id owner() {
-	int result = OS.objc_msgSend(this.id, OS.sel_owner);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setBadgeLabel(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setBadgeLabel_1, string != null ? string.id : 0);
-}
-
-public void setContentView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setContentView_1, view != null ? view.id : 0);
-}
-
-public void setShowsApplicationBadge(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsApplicationBadge_1, flag);
-}
-
-public boolean showsApplicationBadge() {
-	return OS.objc_msgSend(this.id, OS.sel_showsApplicationBadge) != 0;
-}
-
-public NSSize size() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_size);
-	return result;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDocument.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDocument.java
deleted file mode 100644
index a236d5bf6b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDocument.java
+++ /dev/null
@@ -1,466 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDocument extends NSObject {
-
-public NSDocument() {
-	super();
-}
-
-public NSDocument(int id) {
-	super(id);
-}
-
-public void addWindowController(NSWindowController windowController) {
-	OS.objc_msgSend(this.id, OS.sel_addWindowController_1, windowController != null ? windowController.id : 0);
-}
-
-public void autosaveDocumentWithDelegate(id delegate, int didAutosaveSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_autosaveDocumentWithDelegate_1didAutosaveSelector_1contextInfo_1, delegate != null ? delegate.id : 0, didAutosaveSelector, contextInfo);
-}
-
-public NSURL autosavedContentsFileURL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_autosavedContentsFileURL);
-	return result != 0 ? new NSURL(result) : null;
-}
-
-public NSString autosavingFileType() {
-	int result = OS.objc_msgSend(this.id, OS.sel_autosavingFileType);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void canCloseDocumentWithDelegate(id delegate, int shouldCloseSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_canCloseDocumentWithDelegate_1shouldCloseSelector_1contextInfo_1, delegate != null ? delegate.id : 0, shouldCloseSelector, contextInfo);
-}
-
-public void close() {
-	OS.objc_msgSend(this.id, OS.sel_close);
-}
-
-public NSData dataOfType(NSString typeName, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataOfType_1error_1, typeName != null ? typeName.id : 0, outError);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSData dataRepresentationOfType(NSString type) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataRepresentationOfType_1, type != null ? type.id : 0);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSString displayName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_displayName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSDictionary fileAttributesToWriteToFile(NSString fullDocumentPath, NSString documentTypeName, int saveOperationType) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileAttributesToWriteToFile_1ofType_1saveOperation_1, fullDocumentPath != null ? fullDocumentPath.id : 0, documentTypeName != null ? documentTypeName.id : 0, saveOperationType);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDictionary fileAttributesToWriteToURL(NSURL absoluteURL, NSString typeName, int saveOperation, NSURL absoluteOriginalContentsURL, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileAttributesToWriteToURL_1ofType_1forSaveOperation_1originalContentsURL_1error_1, absoluteURL != null ? absoluteURL.id : 0, typeName != null ? typeName.id : 0, saveOperation, absoluteOriginalContentsURL != null ? absoluteOriginalContentsURL.id : 0, outError);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDate fileModificationDate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileModificationDate);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public NSString fileName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString fileNameExtensionForType(NSString typeName, int saveOperation) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileNameExtensionForType_1saveOperation_1, typeName != null ? typeName.id : 0, saveOperation);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean fileNameExtensionWasHiddenInLastRunSavePanel() {
-	return OS.objc_msgSend(this.id, OS.sel_fileNameExtensionWasHiddenInLastRunSavePanel) != 0;
-}
-
-public NSString fileType() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileType);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString fileTypeFromLastRunSavePanel() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileTypeFromLastRunSavePanel);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSURL fileURL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileURL);
-	return result != 0 ? new NSURL(result) : null;
-}
-
-public NSFileWrapper fileWrapperOfType(NSString typeName, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileWrapperOfType_1error_1, typeName != null ? typeName.id : 0, outError);
-	return result != 0 ? new NSFileWrapper(result) : null;
-}
-
-public NSFileWrapper fileWrapperRepresentationOfType(NSString type) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileWrapperRepresentationOfType_1, type != null ? type.id : 0);
-	return result != 0 ? new NSFileWrapper(result) : null;
-}
-
-public id handleCloseScriptCommand(NSCloseCommand command) {
-	int result = OS.objc_msgSend(this.id, OS.sel_handleCloseScriptCommand_1, command != null ? command.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id handlePrintScriptCommand(NSScriptCommand command) {
-	int result = OS.objc_msgSend(this.id, OS.sel_handlePrintScriptCommand_1, command != null ? command.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id handleSaveScriptCommand(NSScriptCommand command) {
-	int result = OS.objc_msgSend(this.id, OS.sel_handleSaveScriptCommand_1, command != null ? command.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean hasUnautosavedChanges() {
-	return OS.objc_msgSend(this.id, OS.sel_hasUnautosavedChanges) != 0;
-}
-
-public boolean hasUndoManager() {
-	return OS.objc_msgSend(this.id, OS.sel_hasUndoManager) != 0;
-}
-
-public NSDocument initForURL(NSURL absoluteDocumentURL, NSURL absoluteDocumentContentsURL, NSString typeName, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initForURL_1withContentsOfURL_1ofType_1error_1, absoluteDocumentURL != null ? absoluteDocumentURL.id : 0, absoluteDocumentContentsURL != null ? absoluteDocumentContentsURL.id : 0, typeName != null ? typeName.id : 0, outError);
-	return result != 0 ? this : null;
-}
-
-public NSDocument initWithContentsOfFile(NSString absolutePath, NSString typeName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_1ofType_1, absolutePath != null ? absolutePath.id : 0, typeName != null ? typeName.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSDocument initWithContentsOfURL_ofType_(NSURL absoluteURL, NSString typeName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1ofType_1, absoluteURL != null ? absoluteURL.id : 0, typeName != null ? typeName.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSDocument initWithContentsOfURL_ofType_error_(NSURL absoluteURL, NSString typeName, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1ofType_1error_1, absoluteURL != null ? absoluteURL.id : 0, typeName != null ? typeName.id : 0, outError);
-	return result != 0 ? this : null;
-}
-
-public NSDocument initWithType(NSString typeName, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithType_1error_1, typeName != null ? typeName.id : 0, outError);
-	return result != 0 ? this : null;
-}
-
-public boolean isDocumentEdited() {
-	return OS.objc_msgSend(this.id, OS.sel_isDocumentEdited) != 0;
-}
-
-public static boolean isNativeType(NSString type) {
-	return OS.objc_msgSend(OS.class_NSDocument, OS.sel_isNativeType_1, type != null ? type.id : 0) != 0;
-}
-
-public boolean keepBackupFile() {
-	return OS.objc_msgSend(this.id, OS.sel_keepBackupFile) != 0;
-}
-
-public NSString lastComponentOfFileName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_lastComponentOfFileName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean loadDataRepresentation(NSData data, NSString type) {
-	return OS.objc_msgSend(this.id, OS.sel_loadDataRepresentation_1ofType_1, data != null ? data.id : 0, type != null ? type.id : 0) != 0;
-}
-
-public boolean loadFileWrapperRepresentation(NSFileWrapper wrapper, NSString type) {
-	return OS.objc_msgSend(this.id, OS.sel_loadFileWrapperRepresentation_1ofType_1, wrapper != null ? wrapper.id : 0, type != null ? type.id : 0) != 0;
-}
-
-public void makeWindowControllers() {
-	OS.objc_msgSend(this.id, OS.sel_makeWindowControllers);
-}
-
-public NSScriptObjectSpecifier objectSpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectSpecifier);
-	return result != 0 ? new NSScriptObjectSpecifier(result) : null;
-}
-
-public boolean preparePageLayout(NSPageLayout pageLayout) {
-	return OS.objc_msgSend(this.id, OS.sel_preparePageLayout_1, pageLayout != null ? pageLayout.id : 0) != 0;
-}
-
-public boolean prepareSavePanel(NSSavePanel savePanel) {
-	return OS.objc_msgSend(this.id, OS.sel_prepareSavePanel_1, savePanel != null ? savePanel.id : 0) != 0;
-}
-
-public boolean presentError_(NSError error) {
-	return OS.objc_msgSend(this.id, OS.sel_presentError_1, error != null ? error.id : 0) != 0;
-}
-
-public void presentError_modalForWindow_delegate_didPresentSelector_contextInfo_(NSError error, NSWindow window, id delegate, int didPresentSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_presentError_1modalForWindow_1delegate_1didPresentSelector_1contextInfo_1, error != null ? error.id : 0, window != null ? window.id : 0, delegate != null ? delegate.id : 0, didPresentSelector, contextInfo);
-}
-
-public void printDocument(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_printDocument_1, sender != null ? sender.id : 0);
-}
-
-public void printDocumentWithSettings(NSDictionary printSettings, boolean showPrintPanel, id delegate, int didPrintSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_printDocumentWithSettings_1showPrintPanel_1delegate_1didPrintSelector_1contextInfo_1, printSettings != null ? printSettings.id : 0, showPrintPanel, delegate != null ? delegate.id : 0, didPrintSelector, contextInfo);
-}
-
-public NSPrintInfo printInfo() {
-	int result = OS.objc_msgSend(this.id, OS.sel_printInfo);
-	return result != 0 ? new NSPrintInfo(result) : null;
-}
-
-public NSPrintOperation printOperationWithSettings(NSDictionary printSettings, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_printOperationWithSettings_1error_1, printSettings != null ? printSettings.id : 0, outError);
-	return result != 0 ? new NSPrintOperation(result) : null;
-}
-
-public void printShowingPrintPanel(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_printShowingPrintPanel_1, flag);
-}
-
-public boolean readFromData(NSData data, NSString typeName, int outError) {
-	return OS.objc_msgSend(this.id, OS.sel_readFromData_1ofType_1error_1, data != null ? data.id : 0, typeName != null ? typeName.id : 0, outError) != 0;
-}
-
-public boolean readFromFile(NSString fileName, NSString type) {
-	return OS.objc_msgSend(this.id, OS.sel_readFromFile_1ofType_1, fileName != null ? fileName.id : 0, type != null ? type.id : 0) != 0;
-}
-
-public boolean readFromFileWrapper(NSFileWrapper fileWrapper, NSString typeName, int outError) {
-	return OS.objc_msgSend(this.id, OS.sel_readFromFileWrapper_1ofType_1error_1, fileWrapper != null ? fileWrapper.id : 0, typeName != null ? typeName.id : 0, outError) != 0;
-}
-
-public boolean readFromURL_ofType_(NSURL url, NSString type) {
-	return OS.objc_msgSend(this.id, OS.sel_readFromURL_1ofType_1, url != null ? url.id : 0, type != null ? type.id : 0) != 0;
-}
-
-public boolean readFromURL_ofType_error_(NSURL absoluteURL, NSString typeName, int outError) {
-	return OS.objc_msgSend(this.id, OS.sel_readFromURL_1ofType_1error_1, absoluteURL != null ? absoluteURL.id : 0, typeName != null ? typeName.id : 0, outError) != 0;
-}
-
-public static NSArray readableTypes() {
-	int result = OS.objc_msgSend(OS.class_NSDocument, OS.sel_readableTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void removeWindowController(NSWindowController windowController) {
-	OS.objc_msgSend(this.id, OS.sel_removeWindowController_1, windowController != null ? windowController.id : 0);
-}
-
-public void revertDocumentToSaved(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_revertDocumentToSaved_1, sender != null ? sender.id : 0);
-}
-
-public boolean revertToContentsOfURL(NSURL absoluteURL, NSString typeName, int outError) {
-	return OS.objc_msgSend(this.id, OS.sel_revertToContentsOfURL_1ofType_1error_1, absoluteURL != null ? absoluteURL.id : 0, typeName != null ? typeName.id : 0, outError) != 0;
-}
-
-public boolean revertToSavedFromFile(NSString fileName, NSString type) {
-	return OS.objc_msgSend(this.id, OS.sel_revertToSavedFromFile_1ofType_1, fileName != null ? fileName.id : 0, type != null ? type.id : 0) != 0;
-}
-
-public boolean revertToSavedFromURL(NSURL url, NSString type) {
-	return OS.objc_msgSend(this.id, OS.sel_revertToSavedFromURL_1ofType_1, url != null ? url.id : 0, type != null ? type.id : 0) != 0;
-}
-
-public int runModalPageLayoutWithPrintInfo_(NSPrintInfo printInfo) {
-	return OS.objc_msgSend(this.id, OS.sel_runModalPageLayoutWithPrintInfo_1, printInfo != null ? printInfo.id : 0);
-}
-
-public void runModalPageLayoutWithPrintInfo_delegate_didRunSelector_contextInfo_(NSPrintInfo printInfo, id delegate, int didRunSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_runModalPageLayoutWithPrintInfo_1delegate_1didRunSelector_1contextInfo_1, printInfo != null ? printInfo.id : 0, delegate != null ? delegate.id : 0, didRunSelector, contextInfo);
-}
-
-public void runModalPrintOperation(NSPrintOperation printOperation, id delegate, int didRunSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_runModalPrintOperation_1delegate_1didRunSelector_1contextInfo_1, printOperation != null ? printOperation.id : 0, delegate != null ? delegate.id : 0, didRunSelector, contextInfo);
-}
-
-public void runModalSavePanelForSaveOperation(int saveOperation, id delegate, int didSaveSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_runModalSavePanelForSaveOperation_1delegate_1didSaveSelector_1contextInfo_1, saveOperation, delegate != null ? delegate.id : 0, didSaveSelector, contextInfo);
-}
-
-public void runPageLayout(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_runPageLayout_1, sender != null ? sender.id : 0);
-}
-
-public void saveDocument(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_saveDocument_1, sender != null ? sender.id : 0);
-}
-
-public void saveDocumentAs(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_saveDocumentAs_1, sender != null ? sender.id : 0);
-}
-
-public void saveDocumentTo(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_saveDocumentTo_1, sender != null ? sender.id : 0);
-}
-
-public void saveDocumentWithDelegate(id delegate, int didSaveSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_saveDocumentWithDelegate_1didSaveSelector_1contextInfo_1, delegate != null ? delegate.id : 0, didSaveSelector, contextInfo);
-}
-
-public void saveToFile(NSString fileName, int saveOperation, id delegate, int didSaveSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_saveToFile_1saveOperation_1delegate_1didSaveSelector_1contextInfo_1, fileName != null ? fileName.id : 0, saveOperation, delegate != null ? delegate.id : 0, didSaveSelector, contextInfo);
-}
-
-public void saveToURL_ofType_forSaveOperation_delegate_didSaveSelector_contextInfo_(NSURL absoluteURL, NSString typeName, int saveOperation, id delegate, int didSaveSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_saveToURL_1ofType_1forSaveOperation_1delegate_1didSaveSelector_1contextInfo_1, absoluteURL != null ? absoluteURL.id : 0, typeName != null ? typeName.id : 0, saveOperation, delegate != null ? delegate.id : 0, didSaveSelector, contextInfo);
-}
-
-public boolean saveToURL_ofType_forSaveOperation_error_(NSURL absoluteURL, NSString typeName, int saveOperation, int outError) {
-	return OS.objc_msgSend(this.id, OS.sel_saveToURL_1ofType_1forSaveOperation_1error_1, absoluteURL != null ? absoluteURL.id : 0, typeName != null ? typeName.id : 0, saveOperation, outError) != 0;
-}
-
-public void setAutosavedContentsFileURL(NSURL absoluteURL) {
-	OS.objc_msgSend(this.id, OS.sel_setAutosavedContentsFileURL_1, absoluteURL != null ? absoluteURL.id : 0);
-}
-
-public void setFileModificationDate(NSDate modificationDate) {
-	OS.objc_msgSend(this.id, OS.sel_setFileModificationDate_1, modificationDate != null ? modificationDate.id : 0);
-}
-
-public void setFileName(NSString fileName) {
-	OS.objc_msgSend(this.id, OS.sel_setFileName_1, fileName != null ? fileName.id : 0);
-}
-
-public void setFileType(NSString typeName) {
-	OS.objc_msgSend(this.id, OS.sel_setFileType_1, typeName != null ? typeName.id : 0);
-}
-
-public void setFileURL(NSURL absoluteURL) {
-	OS.objc_msgSend(this.id, OS.sel_setFileURL_1, absoluteURL != null ? absoluteURL.id : 0);
-}
-
-public void setHasUndoManager(boolean hasUndoManager) {
-	OS.objc_msgSend(this.id, OS.sel_setHasUndoManager_1, hasUndoManager);
-}
-
-public void setLastComponentOfFileName(NSString str) {
-	OS.objc_msgSend(this.id, OS.sel_setLastComponentOfFileName_1, str != null ? str.id : 0);
-}
-
-public void setPrintInfo(NSPrintInfo printInfo) {
-	OS.objc_msgSend(this.id, OS.sel_setPrintInfo_1, printInfo != null ? printInfo.id : 0);
-}
-
-public void setUndoManager(NSUndoManager undoManager) {
-	OS.objc_msgSend(this.id, OS.sel_setUndoManager_1, undoManager != null ? undoManager.id : 0);
-}
-
-public void setWindow(NSWindow window) {
-	OS.objc_msgSend(this.id, OS.sel_setWindow_1, window != null ? window.id : 0);
-}
-
-public boolean shouldChangePrintInfo(NSPrintInfo newPrintInfo) {
-	return OS.objc_msgSend(this.id, OS.sel_shouldChangePrintInfo_1, newPrintInfo != null ? newPrintInfo.id : 0) != 0;
-}
-
-public void shouldCloseWindowController(NSWindowController windowController, id delegate, int shouldCloseSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_shouldCloseWindowController_1delegate_1shouldCloseSelector_1contextInfo_1, windowController != null ? windowController.id : 0, delegate != null ? delegate.id : 0, shouldCloseSelector, contextInfo);
-}
-
-public boolean shouldRunSavePanelWithAccessoryView() {
-	return OS.objc_msgSend(this.id, OS.sel_shouldRunSavePanelWithAccessoryView) != 0;
-}
-
-public void showWindows() {
-	OS.objc_msgSend(this.id, OS.sel_showWindows);
-}
-
-public NSUndoManager undoManager() {
-	int result = OS.objc_msgSend(this.id, OS.sel_undoManager);
-	return result != 0 ? new NSUndoManager(result) : null;
-}
-
-public void updateChangeCount(int change) {
-	OS.objc_msgSend(this.id, OS.sel_updateChangeCount_1, change);
-}
-
-public boolean validateUserInterfaceItem(id  anItem) {
-	return OS.objc_msgSend(this.id, OS.sel_validateUserInterfaceItem_1, anItem != null ? anItem.id : 0) != 0;
-}
-
-public NSError willPresentError(NSError error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_willPresentError_1, error != null ? error.id : 0);
-	return result != 0 ? new NSError(result) : null;
-}
-
-public void windowControllerDidLoadNib(NSWindowController windowController) {
-	OS.objc_msgSend(this.id, OS.sel_windowControllerDidLoadNib_1, windowController != null ? windowController.id : 0);
-}
-
-public void windowControllerWillLoadNib(NSWindowController windowController) {
-	OS.objc_msgSend(this.id, OS.sel_windowControllerWillLoadNib_1, windowController != null ? windowController.id : 0);
-}
-
-public NSArray windowControllers() {
-	int result = OS.objc_msgSend(this.id, OS.sel_windowControllers);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSWindow windowForSheet() {
-	int result = OS.objc_msgSend(this.id, OS.sel_windowForSheet);
-	return result != 0 ? new NSWindow(result) : null;
-}
-
-public NSString windowNibName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_windowNibName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSArray writableTypes() {
-	int result = OS.objc_msgSend(OS.class_NSDocument, OS.sel_writableTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray writableTypesForSaveOperation(int saveOperation) {
-	int result = OS.objc_msgSend(this.id, OS.sel_writableTypesForSaveOperation_1, saveOperation);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean writeSafelyToURL(NSURL absoluteURL, NSString typeName, int saveOperation, int outError) {
-	return OS.objc_msgSend(this.id, OS.sel_writeSafelyToURL_1ofType_1forSaveOperation_1error_1, absoluteURL != null ? absoluteURL.id : 0, typeName != null ? typeName.id : 0, saveOperation, outError) != 0;
-}
-
-public boolean writeToFile_ofType_(NSString fileName, NSString type) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToFile_1ofType_1, fileName != null ? fileName.id : 0, type != null ? type.id : 0) != 0;
-}
-
-public boolean writeToFile_ofType_originalFile_saveOperation_(NSString fullDocumentPath, NSString documentTypeName, NSString fullOriginalDocumentPath, int saveOperationType) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToFile_1ofType_1originalFile_1saveOperation_1, fullDocumentPath != null ? fullDocumentPath.id : 0, documentTypeName != null ? documentTypeName.id : 0, fullOriginalDocumentPath != null ? fullOriginalDocumentPath.id : 0, saveOperationType) != 0;
-}
-
-public boolean writeToURL_ofType_(NSURL url, NSString type) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToURL_1ofType_1, url != null ? url.id : 0, type != null ? type.id : 0) != 0;
-}
-
-public boolean writeToURL_ofType_error_(NSURL absoluteURL, NSString typeName, int outError) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToURL_1ofType_1error_1, absoluteURL != null ? absoluteURL.id : 0, typeName != null ? typeName.id : 0, outError) != 0;
-}
-
-public boolean writeToURL_ofType_forSaveOperation_originalContentsURL_error_(NSURL absoluteURL, NSString typeName, int saveOperation, NSURL absoluteOriginalContentsURL, int outError) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToURL_1ofType_1forSaveOperation_1originalContentsURL_1error_1, absoluteURL != null ? absoluteURL.id : 0, typeName != null ? typeName.id : 0, saveOperation, absoluteOriginalContentsURL != null ? absoluteOriginalContentsURL.id : 0, outError) != 0;
-}
-
-public boolean writeWithBackupToFile(NSString fullDocumentPath, NSString documentTypeName, int saveOperationType) {
-	return OS.objc_msgSend(this.id, OS.sel_writeWithBackupToFile_1ofType_1saveOperation_1, fullDocumentPath != null ? fullDocumentPath.id : 0, documentTypeName != null ? documentTypeName.id : 0, saveOperationType) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDocumentController.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDocumentController.java
deleted file mode 100644
index 43a265ed6c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDocumentController.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDocumentController extends NSObject {
-
-public NSDocumentController() {
-	super();
-}
-
-public NSDocumentController(int id) {
-	super(id);
-}
-
-public NSArray URLsFromRunningOpenPanel() {
-	int result = OS.objc_msgSend(this.id, OS.sel_URLsFromRunningOpenPanel);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void addDocument(NSDocument document) {
-	OS.objc_msgSend(this.id, OS.sel_addDocument_1, document != null ? document.id : 0);
-}
-
-public double autosavingDelay() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_autosavingDelay);
-}
-
-public void clearRecentDocuments(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_clearRecentDocuments_1, sender != null ? sender.id : 0);
-}
-
-public void closeAllDocumentsWithDelegate(id delegate, int didCloseAllSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_closeAllDocumentsWithDelegate_1didCloseAllSelector_1contextInfo_1, delegate != null ? delegate.id : 0, didCloseAllSelector, contextInfo);
-}
-
-public NSString currentDirectory() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currentDirectory);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id currentDocument() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currentDocument);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString defaultType() {
-	int result = OS.objc_msgSend(this.id, OS.sel_defaultType);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString displayNameForType(NSString typeName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_displayNameForType_1, typeName != null ? typeName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int documentClassForType(NSString typeName) {
-	return OS.objc_msgSend(this.id, OS.sel_documentClassForType_1, typeName != null ? typeName.id : 0);
-}
-
-public NSArray documentClassNames() {
-	int result = OS.objc_msgSend(this.id, OS.sel_documentClassNames);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id documentForFileName(NSString fileName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_documentForFileName_1, fileName != null ? fileName.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id documentForURL(NSURL absoluteURL) {
-	int result = OS.objc_msgSend(this.id, OS.sel_documentForURL_1, absoluteURL != null ? absoluteURL.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id documentForWindow(NSWindow window) {
-	int result = OS.objc_msgSend(this.id, OS.sel_documentForWindow_1, window != null ? window.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSArray documents() {
-	int result = OS.objc_msgSend(this.id, OS.sel_documents);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray fileExtensionsFromType(NSString typeName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileExtensionsFromType_1, typeName != null ? typeName.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray fileNamesFromRunningOpenPanel() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileNamesFromRunningOpenPanel);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean hasEditedDocuments() {
-	return OS.objc_msgSend(this.id, OS.sel_hasEditedDocuments) != 0;
-}
-
-public id makeDocumentForURL(NSURL absoluteDocumentURL, NSURL absoluteDocumentContentsURL, NSString typeName, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_makeDocumentForURL_1withContentsOfURL_1ofType_1error_1, absoluteDocumentURL != null ? absoluteDocumentURL.id : 0, absoluteDocumentContentsURL != null ? absoluteDocumentContentsURL.id : 0, typeName != null ? typeName.id : 0, outError);
-	return result != 0 ? new id(result) : null;
-}
-
-public id makeDocumentWithContentsOfFile(NSString fileName, NSString type) {
-	int result = OS.objc_msgSend(this.id, OS.sel_makeDocumentWithContentsOfFile_1ofType_1, fileName != null ? fileName.id : 0, type != null ? type.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id makeDocumentWithContentsOfURL_ofType_(NSURL url, NSString type) {
-	int result = OS.objc_msgSend(this.id, OS.sel_makeDocumentWithContentsOfURL_1ofType_1, url != null ? url.id : 0, type != null ? type.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id makeDocumentWithContentsOfURL_ofType_error_(NSURL absoluteURL, NSString typeName, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_makeDocumentWithContentsOfURL_1ofType_1error_1, absoluteURL != null ? absoluteURL.id : 0, typeName != null ? typeName.id : 0, outError);
-	return result != 0 ? new id(result) : null;
-}
-
-public id makeUntitledDocumentOfType_(NSString type) {
-	int result = OS.objc_msgSend(this.id, OS.sel_makeUntitledDocumentOfType_1, type != null ? type.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id makeUntitledDocumentOfType_error_(NSString typeName, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_makeUntitledDocumentOfType_1error_1, typeName != null ? typeName.id : 0, outError);
-	return result != 0 ? new id(result) : null;
-}
-
-public int maximumRecentDocumentCount() {
-	return OS.objc_msgSend(this.id, OS.sel_maximumRecentDocumentCount);
-}
-
-public void newDocument(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_newDocument_1, sender != null ? sender.id : 0);
-}
-
-public void noteNewRecentDocument(NSDocument document) {
-	OS.objc_msgSend(this.id, OS.sel_noteNewRecentDocument_1, document != null ? document.id : 0);
-}
-
-public void noteNewRecentDocumentURL(NSURL absoluteURL) {
-	OS.objc_msgSend(this.id, OS.sel_noteNewRecentDocumentURL_1, absoluteURL != null ? absoluteURL.id : 0);
-}
-
-public void openDocument(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_openDocument_1, sender != null ? sender.id : 0);
-}
-
-public id openDocumentWithContentsOfFile(NSString fileName, boolean display) {
-	int result = OS.objc_msgSend(this.id, OS.sel_openDocumentWithContentsOfFile_1display_1, fileName != null ? fileName.id : 0, display);
-	return result != 0 ? new id(result) : null;
-}
-
-public id openDocumentWithContentsOfURL_display_(NSURL url, boolean display) {
-	int result = OS.objc_msgSend(this.id, OS.sel_openDocumentWithContentsOfURL_1display_1, url != null ? url.id : 0, display);
-	return result != 0 ? new id(result) : null;
-}
-
-public id openDocumentWithContentsOfURL_display_error_(NSURL absoluteURL, boolean displayDocument, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_openDocumentWithContentsOfURL_1display_1error_1, absoluteURL != null ? absoluteURL.id : 0, displayDocument, outError);
-	return result != 0 ? new id(result) : null;
-}
-
-public id openUntitledDocumentAndDisplay(boolean displayDocument, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_openUntitledDocumentAndDisplay_1error_1, displayDocument, outError);
-	return result != 0 ? new id(result) : null;
-}
-
-public id openUntitledDocumentOfType(NSString type, boolean display) {
-	int result = OS.objc_msgSend(this.id, OS.sel_openUntitledDocumentOfType_1display_1, type != null ? type.id : 0, display);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean presentError_(NSError error) {
-	return OS.objc_msgSend(this.id, OS.sel_presentError_1, error != null ? error.id : 0) != 0;
-}
-
-public void presentError_modalForWindow_delegate_didPresentSelector_contextInfo_(NSError error, NSWindow window, id delegate, int didPresentSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_presentError_1modalForWindow_1delegate_1didPresentSelector_1contextInfo_1, error != null ? error.id : 0, window != null ? window.id : 0, delegate != null ? delegate.id : 0, didPresentSelector, contextInfo);
-}
-
-public NSArray recentDocumentURLs() {
-	int result = OS.objc_msgSend(this.id, OS.sel_recentDocumentURLs);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void removeDocument(NSDocument document) {
-	OS.objc_msgSend(this.id, OS.sel_removeDocument_1, document != null ? document.id : 0);
-}
-
-public boolean reopenDocumentForURL(NSURL absoluteDocumentURL, NSURL absoluteDocumentContentsURL, int outError) {
-	return OS.objc_msgSend(this.id, OS.sel_reopenDocumentForURL_1withContentsOfURL_1error_1, absoluteDocumentURL != null ? absoluteDocumentURL.id : 0, absoluteDocumentContentsURL != null ? absoluteDocumentContentsURL.id : 0, outError) != 0;
-}
-
-public void reviewUnsavedDocumentsWithAlertTitle(NSString title, boolean cancellable, id delegate, int didReviewAllSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_reviewUnsavedDocumentsWithAlertTitle_1cancellable_1delegate_1didReviewAllSelector_1contextInfo_1, title != null ? title.id : 0, cancellable, delegate != null ? delegate.id : 0, didReviewAllSelector, contextInfo);
-}
-
-public int runModalOpenPanel(NSOpenPanel openPanel, NSArray types) {
-	return OS.objc_msgSend(this.id, OS.sel_runModalOpenPanel_1forTypes_1, openPanel != null ? openPanel.id : 0, types != null ? types.id : 0);
-}
-
-public void saveAllDocuments(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_saveAllDocuments_1, sender != null ? sender.id : 0);
-}
-
-public void setAutosavingDelay(double autosavingDelay) {
-	OS.objc_msgSend(this.id, OS.sel_setAutosavingDelay_1, autosavingDelay);
-}
-
-public void setShouldCreateUI(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShouldCreateUI_1, flag);
-}
-
-public static id sharedDocumentController() {
-	int result = OS.objc_msgSend(OS.class_NSDocumentController, OS.sel_sharedDocumentController);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean shouldCreateUI() {
-	return OS.objc_msgSend(this.id, OS.sel_shouldCreateUI) != 0;
-}
-
-public NSString typeForContentsOfURL(NSURL inAbsoluteURL, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_typeForContentsOfURL_1error_1, inAbsoluteURL != null ? inAbsoluteURL.id : 0, outError);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString typeFromFileExtension(NSString fileNameExtensionOrHFSFileType) {
-	int result = OS.objc_msgSend(this.id, OS.sel_typeFromFileExtension_1, fileNameExtensionOrHFSFileType != null ? fileNameExtensionOrHFSFileType.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean validateUserInterfaceItem(id  anItem) {
-	return OS.objc_msgSend(this.id, OS.sel_validateUserInterfaceItem_1, anItem != null ? anItem.id : 0) != 0;
-}
-
-public NSError willPresentError(NSError error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_willPresentError_1, error != null ? error.id : 0);
-	return result != 0 ? new NSError(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDrawer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDrawer.java
deleted file mode 100644
index 8508772802..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDrawer.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSDrawer extends NSResponder {
-
-public NSDrawer() {
-	super();
-}
-
-public NSDrawer(int id) {
-	super(id);
-}
-
-public void close() {
-	OS.objc_msgSend(this.id, OS.sel_close);
-}
-
-public void close_(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_close_1, sender != null ? sender.id : 0);
-}
-
-public NSSize contentSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_contentSize);
-	return result;
-}
-
-public NSView contentView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_contentView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public int edge() {
-	return OS.objc_msgSend(this.id, OS.sel_edge);
-}
-
-public NSDrawer initWithContentSize(NSSize contentSize, int edge) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentSize_1preferredEdge_1, contentSize, edge);
-	return result != 0 ? this : null;
-}
-
-public float leadingOffset() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_leadingOffset);
-}
-
-public NSSize maxContentSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_maxContentSize);
-	return result;
-}
-
-public NSSize minContentSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_minContentSize);
-	return result;
-}
-
-public void open() {
-	OS.objc_msgSend(this.id, OS.sel_open);
-}
-
-public void open_(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_open_1, sender != null ? sender.id : 0);
-}
-
-public void openOnEdge(int edge) {
-	OS.objc_msgSend(this.id, OS.sel_openOnEdge_1, edge);
-}
-
-public NSWindow parentWindow() {
-	int result = OS.objc_msgSend(this.id, OS.sel_parentWindow);
-	return result != 0 ? new NSWindow(result) : null;
-}
-
-public int preferredEdge() {
-	return OS.objc_msgSend(this.id, OS.sel_preferredEdge);
-}
-
-public void setContentSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setContentSize_1, size);
-}
-
-public void setContentView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_setContentView_1, aView != null ? aView.id : 0);
-}
-
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public void setLeadingOffset(float offset) {
-	OS.objc_msgSend(this.id, OS.sel_setLeadingOffset_1, offset);
-}
-
-public void setMaxContentSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxContentSize_1, size);
-}
-
-public void setMinContentSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setMinContentSize_1, size);
-}
-
-public void setParentWindow(NSWindow parent) {
-	OS.objc_msgSend(this.id, OS.sel_setParentWindow_1, parent != null ? parent.id : 0);
-}
-
-public void setPreferredEdge(int edge) {
-	OS.objc_msgSend(this.id, OS.sel_setPreferredEdge_1, edge);
-}
-
-public void setTrailingOffset(float offset) {
-	OS.objc_msgSend(this.id, OS.sel_setTrailingOffset_1, offset);
-}
-
-public int state() {
-	return OS.objc_msgSend(this.id, OS.sel_state);
-}
-
-public void toggle(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_toggle_1, sender != null ? sender.id : 0);
-}
-
-public float trailingOffset() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_trailingOffset);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEPSImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEPSImageRep.java
deleted file mode 100644
index b62e212cf3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEPSImageRep.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSEPSImageRep extends NSImageRep {
-
-public NSEPSImageRep() {
-	super();
-}
-
-public NSEPSImageRep(int id) {
-	super(id);
-}
-
-public NSData EPSRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_EPSRepresentation);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSRect boundingBox() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_boundingBox);
-	return result;
-}
-
-public static id imageRepWithData(NSData epsData) {
-	int result = OS.objc_msgSend(OS.class_NSEPSImageRep, OS.sel_imageRepWithData_1, epsData != null ? epsData.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithData(NSData epsData) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_1, epsData != null ? epsData.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void prepareGState() {
-	OS.objc_msgSend(this.id, OS.sel_prepareGState);
-}
-
-}
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 820d7ce597..f2a704e315 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,13 +16,12 @@ public NSEnumerator() {
 	super();
 }
 
-public NSEnumerator(int id) {
+public NSEnumerator(int /*long*/ id) {
 	super(id);
 }
 
-public NSArray allObjects() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allObjects);
-	return result != 0 ? new NSArray(result) : null;
+public NSEnumerator(id id) {
+	super(id);
 }
 
 public id nextObject() {
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 7812fb5898..52249f0e47 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,27 +16,16 @@ public NSError() {
 	super();
 }
 
-public NSError(int id) {
+public NSError(int /*long*/ id) {
 	super(id);
 }
 
-public int code() {
-	return OS.objc_msgSend(this.id, OS.sel_code);
-}
-
-public NSString domain() {
-	int result = OS.objc_msgSend(this.id, OS.sel_domain);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static id errorWithDomain(NSString domain, int code, NSDictionary dict) {
-	int result = OS.objc_msgSend(OS.class_NSError, OS.sel_errorWithDomain_1code_1userInfo_1, domain != null ? domain.id : 0, code, dict != null ? dict.id : 0);
-	return result != 0 ? new id(result) : null;
+public NSError(id id) {
+	super(id);
 }
 
-public id initWithDomain(NSString domain, int code, NSDictionary dict) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDomain_1code_1userInfo_1, domain != null ? domain.id : 0, code, dict != null ? dict.id : 0);
-	return result != 0 ? new id(result) : null;
+public int code() {
+	return OS.objc_msgSend(this.id, OS.sel_code);
 }
 
 public NSString localizedDescription() {
@@ -44,26 +33,6 @@ public NSString localizedDescription() {
 	return result != 0 ? new NSString(result) : null;
 }
 
-public NSString localizedFailureReason() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedFailureReason);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSArray localizedRecoveryOptions() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedRecoveryOptions);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString localizedRecoverySuggestion() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedRecoverySuggestion);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id recoveryAttempter() {
-	int result = OS.objc_msgSend(this.id, OS.sel_recoveryAttempter);
-	return result != 0 ? new id(result) : null;
-}
-
 public NSDictionary userInfo() {
 	int 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 dacede18ce..709356dc75 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,38 +16,18 @@ public NSEvent() {
 	super();
 }
 
-public NSEvent(int id) {
+public NSEvent(int /*long*/ id) {
 	super(id);
 }
 
-public int CGEvent() {
-	return OS.objc_msgSend(this.id, OS.sel_CGEvent);
-}
-
-public int absoluteX() {
-	return OS.objc_msgSend(this.id, OS.sel_absoluteX);
-}
-
-public int absoluteY() {
-	return OS.objc_msgSend(this.id, OS.sel_absoluteY);
-}
-
-public int absoluteZ() {
-	return OS.objc_msgSend(this.id, OS.sel_absoluteZ);
-}
-
-public int buttonMask() {
-	return OS.objc_msgSend(this.id, OS.sel_buttonMask);
+public NSEvent(id id) {
+	super(id);
 }
 
 public int buttonNumber() {
 	return OS.objc_msgSend(this.id, OS.sel_buttonNumber);
 }
 
-public int capabilityMask() {
-	return OS.objc_msgSend(this.id, OS.sel_capabilityMask);
-}
-
 public NSString characters() {
 	int result = OS.objc_msgSend(this.id, OS.sel_characters);
 	return result != 0 ? new NSString(result) : null;
@@ -62,19 +42,6 @@ public int clickCount() {
 	return OS.objc_msgSend(this.id, OS.sel_clickCount);
 }
 
-public NSGraphicsContext context() {
-	int result = OS.objc_msgSend(this.id, OS.sel_context);
-	return result != 0 ? new NSGraphicsContext(result) : null;
-}
-
-public int data1() {
-	return OS.objc_msgSend(this.id, OS.sel_data1);
-}
-
-public int data2() {
-	return OS.objc_msgSend(this.id, OS.sel_data2);
-}
-
 public float deltaX() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_deltaX);
 }
@@ -83,58 +50,10 @@ public float deltaY() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_deltaY);
 }
 
-public float deltaZ() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_deltaZ);
-}
-
-public int deviceID() {
-	return OS.objc_msgSend(this.id, OS.sel_deviceID);
-}
-
-public static NSEvent enterExitEventWithType(int type, NSPoint location, int flags, double time, int wNum, NSGraphicsContext context, int eNum, int tNum, int data) {
-	int result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_enterExitEventWithType_1location_1modifierFlags_1timestamp_1windowNumber_1context_1eventNumber_1trackingNumber_1userData_1, type, location, flags, time, wNum, context != null ? context.id : 0, eNum, tNum, data);
-	return result != 0 ? new NSEvent(result) : null;
-}
-
-public int eventNumber() {
-	return OS.objc_msgSend(this.id, OS.sel_eventNumber);
-}
-
-public int eventRef() {
-	return OS.objc_msgSend(this.id, OS.sel_eventRef);
-}
-
-public static NSEvent eventWithCGEvent(int cgEvent) {
-	int result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_eventWithCGEvent_1, cgEvent);
-	return result != 0 ? new NSEvent(result) : null;
-}
-
-public static NSEvent eventWithEventRef(int eventRef) {
-	int result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_eventWithEventRef_1, eventRef);
-	return result != 0 ? new NSEvent(result) : null;
-}
-
-public boolean isARepeat() {
-	return OS.objc_msgSend(this.id, OS.sel_isARepeat) != 0;
-}
-
-public boolean isEnteringProximity() {
-	return OS.objc_msgSend(this.id, OS.sel_isEnteringProximity) != 0;
-}
-
-public static boolean isMouseCoalescingEnabled() {
-	return OS.objc_msgSend(OS.class_NSEvent, OS.sel_isMouseCoalescingEnabled) != 0;
-}
-
 public short keyCode() {
 	return (short)OS.objc_msgSend(this.id, OS.sel_keyCode);
 }
 
-public static NSEvent keyEventWithType(int type, NSPoint location, int flags, double time, int wNum, NSGraphicsContext context, NSString keys, NSString ukeys, boolean flag, short code) {
-	int result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_keyEventWithType_1location_1modifierFlags_1timestamp_1windowNumber_1context_1characters_1charactersIgnoringModifiers_1isARepeat_1keyCode_1, type, location, flags, time, wNum, context != null ? context.id : 0, keys != null ? keys.id : 0, ukeys != null ? ukeys.id : 0, flag, code);
-	return result != 0 ? new NSEvent(result) : null;
-}
-
 public NSPoint locationInWindow() {
 	NSPoint result = new NSPoint();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_locationInWindow);
@@ -145,11 +64,6 @@ public int modifierFlags() {
 	return OS.objc_msgSend(this.id, OS.sel_modifierFlags);
 }
 
-public static NSEvent mouseEventWithType(int type, NSPoint location, int flags, double time, int wNum, NSGraphicsContext context, int eNum, int cNum, float pressure) {
-	int result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_mouseEventWithType_1location_1modifierFlags_1timestamp_1windowNumber_1context_1eventNumber_1clickCount_1pressure_1, type, location, flags, time, wNum, context != null ? context.id : 0, eNum, cNum, pressure);
-	return result != 0 ? new NSEvent(result) : null;
-}
-
 public static NSPoint mouseLocation() {
 	NSPoint result = new NSPoint();
 	OS.objc_msgSend_stret(result, OS.class_NSEvent, OS.sel_mouseLocation);
@@ -157,109 +71,17 @@ public static NSPoint mouseLocation() {
 }
 
 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_1location_1modifierFlags_1timestamp_1windowNumber_1context_1subtype_1data1_1data2_1, type, location, flags, time, wNum, context != null ? context.id : 0, subtype, d1, 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);
 	return result != 0 ? new NSEvent(result) : null;
 }
 
-public int pointingDeviceID() {
-	return OS.objc_msgSend(this.id, OS.sel_pointingDeviceID);
-}
-
-public int pointingDeviceSerialNumber() {
-	return OS.objc_msgSend(this.id, OS.sel_pointingDeviceSerialNumber);
-}
-
-public int pointingDeviceType() {
-	return OS.objc_msgSend(this.id, OS.sel_pointingDeviceType);
-}
-
-public float pressure() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_pressure);
-}
-
-public float rotation() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rotation);
-}
-
-public static void setMouseCoalescingEnabled(boolean flag) {
-	OS.objc_msgSend(OS.class_NSEvent, OS.sel_setMouseCoalescingEnabled_1, flag);
-}
-
-public static void startPeriodicEventsAfterDelay(double delay, double period) {
-	OS.objc_msgSend(OS.class_NSEvent, OS.sel_startPeriodicEventsAfterDelay_1withPeriod_1, delay, period);
-}
-
-public static void stopPeriodicEvents() {
-	OS.objc_msgSend(OS.class_NSEvent, OS.sel_stopPeriodicEvents);
-}
-
-public short subtype() {
-	return (short)OS.objc_msgSend(this.id, OS.sel_subtype);
-}
-
-public int systemTabletID() {
-	return OS.objc_msgSend(this.id, OS.sel_systemTabletID);
-}
-
-public int tabletID() {
-	return OS.objc_msgSend(this.id, OS.sel_tabletID);
-}
-
-public float tangentialPressure() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_tangentialPressure);
-}
-
-public NSPoint tilt() {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_tilt);
-	return result;
-}
-
-public double timestamp() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_timestamp);
-}
-
-public NSTrackingArea trackingArea() {
-	int result = OS.objc_msgSend(this.id, OS.sel_trackingArea);
-	return result != 0 ? new NSTrackingArea(result) : null;
-}
-
-public int trackingNumber() {
-	return OS.objc_msgSend(this.id, OS.sel_trackingNumber);
-}
-
 public int type() {
 	return OS.objc_msgSend(this.id, OS.sel_type);
 }
 
-public long uniqueID() {
-	return (long)OS.objc_msgSend(this.id, OS.sel_uniqueID);
-}
-
-public int userData() {
-	return OS.objc_msgSend(this.id, OS.sel_userData);
-}
-
-public id vendorDefined() {
-	int result = OS.objc_msgSend(this.id, OS.sel_vendorDefined);
-	return result != 0 ? new id(result) : null;
-}
-
-public int vendorID() {
-	return OS.objc_msgSend(this.id, OS.sel_vendorID);
-}
-
-public int vendorPointingDeviceType() {
-	return OS.objc_msgSend(this.id, OS.sel_vendorPointingDeviceType);
-}
-
 public NSWindow window() {
 	int result = OS.objc_msgSend(this.id, OS.sel_window);
 	return result != 0 ? new NSWindow(result) : null;
 }
 
-public int windowNumber() {
-	return OS.objc_msgSend(this.id, OS.sel_windowNumber);
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSException.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSException.java
deleted file mode 100644
index a65f2e0fbd..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSException.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSException extends NSObject {
-
-public NSException() {
-	super();
-}
-
-public NSException(int id) {
-	super(id);
-}
-
-public NSArray callStackReturnAddresses() {
-	int result = OS.objc_msgSend(this.id, OS.sel_callStackReturnAddresses);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSException exceptionWithName(NSString name, NSString reason, NSDictionary userInfo) {
-	int result = OS.objc_msgSend(OS.class_NSException, OS.sel_exceptionWithName_1reason_1userInfo_1, name != null ? name.id : 0, reason != null ? reason.id : 0, userInfo != null ? userInfo.id : 0);
-	return result != 0 ? new NSException(result) : null;
-}
-
-public id initWithName(NSString aName, NSString aReason, NSDictionary aUserInfo) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithName_1reason_1userInfo_1, aName != null ? aName.id : 0, aReason != null ? aReason.id : 0, aUserInfo != null ? aUserInfo.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void raise() {
-	OS.objc_msgSend(this.id, OS.sel_raise);
-}
-
-public static void static_raise_format_(NSString name, NSString format) {
-	OS.objc_msgSend(OS.class_NSException, OS.sel_raise_1format_1, name != null ? name.id : 0, format != null ? format.id : 0);
-}
-
-public static void static_raise_format_arguments_(NSString name, NSString format, int argList) {
-	OS.objc_msgSend(OS.class_NSException, OS.sel_raise_1format_1arguments_1, name != null ? name.id : 0, format != null ? format.id : 0, argList);
-}
-
-public NSString reason() {
-	int result = OS.objc_msgSend(this.id, OS.sel_reason);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSDictionary userInfo() {
-	int 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/NSExpression.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSExpression.java
deleted file mode 100644
index b1600a36e3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSExpression.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSExpression extends NSObject {
-
-public NSExpression() {
-	super();
-}
-
-public NSExpression(int id) {
-	super(id);
-}
-
-public NSArray arguments() {
-	int result = OS.objc_msgSend(this.id, OS.sel_arguments);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id collection() {
-	int result = OS.objc_msgSend(this.id, OS.sel_collection);
-	return result != 0 ? new id(result) : null;
-}
-
-public id constantValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_constantValue);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSExpression expressionForAggregate(NSArray subexpressions) {
-	int result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForAggregate_1, subexpressions != null ? subexpressions.id : 0);
-	return result != 0 ? new NSExpression(result) : null;
-}
-
-public static NSExpression expressionForConstantValue(id obj) {
-	int result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForConstantValue_1, obj != null ? obj.id : 0);
-	return result != 0 ? new NSExpression(result) : null;
-}
-
-public static NSExpression expressionForEvaluatedObject() {
-	int result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForEvaluatedObject);
-	return result != 0 ? new NSExpression(result) : null;
-}
-
-public static NSExpression static_expressionForFunction_arguments_(NSString name, NSArray parameters) {
-	int result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForFunction_1arguments_1, name != null ? name.id : 0, parameters != null ? parameters.id : 0);
-	return result != 0 ? new NSExpression(result) : null;
-}
-
-public static NSExpression static_expressionForFunction_selectorName_arguments_(NSExpression target, NSString name, NSArray parameters) {
-	int result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForFunction_1selectorName_1arguments_1, target != null ? target.id : 0, name != null ? name.id : 0, parameters != null ? parameters.id : 0);
-	return result != 0 ? new NSExpression(result) : null;
-}
-
-public static NSExpression expressionForIntersectSet(NSExpression left, NSExpression right) {
-	int result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForIntersectSet_1with_1, left != null ? left.id : 0, right != null ? right.id : 0);
-	return result != 0 ? new NSExpression(result) : null;
-}
-
-public static NSExpression expressionForKeyPath(NSString keyPath) {
-	int result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForKeyPath_1, keyPath != null ? keyPath.id : 0);
-	return result != 0 ? new NSExpression(result) : null;
-}
-
-public static NSExpression expressionForMinusSet(NSExpression left, NSExpression right) {
-	int result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForMinusSet_1with_1, left != null ? left.id : 0, right != null ? right.id : 0);
-	return result != 0 ? new NSExpression(result) : null;
-}
-
-public static NSExpression expressionForSubquery(NSExpression expression, NSString variable, id predicate) {
-	int result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForSubquery_1usingIteratorVariable_1predicate_1, expression != null ? expression.id : 0, variable != null ? variable.id : 0, predicate != null ? predicate.id : 0);
-	return result != 0 ? new NSExpression(result) : null;
-}
-
-public static NSExpression expressionForUnionSet(NSExpression left, NSExpression right) {
-	int result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForUnionSet_1with_1, left != null ? left.id : 0, right != null ? right.id : 0);
-	return result != 0 ? new NSExpression(result) : null;
-}
-
-public static NSExpression expressionForVariable(NSString string) {
-	int result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForVariable_1, string != null ? string.id : 0);
-	return result != 0 ? new NSExpression(result) : null;
-}
-
-public int expressionType() {
-	return OS.objc_msgSend(this.id, OS.sel_expressionType);
-}
-
-public id expressionValueWithObject(id object, NSMutableDictionary context) {
-	int result = OS.objc_msgSend(this.id, OS.sel_expressionValueWithObject_1context_1, object != null ? object.id : 0, context != null ? context.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString function() {
-	int result = OS.objc_msgSend(this.id, OS.sel_function);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id initWithExpressionType(int type) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithExpressionType_1, type);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString keyPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keyPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSExpression leftExpression() {
-	int result = OS.objc_msgSend(this.id, OS.sel_leftExpression);
-	return result == this.id ? this : (result != 0 ? new NSExpression(result) : null);
-}
-
-public NSExpression operand() {
-	int result = OS.objc_msgSend(this.id, OS.sel_operand);
-	return result == this.id ? this : (result != 0 ? new NSExpression(result) : null);
-}
-
-public NSPredicate predicate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_predicate);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public NSExpression rightExpression() {
-	int result = OS.objc_msgSend(this.id, OS.sel_rightExpression);
-	return result == this.id ? this : (result != 0 ? new NSExpression(result) : null);
-}
-
-public NSString variable() {
-	int result = OS.objc_msgSend(this.id, OS.sel_variable);
-	return result != 0 ? new NSString(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileHandle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileHandle.java
deleted file mode 100644
index 094a66e147..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileHandle.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSFileHandle extends NSObject {
-
-public NSFileHandle() {
-	super();
-}
-
-public NSFileHandle(int id) {
-	super(id);
-}
-
-public void acceptConnectionInBackgroundAndNotify() {
-	OS.objc_msgSend(this.id, OS.sel_acceptConnectionInBackgroundAndNotify);
-}
-
-public void acceptConnectionInBackgroundAndNotifyForModes(NSArray modes) {
-	OS.objc_msgSend(this.id, OS.sel_acceptConnectionInBackgroundAndNotifyForModes_1, modes != null ? modes.id : 0);
-}
-
-public NSData availableData() {
-	int result = OS.objc_msgSend(this.id, OS.sel_availableData);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public void closeFile() {
-	OS.objc_msgSend(this.id, OS.sel_closeFile);
-}
-
-public int fileDescriptor() {
-	return OS.objc_msgSend(this.id, OS.sel_fileDescriptor);
-}
-
-public static id fileHandleForReadingAtPath(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSFileHandle, OS.sel_fileHandleForReadingAtPath_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id fileHandleForUpdatingAtPath(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSFileHandle, OS.sel_fileHandleForUpdatingAtPath_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id fileHandleForWritingAtPath(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSFileHandle, OS.sel_fileHandleForWritingAtPath_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id fileHandleWithNullDevice() {
-	int result = OS.objc_msgSend(OS.class_NSFileHandle, OS.sel_fileHandleWithNullDevice);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id fileHandleWithStandardError() {
-	int result = OS.objc_msgSend(OS.class_NSFileHandle, OS.sel_fileHandleWithStandardError);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id fileHandleWithStandardInput() {
-	int result = OS.objc_msgSend(OS.class_NSFileHandle, OS.sel_fileHandleWithStandardInput);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id fileHandleWithStandardOutput() {
-	int result = OS.objc_msgSend(OS.class_NSFileHandle, OS.sel_fileHandleWithStandardOutput);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithFileDescriptor_(int fd) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFileDescriptor_1, fd);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithFileDescriptor_closeOnDealloc_(int fd, boolean closeopt) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFileDescriptor_1closeOnDealloc_1, fd, closeopt);
-	return result != 0 ? new id(result) : null;
-}
-
-public long offsetInFile() {
-	return (long)OS.objc_msgSend(this.id, OS.sel_offsetInFile);
-}
-
-public NSData readDataOfLength(int length) {
-	int result = OS.objc_msgSend(this.id, OS.sel_readDataOfLength_1, length);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSData readDataToEndOfFile() {
-	int result = OS.objc_msgSend(this.id, OS.sel_readDataToEndOfFile);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public void readInBackgroundAndNotify() {
-	OS.objc_msgSend(this.id, OS.sel_readInBackgroundAndNotify);
-}
-
-public void readInBackgroundAndNotifyForModes(NSArray modes) {
-	OS.objc_msgSend(this.id, OS.sel_readInBackgroundAndNotifyForModes_1, modes != null ? modes.id : 0);
-}
-
-public void readToEndOfFileInBackgroundAndNotify() {
-	OS.objc_msgSend(this.id, OS.sel_readToEndOfFileInBackgroundAndNotify);
-}
-
-public void readToEndOfFileInBackgroundAndNotifyForModes(NSArray modes) {
-	OS.objc_msgSend(this.id, OS.sel_readToEndOfFileInBackgroundAndNotifyForModes_1, modes != null ? modes.id : 0);
-}
-
-public long seekToEndOfFile() {
-	return (long)OS.objc_msgSend(this.id, OS.sel_seekToEndOfFile);
-}
-
-public void seekToFileOffset(long offset) {
-	OS.objc_msgSend(this.id, OS.sel_seekToFileOffset_1, offset);
-}
-
-public void synchronizeFile() {
-	OS.objc_msgSend(this.id, OS.sel_synchronizeFile);
-}
-
-public void truncateFileAtOffset(long offset) {
-	OS.objc_msgSend(this.id, OS.sel_truncateFileAtOffset_1, offset);
-}
-
-public void waitForDataInBackgroundAndNotify() {
-	OS.objc_msgSend(this.id, OS.sel_waitForDataInBackgroundAndNotify);
-}
-
-public void waitForDataInBackgroundAndNotifyForModes(NSArray modes) {
-	OS.objc_msgSend(this.id, OS.sel_waitForDataInBackgroundAndNotifyForModes_1, modes != null ? modes.id : 0);
-}
-
-public void writeData(NSData data) {
-	OS.objc_msgSend(this.id, OS.sel_writeData_1, data != null ? data.id : 0);
-}
-
-}
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 55d34f5b8b..140138494a 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,78 +16,16 @@ public NSFileManager() {
 	super();
 }
 
-public NSFileManager(int id) {
+public NSFileManager(int /*long*/ id) {
 	super(id);
 }
 
-public NSDictionary attributesOfFileSystemForPath(NSString path, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributesOfFileSystemForPath_1error_1, path != null ? path.id : 0, error);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDictionary attributesOfItemAtPath(NSString path, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributesOfItemAtPath_1error_1, path != null ? path.id : 0, error);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public boolean changeCurrentDirectoryPath(NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_changeCurrentDirectoryPath_1, path != null ? path.id : 0) != 0;
-}
-
-public boolean changeFileAttributes(NSDictionary attributes, NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_changeFileAttributes_1atPath_1, attributes != null ? attributes.id : 0, path != null ? path.id : 0) != 0;
-}
-
-public NSArray componentsToDisplayForPath(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_componentsToDisplayForPath_1, path != null ? path.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSData contentsAtPath(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_contentsAtPath_1, path != null ? path.id : 0);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public boolean contentsEqualAtPath(NSString path1, NSString path2) {
-	return OS.objc_msgSend(this.id, OS.sel_contentsEqualAtPath_1andPath_1, path1 != null ? path1.id : 0, path2 != null ? path2.id : 0) != 0;
-}
-
-public NSArray contentsOfDirectoryAtPath(NSString path, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_contentsOfDirectoryAtPath_1error_1, path != null ? path.id : 0, error);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean copyItemAtPath(NSString srcPath, NSString dstPath, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_copyItemAtPath_1toPath_1error_1, srcPath != null ? srcPath.id : 0, dstPath != null ? dstPath.id : 0, error) != 0;
-}
-
-public boolean copyPath(NSString src, NSString dest, id handler) {
-	return OS.objc_msgSend(this.id, OS.sel_copyPath_1toPath_1handler_1, src != null ? src.id : 0, dest != null ? dest.id : 0, handler != null ? handler.id : 0) != 0;
-}
-
-public boolean createDirectoryAtPath_attributes_(NSString path, NSDictionary attributes) {
-	return OS.objc_msgSend(this.id, OS.sel_createDirectoryAtPath_1attributes_1, path != null ? path.id : 0, attributes != null ? attributes.id : 0) != 0;
-}
-
-public boolean createDirectoryAtPath_withIntermediateDirectories_attributes_error_(NSString path, boolean createIntermediates, NSDictionary attributes, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_createDirectoryAtPath_1withIntermediateDirectories_1attributes_1error_1, path != null ? path.id : 0, createIntermediates, attributes != null ? attributes.id : 0, error) != 0;
+public NSFileManager(id id) {
+	super(id);
 }
 
 public boolean createFileAtPath(NSString path, NSData data, NSDictionary attr) {
-	return OS.objc_msgSend(this.id, OS.sel_createFileAtPath_1contents_1attributes_1, path != null ? path.id : 0, data != null ? data.id : 0, attr != null ? attr.id : 0) != 0;
-}
-
-public boolean createSymbolicLinkAtPath_pathContent_(NSString path, NSString otherpath) {
-	return OS.objc_msgSend(this.id, OS.sel_createSymbolicLinkAtPath_1pathContent_1, path != null ? path.id : 0, otherpath != null ? otherpath.id : 0) != 0;
-}
-
-public boolean createSymbolicLinkAtPath_withDestinationPath_error_(NSString path, NSString destPath, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_createSymbolicLinkAtPath_1withDestinationPath_1error_1, path != null ? path.id : 0, destPath != null ? destPath.id : 0, error) != 0;
-}
-
-public NSString currentDirectoryPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currentDirectoryPath);
-	return result != 0 ? new NSString(result) : null;
+	return OS.objc_msgSend(this.id, OS.sel_createFileAtPath_contents_attributes_, path != null ? path.id : 0, data != null ? data.id : 0, attr != null ? attr.id : 0) != 0;
 }
 
 public static NSFileManager defaultManager() {
@@ -95,119 +33,13 @@ public static NSFileManager defaultManager() {
 	return result != 0 ? new NSFileManager(result) : null;
 }
 
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString destinationOfSymbolicLinkAtPath(NSString path, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_destinationOfSymbolicLinkAtPath_1error_1, path != null ? path.id : 0, error);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSArray directoryContentsAtPath(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_directoryContentsAtPath_1, path != null ? path.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString displayNameAtPath(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_displayNameAtPath_1, path != null ? path.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
 public NSDirectoryEnumerator enumeratorAtPath(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_enumeratorAtPath_1, path != null ? path.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_enumeratorAtPath_, path != null ? path.id : 0);
 	return result != 0 ? new NSDirectoryEnumerator(result) : null;
 }
 
-public NSDictionary fileAttributesAtPath(NSString path, boolean yorn) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileAttributesAtPath_1traverseLink_1, path != null ? path.id : 0, yorn);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public boolean fileExistsAtPath_(NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_fileExistsAtPath_1, path != null ? path.id : 0) != 0;
-}
-
-public boolean fileExistsAtPath_isDirectory_(NSString path, int isDirectory) {
-	return OS.objc_msgSend(this.id, OS.sel_fileExistsAtPath_1isDirectory_1, path != null ? path.id : 0, isDirectory) != 0;
-}
-
-public NSDictionary fileSystemAttributesAtPath(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileSystemAttributesAtPath_1, path != null ? path.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public int fileSystemRepresentationWithPath(NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_fileSystemRepresentationWithPath_1, path != null ? path.id : 0);
-}
-
-public boolean isDeletableFileAtPath(NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_isDeletableFileAtPath_1, path != null ? path.id : 0) != 0;
-}
-
-public boolean isExecutableFileAtPath(NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_isExecutableFileAtPath_1, path != null ? path.id : 0) != 0;
-}
-
-public boolean isReadableFileAtPath(NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_isReadableFileAtPath_1, path != null ? path.id : 0) != 0;
-}
-
-public boolean isWritableFileAtPath(NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_isWritableFileAtPath_1, path != null ? path.id : 0) != 0;
-}
-
-public boolean linkItemAtPath(NSString srcPath, NSString dstPath, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_linkItemAtPath_1toPath_1error_1, srcPath != null ? srcPath.id : 0, dstPath != null ? dstPath.id : 0, error) != 0;
-}
-
-public boolean linkPath(NSString src, NSString dest, id handler) {
-	return OS.objc_msgSend(this.id, OS.sel_linkPath_1toPath_1handler_1, src != null ? src.id : 0, dest != null ? dest.id : 0, handler != null ? handler.id : 0) != 0;
-}
-
-public boolean moveItemAtPath(NSString srcPath, NSString dstPath, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_moveItemAtPath_1toPath_1error_1, srcPath != null ? srcPath.id : 0, dstPath != null ? dstPath.id : 0, error) != 0;
-}
-
-public boolean movePath(NSString src, NSString dest, id handler) {
-	return OS.objc_msgSend(this.id, OS.sel_movePath_1toPath_1handler_1, src != null ? src.id : 0, dest != null ? dest.id : 0, handler != null ? handler.id : 0) != 0;
-}
-
-public NSString pathContentOfSymbolicLinkAtPath(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathContentOfSymbolicLinkAtPath_1, path != null ? path.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean removeFileAtPath(NSString path, id handler) {
-	return OS.objc_msgSend(this.id, OS.sel_removeFileAtPath_1handler_1, path != null ? path.id : 0, handler != null ? handler.id : 0) != 0;
-}
-
 public boolean removeItemAtPath(NSString path, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_removeItemAtPath_1error_1, path != null ? path.id : 0, error) != 0;
-}
-
-public boolean setAttributes(NSDictionary attributes, NSString path, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_setAttributes_1ofItemAtPath_1error_1, attributes != null ? attributes.id : 0, path != null ? path.id : 0, error) != 0;
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public NSString stringWithFileSystemRepresentation(int str, int len) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringWithFileSystemRepresentation_1length_1, str, len);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSArray subpathsAtPath(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_subpathsAtPath_1, path != null ? path.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray subpathsOfDirectoryAtPath(NSString path, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_subpathsOfDirectoryAtPath_1error_1, path != null ? path.id : 0, error);
-	return result != 0 ? new NSArray(result) : null;
+	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/NSFileWrapper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileWrapper.java
deleted file mode 100644
index 0f46dadc58..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileWrapper.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSFileWrapper extends NSObject {
-
-public NSFileWrapper() {
-	super();
-}
-
-public NSFileWrapper(int id) {
-	super(id);
-}
-
-public NSString addFileWithPath(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_addFileWithPath_1, path != null ? path.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString addFileWrapper(NSFileWrapper doc) {
-	int result = OS.objc_msgSend(this.id, OS.sel_addFileWrapper_1, doc != null ? doc.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString addRegularFileWithContents(NSData data, NSString filename) {
-	int result = OS.objc_msgSend(this.id, OS.sel_addRegularFileWithContents_1preferredFilename_1, data != null ? data.id : 0, filename != null ? filename.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString addSymbolicLinkWithDestination(NSString path, NSString filename) {
-	int result = OS.objc_msgSend(this.id, OS.sel_addSymbolicLinkWithDestination_1preferredFilename_1, path != null ? path.id : 0, filename != null ? filename.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSDictionary fileAttributes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileAttributes);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDictionary fileWrappers() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileWrappers);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSString filename() {
-	int result = OS.objc_msgSend(this.id, OS.sel_filename);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSImage icon() {
-	int result = OS.objc_msgSend(this.id, OS.sel_icon);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public id initDirectoryWithFileWrappers(NSDictionary docs) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initDirectoryWithFileWrappers_1, docs != null ? docs.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initRegularFileWithContents(NSData data) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initRegularFileWithContents_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initSymbolicLinkWithDestination(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initSymbolicLinkWithDestination_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithPath(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithPath_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithSerializedRepresentation(NSData data) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithSerializedRepresentation_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isDirectory() {
-	return OS.objc_msgSend(this.id, OS.sel_isDirectory) != 0;
-}
-
-public boolean isRegularFile() {
-	return OS.objc_msgSend(this.id, OS.sel_isRegularFile) != 0;
-}
-
-public boolean isSymbolicLink() {
-	return OS.objc_msgSend(this.id, OS.sel_isSymbolicLink) != 0;
-}
-
-public NSString keyForFileWrapper(NSFileWrapper doc) {
-	int result = OS.objc_msgSend(this.id, OS.sel_keyForFileWrapper_1, doc != null ? doc.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean needsToBeUpdatedFromPath(NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_needsToBeUpdatedFromPath_1, path != null ? path.id : 0) != 0;
-}
-
-public NSString preferredFilename() {
-	int result = OS.objc_msgSend(this.id, OS.sel_preferredFilename);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSData regularFileContents() {
-	int result = OS.objc_msgSend(this.id, OS.sel_regularFileContents);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public void removeFileWrapper(NSFileWrapper doc) {
-	OS.objc_msgSend(this.id, OS.sel_removeFileWrapper_1, doc != null ? doc.id : 0);
-}
-
-public NSData serializedRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_serializedRepresentation);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public void setFileAttributes(NSDictionary attributes) {
-	OS.objc_msgSend(this.id, OS.sel_setFileAttributes_1, attributes != null ? attributes.id : 0);
-}
-
-public void setFilename(NSString filename) {
-	OS.objc_msgSend(this.id, OS.sel_setFilename_1, filename != null ? filename.id : 0);
-}
-
-public void setIcon(NSImage icon) {
-	OS.objc_msgSend(this.id, OS.sel_setIcon_1, icon != null ? icon.id : 0);
-}
-
-public void setPreferredFilename(NSString filename) {
-	OS.objc_msgSend(this.id, OS.sel_setPreferredFilename_1, filename != null ? filename.id : 0);
-}
-
-public NSString symbolicLinkDestination() {
-	int result = OS.objc_msgSend(this.id, OS.sel_symbolicLinkDestination);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean updateFromPath(NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_updateFromPath_1, path != null ? path.id : 0) != 0;
-}
-
-public boolean writeToFile(NSString path, boolean atomicFlag, boolean updateFilenamesFlag) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToFile_1atomically_1updateFilenames_1, path != null ? path.id : 0, atomicFlag, updateFilenamesFlag) != 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 3298593789..71436e5312 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,284 +16,47 @@ public NSFont() {
 	super();
 }
 
-public NSFont(int id) {
+public NSFont(int /*long*/ id) {
 	super(id);
 }
 
-public NSSize advancementForGlyph(int ag) {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_advancementForGlyph_1, ag);
-	return result;
-}
-
-public NSDictionary afmDictionary() {
-	int result = OS.objc_msgSend(this.id, OS.sel_afmDictionary);
-	return result != 0 ? new NSDictionary(result) : null;
+public NSFont(id id) {
+	super(id);
 }
 
 public float ascender() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_ascender);
 }
 
-public static NSFont boldSystemFontOfSize(float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_boldSystemFontOfSize_1, fontSize);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public NSRect boundingRectForFont() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_boundingRectForFont);
-	return result;
-}
-
-public NSRect boundingRectForGlyph(int aGlyph) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_boundingRectForGlyph_1, aGlyph);
-	return result;
-}
-
-public float capHeight() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_capHeight);
-}
-
-public static NSFont controlContentFontOfSize(float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_controlContentFontOfSize_1, fontSize);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public NSCharacterSet coveredCharacterSet() {
-	int result = OS.objc_msgSend(this.id, OS.sel_coveredCharacterSet);
-	return result != 0 ? new NSCharacterSet(result) : null;
-}
-
-public float defaultLineHeightForFont() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_defaultLineHeightForFont);
-}
-
 public float descender() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_descender);
 }
 
-public NSString displayName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_displayName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString encodingScheme() {
-	int result = OS.objc_msgSend(this.id, OS.sel_encodingScheme);
-	return result != 0 ? new NSString(result) : null;
-}
-
 public NSString familyName() {
 	int result = OS.objc_msgSend(this.id, OS.sel_familyName);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public NSFontDescriptor fontDescriptor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fontDescriptor);
-	return result != 0 ? new NSFontDescriptor(result) : null;
-}
-
 public NSString fontName() {
 	int result = OS.objc_msgSend(this.id, OS.sel_fontName);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public static NSFont static_fontWithDescriptor_size_(NSFontDescriptor fontDescriptor, float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_fontWithDescriptor_1size_1, fontDescriptor != null ? fontDescriptor.id : 0, fontSize);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public static NSFont static_fontWithDescriptor_textTransform_(NSFontDescriptor fontDescriptor, NSAffineTransform textTransform) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_fontWithDescriptor_1textTransform_1, fontDescriptor != null ? fontDescriptor.id : 0, textTransform != null ? textTransform.id : 0);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public static NSFont static_fontWithName_matrix_(NSString fontName, int fontMatrix) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_fontWithName_1matrix_1, fontName != null ? fontName.id : 0, fontMatrix);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public static NSFont static_fontWithName_size_(NSString fontName, float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_fontWithName_1size_1, fontName != null ? fontName.id : 0, fontSize);
+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);
 	return result != 0 ? new NSFont(result) : null;
 }
 
-public void getAdvancements_forGlyphs_count_(int advancements, int glyphs, int glyphCount) {
-	OS.objc_msgSend(this.id, OS.sel_getAdvancements_1forGlyphs_1count_1, advancements, glyphs, glyphCount);
-}
-
-public void getAdvancements_forPackedGlyphs_length_(int advancements, int packedGlyphs, int length) {
-	OS.objc_msgSend(this.id, OS.sel_getAdvancements_1forPackedGlyphs_1length_1, advancements, packedGlyphs, length);
-}
-
-public void getBoundingRects(int bounds, int glyphs, int glyphCount) {
-	OS.objc_msgSend(this.id, OS.sel_getBoundingRects_1forGlyphs_1count_1, bounds, glyphs, glyphCount);
-}
-
-public boolean glyphIsEncoded(int aGlyph) {
-	return OS.objc_msgSend(this.id, OS.sel_glyphIsEncoded_1, aGlyph) != 0;
-}
-
-public int glyphPacking() {
-	return OS.objc_msgSend(this.id, OS.sel_glyphPacking);
-}
-
-public int glyphWithName(NSString aName) {
-	return OS.objc_msgSend(this.id, OS.sel_glyphWithName_1, aName != null ? aName.id : 0);
-}
-
-public boolean isBaseFont() {
-	return OS.objc_msgSend(this.id, OS.sel_isBaseFont) != 0;
-}
-
-public boolean isFixedPitch() {
-	return OS.objc_msgSend(this.id, OS.sel_isFixedPitch) != 0;
-}
-
-public float italicAngle() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_italicAngle);
-}
-
-public static NSFont labelFontOfSize(float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_labelFontOfSize_1, fontSize);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public static float labelFontSize() {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_labelFontSize);
-}
-
 public float leading() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_leading);
 }
 
-public int matrix() {
-	return OS.objc_msgSend(this.id, OS.sel_matrix);
-}
-
-public NSSize maximumAdvancement() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_maximumAdvancement);
-	return result;
-}
-
-public static NSFont menuBarFontOfSize(float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_menuBarFontOfSize_1, fontSize);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public static NSFont menuFontOfSize(float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_menuFontOfSize_1, fontSize);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public static NSFont messageFontOfSize(float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_messageFontOfSize_1, fontSize);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public int mostCompatibleStringEncoding() {
-	return OS.objc_msgSend(this.id, OS.sel_mostCompatibleStringEncoding);
-}
-
-public int numberOfGlyphs() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfGlyphs);
-}
-
-public static NSFont paletteFontOfSize(float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_paletteFontOfSize_1, fontSize);
-	return result != 0 ? new NSFont(result) : null;
-}
-
 public float pointSize() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_pointSize);
 }
 
-public NSPoint positionOfGlyph_forCharacter_struckOverRect_(int aGlyph, short aChar, NSRect aRect) {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_positionOfGlyph_1forCharacter_1struckOverRect_1, aGlyph, aChar, aRect);
-	return result;
-}
-
-public NSPoint positionOfGlyph_precededByGlyph_isNominal_(int curGlyph, int prevGlyph, int nominal) {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_positionOfGlyph_1precededByGlyph_1isNominal_1, curGlyph, prevGlyph, nominal);
-	return result;
-}
-
-public NSPoint positionOfGlyph_struckOverGlyph_metricsExist_(int curGlyph, int prevGlyph, int exist) {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_positionOfGlyph_1struckOverGlyph_1metricsExist_1, curGlyph, prevGlyph, exist);
-	return result;
-}
-
-public NSPoint positionOfGlyph_struckOverRect_metricsExist_(int aGlyph, NSRect aRect, int exist) {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_positionOfGlyph_1struckOverRect_1metricsExist_1, aGlyph, aRect, exist);
-	return result;
-}
-
-public NSPoint positionOfGlyph_withRelation_toBaseGlyph_totalAdvancement_metricsExist_(int thisGlyph, int rel, int baseGlyph, int adv, int exist) {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_positionOfGlyph_1withRelation_1toBaseGlyph_1totalAdvancement_1metricsExist_1, thisGlyph, rel, baseGlyph, adv, exist);
-	return result;
-}
-
-public int positionsForCompositeSequence(int someGlyphs, int numGlyphs, int points) {
-	return OS.objc_msgSend(this.id, OS.sel_positionsForCompositeSequence_1numberOfGlyphs_1pointArray_1, someGlyphs, numGlyphs, points);
-}
-
-public static NSArray preferredFontNames() {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_preferredFontNames);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSFont printerFont() {
-	int result = OS.objc_msgSend(this.id, OS.sel_printerFont);
-	return result == this.id ? this : (result != 0 ? new NSFont(result) : null);
-}
-
-public int renderingMode() {
-	return OS.objc_msgSend(this.id, OS.sel_renderingMode);
-}
-
-public NSFont screenFont() {
-	int result = OS.objc_msgSend(this.id, OS.sel_screenFont);
-	return result == this.id ? this : (result != 0 ? new NSFont(result) : null);
-}
-
-public NSFont screenFontWithRenderingMode(int renderingMode) {
-	int result = OS.objc_msgSend(this.id, OS.sel_screenFontWithRenderingMode_1, renderingMode);
-	return result == this.id ? this : (result != 0 ? new NSFont(result) : null);
-}
-
-public void set() {
-	OS.objc_msgSend(this.id, OS.sel_set);
-}
-
-public void setInContext(NSGraphicsContext graphicsContext) {
-	OS.objc_msgSend(this.id, OS.sel_setInContext_1, graphicsContext != null ? graphicsContext.id : 0);
-}
-
-public static void setPreferredFontNames(NSArray fontNameArray) {
-	OS.objc_msgSend(OS.class_NSFont, OS.sel_setPreferredFontNames_1, fontNameArray != null ? fontNameArray.id : 0);
-}
-
-public static void setUserFixedPitchFont(NSFont aFont) {
-	OS.objc_msgSend(OS.class_NSFont, OS.sel_setUserFixedPitchFont_1, aFont != null ? aFont.id : 0);
-}
-
-public static void setUserFont(NSFont aFont) {
-	OS.objc_msgSend(OS.class_NSFont, OS.sel_setUserFont_1, aFont != null ? aFont.id : 0);
-}
-
-public static float smallSystemFontSize() {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_smallSystemFontSize);
-}
-
 public static NSFont systemFontOfSize(float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_systemFontOfSize_1, fontSize);
+	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_systemFontOfSize_, fontSize);
 	return result != 0 ? new NSFont(result) : null;
 }
 
@@ -301,53 +64,4 @@ public static float systemFontSize() {
 	return (float)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSize);
 }
 
-public static float systemFontSizeForControlSize(int controlSize) {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSizeForControlSize_1, controlSize);
-}
-
-public NSAffineTransform textTransform() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textTransform);
-	return result != 0 ? new NSAffineTransform(result) : null;
-}
-
-public static NSFont titleBarFontOfSize(float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_titleBarFontOfSize_1, fontSize);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public static NSFont toolTipsFontOfSize(float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_toolTipsFontOfSize_1, fontSize);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public float underlinePosition() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_underlinePosition);
-}
-
-public float underlineThickness() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_underlineThickness);
-}
-
-public static void useFont(NSString fontName) {
-	OS.objc_msgSend(OS.class_NSFont, OS.sel_useFont_1, fontName != null ? fontName.id : 0);
-}
-
-public static NSFont userFixedPitchFontOfSize(float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_userFixedPitchFontOfSize_1, fontSize);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public static NSFont userFontOfSize(float fontSize) {
-	int result = OS.objc_msgSend(OS.class_NSFont, OS.sel_userFontOfSize_1, fontSize);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public float widthOfString(NSString string) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_widthOfString_1, string != null ? string.id : 0);
-}
-
-public float xHeight() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_xHeight);
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontDescriptor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontDescriptor.java
deleted file mode 100644
index 8ddd531a92..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontDescriptor.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSFontDescriptor extends NSObject {
-
-public NSFontDescriptor() {
-	super();
-}
-
-public NSFontDescriptor(int id) {
-	super(id);
-}
-
-public NSDictionary fontAttributes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fontAttributes);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSFontDescriptor fontDescriptorByAddingAttributes(NSDictionary attributes) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fontDescriptorByAddingAttributes_1, attributes != null ? attributes.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSFontDescriptor(result) : null);
-}
-
-public NSFontDescriptor fontDescriptorWithFace(NSString newFace) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fontDescriptorWithFace_1, newFace != null ? newFace.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSFontDescriptor(result) : null);
-}
-
-public NSFontDescriptor fontDescriptorWithFamily(NSString newFamily) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fontDescriptorWithFamily_1, newFamily != null ? newFamily.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSFontDescriptor(result) : null);
-}
-
-public static NSFontDescriptor fontDescriptorWithFontAttributes(NSDictionary attributes) {
-	int result = OS.objc_msgSend(OS.class_NSFontDescriptor, OS.sel_fontDescriptorWithFontAttributes_1, attributes != null ? attributes.id : 0);
-	return result != 0 ? new NSFontDescriptor(result) : null;
-}
-
-public NSFontDescriptor fontDescriptorWithMatrix(NSAffineTransform matrix) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fontDescriptorWithMatrix_1, matrix != null ? matrix.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSFontDescriptor(result) : null);
-}
-
-public static NSFontDescriptor static_fontDescriptorWithName_matrix_(NSString fontName, NSAffineTransform matrix) {
-	int result = OS.objc_msgSend(OS.class_NSFontDescriptor, OS.sel_fontDescriptorWithName_1matrix_1, fontName != null ? fontName.id : 0, matrix != null ? matrix.id : 0);
-	return result != 0 ? new NSFontDescriptor(result) : null;
-}
-
-public static NSFontDescriptor static_fontDescriptorWithName_size_(NSString fontName, float size) {
-	int result = OS.objc_msgSend(OS.class_NSFontDescriptor, OS.sel_fontDescriptorWithName_1size_1, fontName != null ? fontName.id : 0, size);
-	return result != 0 ? new NSFontDescriptor(result) : null;
-}
-
-public NSFontDescriptor fontDescriptorWithSize(float newPointSize) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fontDescriptorWithSize_1, newPointSize);
-	return result == this.id ? this : (result != 0 ? new NSFontDescriptor(result) : null);
-}
-
-public NSFontDescriptor fontDescriptorWithSymbolicTraits(int symbolicTraits) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fontDescriptorWithSymbolicTraits_1, symbolicTraits);
-	return result == this.id ? this : (result != 0 ? new NSFontDescriptor(result) : null);
-}
-
-public id initWithFontAttributes(NSDictionary attributes) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFontAttributes_1, attributes != null ? attributes.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSFontDescriptor matchingFontDescriptorWithMandatoryKeys(NSSet mandatoryKeys) {
-	int result = OS.objc_msgSend(this.id, OS.sel_matchingFontDescriptorWithMandatoryKeys_1, mandatoryKeys != null ? mandatoryKeys.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSFontDescriptor(result) : null);
-}
-
-public NSArray matchingFontDescriptorsWithMandatoryKeys(NSSet mandatoryKeys) {
-	int result = OS.objc_msgSend(this.id, OS.sel_matchingFontDescriptorsWithMandatoryKeys_1, mandatoryKeys != null ? mandatoryKeys.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSAffineTransform matrix() {
-	int result = OS.objc_msgSend(this.id, OS.sel_matrix);
-	return result != 0 ? new NSAffineTransform(result) : null;
-}
-
-public id objectForKey(NSString anAttribute) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectForKey_1, anAttribute != null ? anAttribute.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public float pointSize() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_pointSize);
-}
-
-public NSString postscriptName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_postscriptName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int symbolicTraits() {
-	return OS.objc_msgSend(this.id, OS.sel_symbolicTraits);
-}
-
-}
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 280fe96350..bc2b5c53c6 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,39 +16,12 @@ public NSFontManager() {
 	super();
 }
 
-public NSFontManager(int id) {
+public NSFontManager(int /*long*/ id) {
 	super(id);
 }
 
-public int action() {
-	return OS.objc_msgSend(this.id, OS.sel_action);
-}
-
-public boolean addCollection(NSString collectionName, int collectionOptions) {
-	return OS.objc_msgSend(this.id, OS.sel_addCollection_1options_1, collectionName != null ? collectionName.id : 0, collectionOptions) != 0;
-}
-
-public void addFontDescriptors(NSArray descriptors, NSString collectionName) {
-	OS.objc_msgSend(this.id, OS.sel_addFontDescriptors_1toCollection_1, descriptors != null ? descriptors.id : 0, collectionName != null ? collectionName.id : 0);
-}
-
-public void addFontTrait(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_addFontTrait_1, sender != null ? sender.id : 0);
-}
-
-public NSArray availableFontFamilies() {
-	int result = OS.objc_msgSend(this.id, OS.sel_availableFontFamilies);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray availableFontNamesMatchingFontDescriptor(NSFontDescriptor descriptor) {
-	int result = OS.objc_msgSend(this.id, OS.sel_availableFontNamesMatchingFontDescriptor_1, descriptor != null ? descriptor.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray availableFontNamesWithTraits(int someTraits) {
-	int result = OS.objc_msgSend(this.id, OS.sel_availableFontNamesWithTraits_1, someTraits);
-	return result != 0 ? new NSArray(result) : null;
+public NSFontManager(id id) {
+	super(id);
 }
 
 public NSArray availableFonts() {
@@ -56,195 +29,9 @@ public NSArray availableFonts() {
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public NSArray availableMembersOfFontFamily(NSString fam) {
-	int result = OS.objc_msgSend(this.id, OS.sel_availableMembersOfFontFamily_1, fam != null ? fam.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray collectionNames() {
-	int result = OS.objc_msgSend(this.id, OS.sel_collectionNames);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSDictionary convertAttributes(NSDictionary attributes) {
-	int result = OS.objc_msgSend(this.id, OS.sel_convertAttributes_1, attributes != null ? attributes.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSFont convertFont_(NSFont fontObj) {
-	int result = OS.objc_msgSend(this.id, OS.sel_convertFont_1, fontObj != null ? fontObj.id : 0);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public NSFont convertFont_toFace_(NSFont fontObj, NSString typeface) {
-	int result = OS.objc_msgSend(this.id, OS.sel_convertFont_1toFace_1, fontObj != null ? fontObj.id : 0, typeface != null ? typeface.id : 0);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public NSFont convertFont_toFamily_(NSFont fontObj, NSString family) {
-	int result = OS.objc_msgSend(this.id, OS.sel_convertFont_1toFamily_1, fontObj != null ? fontObj.id : 0, family != null ? family.id : 0);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public NSFont convertFont_toHaveTrait_(NSFont fontObj, int trait) {
-	int result = OS.objc_msgSend(this.id, OS.sel_convertFont_1toHaveTrait_1, fontObj != null ? fontObj.id : 0, trait);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public NSFont convertFont_toNotHaveTrait_(NSFont fontObj, int trait) {
-	int result = OS.objc_msgSend(this.id, OS.sel_convertFont_1toNotHaveTrait_1, fontObj != null ? fontObj.id : 0, trait);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public NSFont convertFont_toSize_(NSFont fontObj, float size) {
-	int result = OS.objc_msgSend(this.id, OS.sel_convertFont_1toSize_1, fontObj != null ? fontObj.id : 0, size);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public int convertFontTraits(int traits) {
-	return OS.objc_msgSend(this.id, OS.sel_convertFontTraits_1, traits);
-}
-
-public NSFont convertWeight(boolean upFlag, NSFont fontObj) {
-	int result = OS.objc_msgSend(this.id, OS.sel_convertWeight_1ofFont_1, upFlag, fontObj != null ? fontObj.id : 0);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public int currentFontAction() {
-	return OS.objc_msgSend(this.id, OS.sel_currentFontAction);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSArray fontDescriptorsInCollection(NSString collectionNames) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fontDescriptorsInCollection_1, collectionNames != null ? collectionNames.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSMenu fontMenu(boolean create) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fontMenu_1, create);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
-public boolean fontNamed(NSString fName, int someTraits) {
-	return OS.objc_msgSend(this.id, OS.sel_fontNamed_1hasTraits_1, fName != null ? fName.id : 0, someTraits) != 0;
-}
-
-public NSFontPanel fontPanel(boolean create) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fontPanel_1, create);
-	return result != 0 ? new NSFontPanel(result) : null;
-}
-
-public NSFont fontWithFamily(NSString family, int traits, int weight, float size) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fontWithFamily_1traits_1weight_1size_1, family != null ? family.id : 0, traits, weight, size);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public boolean isEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isEnabled) != 0;
-}
-
-public boolean isMultiple() {
-	return OS.objc_msgSend(this.id, OS.sel_isMultiple) != 0;
-}
-
-public NSString localizedNameForFamily(NSString family, NSString faceKey) {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedNameForFamily_1face_1, family != null ? family.id : 0, faceKey != null ? faceKey.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void modifyFont(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_modifyFont_1, sender != null ? sender.id : 0);
-}
-
-public void modifyFontViaPanel(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_modifyFontViaPanel_1, sender != null ? sender.id : 0);
-}
-
-public void orderFrontFontPanel(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_orderFrontFontPanel_1, sender != null ? sender.id : 0);
-}
-
-public void orderFrontStylesPanel(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_orderFrontStylesPanel_1, sender != null ? sender.id : 0);
-}
-
-public boolean removeCollection(NSString collectionName) {
-	return OS.objc_msgSend(this.id, OS.sel_removeCollection_1, collectionName != null ? collectionName.id : 0) != 0;
-}
-
-public void removeFontDescriptor(NSFontDescriptor descriptor, NSString collection) {
-	OS.objc_msgSend(this.id, OS.sel_removeFontDescriptor_1fromCollection_1, descriptor != null ? descriptor.id : 0, collection != null ? collection.id : 0);
-}
-
-public void removeFontTrait(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_removeFontTrait_1, sender != null ? sender.id : 0);
-}
-
-public NSFont selectedFont() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedFont);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public boolean sendAction() {
-	return OS.objc_msgSend(this.id, OS.sel_sendAction) != 0;
-}
-
-public void setAction(int aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_setAction_1, aSelector);
-}
-
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public void setEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEnabled_1, flag);
-}
-
-public static void setFontManagerFactory(int factoryId) {
-	OS.objc_msgSend(OS.class_NSFontManager, OS.sel_setFontManagerFactory_1, factoryId);
-}
-
-public void setFontMenu(NSMenu newMenu) {
-	OS.objc_msgSend(this.id, OS.sel_setFontMenu_1, newMenu != null ? newMenu.id : 0);
-}
-
-public static void setFontPanelFactory(int factoryId) {
-	OS.objc_msgSend(OS.class_NSFontManager, OS.sel_setFontPanelFactory_1, factoryId);
-}
-
-public void setSelectedAttributes(NSDictionary attributes, boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedAttributes_1isMultiple_1, attributes != null ? attributes.id : 0, flag);
-}
-
-public void setSelectedFont(NSFont fontObj, boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedFont_1isMultiple_1, fontObj != null ? fontObj.id : 0, flag);
-}
-
-public void setTarget(id aTarget) {
-	OS.objc_msgSend(this.id, OS.sel_setTarget_1, aTarget != null ? aTarget.id : 0);
-}
-
 public static NSFontManager sharedFontManager() {
 	int result = OS.objc_msgSend(OS.class_NSFontManager, OS.sel_sharedFontManager);
 	return result != 0 ? new NSFontManager(result) : null;
 }
 
-public id target() {
-	int result = OS.objc_msgSend(this.id, OS.sel_target);
-	return result != 0 ? new id(result) : null;
-}
-
-public int traitsOfFont(NSFont fontObj) {
-	return OS.objc_msgSend(this.id, OS.sel_traitsOfFont_1, fontObj != null ? fontObj.id : 0);
-}
-
-public int weightOfFont(NSFont fontObj) {
-	return OS.objc_msgSend(this.id, OS.sel_weightOfFont_1, fontObj != null ? fontObj.id : 0);
-}
-
 }
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 0a17924b36..5560f69d0c 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,38 +16,21 @@ public NSFontPanel() {
 	super();
 }
 
-public NSFontPanel(int id) {
+public NSFontPanel(int /*long*/ id) {
 	super(id);
 }
 
-public NSView accessoryView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_accessoryView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public boolean isEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isEnabled) != 0;
+public NSFontPanel(id id) {
+	super(id);
 }
 
 public NSFont panelConvertFont(NSFont fontObj) {
-	int result = OS.objc_msgSend(this.id, OS.sel_panelConvertFont_1, fontObj != null ? fontObj.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_panelConvertFont_, fontObj != null ? fontObj.id : 0);
 	return result != 0 ? new NSFont(result) : null;
 }
 
-public void reloadDefaultFontFamilies() {
-	OS.objc_msgSend(this.id, OS.sel_reloadDefaultFontFamilies);
-}
-
-public void setAccessoryView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_setAccessoryView_1, aView != null ? aView.id : 0);
-}
-
-public void setEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEnabled_1, flag);
-}
-
 public void setPanelFont(NSFont fontObj, boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setPanelFont_1isMultiple_1, fontObj != null ? fontObj.id : 0, flag);
+	OS.objc_msgSend(this.id, OS.sel_setPanelFont_isMultiple_, fontObj != null ? fontObj.id : 0, flag);
 }
 
 public static NSFontPanel sharedFontPanel() {
@@ -55,12 +38,4 @@ public static NSFontPanel sharedFontPanel() {
 	return result != 0 ? new NSFontPanel(result) : null;
 }
 
-public static boolean sharedFontPanelExists() {
-	return OS.objc_msgSend(OS.class_NSFontPanel, OS.sel_sharedFontPanelExists) != 0;
-}
-
-public boolean worksWhenModal() {
-	return OS.objc_msgSend(this.id, OS.sel_worksWhenModal) != 0;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSForm.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSForm.java
deleted file mode 100644
index e573d5028a..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSForm.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSForm extends NSMatrix {
-
-public NSForm() {
-	super();
-}
-
-public NSForm(int id) {
-	super(id);
-}
-
-public NSFormCell addEntry(NSString title) {
-	int result = OS.objc_msgSend(this.id, OS.sel_addEntry_1, title != null ? title.id : 0);
-	return result != 0 ? new NSFormCell(result) : null;
-}
-
-public id cellAtIndex(int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_cellAtIndex_1, index);
-	return result != 0 ? new id(result) : null;
-}
-
-public void drawCellAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_drawCellAtIndex_1, index);
-}
-
-public int indexOfCellWithTag(int aTag) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfCellWithTag_1, aTag);
-}
-
-public int indexOfSelectedItem() {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfSelectedItem);
-}
-
-public NSFormCell insertEntry(NSString title, int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_insertEntry_1atIndex_1, title != null ? title.id : 0, index);
-	return result != 0 ? new NSFormCell(result) : null;
-}
-
-public void removeEntryAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeEntryAtIndex_1, index);
-}
-
-public void selectTextAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_selectTextAtIndex_1, index);
-}
-
-public void setBezeled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBezeled_1, flag);
-}
-
-public void setBordered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBordered_1, flag);
-}
-
-public void setEntryWidth(float width) {
-	OS.objc_msgSend(this.id, OS.sel_setEntryWidth_1, width);
-}
-
-public void setFrameSize(NSSize newSize) {
-	OS.objc_msgSend(this.id, OS.sel_setFrameSize_1, newSize);
-}
-
-public void setInterlineSpacing(float spacing) {
-	OS.objc_msgSend(this.id, OS.sel_setInterlineSpacing_1, spacing);
-}
-
-public void setTextAlignment(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setTextAlignment_1, mode);
-}
-
-public void setTextBaseWritingDirection(int writingDirection) {
-	OS.objc_msgSend(this.id, OS.sel_setTextBaseWritingDirection_1, writingDirection);
-}
-
-public void setTextFont(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setTextFont_1, fontObj != null ? fontObj.id : 0);
-}
-
-public void setTitleAlignment(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleAlignment_1, mode);
-}
-
-public void setTitleBaseWritingDirection(int writingDirection) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleBaseWritingDirection_1, writingDirection);
-}
-
-public void setTitleFont(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleFont_1, fontObj != null ? fontObj.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormCell.java
deleted file mode 100644
index 468f4b5250..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormCell.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSFormCell extends NSActionCell {
-
-public NSFormCell() {
-	super();
-}
-
-public NSFormCell(int id) {
-	super(id);
-}
-
-public NSAttributedString attributedTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedTitle);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public boolean isOpaque() {
-	return OS.objc_msgSend(this.id, OS.sel_isOpaque) != 0;
-}
-
-public NSAttributedString placeholderAttributedString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_placeholderAttributedString);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public NSString placeholderString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_placeholderString);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setAttributedTitle(NSAttributedString obj) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedTitle_1, obj != null ? obj.id : 0);
-}
-
-public void setPlaceholderAttributedString(NSAttributedString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPlaceholderAttributedString_1, string != null ? string.id : 0);
-}
-
-public void setPlaceholderString(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPlaceholderString_1, string != null ? string.id : 0);
-}
-
-public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, aString != null ? aString.id : 0);
-}
-
-public void setTitleAlignment(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleAlignment_1, mode);
-}
-
-public void setTitleBaseWritingDirection(int writingDirection) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleBaseWritingDirection_1, writingDirection);
-}
-
-public void setTitleFont(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleFont_1, fontObj != null ? fontObj.id : 0);
-}
-
-public void setTitleWidth(float width) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleWidth_1, width);
-}
-
-public void setTitleWithMnemonic(NSString stringWithAmpersand) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleWithMnemonic_1, stringWithAmpersand != null ? stringWithAmpersand.id : 0);
-}
-
-public NSString title() {
-	int result = OS.objc_msgSend(this.id, OS.sel_title);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int titleAlignment() {
-	return OS.objc_msgSend(this.id, OS.sel_titleAlignment);
-}
-
-public int titleBaseWritingDirection() {
-	return OS.objc_msgSend(this.id, OS.sel_titleBaseWritingDirection);
-}
-
-public NSFont titleFont() {
-	int result = OS.objc_msgSend(this.id, OS.sel_titleFont);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public float titleWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_titleWidth);
-}
-
-public float titleWidth_(NSSize aSize) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_titleWidth_1, aSize);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormatter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormatter.java
deleted file mode 100644
index 6b0becac64..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormatter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSFormatter extends NSObject {
-
-public NSFormatter() {
-	super();
-}
-
-public NSFormatter(int id) {
-	super(id);
-}
-
-public NSAttributedString attributedStringForObjectValue(id obj, NSDictionary attrs) {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedStringForObjectValue_1withDefaultAttributes_1, obj != null ? obj.id : 0, attrs != null ? attrs.id : 0);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public NSString editingStringForObjectValue(id obj) {
-	int result = OS.objc_msgSend(this.id, OS.sel_editingStringForObjectValue_1, obj != null ? obj.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean getObjectValue(int obj, NSString string, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_getObjectValue_1forString_1errorDescription_1, obj, string != null ? string.id : 0, error) != 0;
-}
-
-public boolean isPartialStringValid_newEditingString_errorDescription_(NSString partialString, int newString, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_isPartialStringValid_1newEditingString_1errorDescription_1, partialString != null ? partialString.id : 0, newString, error) != 0;
-}
-
-public boolean isPartialStringValid_proposedSelectedRange_originalString_originalSelectedRange_errorDescription_(int partialStringPtr, int proposedSelRangePtr, NSString origString, NSRange origSelRange, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_isPartialStringValid_1proposedSelectedRange_1originalString_1originalSelectedRange_1errorDescription_1, partialStringPtr, proposedSelRangePtr, origString != null ? origString.id : 0, origSelRange, error) != 0;
-}
-
-public NSString stringForObjectValue(id obj) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringForObjectValue_1, obj != null ? obj.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGarbageCollector.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGarbageCollector.java
deleted file mode 100644
index fdca1058d9..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGarbageCollector.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSGarbageCollector extends NSObject {
-
-public NSGarbageCollector() {
-	super();
-}
-
-public NSGarbageCollector(int id) {
-	super(id);
-}
-
-public void collectExhaustively() {
-	OS.objc_msgSend(this.id, OS.sel_collectExhaustively);
-}
-
-public void collectIfNeeded() {
-	OS.objc_msgSend(this.id, OS.sel_collectIfNeeded);
-}
-
-public static id defaultCollector() {
-	int result = OS.objc_msgSend(OS.class_NSGarbageCollector, OS.sel_defaultCollector);
-	return result != 0 ? new id(result) : null;
-}
-
-public void disable() {
-	OS.objc_msgSend(this.id, OS.sel_disable);
-}
-
-public void disableCollectorForPointer(int ptr) {
-	OS.objc_msgSend(this.id, OS.sel_disableCollectorForPointer_1, ptr);
-}
-
-public void enable() {
-	OS.objc_msgSend(this.id, OS.sel_enable);
-}
-
-public void enableCollectorForPointer(int ptr) {
-	OS.objc_msgSend(this.id, OS.sel_enableCollectorForPointer_1, ptr);
-}
-
-public boolean isCollecting() {
-	return OS.objc_msgSend(this.id, OS.sel_isCollecting) != 0;
-}
-
-public boolean isEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isEnabled) != 0;
-}
-
-public int zone() {
-	return OS.objc_msgSend(this.id, OS.sel_zone);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGlyphGenerator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGlyphGenerator.java
deleted file mode 100644
index 2c7494edab..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGlyphGenerator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSGlyphGenerator extends NSObject {
-
-public NSGlyphGenerator() {
-	super();
-}
-
-public NSGlyphGenerator(int id) {
-	super(id);
-}
-
-public void generateGlyphsForGlyphStorage(id  glyphStorage, int nChars, int glyphIndex, int charIndex) {
-	OS.objc_msgSend(this.id, OS.sel_generateGlyphsForGlyphStorage_1desiredNumberOfCharacters_1glyphIndex_1characterIndex_1, glyphStorage != null ? glyphStorage.id : 0, nChars, glyphIndex, charIndex);
-}
-
-public static id sharedGlyphGenerator() {
-	int result = OS.objc_msgSend(OS.class_NSGlyphGenerator, OS.sel_sharedGlyphGenerator);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGlyphInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGlyphInfo.java
deleted file mode 100644
index 6261cdbb30..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGlyphInfo.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSGlyphInfo extends NSObject {
-
-public NSGlyphInfo() {
-	super();
-}
-
-public NSGlyphInfo(int id) {
-	super(id);
-}
-
-public int characterCollection() {
-	return OS.objc_msgSend(this.id, OS.sel_characterCollection);
-}
-
-public int characterIdentifier() {
-	return OS.objc_msgSend(this.id, OS.sel_characterIdentifier);
-}
-
-public static NSGlyphInfo glyphInfoWithCharacterIdentifier(int cid, int characterCollection, NSString theString) {
-	int result = OS.objc_msgSend(OS.class_NSGlyphInfo, OS.sel_glyphInfoWithCharacterIdentifier_1collection_1baseString_1, cid, characterCollection, theString != null ? theString.id : 0);
-	return result != 0 ? new NSGlyphInfo(result) : null;
-}
-
-public static NSGlyphInfo glyphInfoWithGlyph(int glyph, NSFont font, NSString theString) {
-	int result = OS.objc_msgSend(OS.class_NSGlyphInfo, OS.sel_glyphInfoWithGlyph_1forFont_1baseString_1, glyph, font != null ? font.id : 0, theString != null ? theString.id : 0);
-	return result != 0 ? new NSGlyphInfo(result) : null;
-}
-
-public static NSGlyphInfo glyphInfoWithGlyphName(NSString glyphName, NSFont font, NSString theString) {
-	int result = OS.objc_msgSend(OS.class_NSGlyphInfo, OS.sel_glyphInfoWithGlyphName_1forFont_1baseString_1, glyphName != null ? glyphName.id : 0, font != null ? font.id : 0, theString != null ? theString.id : 0);
-	return result != 0 ? new NSGlyphInfo(result) : null;
-}
-
-public NSString glyphName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_glyphName);
-	return result != 0 ? new NSString(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 fa56dabf58..68e574b733 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,70 +16,25 @@ public NSGradient() {
 	super();
 }
 
-public NSGradient(int id) {
+public NSGradient(int /*long*/ id) {
 	super(id);
 }
 
-public NSColorSpace colorSpace() {
-	int result = OS.objc_msgSend(this.id, OS.sel_colorSpace);
-	return result != 0 ? new NSColorSpace(result) : null;
-}
-
-public void drawFromCenter(NSPoint startCenter, float startRadius, NSPoint endCenter, float endRadius, int options) {
-	OS.objc_msgSend(this.id, OS.sel_drawFromCenter_1radius_1toCenter_1radius_1options_1, startCenter, startRadius, endCenter, endRadius, options);
+public NSGradient(id id) {
+	super(id);
 }
 
 public void drawFromPoint(NSPoint startingPoint, NSPoint endingPoint, int options) {
-	OS.objc_msgSend(this.id, OS.sel_drawFromPoint_1toPoint_1options_1, startingPoint, endingPoint, options);
-}
-
-public void drawInBezierPath_angle_(NSBezierPath path, float angle) {
-	OS.objc_msgSend(this.id, OS.sel_drawInBezierPath_1angle_1, path != null ? path.id : 0, angle);
-}
-
-public void drawInBezierPath_relativeCenterPosition_(NSBezierPath path, NSPoint relativeCenterPosition) {
-	OS.objc_msgSend(this.id, OS.sel_drawInBezierPath_1relativeCenterPosition_1, path != null ? path.id : 0, relativeCenterPosition);
-}
-
-public void drawInRect_angle_(NSRect rect, float angle) {
-	OS.objc_msgSend(this.id, OS.sel_drawInRect_1angle_1, rect, angle);
-}
-
-public void drawInRect_relativeCenterPosition_(NSRect rect, NSPoint relativeCenterPosition) {
-	OS.objc_msgSend(this.id, OS.sel_drawInRect_1relativeCenterPosition_1, rect, relativeCenterPosition);
+	OS.objc_msgSend(this.id, OS.sel_drawFromPoint_toPoint_options_, startingPoint, endingPoint, options);
 }
 
-public void getColor(int color, int location, int index) {
-	OS.objc_msgSend(this.id, OS.sel_getColor_1location_1atIndex_1, color, location, index);
-}
-
-public NSGradient initWithColors_(NSArray colorArray) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithColors_1, colorArray != null ? colorArray.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSGradient initWithColors_atLocations_colorSpace_(NSArray colorArray, int locations, NSColorSpace colorSpace) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithColors_1atLocations_1colorSpace_1, colorArray != null ? colorArray.id : 0, locations, colorSpace != null ? colorSpace.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSGradient initWithColorsAndLocations(NSColor initWithColorsAndLocations) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithColorsAndLocations_1, initWithColorsAndLocations != null ? initWithColorsAndLocations.id : 0);
-	return result != 0 ? this : null;
+public void drawInRect(NSRect rect, float 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_1endingColor_1, startingColor != null ? startingColor.id : 0, endingColor != null ? endingColor.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSColor interpolatedColorAtLocation(float location) {
-	int result = OS.objc_msgSend(this.id, OS.sel_interpolatedColorAtLocation_1, location);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public int numberOfColorStops() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfColorStops);
+	int 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 f1461d0c5a..f1d9edd7b0 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,26 +16,12 @@ public NSGraphicsContext() {
 	super();
 }
 
-public NSGraphicsContext(int id) {
+public NSGraphicsContext(int /*long*/ id) {
 	super(id);
 }
 
-//public CIContext CIContext() {
-//	int result = OS.objc_msgSend(this.id, OS.sel_CIContext);
-//	return result != 0 ? new CIContext(result) : null;
-//}
-
-public NSDictionary attributes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributes);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public int colorRenderingIntent() {
-	return OS.objc_msgSend(this.id, OS.sel_colorRenderingIntent);
-}
-
-public int compositingOperation() {
-	return OS.objc_msgSend(this.id, OS.sel_compositingOperation);
+public NSGraphicsContext(id id) {
+	super(id);
 }
 
 public static NSGraphicsContext currentContext() {
@@ -43,111 +29,50 @@ public static NSGraphicsContext currentContext() {
 	return result != 0 ? new NSGraphicsContext(result) : null;
 }
 
-public static boolean currentContextDrawingToScreen() {
-	return OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_currentContextDrawingToScreen) != 0;
-}
-
 public void flushGraphics() {
 	OS.objc_msgSend(this.id, OS.sel_flushGraphics);
 }
 
-public id focusStack() {
-	int result = OS.objc_msgSend(this.id, OS.sel_focusStack);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSGraphicsContext graphicsContextWithAttributes(NSDictionary attributes) {
-	int result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithAttributes_1, attributes != null ? attributes.id : 0);
-	return result != 0 ? new NSGraphicsContext(result) : null;
-}
-
 public static NSGraphicsContext graphicsContextWithBitmapImageRep(NSBitmapImageRep bitmapRep) {
-	int result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithBitmapImageRep_1, bitmapRep != null ? bitmapRep.id : 0);
-	return result != 0 ? new NSGraphicsContext(result) : null;
-}
-
-public static NSGraphicsContext graphicsContextWithGraphicsPort(int graphicsPort, boolean initialFlippedState) {
-	int result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithGraphicsPort_1flipped_1, graphicsPort, initialFlippedState);
+	int 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_1, window != null ? window.id : 0);
+	int result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithWindow_, window != null ? window.id : 0);
 	return result != 0 ? new NSGraphicsContext(result) : null;
 }
 
-public int graphicsPort() {
-	return OS.objc_msgSend(this.id, OS.sel_graphicsPort);
-}
-
 public int imageInterpolation() {
 	return OS.objc_msgSend(this.id, OS.sel_imageInterpolation);
 }
 
-public boolean isDrawingToScreen() {
-	return OS.objc_msgSend(this.id, OS.sel_isDrawingToScreen) != 0;
-}
-
-public boolean isFlipped() {
-	return OS.objc_msgSend(this.id, OS.sel_isFlipped) != 0;
-}
-
-public NSPoint patternPhase() {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_patternPhase);
-	return result;
-}
-
 public void restoreGraphicsState() {
 	OS.objc_msgSend(this.id, OS.sel_restoreGraphicsState);
 }
 
-public static void static_restoreGraphicsState() {
-	OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_restoreGraphicsState);
-}
-
 public void saveGraphicsState() {
 	OS.objc_msgSend(this.id, OS.sel_saveGraphicsState);
 }
 
-public static void static_saveGraphicsState() {
-	OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_saveGraphicsState);
-}
-
-public void setColorRenderingIntent(int renderingIntent) {
-	OS.objc_msgSend(this.id, OS.sel_setColorRenderingIntent_1, renderingIntent);
-}
-
 public void setCompositingOperation(int operation) {
-	OS.objc_msgSend(this.id, OS.sel_setCompositingOperation_1, operation);
+	OS.objc_msgSend(this.id, OS.sel_setCompositingOperation_, operation);
 }
 
 public static void setCurrentContext(NSGraphicsContext context) {
-	OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_setCurrentContext_1, context != null ? context.id : 0);
-}
-
-public void setFocusStack(id stack) {
-	OS.objc_msgSend(this.id, OS.sel_setFocusStack_1, stack != null ? stack.id : 0);
-}
-
-public static void setGraphicsState(int gState) {
-	OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_setGraphicsState_1, gState);
+	OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_setCurrentContext_, context != null ? context.id : 0);
 }
 
 public void setImageInterpolation(int interpolation) {
-	OS.objc_msgSend(this.id, OS.sel_setImageInterpolation_1, interpolation);
+	OS.objc_msgSend(this.id, OS.sel_setImageInterpolation_, interpolation);
 }
 
 public void setPatternPhase(NSPoint phase) {
-	OS.objc_msgSend(this.id, OS.sel_setPatternPhase_1, phase);
+	OS.objc_msgSend(this.id, OS.sel_setPatternPhase_, phase);
 }
 
 public void setShouldAntialias(boolean antialias) {
-	OS.objc_msgSend(this.id, OS.sel_setShouldAntialias_1, antialias);
-}
-
-public boolean shouldAntialias() {
-	return OS.objc_msgSend(this.id, OS.sel_shouldAntialias) != 0;
+	OS.objc_msgSend(this.id, OS.sel_setShouldAntialias_, antialias);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookie.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookie.java
index 1311252db5..207c2d239f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookie.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookie.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,85 +16,16 @@ public NSHTTPCookie() {
 	super();
 }
 
-public NSHTTPCookie(int id) {
+public NSHTTPCookie(int /*long*/ id) {
 	super(id);
 }
 
-public NSString comment() {
-	int result = OS.objc_msgSend(this.id, OS.sel_comment);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSURL commentURL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_commentURL);
-	return result != 0 ? new NSURL(result) : null;
-}
-
-public static id cookieWithProperties(NSDictionary properties) {
-	int result = OS.objc_msgSend(OS.class_NSHTTPCookie, OS.sel_cookieWithProperties_1, properties != null ? properties.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSArray cookiesWithResponseHeaderFields(NSDictionary headerFields, NSURL URL) {
-	int result = OS.objc_msgSend(OS.class_NSHTTPCookie, OS.sel_cookiesWithResponseHeaderFields_1forURL_1, headerFields != null ? headerFields.id : 0, URL != null ? URL.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString domain() {
-	int result = OS.objc_msgSend(this.id, OS.sel_domain);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSDate expiresDate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_expiresDate);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public id initWithProperties(NSDictionary properties) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithProperties_1, properties != null ? properties.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isSecure() {
-	return OS.objc_msgSend(this.id, OS.sel_isSecure) != 0;
+public NSHTTPCookie(id id) {
+	super(id);
 }
 
 public boolean isSessionOnly() {
 	return OS.objc_msgSend(this.id, OS.sel_isSessionOnly) != 0;
 }
 
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString path() {
-	int result = OS.objc_msgSend(this.id, OS.sel_path);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSArray portList() {
-	int result = OS.objc_msgSend(this.id, OS.sel_portList);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSDictionary properties() {
-	int result = OS.objc_msgSend(this.id, OS.sel_properties);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public static NSDictionary requestHeaderFieldsWithCookies(NSArray cookies) {
-	int result = OS.objc_msgSend(OS.class_NSHTTPCookie, OS.sel_requestHeaderFieldsWithCookies_1, cookies != null ? cookies.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSString value() {
-	int result = OS.objc_msgSend(this.id, OS.sel_value);
-	return result != 0 ? new NSString(result) : null;
-}
-
-//public int version() {
-//	return OS.objc_msgSend(this.id, OS.sel_version);
-//}
-
 }
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 58f669eb40..568acd2dd5 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,12 +16,12 @@ public NSHTTPCookieStorage() {
 	super();
 }
 
-public NSHTTPCookieStorage(int id) {
+public NSHTTPCookieStorage(int /*long*/ id) {
 	super(id);
 }
 
-public int cookieAcceptPolicy() {
-	return OS.objc_msgSend(this.id, OS.sel_cookieAcceptPolicy);
+public NSHTTPCookieStorage(id id) {
+	super(id);
 }
 
 public NSArray cookies() {
@@ -29,25 +29,8 @@ public NSArray cookies() {
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public NSArray cookiesForURL(NSURL URL) {
-	int result = OS.objc_msgSend(this.id, OS.sel_cookiesForURL_1, URL != null ? URL.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
 public void deleteCookie(NSHTTPCookie cookie) {
-	OS.objc_msgSend(this.id, OS.sel_deleteCookie_1, cookie != null ? cookie.id : 0);
-}
-
-public void setCookie(NSHTTPCookie cookie) {
-	OS.objc_msgSend(this.id, OS.sel_setCookie_1, cookie != null ? cookie.id : 0);
-}
-
-public void setCookieAcceptPolicy(int cookieAcceptPolicy) {
-	OS.objc_msgSend(this.id, OS.sel_setCookieAcceptPolicy_1, cookieAcceptPolicy);
-}
-
-public void setCookies(NSArray cookies, NSURL URL, NSURL mainDocumentURL) {
-	OS.objc_msgSend(this.id, OS.sel_setCookies_1forURL_1mainDocumentURL_1, cookies != null ? cookies.id : 0, URL != null ? URL.id : 0, mainDocumentURL != null ? mainDocumentURL.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_deleteCookie_, cookie != null ? cookie.id : 0);
 }
 
 public static NSHTTPCookieStorage sharedHTTPCookieStorage() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPURLResponse.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPURLResponse.java
deleted file mode 100644
index 7707a348f1..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPURLResponse.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSHTTPURLResponse extends NSURLResponse {
-
-public NSHTTPURLResponse() {
-	super();
-}
-
-public NSHTTPURLResponse(int id) {
-	super(id);
-}
-
-public NSDictionary allHeaderFields() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allHeaderFields);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public static NSString localizedStringForStatusCode(int statusCode) {
-	int result = OS.objc_msgSend(OS.class_NSHTTPURLResponse, OS.sel_localizedStringForStatusCode_1, statusCode);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int statusCode() {
-	return OS.objc_msgSend(this.id, OS.sel_statusCode);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHashEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHashEnumerator.java
deleted file mode 100644
index 323c1d2861..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHashEnumerator.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSHashEnumerator {
-//TODO
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHashTable.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHashTable.java
deleted file mode 100644
index 75dde38cac..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHashTable.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSHashTable extends NSObject {
-
-public NSHashTable() {
-	super();
-}
-
-public NSHashTable(int id) {
-	super(id);
-}
-
-public void addObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_addObject_1, object != null ? object.id : 0);
-}
-
-public NSArray allObjects() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allObjects);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id anyObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_anyObject);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean containsObject(id anObject) {
-	return OS.objc_msgSend(this.id, OS.sel_containsObject_1, anObject != null ? anObject.id : 0) != 0;
-}
-
-public int count() {
-	return OS.objc_msgSend(this.id, OS.sel_count);
-}
-
-public static id hashTableWithOptions(int options) {
-	int result = OS.objc_msgSend(OS.class_NSHashTable, OS.sel_hashTableWithOptions_1, options);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id hashTableWithWeakObjects() {
-	int result = OS.objc_msgSend(OS.class_NSHashTable, OS.sel_hashTableWithWeakObjects);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithOptions(int options, int initialCapacity) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithOptions_1capacity_1, options, initialCapacity);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithPointerFunctions(NSPointerFunctions functions, int initialCapacity) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithPointerFunctions_1capacity_1, functions != null ? functions.id : 0, initialCapacity);
-	return result != 0 ? new id(result) : null;
-}
-
-public void intersectHashTable(NSHashTable other) {
-	OS.objc_msgSend(this.id, OS.sel_intersectHashTable_1, other != null ? other.id : 0);
-}
-
-public boolean intersectsHashTable(NSHashTable other) {
-	return OS.objc_msgSend(this.id, OS.sel_intersectsHashTable_1, other != null ? other.id : 0) != 0;
-}
-
-public boolean isEqualToHashTable(NSHashTable other) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualToHashTable_1, other != null ? other.id : 0) != 0;
-}
-
-public boolean isSubsetOfHashTable(NSHashTable other) {
-	return OS.objc_msgSend(this.id, OS.sel_isSubsetOfHashTable_1, other != null ? other.id : 0) != 0;
-}
-
-public id member(id object) {
-	int result = OS.objc_msgSend(this.id, OS.sel_member_1, object != null ? object.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void minusHashTable(NSHashTable other) {
-	OS.objc_msgSend(this.id, OS.sel_minusHashTable_1, other != null ? other.id : 0);
-}
-
-public NSEnumerator objectEnumerator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
-	return result != 0 ? new NSEnumerator(result) : null;
-}
-
-public NSPointerFunctions pointerFunctions() {
-	int result = OS.objc_msgSend(this.id, OS.sel_pointerFunctions);
-	return result != 0 ? new NSPointerFunctions(result) : null;
-}
-
-public void removeAllObjects() {
-	OS.objc_msgSend(this.id, OS.sel_removeAllObjects);
-}
-
-public void removeObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_removeObject_1, object != null ? object.id : 0);
-}
-
-public NSSet setRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_setRepresentation);
-	return result != 0 ? new NSSet(result) : null;
-}
-
-public void unionHashTable(NSHashTable other) {
-	OS.objc_msgSend(this.id, OS.sel_unionHashTable_1, other != null ? other.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHashTableCallBacks.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHashTableCallBacks.java
deleted file mode 100644
index fb5c891294..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHashTableCallBacks.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSHashTableCallBacks {
-//TODO
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHelpManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHelpManager.java
deleted file mode 100644
index e815b5cfc7..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHelpManager.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSHelpManager extends NSObject {
-
-public NSHelpManager() {
-	super();
-}
-
-public NSHelpManager(int id) {
-	super(id);
-}
-
-public NSAttributedString contextHelpForObject(id object) {
-	int result = OS.objc_msgSend(this.id, OS.sel_contextHelpForObject_1, object != null ? object.id : 0);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public void findString(NSString query, NSString book) {
-	OS.objc_msgSend(this.id, OS.sel_findString_1inBook_1, query != null ? query.id : 0, book != null ? book.id : 0);
-}
-
-public static boolean isContextHelpModeActive() {
-	return OS.objc_msgSend(OS.class_NSHelpManager, OS.sel_isContextHelpModeActive) != 0;
-}
-
-public void openHelpAnchor(NSString anchor, NSString book) {
-	OS.objc_msgSend(this.id, OS.sel_openHelpAnchor_1inBook_1, anchor != null ? anchor.id : 0, book != null ? book.id : 0);
-}
-
-public void removeContextHelpForObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_removeContextHelpForObject_1, object != null ? object.id : 0);
-}
-
-public void setContextHelp(NSAttributedString attrString, id object) {
-	OS.objc_msgSend(this.id, OS.sel_setContextHelp_1forObject_1, attrString != null ? attrString.id : 0, object != null ? object.id : 0);
-}
-
-public static void setContextHelpModeActive(boolean active) {
-	OS.objc_msgSend(OS.class_NSHelpManager, OS.sel_setContextHelpModeActive_1, active);
-}
-
-public static NSHelpManager sharedHelpManager() {
-	int result = OS.objc_msgSend(OS.class_NSHelpManager, OS.sel_sharedHelpManager);
-	return result != 0 ? new NSHelpManager(result) : null;
-}
-
-public boolean showContextHelpForObject(id object, NSPoint pt) {
-	return OS.objc_msgSend(this.id, OS.sel_showContextHelpForObject_1locationHint_1, object != null ? object.id : 0, pt) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHost.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHost.java
deleted file mode 100644
index 3cbcc7b7ee..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHost.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSHost extends NSObject {
-
-public NSHost() {
-	super();
-}
-
-public NSHost(int id) {
-	super(id);
-}
-
-public NSString address() {
-	int result = OS.objc_msgSend(this.id, OS.sel_address);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSArray addresses() {
-	int result = OS.objc_msgSend(this.id, OS.sel_addresses);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSHost currentHost() {
-	int result = OS.objc_msgSend(OS.class_NSHost, OS.sel_currentHost);
-	return result != 0 ? new NSHost(result) : null;
-}
-
-public static void flushHostCache() {
-	OS.objc_msgSend(OS.class_NSHost, OS.sel_flushHostCache);
-}
-
-public static NSHost hostWithAddress(NSString address) {
-	int result = OS.objc_msgSend(OS.class_NSHost, OS.sel_hostWithAddress_1, address != null ? address.id : 0);
-	return result != 0 ? new NSHost(result) : null;
-}
-
-public static NSHost hostWithName(NSString name) {
-	int result = OS.objc_msgSend(OS.class_NSHost, OS.sel_hostWithName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSHost(result) : null;
-}
-
-public boolean isEqualToHost(NSHost aHost) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualToHost_1, aHost != null ? aHost.id : 0) != 0;
-}
-
-public static boolean isHostCacheEnabled() {
-	return OS.objc_msgSend(OS.class_NSHost, OS.sel_isHostCacheEnabled) != 0;
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSArray names() {
-	int result = OS.objc_msgSend(this.id, OS.sel_names);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static void setHostCacheEnabled(boolean flag) {
-	OS.objc_msgSend(OS.class_NSHost, OS.sel_setHostCacheEnabled_1, flag);
-}
-
-}
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 c67479d35c..5d12f18f80 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,292 +16,52 @@ public NSImage() {
 	super();
 }
 
-public NSImage(int id) {
+public NSImage(int /*long*/ id) {
 	super(id);
 }
 
-public NSData TIFFRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentation);
-	return result != 0 ? new NSData(result) : null;
+public NSImage(id id) {
+	super(id);
 }
 
-public NSData TIFFRepresentationUsingCompression(int comp, float aFloat) {
-	int result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentationUsingCompression_1factor_1, comp, aFloat);
+public NSData TIFFRepresentation() {
+	int result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentation);
 	return result != 0 ? new NSData(result) : null;
 }
 
 public void addRepresentation(NSImageRep imageRep) {
-	OS.objc_msgSend(this.id, OS.sel_addRepresentation_1, imageRep != null ? imageRep.id : 0);
-}
-
-public void addRepresentations(NSArray imageReps) {
-	OS.objc_msgSend(this.id, OS.sel_addRepresentations_1, imageReps != null ? imageReps.id : 0);
-}
-
-public NSRect alignmentRect() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_alignmentRect);
-	return result;
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_addRepresentation_, imageRep != null ? imageRep.id : 0);
 }
 
 public NSImageRep bestRepresentationForDevice(NSDictionary deviceDescription) {
-	int result = OS.objc_msgSend(this.id, OS.sel_bestRepresentationForDevice_1, deviceDescription != null ? deviceDescription.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_bestRepresentationForDevice_, deviceDescription != null ? deviceDescription.id : 0);
 	return result != 0 ? new NSImageRep(result) : null;
 }
 
-public boolean cacheDepthMatchesImageDepth() {
-	return OS.objc_msgSend(this.id, OS.sel_cacheDepthMatchesImageDepth) != 0;
-}
-
-public int cacheMode() {
-	return OS.objc_msgSend(this.id, OS.sel_cacheMode);
-}
-
-public static boolean canInitWithPasteboard(NSPasteboard pasteboard) {
-	return OS.objc_msgSend(OS.class_NSImage, OS.sel_canInitWithPasteboard_1, pasteboard != null ? pasteboard.id : 0) != 0;
-}
-
-public void cancelIncrementalLoad() {
-	OS.objc_msgSend(this.id, OS.sel_cancelIncrementalLoad);
-}
-
-public void compositeToPoint_fromRect_operation_(NSPoint point, NSRect rect, int op) {
-	OS.objc_msgSend(this.id, OS.sel_compositeToPoint_1fromRect_1operation_1, point, rect, op);
-}
-
-public void compositeToPoint_fromRect_operation_fraction_(NSPoint point, NSRect rect, int op, float delta) {
-	OS.objc_msgSend(this.id, OS.sel_compositeToPoint_1fromRect_1operation_1fraction_1, point, rect, op, delta);
-}
-
-public void compositeToPoint_operation_(NSPoint point, int op) {
-	OS.objc_msgSend(this.id, OS.sel_compositeToPoint_1operation_1, point, op);
-}
-
-public void compositeToPoint_operation_fraction_(NSPoint point, int op, float delta) {
-	OS.objc_msgSend(this.id, OS.sel_compositeToPoint_1operation_1fraction_1, point, op, delta);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void dissolveToPoint_fraction_(NSPoint point, float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_dissolveToPoint_1fraction_1, point, aFloat);
-}
-
-public void dissolveToPoint_fromRect_fraction_(NSPoint point, NSRect rect, float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_dissolveToPoint_1fromRect_1fraction_1, point, rect, aFloat);
-}
-
 public void drawAtPoint(NSPoint point, NSRect fromRect, int op, float delta) {
-	OS.objc_msgSend(this.id, OS.sel_drawAtPoint_1fromRect_1operation_1fraction_1, point, fromRect, op, 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) {
-	OS.objc_msgSend(this.id, OS.sel_drawInRect_1fromRect_1operation_1fraction_1, rect, fromRect, op, delta);
-}
-
-public boolean drawRepresentation(NSImageRep imageRep, NSRect rect) {
-	return OS.objc_msgSend(this.id, OS.sel_drawRepresentation_1inRect_1, imageRep != null ? imageRep.id : 0, rect) != 0;
+	OS.objc_msgSend(this.id, OS.sel_drawInRect_fromRect_operation_fraction_, rect, fromRect, op, delta);
 }
 
-public static NSArray imageFileTypes() {
-	int result = OS.objc_msgSend(OS.class_NSImage, OS.sel_imageFileTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static id imageNamed(NSString name) {
-	int result = OS.objc_msgSend(OS.class_NSImage, OS.sel_imageNamed_1, name != null ? name.id : 0);
+public id initWithData(NSData data) {
+	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_, data != null ? data.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
-public static NSArray imagePasteboardTypes() {
-	int result = OS.objc_msgSend(OS.class_NSImage, OS.sel_imagePasteboardTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray imageTypes() {
-	int result = OS.objc_msgSend(OS.class_NSImage, OS.sel_imageTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray imageUnfilteredFileTypes() {
-	int result = OS.objc_msgSend(OS.class_NSImage, OS.sel_imageUnfilteredFileTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray imageUnfilteredPasteboardTypes() {
-	int result = OS.objc_msgSend(OS.class_NSImage, OS.sel_imageUnfilteredPasteboardTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray imageUnfilteredTypes() {
-	int result = OS.objc_msgSend(OS.class_NSImage, OS.sel_imageUnfilteredTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSImage initByReferencingFile(NSString fileName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initByReferencingFile_1, fileName != null ? fileName.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSImage initByReferencingURL(NSURL url) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initByReferencingURL_1, url != null ? url.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSImage initWithContentsOfFile(NSString fileName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_1, fileName != null ? fileName.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSImage initWithContentsOfURL(NSURL url) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1, url != null ? url.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSImage initWithData(NSData data) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_1, data != null ? data.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSImage initWithIconRef(int iconRef) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithIconRef_1, iconRef);
-	return result != 0 ? this : null;
-}
-
-public NSImage initWithPasteboard(NSPasteboard pasteboard) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithPasteboard_1, pasteboard != null ? pasteboard.id : 0);
-	return result != 0 ? this : null;
-}
-
 public NSImage initWithSize(NSSize aSize) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithSize_1, aSize);
-	return result != 0 ? this : null;
-}
-
-public boolean isCachedSeparately() {
-	return OS.objc_msgSend(this.id, OS.sel_isCachedSeparately) != 0;
-}
-
-public boolean isDataRetained() {
-	return OS.objc_msgSend(this.id, OS.sel_isDataRetained) != 0;
-}
-
-public boolean isFlipped() {
-	return OS.objc_msgSend(this.id, OS.sel_isFlipped) != 0;
-}
-
-public boolean isTemplate() {
-	return OS.objc_msgSend(this.id, OS.sel_isTemplate) != 0;
-}
-
-public boolean isValid() {
-	return OS.objc_msgSend(this.id, OS.sel_isValid) != 0;
-}
-
-public void lockFocus() {
-	OS.objc_msgSend(this.id, OS.sel_lockFocus);
-}
-
-public void lockFocusOnRepresentation(NSImageRep imageRepresentation) {
-	OS.objc_msgSend(this.id, OS.sel_lockFocusOnRepresentation_1, imageRepresentation != null ? imageRepresentation.id : 0);
-}
-
-public boolean matchesOnMultipleResolution() {
-	return OS.objc_msgSend(this.id, OS.sel_matchesOnMultipleResolution) != 0;
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean prefersColorMatch() {
-	return OS.objc_msgSend(this.id, OS.sel_prefersColorMatch) != 0;
-}
-
-public void recache() {
-	OS.objc_msgSend(this.id, OS.sel_recache);
-}
-
-public void removeRepresentation(NSImageRep imageRep) {
-	OS.objc_msgSend(this.id, OS.sel_removeRepresentation_1, imageRep != null ? imageRep.id : 0);
-}
-
-public NSArray representations() {
-	int result = OS.objc_msgSend(this.id, OS.sel_representations);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean scalesWhenResized() {
-	return OS.objc_msgSend(this.id, OS.sel_scalesWhenResized) != 0;
-}
-
-public void setAlignmentRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_setAlignmentRect_1, rect);
-}
-
-public void setBackgroundColor(NSColor aColor) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, aColor != null ? aColor.id : 0);
-}
-
-public void setCacheDepthMatchesImageDepth(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCacheDepthMatchesImageDepth_1, flag);
+	int 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) {
-	OS.objc_msgSend(this.id, OS.sel_setCacheMode_1, mode);
-}
-
-public void setCachedSeparately(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCachedSeparately_1, flag);
-}
-
-public void setDataRetained(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDataRetained_1, flag);
-}
-
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public void setFlipped(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setFlipped_1, flag);
-}
-
-public void setMatchesOnMultipleResolution(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setMatchesOnMultipleResolution_1, flag);
-}
-
-public boolean setName(NSString string) {
-	return OS.objc_msgSend(this.id, OS.sel_setName_1, string != null ? string.id : 0) != 0;
-}
-
-public void setPrefersColorMatch(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setPrefersColorMatch_1, flag);
-}
-
-public void setScalesWhenResized(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setScalesWhenResized_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setCacheMode_, mode);
 }
 
 public void setSize(NSSize aSize) {
-	OS.objc_msgSend(this.id, OS.sel_setSize_1, aSize);
-}
-
-public void setTemplate(boolean isTemplate) {
-	OS.objc_msgSend(this.id, OS.sel_setTemplate_1, isTemplate);
-}
-
-public void setUsesEPSOnResolutionMismatch(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesEPSOnResolutionMismatch_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setSize_, aSize);
 }
 
 public NSSize size() {
@@ -310,12 +70,4 @@ public NSSize size() {
 	return result;
 }
 
-public void unlockFocus() {
-	OS.objc_msgSend(this.id, OS.sel_unlockFocus);
-}
-
-public boolean usesEPSOnResolutionMismatch() {
-	return OS.objc_msgSend(this.id, OS.sel_usesEPSOnResolutionMismatch) != 0;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageCell.java
deleted file mode 100644
index 580a67c3ac..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageCell.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSImageCell extends NSCell {
-
-public NSImageCell() {
-	super();
-}
-
-public NSImageCell(int id) {
-	super(id);
-}
-
-public int imageAlignment() {
-	return OS.objc_msgSend(this.id, OS.sel_imageAlignment);
-}
-
-public int imageFrameStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_imageFrameStyle);
-}
-
-public int imageScaling() {
-	return OS.objc_msgSend(this.id, OS.sel_imageScaling);
-}
-
-public void setImageAlignment(int newAlign) {
-	OS.objc_msgSend(this.id, OS.sel_setImageAlignment_1, newAlign);
-}
-
-public void setImageFrameStyle(int newStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setImageFrameStyle_1, newStyle);
-}
-
-public void setImageScaling(int newScaling) {
-	OS.objc_msgSend(this.id, OS.sel_setImageScaling_1, newScaling);
-}
-
-}
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 e658686d89..8824b1a44c 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,123 +16,22 @@ public NSImageRep() {
 	super();
 }
 
-public NSImageRep(int id) {
+public NSImageRep(int /*long*/ id) {
 	super(id);
 }
 
-public int bitsPerSample() {
-	return OS.objc_msgSend(this.id, OS.sel_bitsPerSample);
-}
-
-public static boolean canInitWithData(NSData data) {
-	return OS.objc_msgSend(OS.class_NSImageRep, OS.sel_canInitWithData_1, data != null ? data.id : 0) != 0;
-}
-
-public static boolean canInitWithPasteboard(NSPasteboard pasteboard) {
-	return OS.objc_msgSend(OS.class_NSImageRep, OS.sel_canInitWithPasteboard_1, pasteboard != null ? pasteboard.id : 0) != 0;
-}
-
-public NSString colorSpaceName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_colorSpaceName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean draw() {
-	return OS.objc_msgSend(this.id, OS.sel_draw) != 0;
-}
-
-public boolean drawAtPoint(NSPoint point) {
-	return OS.objc_msgSend(this.id, OS.sel_drawAtPoint_1, point) != 0;
+public NSImageRep(id id) {
+	super(id);
 }
 
-public boolean drawInRect(NSRect rect) {
-	return OS.objc_msgSend(this.id, OS.sel_drawInRect_1, rect) != 0;
+public int bitsPerSample() {
+	return OS.objc_msgSend(this.id, OS.sel_bitsPerSample);
 }
 
 public boolean hasAlpha() {
 	return OS.objc_msgSend(this.id, OS.sel_hasAlpha) != 0;
 }
 
-public static NSArray imageFileTypes() {
-	int result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageFileTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray imagePasteboardTypes() {
-	int result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imagePasteboardTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static int imageRepClassForData(NSData data) {
-	return OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageRepClassForData_1, data != null ? data.id : 0);
-}
-
-public static int imageRepClassForFileType(NSString type) {
-	return OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageRepClassForFileType_1, type != null ? type.id : 0);
-}
-
-public static int imageRepClassForPasteboardType(NSString type) {
-	return OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageRepClassForPasteboardType_1, type != null ? type.id : 0);
-}
-
-public static int imageRepClassForType(NSString type) {
-	return OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageRepClassForType_1, type != null ? type.id : 0);
-}
-
-public static id imageRepWithContentsOfFile(NSString filename) {
-	int result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageRepWithContentsOfFile_1, filename != null ? filename.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id imageRepWithContentsOfURL(NSURL url) {
-	int result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageRepWithContentsOfURL_1, url != null ? url.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id imageRepWithPasteboard(NSPasteboard pasteboard) {
-	int result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageRepWithPasteboard_1, pasteboard != null ? pasteboard.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSArray imageRepsWithContentsOfFile(NSString filename) {
-	int result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageRepsWithContentsOfFile_1, filename != null ? filename.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray imageRepsWithContentsOfURL(NSURL url) {
-	int result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageRepsWithContentsOfURL_1, url != null ? url.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray imageRepsWithPasteboard(NSPasteboard pasteboard) {
-	int result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageRepsWithPasteboard_1, pasteboard != null ? pasteboard.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray imageTypes() {
-	int result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray imageUnfilteredFileTypes() {
-	int result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageUnfilteredFileTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray imageUnfilteredPasteboardTypes() {
-	int result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageUnfilteredPasteboardTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray imageUnfilteredTypes() {
-	int result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageUnfilteredTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean isOpaque() {
-	return OS.objc_msgSend(this.id, OS.sel_isOpaque) != 0;
-}
-
 public int pixelsHigh() {
 	return OS.objc_msgSend(this.id, OS.sel_pixelsHigh);
 }
@@ -141,51 +40,4 @@ public int pixelsWide() {
 	return OS.objc_msgSend(this.id, OS.sel_pixelsWide);
 }
 
-public static void registerImageRepClass(int imageRepClass) {
-	OS.objc_msgSend(OS.class_NSImageRep, OS.sel_registerImageRepClass_1, imageRepClass);
-}
-
-public static NSArray registeredImageRepClasses() {
-	int result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_registeredImageRepClasses);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void setAlpha(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAlpha_1, flag);
-}
-
-public void setBitsPerSample(int anInt) {
-	OS.objc_msgSend(this.id, OS.sel_setBitsPerSample_1, anInt);
-}
-
-public void setColorSpaceName(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setColorSpaceName_1, string != null ? string.id : 0);
-}
-
-public void setOpaque(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setOpaque_1, flag);
-}
-
-public void setPixelsHigh(int anInt) {
-	OS.objc_msgSend(this.id, OS.sel_setPixelsHigh_1, anInt);
-}
-
-public void setPixelsWide(int anInt) {
-	OS.objc_msgSend(this.id, OS.sel_setPixelsWide_1, anInt);
-}
-
-public void setSize(NSSize aSize) {
-	OS.objc_msgSend(this.id, OS.sel_setSize_1, aSize);
-}
-
-public NSSize size() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_size);
-	return result;
-}
-
-public static void unregisterImageRepClass(int imageRepClass) {
-	OS.objc_msgSend(OS.class_NSImageRep, OS.sel_unregisterImageRepClass_1, imageRepClass);
-}
-
 }
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 e3ff7e6a25..b2abeba585 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,65 +16,24 @@ public NSImageView() {
 	super();
 }
 
-public NSImageView(int id) {
+public NSImageView(int /*long*/ id) {
 	super(id);
 }
 
-public boolean allowsCutCopyPaste() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsCutCopyPaste) != 0;
-}
-
-public boolean animates() {
-	return OS.objc_msgSend(this.id, OS.sel_animates) != 0;
-}
-
-public NSImage image() {
-	int result = OS.objc_msgSend(this.id, OS.sel_image);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public int imageAlignment() {
-	return OS.objc_msgSend(this.id, OS.sel_imageAlignment);
-}
-
-public int imageFrameStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_imageFrameStyle);
-}
-
-public int imageScaling() {
-	return OS.objc_msgSend(this.id, OS.sel_imageScaling);
-}
-
-public boolean isEditable() {
-	return OS.objc_msgSend(this.id, OS.sel_isEditable) != 0;
-}
-
-public void setAllowsCutCopyPaste(boolean allow) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsCutCopyPaste_1, allow);
-}
-
-public void setAnimates(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAnimates_1, flag);
-}
-
-public void setEditable(boolean yn) {
-	OS.objc_msgSend(this.id, OS.sel_setEditable_1, yn);
+public NSImageView(id id) {
+	super(id);
 }
 
 public void setImage(NSImage newImage) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1, newImage != null ? newImage.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setImage_, newImage != null ? newImage.id : 0);
 }
 
 public void setImageAlignment(int newAlign) {
-	OS.objc_msgSend(this.id, OS.sel_setImageAlignment_1, newAlign);
-}
-
-public void setImageFrameStyle(int newStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setImageFrameStyle_1, newStyle);
+	OS.objc_msgSend(this.id, OS.sel_setImageAlignment_, newAlign);
 }
 
 public void setImageScaling(int newScaling) {
-	OS.objc_msgSend(this.id, OS.sel_setImageScaling_1, 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/NSIndexPath.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexPath.java
deleted file mode 100644
index 41a19f3d12..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexPath.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSIndexPath extends NSObject {
-
-public NSIndexPath() {
-	super();
-}
-
-public NSIndexPath(int id) {
-	super(id);
-}
-
-public int compare(NSIndexPath otherObject) {
-	return OS.objc_msgSend(this.id, OS.sel_compare_1, otherObject != null ? otherObject.id : 0);
-}
-
-public void getIndexes(int indexes) {
-	OS.objc_msgSend(this.id, OS.sel_getIndexes_1, indexes);
-}
-
-public int indexAtPosition(int position) {
-	return OS.objc_msgSend(this.id, OS.sel_indexAtPosition_1, position);
-}
-
-public NSIndexPath indexPathByAddingIndex(int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_indexPathByAddingIndex_1, index);
-	return result == this.id ? this : (result != 0 ? new NSIndexPath(result) : null);
-}
-
-public NSIndexPath indexPathByRemovingLastIndex() {
-	int result = OS.objc_msgSend(this.id, OS.sel_indexPathByRemovingLastIndex);
-	return result == this.id ? this : (result != 0 ? new NSIndexPath(result) : null);
-}
-
-public static id indexPathWithIndex(int index) {
-	int result = OS.objc_msgSend(OS.class_NSIndexPath, OS.sel_indexPathWithIndex_1, index);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id indexPathWithIndexes(int indexes, int length) {
-	int result = OS.objc_msgSend(OS.class_NSIndexPath, OS.sel_indexPathWithIndexes_1length_1, indexes, length);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithIndex(int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithIndex_1, index);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithIndexes(int indexes, int length) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithIndexes_1length_1, indexes, length);
-	return result != 0 ? new id(result) : null;
-}
-
-public int length() {
-	return OS.objc_msgSend(this.id, OS.sel_length);
-}
-
-}
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 c11fc3745b..c8f89fb013 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,94 +16,30 @@ public NSIndexSet() {
 	super();
 }
 
-public NSIndexSet(int id) {
+public NSIndexSet(int /*long*/ id) {
 	super(id);
 }
 
-public boolean containsIndex(int value) {
-	return OS.objc_msgSend(this.id, OS.sel_containsIndex_1, value) != 0;
-}
-
-public boolean containsIndexes(NSIndexSet indexSet) {
-	return OS.objc_msgSend(this.id, OS.sel_containsIndexes_1, indexSet != null ? indexSet.id : 0) != 0;
-}
-
-public boolean containsIndexesInRange(NSRange range) {
-	return OS.objc_msgSend(this.id, OS.sel_containsIndexesInRange_1, range) != 0;
+public NSIndexSet(id id) {
+	super(id);
 }
 
 public int count() {
 	return OS.objc_msgSend(this.id, OS.sel_count);
 }
 
-public int countOfIndexesInRange(NSRange range) {
-	return OS.objc_msgSend(this.id, OS.sel_countOfIndexesInRange_1, range);
-}
-
-public int firstIndex() {
-	return OS.objc_msgSend(this.id, OS.sel_firstIndex);
-}
-
-public int getIndexes(int [] indexBuffer, int bufferSize, int range) {
-	return OS.objc_msgSend(this.id, OS.sel_getIndexes_1maxCount_1inIndexRange_1, indexBuffer, bufferSize, range);
-}
-
-public int indexGreaterThanIndex(int value) {
-	return OS.objc_msgSend(this.id, OS.sel_indexGreaterThanIndex_1, value);
-}
-
-public int indexGreaterThanOrEqualToIndex(int value) {
-	return OS.objc_msgSend(this.id, OS.sel_indexGreaterThanOrEqualToIndex_1, value);
-}
-
-public int indexLessThanIndex(int value) {
-	return OS.objc_msgSend(this.id, OS.sel_indexLessThanIndex_1, value);
-}
-
-public int indexLessThanOrEqualToIndex(int value) {
-	return OS.objc_msgSend(this.id, OS.sel_indexLessThanOrEqualToIndex_1, value);
-}
-
-public static id indexSet() {
-	int result = OS.objc_msgSend(OS.class_NSIndexSet, OS.sel_indexSet);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id indexSetWithIndex(int value) {
-	int result = OS.objc_msgSend(OS.class_NSIndexSet, OS.sel_indexSetWithIndex_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id indexSetWithIndexesInRange(NSRange range) {
-	int result = OS.objc_msgSend(OS.class_NSIndexSet, OS.sel_indexSetWithIndexesInRange_1, range);
-	return result != 0 ? new id(result) : null;
+public int getIndexes(int[] indexBuffer, int bufferSize, int range) {
+	return 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_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithIndexSet(NSIndexSet indexSet) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithIndexSet_1, indexSet != null ? indexSet.id : 0);
+	int 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_1, range);
+	int result = OS.objc_msgSend(this.id, OS.sel_initWithIndexesInRange_, range);
 	return result != 0 ? new id(result) : null;
 }
 
-public boolean intersectsIndexesInRange(NSRange range) {
-	return OS.objc_msgSend(this.id, OS.sel_intersectsIndexesInRange_1, range) != 0;
-}
-
-public boolean isEqualToIndexSet(NSIndexSet indexSet) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualToIndexSet_1, indexSet != null ? indexSet.id : 0) != 0;
-}
-
-public int lastIndex() {
-	return OS.objc_msgSend(this.id, OS.sel_lastIndex);
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSpecifier.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSpecifier.java
deleted file mode 100644
index 4e5223e15b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSpecifier.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSIndexSpecifier extends NSScriptObjectSpecifier {
-
-public NSIndexSpecifier() {
-	super();
-}
-
-public NSIndexSpecifier(int id) {
-	super(id);
-}
-
-public int index() {
-	return OS.objc_msgSend(this.id, OS.sel_index);
-}
-
-public id initWithContainerClassDescription(NSScriptClassDescription classDesc, NSScriptObjectSpecifier container, NSString property, int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContainerClassDescription_1containerSpecifier_1key_1index_1, classDesc != null ? classDesc.id : 0, container != null ? container.id : 0, property != null ? property.id : 0, index);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_setIndex_1, index);
-}
-
-}
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 9cee3c193d..4df5bed166 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,7 +16,11 @@ public NSInputManager() {
 	super();
 }
 
-public NSInputManager(int id) {
+public NSInputManager(int /*long*/ id) {
+	super(id);
+}
+
+public NSInputManager(id id) {
 	super(id);
 }
 
@@ -25,61 +29,12 @@ public static NSInputManager currentInputManager() {
 	return result != 0 ? new NSInputManager(result) : null;
 }
 
-public static void cycleToNextInputLanguage(id sender) {
-	OS.objc_msgSend(OS.class_NSInputManager, OS.sel_cycleToNextInputLanguage_1, sender != null ? sender.id : 0);
-}
-
-public static void cycleToNextInputServerInLanguage(id sender) {
-	OS.objc_msgSend(OS.class_NSInputManager, OS.sel_cycleToNextInputServerInLanguage_1, sender != null ? sender.id : 0);
-}
-
 public boolean handleMouseEvent(NSEvent theMouseEvent) {
-	return OS.objc_msgSend(this.id, OS.sel_handleMouseEvent_1, theMouseEvent != null ? theMouseEvent.id : 0) != 0;
-}
-
-public NSImage image() {
-	int result = OS.objc_msgSend(this.id, OS.sel_image);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSInputManager initWithName(NSString inputServerName, NSString hostName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithName_1host_1, inputServerName != null ? inputServerName.id : 0, hostName != null ? hostName.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSInputManager(result) : null);
-}
-
-public NSString language() {
-	int result = OS.objc_msgSend(this.id, OS.sel_language);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString localizedInputManagerName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedInputManagerName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void markedTextAbandoned(id cli) {
-	OS.objc_msgSend(this.id, OS.sel_markedTextAbandoned_1, cli != null ? cli.id : 0);
-}
-
-public void markedTextSelectionChanged(NSRange newSel, id cli) {
-	OS.objc_msgSend(this.id, OS.sel_markedTextSelectionChanged_1client_1, newSel, cli != null ? cli.id : 0);
-}
-
-public NSInputServer server() {
-	int result = OS.objc_msgSend(this.id, OS.sel_server);
-	return result != 0 ? new NSInputServer(result) : null;
-}
-
-public boolean wantsToDelayTextChangeNotifications() {
-	return OS.objc_msgSend(this.id, OS.sel_wantsToDelayTextChangeNotifications) != 0;
+	return OS.objc_msgSend(this.id, OS.sel_handleMouseEvent_, theMouseEvent != null ? theMouseEvent.id : 0) != 0;
 }
 
 public boolean wantsToHandleMouseEvents() {
 	return OS.objc_msgSend(this.id, OS.sel_wantsToHandleMouseEvents) != 0;
 }
 
-public boolean wantsToInterpretAllKeystrokes() {
-	return OS.objc_msgSend(this.id, OS.sel_wantsToInterpretAllKeystrokes) != 0;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputServer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputServer.java
deleted file mode 100644
index faaceafbfb..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputServer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSInputServer extends NSObject {
-
-public NSInputServer() {
-	super();
-}
-
-public NSInputServer(int id) {
-	super(id);
-}
-
-public id initWithDelegate(id aDelegate, NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDelegate_1name_1, aDelegate != null ? aDelegate.id : 0, name != null ? name.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/NSInputStream.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputStream.java
deleted file mode 100644
index c43c01ada9..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputStream.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSInputStream extends NSStream {
-
-public NSInputStream() {
-	super();
-}
-
-public NSInputStream(int id) {
-	super(id);
-}
-
-public boolean getBuffer(int buffer, int len) {
-	return OS.objc_msgSend(this.id, OS.sel_getBuffer_1length_1, buffer, len) != 0;
-}
-
-public boolean hasBytesAvailable() {
-	return OS.objc_msgSend(this.id, OS.sel_hasBytesAvailable) != 0;
-}
-
-public id initWithData(NSData data) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithFileAtPath(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFileAtPath_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id inputStreamWithData(NSData data) {
-	int result = OS.objc_msgSend(OS.class_NSInputStream, OS.sel_inputStreamWithData_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id inputStreamWithFileAtPath(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSInputStream, OS.sel_inputStreamWithFileAtPath_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public int read(int buffer, int len) {
-	return OS.objc_msgSend(this.id, OS.sel_read_1maxLength_1, buffer, len);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInvocation.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInvocation.java
deleted file mode 100644
index d514fd9422..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInvocation.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSInvocation extends NSObject {
-
-public NSInvocation() {
-	super();
-}
-
-public NSInvocation(int id) {
-	super(id);
-}
-
-public boolean argumentsRetained() {
-	return OS.objc_msgSend(this.id, OS.sel_argumentsRetained) != 0;
-}
-
-public void getArgument(int argumentLocation, int idx) {
-	OS.objc_msgSend(this.id, OS.sel_getArgument_1atIndex_1, argumentLocation, idx);
-}
-
-public void getReturnValue(int retLoc) {
-	OS.objc_msgSend(this.id, OS.sel_getReturnValue_1, retLoc);
-}
-
-public static NSInvocation invocationWithMethodSignature(NSMethodSignature sig) {
-	int result = OS.objc_msgSend(OS.class_NSInvocation, OS.sel_invocationWithMethodSignature_1, sig != null ? sig.id : 0);
-	return result != 0 ? new NSInvocation(result) : null;
-}
-
-public void invoke() {
-	OS.objc_msgSend(this.id, OS.sel_invoke);
-}
-
-public void invokeWithTarget(id target) {
-	OS.objc_msgSend(this.id, OS.sel_invokeWithTarget_1, target != null ? target.id : 0);
-}
-
-public NSMethodSignature methodSignature() {
-	int result = OS.objc_msgSend(this.id, OS.sel_methodSignature);
-	return result != 0 ? new NSMethodSignature(result) : null;
-}
-
-public void retainArguments() {
-	OS.objc_msgSend(this.id, OS.sel_retainArguments);
-}
-
-public int selector() {
-	return OS.objc_msgSend(this.id, OS.sel_selector);
-}
-
-public void setArgument(int argumentLocation, int idx) {
-	OS.objc_msgSend(this.id, OS.sel_setArgument_1atIndex_1, argumentLocation, idx);
-}
-
-public void setReturnValue(int retLoc) {
-	OS.objc_msgSend(this.id, OS.sel_setReturnValue_1, retLoc);
-}
-
-public void setSelector(int selector) {
-	OS.objc_msgSend(this.id, OS.sel_setSelector_1, selector);
-}
-
-public void setTarget(id target) {
-	OS.objc_msgSend(this.id, OS.sel_setTarget_1, target != null ? target.id : 0);
-}
-
-public id target() {
-	int 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/NSInvocationOperation.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInvocationOperation.java
deleted file mode 100644
index df4451d1f3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInvocationOperation.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSInvocationOperation extends NSOperation {
-
-public NSInvocationOperation() {
-	super();
-}
-
-public NSInvocationOperation(int id) {
-	super(id);
-}
-
-public id initWithInvocation(NSInvocation inv) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithInvocation_1, inv != null ? inv.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithTarget(id target, int sel, id arg) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithTarget_1selector_1object_1, target != null ? target.id : 0, sel, arg != null ? arg.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSInvocation invocation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_invocation);
-	return result != 0 ? new NSInvocation(result) : null;
-}
-
-public id result() {
-	int result = OS.objc_msgSend(this.id, OS.sel_result);
-	return result != 0 ? new id(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 1030e478da..b30e5972ba 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,97 +16,17 @@ public NSKeyedArchiver() {
 	super();
 }
 
-public NSKeyedArchiver(int id) {
+public NSKeyedArchiver(int /*long*/ id) {
 	super(id);
 }
 
-public static boolean archiveRootObject(id rootObject, NSString path) {
-	return OS.objc_msgSend(OS.class_NSKeyedArchiver, OS.sel_archiveRootObject_1toFile_1, rootObject != null ? rootObject.id : 0, path != null ? path.id : 0) != 0;
+public NSKeyedArchiver(id id) {
+	super(id);
 }
 
 public static NSData archivedDataWithRootObject(id rootObject) {
-	int result = OS.objc_msgSend(OS.class_NSKeyedArchiver, OS.sel_archivedDataWithRootObject_1, rootObject != null ? rootObject.id : 0);
+	int result = OS.objc_msgSend(OS.class_NSKeyedArchiver, OS.sel_archivedDataWithRootObject_, rootObject != null ? rootObject.id : 0);
 	return result != 0 ? new NSData(result) : null;
 }
 
-public NSString classNameForClass_(int cls) {
-	int result = OS.objc_msgSend(this.id, OS.sel_classNameForClass_1, cls);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSString static_classNameForClass_(int cls) {
-	int result = OS.objc_msgSend(OS.class_NSKeyedArchiver, OS.sel_classNameForClass_1, cls);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void encodeBool(boolean boolv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeBool_1forKey_1, boolv, key != null ? key.id : 0);
-}
-
-public void encodeBytes(int bytesp, int lenv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeBytes_1length_1forKey_1, bytesp, lenv, key != null ? key.id : 0);
-}
-
-public void encodeConditionalObject(id objv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeConditionalObject_1forKey_1, objv != null ? objv.id : 0, key != null ? key.id : 0);
-}
-
-public void encodeDouble(double realv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeDouble_1forKey_1, realv, key != null ? key.id : 0);
-}
-
-public void encodeFloat(float realv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeFloat_1forKey_1, realv, key != null ? key.id : 0);
-}
-
-public void encodeInt32(int intv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeInt32_1forKey_1, intv, key != null ? key.id : 0);
-}
-
-public void encodeInt64(long intv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeInt64_1forKey_1, intv, key != null ? key.id : 0);
-}
-
-public void encodeInt(int intv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeInt_1forKey_1, intv, key != null ? key.id : 0);
-}
-
-public void encodeObject(id objv, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_encodeObject_1forKey_1, objv != null ? objv.id : 0, key != null ? key.id : 0);
-}
-
-public void finishEncoding() {
-	OS.objc_msgSend(this.id, OS.sel_finishEncoding);
-}
-
-public id initForWritingWithMutableData(NSMutableData data) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initForWritingWithMutableData_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public int outputFormat() {
-	return OS.objc_msgSend(this.id, OS.sel_outputFormat);
-}
-
-public static void static_setClassName_forClass_(NSString codedName, int cls) {
-	OS.objc_msgSend(OS.class_NSKeyedArchiver, OS.sel_setClassName_1forClass_1, codedName != null ? codedName.id : 0, cls);
-}
-
-public void setClassName_forClass_(NSString codedName, int cls) {
-	OS.objc_msgSend(this.id, OS.sel_setClassName_1forClass_1, codedName != null ? codedName.id : 0, cls);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setOutputFormat(int format) {
-	OS.objc_msgSend(this.id, OS.sel_setOutputFormat_1, format);
-}
-
 }
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 b9bffa5f74..662d283fdd 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,88 +16,16 @@ public NSKeyedUnarchiver() {
 	super();
 }
 
-public NSKeyedUnarchiver(int id) {
+public NSKeyedUnarchiver(int /*long*/ id) {
 	super(id);
 }
 
-public int classForClassName_(NSString codedName) {
-	return OS.objc_msgSend(this.id, OS.sel_classForClassName_1, codedName != null ? codedName.id : 0);
-}
-
-public static int static_classForClassName_(NSString codedName) {
-	return OS.objc_msgSend(OS.class_NSKeyedUnarchiver, OS.sel_classForClassName_1, codedName != null ? codedName.id : 0);
-}
-
-public boolean containsValueForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_containsValueForKey_1, key != null ? key.id : 0) != 0;
-}
-
-public boolean decodeBoolForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_decodeBoolForKey_1, key != null ? key.id : 0) != 0;
-}
-
-public int decodeBytesForKey(NSString key, int lengthp) {
-	return OS.objc_msgSend(this.id, OS.sel_decodeBytesForKey_1returnedLength_1, key != null ? key.id : 0, lengthp);
-}
-
-public double decodeDoubleForKey(NSString key) {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_decodeDoubleForKey_1, key != null ? key.id : 0);
-}
-
-public float decodeFloatForKey(NSString key) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_decodeFloatForKey_1, key != null ? key.id : 0);
-}
-
-public int decodeInt32ForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_decodeInt32ForKey_1, key != null ? key.id : 0);
-}
-
-public long decodeInt64ForKey(NSString key) {
-	return (long)OS.objc_msgSend(this.id, OS.sel_decodeInt64ForKey_1, key != null ? key.id : 0);
-}
-
-public int decodeIntForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_decodeIntForKey_1, key != null ? key.id : 0);
-}
-
-public id decodeObjectForKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_decodeObjectForKey_1, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void finishDecoding() {
-	OS.objc_msgSend(this.id, OS.sel_finishDecoding);
-}
-
-public id initForReadingWithData(NSData data) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initForReadingWithData_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setClass_forClassName_(int cls, NSString codedName) {
-	OS.objc_msgSend(this.id, OS.sel_setClass_1forClassName_1, cls, codedName != null ? codedName.id : 0);
-}
-
-public static void static_setClass_forClassName_(int cls, NSString codedName) {
-	OS.objc_msgSend(OS.class_NSKeyedUnarchiver, OS.sel_setClass_1forClassName_1, cls, codedName != null ? codedName.id : 0);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
+public NSKeyedUnarchiver(id id) {
+	super(id);
 }
 
 public static id unarchiveObjectWithData(NSData data) {
-	int result = OS.objc_msgSend(OS.class_NSKeyedUnarchiver, OS.sel_unarchiveObjectWithData_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id unarchiveObjectWithFile(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSKeyedUnarchiver, OS.sel_unarchiveObjectWithFile_1, path != null ? path.id : 0);
+	int 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 d53cb9235a..88c50d258d 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,571 +16,90 @@ public NSLayoutManager() {
 	super();
 }
 
-public NSLayoutManager(int id) {
+public NSLayoutManager(int /*long*/ id) {
 	super(id);
 }
 
-public void addTemporaryAttribute(NSString attrName, id value, NSRange charRange) {
-	OS.objc_msgSend(this.id, OS.sel_addTemporaryAttribute_1value_1forCharacterRange_1, attrName != null ? attrName.id : 0, value != null ? value.id : 0, charRange);
+public NSLayoutManager(id id) {
+	super(id);
 }
 
-public void addTemporaryAttributes(NSDictionary attrs, NSRange charRange) {
-	OS.objc_msgSend(this.id, OS.sel_addTemporaryAttributes_1forCharacterRange_1, attrs != null ? attrs.id : 0, charRange);
+public void addTemporaryAttribute(NSString attrName, id value, NSRange charRange) {
+	OS.objc_msgSend(this.id, OS.sel_addTemporaryAttribute_value_forCharacterRange_, attrName != null ? attrName.id : 0, value != null ? value.id : 0, charRange);
 }
 
 public void addTextContainer(NSTextContainer container) {
-	OS.objc_msgSend(this.id, OS.sel_addTextContainer_1, container != null ? container.id : 0);
-}
-
-public boolean allowsNonContiguousLayout() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsNonContiguousLayout) != 0;
-}
-
-public NSSize attachmentSizeForGlyphAtIndex(int glyphIndex) {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_attachmentSizeForGlyphAtIndex_1, glyphIndex);
-	return result;
-}
-
-public NSAttributedString attributedString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedString);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public boolean backgroundLayoutEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_backgroundLayoutEnabled) != 0;
+	OS.objc_msgSend(this.id, OS.sel_addTextContainer_, container != null ? container.id : 0);
 }
 
 public NSRect boundingRectForGlyphRange(NSRange glyphRange, NSTextContainer container) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_boundingRectForGlyphRange_1inTextContainer_1, glyphRange, container != null ? container.id : 0);
-	return result;
-}
-
-public NSRect boundsRectForTextBlock_atIndex_effectiveRange_(NSTextBlock block, int glyphIndex, int effectiveGlyphRange) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_boundsRectForTextBlock_1atIndex_1effectiveRange_1, block != null ? block.id : 0, glyphIndex, effectiveGlyphRange);
-	return result;
-}
-
-public NSRect boundsRectForTextBlock_glyphRange_(NSTextBlock block, NSRange glyphRange) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_boundsRectForTextBlock_1glyphRange_1, block != null ? block.id : 0, glyphRange);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_boundingRectForGlyphRange_inTextContainer_, glyphRange, container != null ? container.id : 0);
 	return result;
 }
 
 public int characterIndexForGlyphAtIndex(int glyphIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_characterIndexForGlyphAtIndex_1, glyphIndex);
-}
-
-public NSRange characterRangeForGlyphRange(NSRange glyphRange, int actualGlyphRange) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_characterRangeForGlyphRange_1actualGlyphRange_1, glyphRange, actualGlyphRange);
-	return result;
-}
-
-public int defaultAttachmentScaling() {
-	return OS.objc_msgSend(this.id, OS.sel_defaultAttachmentScaling);
-}
-
-public float defaultBaselineOffsetForFont(NSFont theFont) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_defaultBaselineOffsetForFont_1, theFont != null ? theFont.id : 0);
+	return OS.objc_msgSend(this.id, OS.sel_characterIndexForGlyphAtIndex_, glyphIndex);
 }
 
 public float defaultLineHeightForFont(NSFont theFont) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_defaultLineHeightForFont_1, theFont != null ? theFont.id : 0);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void deleteGlyphsInRange(NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_deleteGlyphsInRange_1, glyphRange);
+	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_defaultLineHeightForFont_, theFont != null ? theFont.id : 0);
 }
 
 public void drawBackgroundForGlyphRange(NSRange glyphsToShow, NSPoint origin) {
-	OS.objc_msgSend(this.id, OS.sel_drawBackgroundForGlyphRange_1atPoint_1, glyphsToShow, origin);
+	OS.objc_msgSend(this.id, OS.sel_drawBackgroundForGlyphRange_atPoint_, glyphsToShow, origin);
 }
 
 public void drawGlyphsForGlyphRange(NSRange glyphsToShow, NSPoint origin) {
-	OS.objc_msgSend(this.id, OS.sel_drawGlyphsForGlyphRange_1atPoint_1, glyphsToShow, origin);
-}
-
-public void drawStrikethroughForGlyphRange(NSRange glyphRange, int strikethroughVal, float baselineOffset, NSRect lineRect, NSRange lineGlyphRange, NSPoint containerOrigin) {
-	OS.objc_msgSend(this.id, OS.sel_drawStrikethroughForGlyphRange_1strikethroughType_1baselineOffset_1lineFragmentRect_1lineFragmentGlyphRange_1containerOrigin_1, glyphRange, strikethroughVal, baselineOffset, lineRect, lineGlyphRange, containerOrigin);
-}
-
-public void drawUnderlineForGlyphRange(NSRange glyphRange, int underlineVal, float baselineOffset, NSRect lineRect, NSRange lineGlyphRange, NSPoint containerOrigin) {
-	OS.objc_msgSend(this.id, OS.sel_drawUnderlineForGlyphRange_1underlineType_1baselineOffset_1lineFragmentRect_1lineFragmentGlyphRange_1containerOrigin_1, glyphRange, underlineVal, baselineOffset, lineRect, lineGlyphRange, containerOrigin);
-}
-
-public boolean drawsOutsideLineFragmentForGlyphAtIndex(int glyphIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_drawsOutsideLineFragmentForGlyphAtIndex_1, glyphIndex) != 0;
-}
-
-public void ensureGlyphsForCharacterRange(NSRange charRange) {
-	OS.objc_msgSend(this.id, OS.sel_ensureGlyphsForCharacterRange_1, charRange);
-}
-
-public void ensureGlyphsForGlyphRange(NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_ensureGlyphsForGlyphRange_1, glyphRange);
-}
-
-public void ensureLayoutForBoundingRect(NSRect bounds, NSTextContainer container) {
-	OS.objc_msgSend(this.id, OS.sel_ensureLayoutForBoundingRect_1inTextContainer_1, bounds, container != null ? container.id : 0);
-}
-
-public void ensureLayoutForCharacterRange(NSRange charRange) {
-	OS.objc_msgSend(this.id, OS.sel_ensureLayoutForCharacterRange_1, charRange);
-}
-
-public void ensureLayoutForGlyphRange(NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_ensureLayoutForGlyphRange_1, glyphRange);
-}
-
-public void ensureLayoutForTextContainer(NSTextContainer container) {
-	OS.objc_msgSend(this.id, OS.sel_ensureLayoutForTextContainer_1, container != null ? container.id : 0);
-}
-
-public NSRect extraLineFragmentRect() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_extraLineFragmentRect);
-	return result;
-}
-
-public NSTextContainer extraLineFragmentTextContainer() {
-	int result = OS.objc_msgSend(this.id, OS.sel_extraLineFragmentTextContainer);
-	return result != 0 ? new NSTextContainer(result) : null;
-}
-
-public NSRect extraLineFragmentUsedRect() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_extraLineFragmentUsedRect);
-	return result;
-}
-
-public NSTextView firstTextView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_firstTextView);
-	return result != 0 ? new NSTextView(result) : null;
-}
-
-public int firstUnlaidCharacterIndex() {
-	return OS.objc_msgSend(this.id, OS.sel_firstUnlaidCharacterIndex);
-}
-
-public int firstUnlaidGlyphIndex() {
-	return OS.objc_msgSend(this.id, OS.sel_firstUnlaidGlyphIndex);
-}
-
-public float fractionOfDistanceThroughGlyphForPoint(NSPoint point, NSTextContainer container) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_fractionOfDistanceThroughGlyphForPoint_1inTextContainer_1, point, container != null ? container.id : 0);
-}
-
-public void getFirstUnlaidCharacterIndex(int charIndex, int glyphIndex) {
-	OS.objc_msgSend(this.id, OS.sel_getFirstUnlaidCharacterIndex_1glyphIndex_1, charIndex, glyphIndex);
+	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_1range_1, glyphArray, glyphRange);
-}
-
-public int getGlyphsInRange_glyphs_characterIndexes_glyphInscriptions_elasticBits_(NSRange glyphRange, int glyphBuffer, int charIndexBuffer, int inscribeBuffer, int elasticBuffer) {
-	return OS.objc_msgSend(this.id, OS.sel_getGlyphsInRange_1glyphs_1characterIndexes_1glyphInscriptions_1elasticBits_1, glyphRange, glyphBuffer, charIndexBuffer, inscribeBuffer, elasticBuffer);
-}
-
-public int getGlyphsInRange_glyphs_characterIndexes_glyphInscriptions_elasticBits_bidiLevels_(NSRange glyphRange, int glyphBuffer, int charIndexBuffer, int inscribeBuffer, int elasticBuffer, int bidiLevelBuffer) {
-	return OS.objc_msgSend(this.id, OS.sel_getGlyphsInRange_1glyphs_1characterIndexes_1glyphInscriptions_1elasticBits_1bidiLevels_1, glyphRange, glyphBuffer, charIndexBuffer, inscribeBuffer, elasticBuffer, bidiLevelBuffer);
-}
-
-public int getLineFragmentInsertionPointsForCharacterAtIndex(int charIndex, boolean aFlag, boolean dFlag, int positions, int charIndexes) {
-	return OS.objc_msgSend(this.id, OS.sel_getLineFragmentInsertionPointsForCharacterAtIndex_1alternatePositions_1inDisplayOrder_1positions_1characterIndexes_1, charIndex, aFlag, dFlag, positions, charIndexes);
-}
-
-public int glyphAtIndex_(int glyphIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_glyphAtIndex_1, glyphIndex);
-}
-
-public int glyphAtIndex_isValidIndex_(int glyphIndex, int isValidIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_glyphAtIndex_1isValidIndex_1, glyphIndex, isValidIndex);
-}
-
-public NSGlyphGenerator glyphGenerator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_glyphGenerator);
-	return result != 0 ? new NSGlyphGenerator(result) : null;
+	return 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_1, charIndex);
-}
-
-public int glyphIndexForPoint_inTextContainer_(NSPoint point, NSTextContainer container) {
-	return OS.objc_msgSend(this.id, OS.sel_glyphIndexForPoint_1inTextContainer_1, point, container != null ? container.id : 0);
-}
-
-public int glyphIndexForPoint_inTextContainer_fractionOfDistanceThroughGlyph_(NSPoint point, NSTextContainer container, float[] partialFraction) {
-	return OS.objc_msgSend(this.id, OS.sel_glyphIndexForPoint_1inTextContainer_1fractionOfDistanceThroughGlyph_1, point, container != null ? container.id : 0, partialFraction);
-}
-
-public NSRange glyphRangeForBoundingRect(NSRect bounds, NSTextContainer container) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_glyphRangeForBoundingRect_1inTextContainer_1, bounds, container != null ? container.id : 0);
-	return result;
-}
-
-public NSRange glyphRangeForBoundingRectWithoutAdditionalLayout(NSRect bounds, NSTextContainer container) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_glyphRangeForBoundingRectWithoutAdditionalLayout_1inTextContainer_1, bounds, container != null ? container.id : 0);
-	return result;
+	return OS.objc_msgSend(this.id, OS.sel_glyphIndexForCharacterAtIndex_, charIndex);
 }
 
-public NSRange glyphRangeForCharacterRange(NSRange charRange, int actualCharRange) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_glyphRangeForCharacterRange_1actualCharacterRange_1, charRange, actualCharRange);
-	return result;
+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 NSRange glyphRangeForTextContainer(NSTextContainer container) {
 	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_glyphRangeForTextContainer_1, container != null ? container.id : 0);
-	return result;
-}
-
-public boolean hasNonContiguousLayout() {
-	return OS.objc_msgSend(this.id, OS.sel_hasNonContiguousLayout) != 0;
-}
-
-public float hyphenationFactor() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_hyphenationFactor);
-}
-
-public void insertGlyph(int glyph, int glyphIndex, int charIndex) {
-	OS.objc_msgSend(this.id, OS.sel_insertGlyph_1atGlyphIndex_1characterIndex_1, glyph, glyphIndex, charIndex);
-}
-
-public void insertGlyphs(int glyphs, int length, int glyphIndex, int charIndex) {
-	OS.objc_msgSend(this.id, OS.sel_insertGlyphs_1length_1forStartingGlyphAtIndex_1characterIndex_1, glyphs, length, glyphIndex, charIndex);
-}
-
-public void insertTextContainer(NSTextContainer container, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertTextContainer_1atIndex_1, container != null ? container.id : 0, index);
-}
-
-public int intAttribute(int attributeTag, int glyphIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_intAttribute_1forGlyphAtIndex_1, attributeTag, glyphIndex);
-}
-
-public void invalidateDisplayForCharacterRange(NSRange charRange) {
-	OS.objc_msgSend(this.id, OS.sel_invalidateDisplayForCharacterRange_1, charRange);
-}
-
-public void invalidateDisplayForGlyphRange(NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_invalidateDisplayForGlyphRange_1, glyphRange);
-}
-
-public void invalidateGlyphsForCharacterRange(NSRange charRange, int delta, int actualCharRange) {
-	OS.objc_msgSend(this.id, OS.sel_invalidateGlyphsForCharacterRange_1changeInLength_1actualCharacterRange_1, charRange, delta, actualCharRange);
-}
-
-public void invalidateGlyphsOnLayoutInvalidationForGlyphRange(NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_invalidateGlyphsOnLayoutInvalidationForGlyphRange_1, glyphRange);
-}
-
-public void invalidateLayoutForCharacterRange_actualCharacterRange_(NSRange charRange, int actualCharRange) {
-	OS.objc_msgSend(this.id, OS.sel_invalidateLayoutForCharacterRange_1actualCharacterRange_1, charRange, actualCharRange);
-}
-
-public void invalidateLayoutForCharacterRange_isSoft_actualCharacterRange_(NSRange charRange, boolean flag, int actualCharRange) {
-	OS.objc_msgSend(this.id, OS.sel_invalidateLayoutForCharacterRange_1isSoft_1actualCharacterRange_1, charRange, flag, actualCharRange);
-}
-
-public boolean isValidGlyphIndex(int glyphIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_isValidGlyphIndex_1, glyphIndex) != 0;
-}
-
-public boolean layoutManagerOwnsFirstResponderInWindow(NSWindow window) {
-	return OS.objc_msgSend(this.id, OS.sel_layoutManagerOwnsFirstResponderInWindow_1, window != null ? window.id : 0) != 0;
-}
-
-public int layoutOptions() {
-	return OS.objc_msgSend(this.id, OS.sel_layoutOptions);
-}
-
-public NSRect layoutRectForTextBlock_atIndex_effectiveRange_(NSTextBlock block, int glyphIndex, int effectiveGlyphRange) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_layoutRectForTextBlock_1atIndex_1effectiveRange_1, block != null ? block.id : 0, glyphIndex, effectiveGlyphRange);
-	return result;
-}
-
-public NSRect layoutRectForTextBlock_glyphRange_(NSTextBlock block, NSRange glyphRange) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_layoutRectForTextBlock_1glyphRange_1, block != null ? block.id : 0, glyphRange);
-	return result;
-}
-
-public NSRect lineFragmentRectForGlyphAtIndex_effectiveRange_(int glyphIndex, int effectiveGlyphRange) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentRectForGlyphAtIndex_1effectiveRange_1, glyphIndex, effectiveGlyphRange);
-	return result;
-}
-
-public NSRect lineFragmentRectForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_(int glyphIndex, int effectiveGlyphRange, boolean flag) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentRectForGlyphAtIndex_1effectiveRange_1withoutAdditionalLayout_1, glyphIndex, effectiveGlyphRange, flag);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_glyphRangeForTextContainer_, container != null ? container.id : 0);
 	return result;
 }
 
-public NSRect lineFragmentUsedRectForGlyphAtIndex_effectiveRange_(int glyphIndex, int effectiveGlyphRange) {
+public NSRect lineFragmentUsedRectForGlyphAtIndex(int glyphIndex, int effectiveGlyphRange) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentUsedRectForGlyphAtIndex_1effectiveRange_1, glyphIndex, effectiveGlyphRange);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_, glyphIndex, effectiveGlyphRange);
 	return result;
 }
 
-public NSRect lineFragmentUsedRectForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_(int glyphIndex, int effectiveGlyphRange, boolean flag) {
+public NSRect lineFragmentUsedRectForGlyphAtIndex(int glyphIndex, int effectiveGlyphRange, boolean flag) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentUsedRectForGlyphAtIndex_1effectiveRange_1withoutAdditionalLayout_1, glyphIndex, effectiveGlyphRange, flag);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_, glyphIndex, effectiveGlyphRange, flag);
 	return result;
 }
 
 public NSPoint locationForGlyphAtIndex(int glyphIndex) {
 	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_locationForGlyphAtIndex_1, glyphIndex);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_locationForGlyphAtIndex_, glyphIndex);
 	return result;
 }
 
-public boolean notShownAttributeForGlyphAtIndex(int glyphIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_notShownAttributeForGlyphAtIndex_1, glyphIndex) != 0;
-}
-
 public int numberOfGlyphs() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfGlyphs);
 }
 
-public NSRange rangeOfNominallySpacedGlyphsContainingIndex(int glyphIndex) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeOfNominallySpacedGlyphsContainingIndex_1, glyphIndex);
-	return result;
-}
-
-public int rectArrayForCharacterRange(NSRange charRange, NSRange selCharRange, NSTextContainer container, int rectCount) {
-	return OS.objc_msgSend(this.id, OS.sel_rectArrayForCharacterRange_1withinSelectedCharacterRange_1inTextContainer_1rectCount_1, charRange, selCharRange, container != null ? container.id : 0, rectCount);
-}
-
-public int rectArrayForGlyphRange(NSRange glyphRange, NSRange selGlyphRange, NSTextContainer container, int rectCount) {
-	return OS.objc_msgSend(this.id, OS.sel_rectArrayForGlyphRange_1withinSelectedGlyphRange_1inTextContainer_1rectCount_1, glyphRange, selGlyphRange, container != null ? container.id : 0, rectCount);
-}
-
 public void removeTemporaryAttribute(NSString attrName, NSRange charRange) {
-	OS.objc_msgSend(this.id, OS.sel_removeTemporaryAttribute_1forCharacterRange_1, attrName != null ? attrName.id : 0, charRange);
-}
-
-public void removeTextContainerAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeTextContainerAtIndex_1, index);
-}
-
-public void replaceGlyphAtIndex(int glyphIndex, int newGlyph) {
-	OS.objc_msgSend(this.id, OS.sel_replaceGlyphAtIndex_1withGlyph_1, glyphIndex, newGlyph);
-}
-
-public void replaceTextStorage(NSTextStorage newTextStorage) {
-	OS.objc_msgSend(this.id, OS.sel_replaceTextStorage_1, newTextStorage != null ? newTextStorage.id : 0);
-}
-
-public NSView rulerAccessoryViewForTextView(NSTextView view, NSParagraphStyle style, NSRulerView ruler, boolean isEnabled) {
-	int result = OS.objc_msgSend(this.id, OS.sel_rulerAccessoryViewForTextView_1paragraphStyle_1ruler_1enabled_1, view != null ? view.id : 0, style != null ? style.id : 0, ruler != null ? ruler.id : 0, isEnabled);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public NSArray rulerMarkersForTextView(NSTextView view, NSParagraphStyle style, NSRulerView ruler) {
-	int result = OS.objc_msgSend(this.id, OS.sel_rulerMarkersForTextView_1paragraphStyle_1ruler_1, view != null ? view.id : 0, style != null ? style.id : 0, ruler != null ? ruler.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void setAllowsNonContiguousLayout(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsNonContiguousLayout_1, flag);
-}
-
-public void setAttachmentSize(NSSize attachmentSize, NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_setAttachmentSize_1forGlyphRange_1, attachmentSize, glyphRange);
-}
-
-public void setBackgroundLayoutEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundLayoutEnabled_1, flag);
-}
-
-public void setBoundsRect(NSRect rect, NSTextBlock block, NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_setBoundsRect_1forTextBlock_1glyphRange_1, rect, block != null ? block.id : 0, glyphRange);
-}
-
-public void setCharacterIndex(int charIndex, int glyphIndex) {
-	OS.objc_msgSend(this.id, OS.sel_setCharacterIndex_1forGlyphAtIndex_1, charIndex, glyphIndex);
-}
-
-public void setDefaultAttachmentScaling(int scaling) {
-	OS.objc_msgSend(this.id, OS.sel_setDefaultAttachmentScaling_1, scaling);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setDrawsOutsideLineFragment(boolean flag, int glyphIndex) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsOutsideLineFragment_1forGlyphAtIndex_1, flag, glyphIndex);
-}
-
-public void setExtraLineFragmentRect(NSRect fragmentRect, NSRect usedRect, NSTextContainer container) {
-	OS.objc_msgSend(this.id, OS.sel_setExtraLineFragmentRect_1usedRect_1textContainer_1, fragmentRect, usedRect, container != null ? container.id : 0);
-}
-
-public void setGlyphGenerator(NSGlyphGenerator glyphGenerator) {
-	OS.objc_msgSend(this.id, OS.sel_setGlyphGenerator_1, glyphGenerator != null ? glyphGenerator.id : 0);
-}
-
-public void setHyphenationFactor(float factor) {
-	OS.objc_msgSend(this.id, OS.sel_setHyphenationFactor_1, factor);
-}
-
-public void setIntAttribute(int attributeTag, int val, int glyphIndex) {
-	OS.objc_msgSend(this.id, OS.sel_setIntAttribute_1value_1forGlyphAtIndex_1, attributeTag, val, glyphIndex);
-}
-
-public void setLayoutRect(NSRect rect, NSTextBlock block, NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_setLayoutRect_1forTextBlock_1glyphRange_1, rect, block != null ? block.id : 0, glyphRange);
+	OS.objc_msgSend(this.id, OS.sel_removeTemporaryAttribute_forCharacterRange_, attrName != null ? attrName.id : 0, charRange);
 }
 
 public void setLineFragmentRect(NSRect fragmentRect, NSRange glyphRange, NSRect usedRect) {
-	OS.objc_msgSend(this.id, OS.sel_setLineFragmentRect_1forGlyphRange_1usedRect_1, fragmentRect, glyphRange, usedRect);
-}
-
-public void setLocation(NSPoint location, NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_setLocation_1forStartOfGlyphRange_1, location, glyphRange);
-}
-
-public void setLocations(int locations, int glyphIndexes, int count, NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_setLocations_1startingGlyphIndexes_1count_1forGlyphRange_1, locations, glyphIndexes, count, glyphRange);
-}
-
-public void setNotShownAttribute(boolean flag, int glyphIndex) {
-	OS.objc_msgSend(this.id, OS.sel_setNotShownAttribute_1forGlyphAtIndex_1, flag, glyphIndex);
-}
-
-public void setShowsControlCharacters(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsControlCharacters_1, flag);
-}
-
-public void setShowsInvisibleCharacters(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsInvisibleCharacters_1, flag);
-}
-
-public void setTemporaryAttributes(NSDictionary attrs, NSRange charRange) {
-	OS.objc_msgSend(this.id, OS.sel_setTemporaryAttributes_1forCharacterRange_1, attrs != null ? attrs.id : 0, charRange);
-}
-
-public void setTextContainer(NSTextContainer container, NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_setTextContainer_1forGlyphRange_1, container != null ? container.id : 0, glyphRange);
-}
-
-public void setTextStorage(NSTextStorage textStorage) {
-	OS.objc_msgSend(this.id, OS.sel_setTextStorage_1, textStorage != null ? textStorage.id : 0);
-}
-
-public void setTypesetter(NSTypesetter typesetter) {
-	OS.objc_msgSend(this.id, OS.sel_setTypesetter_1, typesetter != null ? typesetter.id : 0);
-}
-
-public void setTypesetterBehavior(int theBehavior) {
-	OS.objc_msgSend(this.id, OS.sel_setTypesetterBehavior_1, theBehavior);
-}
-
-public void setUsesFontLeading(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesFontLeading_1, flag);
-}
-
-public void setUsesScreenFonts(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesScreenFonts_1, flag);
-}
-
-public void showAttachmentCell(NSCell cell, NSRect rect, int attachmentIndex) {
-	OS.objc_msgSend(this.id, OS.sel_showAttachmentCell_1inRect_1characterIndex_1, cell != null ? cell.id : 0, rect, attachmentIndex);
-}
-
-public void showPackedGlyphs(int glyphs, int glyphLen, NSRange glyphRange, NSPoint point, NSFont font, NSColor color, NSSize printingAdjustment) {
-	OS.objc_msgSend(this.id, OS.sel_showPackedGlyphs_1length_1glyphRange_1atPoint_1font_1color_1printingAdjustment_1, glyphs, glyphLen, glyphRange, point, font != null ? font.id : 0, color != null ? color.id : 0, printingAdjustment);
-}
-
-public boolean showsControlCharacters() {
-	return OS.objc_msgSend(this.id, OS.sel_showsControlCharacters) != 0;
-}
-
-public boolean showsInvisibleCharacters() {
-	return OS.objc_msgSend(this.id, OS.sel_showsInvisibleCharacters) != 0;
-}
-
-public void strikethroughGlyphRange(NSRange glyphRange, int strikethroughVal, NSRect lineRect, NSRange lineGlyphRange, NSPoint containerOrigin) {
-	OS.objc_msgSend(this.id, OS.sel_strikethroughGlyphRange_1strikethroughType_1lineFragmentRect_1lineFragmentGlyphRange_1containerOrigin_1, glyphRange, strikethroughVal, lineRect, lineGlyphRange, containerOrigin);
-}
-
-public NSFont substituteFontForFont(NSFont originalFont) {
-	int result = OS.objc_msgSend(this.id, OS.sel_substituteFontForFont_1, originalFont != null ? originalFont.id : 0);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public id temporaryAttribute_atCharacterIndex_effectiveRange_(NSString attrName, int location, int range) {
-	int result = OS.objc_msgSend(this.id, OS.sel_temporaryAttribute_1atCharacterIndex_1effectiveRange_1, attrName != null ? attrName.id : 0, location, range);
-	return result != 0 ? new id(result) : null;
-}
-
-public id temporaryAttribute_atCharacterIndex_longestEffectiveRange_inRange_(NSString attrName, int location, int range, NSRange rangeLimit) {
-	int result = OS.objc_msgSend(this.id, OS.sel_temporaryAttribute_1atCharacterIndex_1longestEffectiveRange_1inRange_1, attrName != null ? attrName.id : 0, location, range, rangeLimit);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSDictionary temporaryAttributesAtCharacterIndex_effectiveRange_(int charIndex, int effectiveCharRange) {
-	int result = OS.objc_msgSend(this.id, OS.sel_temporaryAttributesAtCharacterIndex_1effectiveRange_1, charIndex, effectiveCharRange);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDictionary temporaryAttributesAtCharacterIndex_longestEffectiveRange_inRange_(int location, int range, NSRange rangeLimit) {
-	int result = OS.objc_msgSend(this.id, OS.sel_temporaryAttributesAtCharacterIndex_1longestEffectiveRange_1inRange_1, location, range, rangeLimit);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public void textContainerChangedGeometry(NSTextContainer container) {
-	OS.objc_msgSend(this.id, OS.sel_textContainerChangedGeometry_1, container != null ? container.id : 0);
-}
-
-public void textContainerChangedTextView(NSTextContainer container) {
-	OS.objc_msgSend(this.id, OS.sel_textContainerChangedTextView_1, container != null ? container.id : 0);
-}
-
-public NSTextContainer textContainerForGlyphAtIndex_effectiveRange_(int glyphIndex, int effectiveGlyphRange) {
-	int result = OS.objc_msgSend(this.id, OS.sel_textContainerForGlyphAtIndex_1effectiveRange_1, glyphIndex, effectiveGlyphRange);
-	return result != 0 ? new NSTextContainer(result) : null;
-}
-
-public NSTextContainer textContainerForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_(int glyphIndex, int effectiveGlyphRange, boolean flag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_textContainerForGlyphAtIndex_1effectiveRange_1withoutAdditionalLayout_1, glyphIndex, effectiveGlyphRange, flag);
-	return result != 0 ? new NSTextContainer(result) : null;
-}
-
-public NSArray textContainers() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textContainers);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSTextStorage textStorage() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textStorage);
-	return result != 0 ? new NSTextStorage(result) : null;
-}
-
-public void textStorage_edited_range_changeInLength_invalidatedRange_(NSTextStorage str, int editedMask, NSRange newCharRange, int delta, NSRange invalidatedCharRange) {
-	OS.objc_msgSend(this.id, OS.sel_textStorage_1edited_1range_1changeInLength_1invalidatedRange_1, str != null ? str.id : 0, editedMask, newCharRange, delta, invalidatedCharRange);
-}
-
-public NSTextView textViewForBeginningOfSelection() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textViewForBeginningOfSelection);
-	return result != 0 ? new NSTextView(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setLineFragmentRect_forGlyphRange_usedRect_, fragmentRect, glyphRange, usedRect);
 }
 
 public NSTypesetter typesetter() {
@@ -588,26 +107,10 @@ public NSTypesetter typesetter() {
 	return result != 0 ? new NSTypesetter(result) : null;
 }
 
-public int typesetterBehavior() {
-	return OS.objc_msgSend(this.id, OS.sel_typesetterBehavior);
-}
-
-public void underlineGlyphRange(NSRange glyphRange, int underlineVal, NSRect lineRect, NSRange lineGlyphRange, NSPoint containerOrigin) {
-	OS.objc_msgSend(this.id, OS.sel_underlineGlyphRange_1underlineType_1lineFragmentRect_1lineFragmentGlyphRange_1containerOrigin_1, glyphRange, underlineVal, lineRect, lineGlyphRange, containerOrigin);
-}
-
 public NSRect usedRectForTextContainer(NSTextContainer container) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_usedRectForTextContainer_1, container != null ? container.id : 0);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_usedRectForTextContainer_, container != null ? container.id : 0);
 	return result;
 }
 
-public boolean usesFontLeading() {
-	return OS.objc_msgSend(this.id, OS.sel_usesFontLeading) != 0;
-}
-
-public boolean usesScreenFonts() {
-	return OS.objc_msgSend(this.id, OS.sel_usesScreenFonts) != 0;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLevelIndicator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLevelIndicator.java
deleted file mode 100644
index 3b42cfcd71..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLevelIndicator.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSLevelIndicator extends NSControl {
-
-public NSLevelIndicator() {
-	super();
-}
-
-public NSLevelIndicator(int id) {
-	super(id);
-}
-
-public double criticalValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_criticalValue);
-}
-
-public double maxValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_maxValue);
-}
-
-public double minValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_minValue);
-}
-
-public int numberOfMajorTickMarks() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfMajorTickMarks);
-}
-
-public int numberOfTickMarks() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfTickMarks);
-}
-
-public NSRect rectOfTickMarkAtIndex(int index) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfTickMarkAtIndex_1, index);
-	return result;
-}
-
-public void setCriticalValue(double criticalValue) {
-	OS.objc_msgSend(this.id, OS.sel_setCriticalValue_1, criticalValue);
-}
-
-public void setMaxValue(double maxValue) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxValue_1, maxValue);
-}
-
-public void setMinValue(double minValue) {
-	OS.objc_msgSend(this.id, OS.sel_setMinValue_1, minValue);
-}
-
-public void setNumberOfMajorTickMarks(int count) {
-	OS.objc_msgSend(this.id, OS.sel_setNumberOfMajorTickMarks_1, count);
-}
-
-public void setNumberOfTickMarks(int count) {
-	OS.objc_msgSend(this.id, OS.sel_setNumberOfTickMarks_1, count);
-}
-
-public void setTickMarkPosition(int position) {
-	OS.objc_msgSend(this.id, OS.sel_setTickMarkPosition_1, position);
-}
-
-public void setWarningValue(double warningValue) {
-	OS.objc_msgSend(this.id, OS.sel_setWarningValue_1, warningValue);
-}
-
-public int tickMarkPosition() {
-	return OS.objc_msgSend(this.id, OS.sel_tickMarkPosition);
-}
-
-public double tickMarkValueAtIndex(int index) {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_tickMarkValueAtIndex_1, index);
-}
-
-public double warningValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_warningValue);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLevelIndicatorCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLevelIndicatorCell.java
deleted file mode 100644
index 55e2b532e5..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLevelIndicatorCell.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSLevelIndicatorCell extends NSActionCell {
-
-public NSLevelIndicatorCell() {
-	super();
-}
-
-public NSLevelIndicatorCell(int id) {
-	super(id);
-}
-
-public double criticalValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_criticalValue);
-}
-
-public id initWithLevelIndicatorStyle(int levelIndicatorStyle) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithLevelIndicatorStyle_1, levelIndicatorStyle);
-	return result != 0 ? new id(result) : null;
-}
-
-public int levelIndicatorStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_levelIndicatorStyle);
-}
-
-public double maxValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_maxValue);
-}
-
-public double minValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_minValue);
-}
-
-public int numberOfMajorTickMarks() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfMajorTickMarks);
-}
-
-public int numberOfTickMarks() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfTickMarks);
-}
-
-public NSRect rectOfTickMarkAtIndex(int index) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfTickMarkAtIndex_1, index);
-	return result;
-}
-
-public void setCriticalValue(double criticalValue) {
-	OS.objc_msgSend(this.id, OS.sel_setCriticalValue_1, criticalValue);
-}
-
-public void setImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1, image != null ? image.id : 0);
-}
-
-public void setLevelIndicatorStyle(int levelIndicatorStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setLevelIndicatorStyle_1, levelIndicatorStyle);
-}
-
-public void setMaxValue(double maxValue) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxValue_1, maxValue);
-}
-
-public void setMinValue(double minValue) {
-	OS.objc_msgSend(this.id, OS.sel_setMinValue_1, minValue);
-}
-
-public void setNumberOfMajorTickMarks(int count) {
-	OS.objc_msgSend(this.id, OS.sel_setNumberOfMajorTickMarks_1, count);
-}
-
-public void setNumberOfTickMarks(int count) {
-	OS.objc_msgSend(this.id, OS.sel_setNumberOfTickMarks_1, count);
-}
-
-public void setTickMarkPosition(int position) {
-	OS.objc_msgSend(this.id, OS.sel_setTickMarkPosition_1, position);
-}
-
-public void setWarningValue(double warningValue) {
-	OS.objc_msgSend(this.id, OS.sel_setWarningValue_1, warningValue);
-}
-
-public int tickMarkPosition() {
-	return OS.objc_msgSend(this.id, OS.sel_tickMarkPosition);
-}
-
-public double tickMarkValueAtIndex(int index) {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_tickMarkValueAtIndex_1, index);
-}
-
-public double warningValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_warningValue);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java
deleted file mode 100644
index a14892c052..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSLocale extends NSObject {
-
-public NSLocale() {
-	super();
-}
-
-public NSLocale(int id) {
-	super(id);
-}
-
-public static NSArray ISOCountryCodes() {
-	int result = OS.objc_msgSend(OS.class_NSLocale, OS.sel_ISOCountryCodes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray ISOCurrencyCodes() {
-	int result = OS.objc_msgSend(OS.class_NSLocale, OS.sel_ISOCurrencyCodes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray ISOLanguageCodes() {
-	int result = OS.objc_msgSend(OS.class_NSLocale, OS.sel_ISOLanguageCodes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static id autoupdatingCurrentLocale() {
-	int result = OS.objc_msgSend(OS.class_NSLocale, OS.sel_autoupdatingCurrentLocale);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSArray availableLocaleIdentifiers() {
-	int result = OS.objc_msgSend(OS.class_NSLocale, OS.sel_availableLocaleIdentifiers);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSString canonicalLocaleIdentifierFromString(NSString string) {
-	int result = OS.objc_msgSend(OS.class_NSLocale, OS.sel_canonicalLocaleIdentifierFromString_1, string != null ? string.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSArray commonISOCurrencyCodes() {
-	int result = OS.objc_msgSend(OS.class_NSLocale, OS.sel_commonISOCurrencyCodes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSDictionary componentsFromLocaleIdentifier(NSString string) {
-	int result = OS.objc_msgSend(OS.class_NSLocale, OS.sel_componentsFromLocaleIdentifier_1, string != null ? string.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public static id currentLocale() {
-	int result = OS.objc_msgSend(OS.class_NSLocale, OS.sel_currentLocale);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString displayNameForKey(id key, id value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_displayNameForKey_1value_1, key != null ? key.id : 0, value != null ? value.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id initWithLocaleIdentifier(NSString string) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithLocaleIdentifier_1, string != null ? string.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString localeIdentifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localeIdentifier);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSString localeIdentifierFromComponents(NSDictionary dict) {
-	int result = OS.objc_msgSend(OS.class_NSLocale, OS.sel_localeIdentifierFromComponents_1, dict != null ? dict.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id objectForKey(id key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectForKey_1, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSArray preferredLanguages() {
-	int result = OS.objc_msgSend(OS.class_NSLocale, OS.sel_preferredLanguages);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static id systemLocale() {
-	int result = OS.objc_msgSend(OS.class_NSLocale, OS.sel_systemLocale);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLock.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLock.java
deleted file mode 100644
index 285a18aef9..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLock.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSLock extends NSObject {
-
-public NSLock() {
-	super();
-}
-
-public NSLock(int id) {
-	super(id);
-}
-
-public boolean lockBeforeDate(NSDate limit) {
-	return OS.objc_msgSend(this.id, OS.sel_lockBeforeDate_1, limit != null ? limit.id : 0) != 0;
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setName(NSString n) {
-	OS.objc_msgSend(this.id, OS.sel_setName_1, n != null ? n.id : 0);
-}
-
-public boolean tryLock() {
-	return OS.objc_msgSend(this.id, OS.sel_tryLock) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLogicalTest.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLogicalTest.java
deleted file mode 100644
index 66a71f25bc..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLogicalTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSLogicalTest extends NSScriptWhoseTest {
-
-public NSLogicalTest() {
-	super();
-}
-
-public NSLogicalTest(int id) {
-	super(id);
-}
-
-public id initAndTestWithTests(NSArray subTests) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initAndTestWithTests_1, subTests != null ? subTests.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initNotTestWithTest(NSScriptWhoseTest subTest) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initNotTestWithTest_1, subTest != null ? subTest.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initOrTestWithTests(NSArray subTests) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initOrTestWithTests_1, subTests != null ? subTests.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/NSMachBootstrapServer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMachBootstrapServer.java
deleted file mode 100644
index 2cf8978f70..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMachBootstrapServer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMachBootstrapServer extends NSPortNameServer {
-
-public NSMachBootstrapServer() {
-	super();
-}
-
-public NSMachBootstrapServer(int id) {
-	super(id);
-}
-
-public NSPort portForName_(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_portForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public NSPort portForName_host_(NSString name, NSString host) {
-	int result = OS.objc_msgSend(this.id, OS.sel_portForName_1host_1, name != null ? name.id : 0, host != null ? host.id : 0);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public boolean registerPort(NSPort port, NSString name) {
-	return OS.objc_msgSend(this.id, OS.sel_registerPort_1name_1, port != null ? port.id : 0, name != null ? name.id : 0) != 0;
-}
-
-public NSPort servicePortWithName(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_servicePortWithName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public static id sharedInstance() {
-	int result = OS.objc_msgSend(OS.class_NSMachBootstrapServer, OS.sel_sharedInstance);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMachPort.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMachPort.java
deleted file mode 100644
index df5299914d..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMachPort.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMachPort extends NSPort {
-
-public NSMachPort() {
-	super();
-}
-
-public NSMachPort(int id) {
-	super(id);
-}
-
-public id initWithMachPort_(int machPort) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithMachPort_1, machPort);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithMachPort_options_(int machPort, int f) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithMachPort_1options_1, machPort, f);
-	return result != 0 ? new id(result) : null;
-}
-
-public int machPort() {
-	return OS.objc_msgSend(this.id, OS.sel_machPort);
-}
-
-public static NSPort static_portWithMachPort_(int machPort) {
-	int result = OS.objc_msgSend(OS.class_NSMachPort, OS.sel_portWithMachPort_1, machPort);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public static NSPort static_portWithMachPort_options_(int machPort, int f) {
-	int result = OS.objc_msgSend(OS.class_NSMachPort, OS.sel_portWithMachPort_1options_1, machPort, f);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public void removeFromRunLoop(NSRunLoop runLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_removeFromRunLoop_1forMode_1, runLoop != null ? runLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-public void scheduleInRunLoop(NSRunLoop runLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_scheduleInRunLoop_1forMode_1, runLoop != null ? runLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMapEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMapEnumerator.java
deleted file mode 100644
index 6387707b61..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMapEnumerator.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMapEnumerator {
-//TODO
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMapTable.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMapTable.java
deleted file mode 100644
index 03f8ab4967..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMapTable.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMapTable extends NSObject {
-
-public NSMapTable() {
-	super();
-}
-
-public NSMapTable(int id) {
-	super(id);
-}
-
-public int count() {
-	return OS.objc_msgSend(this.id, OS.sel_count);
-}
-
-public NSDictionary dictionaryRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_dictionaryRepresentation);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public id initWithKeyOptions(int keyOptions, int valueOptions, int initialCapacity) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithKeyOptions_1valueOptions_1capacity_1, keyOptions, valueOptions, initialCapacity);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithKeyPointerFunctions(NSPointerFunctions keyFunctions, NSPointerFunctions valueFunctions, int initialCapacity) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithKeyPointerFunctions_1valuePointerFunctions_1capacity_1, keyFunctions != null ? keyFunctions.id : 0, valueFunctions != null ? valueFunctions.id : 0, initialCapacity);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSEnumerator keyEnumerator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keyEnumerator);
-	return result != 0 ? new NSEnumerator(result) : null;
-}
-
-public NSPointerFunctions keyPointerFunctions() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keyPointerFunctions);
-	return result != 0 ? new NSPointerFunctions(result) : null;
-}
-
-public static id mapTableWithKeyOptions(int keyOptions, int valueOptions) {
-	int result = OS.objc_msgSend(OS.class_NSMapTable, OS.sel_mapTableWithKeyOptions_1valueOptions_1, keyOptions, valueOptions);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id mapTableWithStrongToStrongObjects() {
-	int result = OS.objc_msgSend(OS.class_NSMapTable, OS.sel_mapTableWithStrongToStrongObjects);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id mapTableWithStrongToWeakObjects() {
-	int result = OS.objc_msgSend(OS.class_NSMapTable, OS.sel_mapTableWithStrongToWeakObjects);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id mapTableWithWeakToStrongObjects() {
-	int result = OS.objc_msgSend(OS.class_NSMapTable, OS.sel_mapTableWithWeakToStrongObjects);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id mapTableWithWeakToWeakObjects() {
-	int result = OS.objc_msgSend(OS.class_NSMapTable, OS.sel_mapTableWithWeakToWeakObjects);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSEnumerator objectEnumerator() {
-	int 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_1, aKey != null ? aKey.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void removeAllObjects() {
-	OS.objc_msgSend(this.id, OS.sel_removeAllObjects);
-}
-
-public void removeObjectForKey(id aKey) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectForKey_1, aKey != null ? aKey.id : 0);
-}
-
-public void setObject(id anObject, id aKey) {
-	OS.objc_msgSend(this.id, OS.sel_setObject_1forKey_1, anObject != null ? anObject.id : 0, aKey != null ? aKey.id : 0);
-}
-
-public NSPointerFunctions valuePointerFunctions() {
-	int result = OS.objc_msgSend(this.id, OS.sel_valuePointerFunctions);
-	return result != 0 ? new NSPointerFunctions(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMapTableKeyCallBacks.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMapTableKeyCallBacks.java
deleted file mode 100644
index 90a5ef7811..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMapTableKeyCallBacks.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMapTableKeyCallBacks {
-//TODO
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMapTableValueCallBacks.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMapTableValueCallBacks.java
deleted file mode 100644
index e6fbae20ba..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMapTableValueCallBacks.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMapTableValueCallBacks {
-//TODO
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMatrix.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMatrix.java
deleted file mode 100644
index 73f3394169..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMatrix.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMatrix extends NSControl {
-
-public NSMatrix() {
-	super();
-}
-
-public NSMatrix(int id) {
-	super(id);
-}
-
-public boolean acceptsFirstMouse(NSEvent theEvent) {
-	return OS.objc_msgSend(this.id, OS.sel_acceptsFirstMouse_1, theEvent != null ? theEvent.id : 0) != 0;
-}
-
-public void addColumn() {
-	OS.objc_msgSend(this.id, OS.sel_addColumn);
-}
-
-public void addColumnWithCells(NSArray newCells) {
-	OS.objc_msgSend(this.id, OS.sel_addColumnWithCells_1, newCells != null ? newCells.id : 0);
-}
-
-public void addRow() {
-	OS.objc_msgSend(this.id, OS.sel_addRow);
-}
-
-public void addRowWithCells(NSArray newCells) {
-	OS.objc_msgSend(this.id, OS.sel_addRowWithCells_1, newCells != null ? newCells.id : 0);
-}
-
-public boolean allowsEmptySelection() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsEmptySelection) != 0;
-}
-
-public boolean autosizesCells() {
-	return OS.objc_msgSend(this.id, OS.sel_autosizesCells) != 0;
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public id cellAtRow(int row, int col) {
-	int result = OS.objc_msgSend(this.id, OS.sel_cellAtRow_1column_1, row, col);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSColor cellBackgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_cellBackgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-//public int cellClass() {
-//	return OS.objc_msgSend(this.id, OS.sel_cellClass);
-//}
-
-public NSRect cellFrameAtRow(int row, int col) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_cellFrameAtRow_1column_1, row, col);
-	return result;
-}
-
-public NSSize cellSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_cellSize);
-	return result;
-}
-
-public id cellWithTag(int anInt) {
-	int result = OS.objc_msgSend(this.id, OS.sel_cellWithTag_1, anInt);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSArray cells() {
-	int result = OS.objc_msgSend(this.id, OS.sel_cells);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void deselectAllCells() {
-	OS.objc_msgSend(this.id, OS.sel_deselectAllCells);
-}
-
-public void deselectSelectedCell() {
-	OS.objc_msgSend(this.id, OS.sel_deselectSelectedCell);
-}
-
-public int doubleAction() {
-	return OS.objc_msgSend(this.id, OS.sel_doubleAction);
-}
-
-public void drawCellAtRow(int row, int col) {
-	OS.objc_msgSend(this.id, OS.sel_drawCellAtRow_1column_1, row, col);
-}
-
-public boolean drawsBackground() {
-	return OS.objc_msgSend(this.id, OS.sel_drawsBackground) != 0;
-}
-
-public boolean drawsCellBackground() {
-	return OS.objc_msgSend(this.id, OS.sel_drawsCellBackground) != 0;
-}
-
-public void getNumberOfRows(int rowCount, int colCount) {
-	OS.objc_msgSend(this.id, OS.sel_getNumberOfRows_1columns_1, rowCount, colCount);
-}
-
-public boolean getRow_column_forPoint_(int row, int col, NSPoint aPoint) {
-	return OS.objc_msgSend(this.id, OS.sel_getRow_1column_1forPoint_1, row, col, aPoint) != 0;
-}
-
-public boolean getRow_column_ofCell_(int row, int col, NSCell aCell) {
-	return OS.objc_msgSend(this.id, OS.sel_getRow_1column_1ofCell_1, row, col, aCell != null ? aCell.id : 0) != 0;
-}
-
-public void highlightCell(boolean flag, int row, int col) {
-	OS.objc_msgSend(this.id, OS.sel_highlightCell_1atRow_1column_1, flag, row, col);
-}
-
-public id initWithFrame_(NSRect frameRect) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_1, frameRect);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithFrame_mode_cellClass_numberOfRows_numberOfColumns_(NSRect frameRect, int aMode, int factoryId, int rowsHigh, int colsWide) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_1mode_1cellClass_1numberOfRows_1numberOfColumns_1, frameRect, aMode, factoryId, rowsHigh, colsWide);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithFrame_mode_prototype_numberOfRows_numberOfColumns_(NSRect frameRect, int aMode, NSCell aCell, int rowsHigh, int colsWide) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_1mode_1prototype_1numberOfRows_1numberOfColumns_1, frameRect, aMode, aCell != null ? aCell.id : 0, rowsHigh, colsWide);
-	return result != 0 ? new id(result) : null;
-}
-
-public void insertColumn_(int column) {
-	OS.objc_msgSend(this.id, OS.sel_insertColumn_1, column);
-}
-
-public void insertColumn_withCells_(int column, NSArray newCells) {
-	OS.objc_msgSend(this.id, OS.sel_insertColumn_1withCells_1, column, newCells != null ? newCells.id : 0);
-}
-
-public void insertRow_(int row) {
-	OS.objc_msgSend(this.id, OS.sel_insertRow_1, row);
-}
-
-public void insertRow_withCells_(int row, NSArray newCells) {
-	OS.objc_msgSend(this.id, OS.sel_insertRow_1withCells_1, row, newCells != null ? newCells.id : 0);
-}
-
-public NSSize intercellSpacing() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_intercellSpacing);
-	return result;
-}
-
-public boolean isAutoscroll() {
-	return OS.objc_msgSend(this.id, OS.sel_isAutoscroll) != 0;
-}
-
-public boolean isSelectionByRect() {
-	return OS.objc_msgSend(this.id, OS.sel_isSelectionByRect) != 0;
-}
-
-public id keyCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keyCell);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSCell makeCellAtRow(int row, int col) {
-	int result = OS.objc_msgSend(this.id, OS.sel_makeCellAtRow_1column_1, row, col);
-	return result != 0 ? new NSCell(result) : null;
-}
-
-public int mode() {
-	return OS.objc_msgSend(this.id, OS.sel_mode);
-}
-
-public void mouseDown(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_mouseDown_1, theEvent != null ? theEvent.id : 0);
-}
-
-public int mouseDownFlags() {
-	return OS.objc_msgSend(this.id, OS.sel_mouseDownFlags);
-}
-
-public int numberOfColumns() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfColumns);
-}
-
-public int numberOfRows() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfRows);
-}
-
-public boolean performKeyEquivalent(NSEvent theEvent) {
-	return OS.objc_msgSend(this.id, OS.sel_performKeyEquivalent_1, theEvent != null ? theEvent.id : 0) != 0;
-}
-
-public id prototype() {
-	int result = OS.objc_msgSend(this.id, OS.sel_prototype);
-	return result != 0 ? new id(result) : null;
-}
-
-public void putCell(NSCell newCell, int row, int col) {
-	OS.objc_msgSend(this.id, OS.sel_putCell_1atRow_1column_1, newCell != null ? newCell.id : 0, row, col);
-}
-
-public void removeColumn(int col) {
-	OS.objc_msgSend(this.id, OS.sel_removeColumn_1, col);
-}
-
-public void removeRow(int row) {
-	OS.objc_msgSend(this.id, OS.sel_removeRow_1, row);
-}
-
-public void renewRows(int newRows, int newCols) {
-	OS.objc_msgSend(this.id, OS.sel_renewRows_1columns_1, newRows, newCols);
-}
-
-public void resetCursorRects() {
-	OS.objc_msgSend(this.id, OS.sel_resetCursorRects);
-}
-
-public void scrollCellToVisibleAtRow(int row, int col) {
-	OS.objc_msgSend(this.id, OS.sel_scrollCellToVisibleAtRow_1column_1, row, col);
-}
-
-public void selectAll(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectAll_1, sender != null ? sender.id : 0);
-}
-
-public void selectCellAtRow(int row, int col) {
-	OS.objc_msgSend(this.id, OS.sel_selectCellAtRow_1column_1, row, col);
-}
-
-public boolean selectCellWithTag(int anInt) {
-	return OS.objc_msgSend(this.id, OS.sel_selectCellWithTag_1, anInt) != 0;
-}
-
-public void selectText(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectText_1, sender != null ? sender.id : 0);
-}
-
-public id selectTextAtRow(int row, int col) {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectTextAtRow_1column_1, row, col);
-	return result != 0 ? new id(result) : null;
-}
-
-public id selectedCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedCell);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSArray selectedCells() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedCells);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public int selectedColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_selectedColumn);
-}
-
-public int selectedRow() {
-	return OS.objc_msgSend(this.id, OS.sel_selectedRow);
-}
-
-public boolean sendAction() {
-	return OS.objc_msgSend(this.id, OS.sel_sendAction) != 0;
-}
-
-public void sendAction_to_forAllCells_(int aSelector, id anObject, boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_sendAction_1to_1forAllCells_1, aSelector, anObject != null ? anObject.id : 0, flag);
-}
-
-public void sendDoubleAction() {
-	OS.objc_msgSend(this.id, OS.sel_sendDoubleAction);
-}
-
-public void setAllowsEmptySelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsEmptySelection_1, flag);
-}
-
-public void setAutoscroll(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutoscroll_1, flag);
-}
-
-public void setAutosizesCells(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutosizesCells_1, flag);
-}
-
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setCellBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setCellBackgroundColor_1, color != null ? color.id : 0);
-}
-
-//public void setCellClass(int factoryId) {
-//	OS.objc_msgSend(this.id, OS.sel_setCellClass_1, factoryId);
-//}
-
-public void setCellSize(NSSize aSize) {
-	OS.objc_msgSend(this.id, OS.sel_setCellSize_1, aSize);
-}
-
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public void setDoubleAction(int aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_setDoubleAction_1, aSelector);
-}
-
-public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_1, flag);
-}
-
-public void setDrawsCellBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsCellBackground_1, flag);
-}
-
-public void setIntercellSpacing(NSSize aSize) {
-	OS.objc_msgSend(this.id, OS.sel_setIntercellSpacing_1, aSize);
-}
-
-public void setKeyCell(NSCell keyCell) {
-	OS.objc_msgSend(this.id, OS.sel_setKeyCell_1, keyCell != null ? keyCell.id : 0);
-}
-
-public void setMode(int aMode) {
-	OS.objc_msgSend(this.id, OS.sel_setMode_1, aMode);
-}
-
-public void setPrototype(NSCell aCell) {
-	OS.objc_msgSend(this.id, OS.sel_setPrototype_1, aCell != null ? aCell.id : 0);
-}
-
-public void setScrollable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setScrollable_1, flag);
-}
-
-public void setSelectionByRect(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectionByRect_1, flag);
-}
-
-public void setSelectionFrom(int startPos, int endPos, int anchorPos, boolean lit) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectionFrom_1to_1anchor_1highlight_1, startPos, endPos, anchorPos, lit);
-}
-
-public void setState(int value, int row, int col) {
-	OS.objc_msgSend(this.id, OS.sel_setState_1atRow_1column_1, value, row, col);
-}
-
-public void setTabKeyTraversesCells(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setTabKeyTraversesCells_1, flag);
-}
-
-public void setToolTip(NSString toolTipString, NSCell cell) {
-	OS.objc_msgSend(this.id, OS.sel_setToolTip_1forCell_1, toolTipString != null ? toolTipString.id : 0, cell != null ? cell.id : 0);
-}
-
-public void setValidateSize(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setValidateSize_1, flag);
-}
-
-public void sizeToCells() {
-	OS.objc_msgSend(this.id, OS.sel_sizeToCells);
-}
-
-public void sortUsingFunction(int compare, int context) {
-	OS.objc_msgSend(this.id, OS.sel_sortUsingFunction_1context_1, compare, context);
-}
-
-public void sortUsingSelector(int comparator) {
-	OS.objc_msgSend(this.id, OS.sel_sortUsingSelector_1, comparator);
-}
-
-public boolean tabKeyTraversesCells() {
-	return OS.objc_msgSend(this.id, OS.sel_tabKeyTraversesCells) != 0;
-}
-
-public void textDidBeginEditing(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_textDidBeginEditing_1, notification != null ? notification.id : 0);
-}
-
-public void textDidChange(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_textDidChange_1, notification != null ? notification.id : 0);
-}
-
-public void textDidEndEditing(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_textDidEndEditing_1, notification != null ? notification.id : 0);
-}
-
-public boolean textShouldBeginEditing(NSText textObject) {
-	return OS.objc_msgSend(this.id, OS.sel_textShouldBeginEditing_1, textObject != null ? textObject.id : 0) != 0;
-}
-
-public boolean textShouldEndEditing(NSText textObject) {
-	return OS.objc_msgSend(this.id, OS.sel_textShouldEndEditing_1, textObject != null ? textObject.id : 0) != 0;
-}
-
-public NSString toolTipForCell(NSCell cell) {
-	int result = OS.objc_msgSend(this.id, OS.sel_toolTipForCell_1, cell != null ? cell.id : 0);
-	return result != 0 ? new NSString(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 066b492fce..87a54999c2 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,95 +16,29 @@ public NSMenu() {
 	super();
 }
 
-public NSMenu(int id) {
+public NSMenu(int /*long*/ id) {
 	super(id);
 }
 
-public void addItem(NSMenuItem newItem) {
-	OS.objc_msgSend(this.id, OS.sel_addItem_1, newItem != null ? newItem.id : 0);
-}
-
-public NSMenuItem addItemWithTitle(NSString aString, int aSelector, NSString charCode) {
-	int result = OS.objc_msgSend(this.id, OS.sel_addItemWithTitle_1action_1keyEquivalent_1, aString != null ? aString.id : 0, aSelector, charCode != null ? charCode.id : 0);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
-public NSMenu attachedMenu() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attachedMenu);
-	return result == this.id ? this : (result != 0 ? new NSMenu(result) : null);
+public NSMenu(id id) {
+	super(id);
 }
 
-public boolean autoenablesItems() {
-	return OS.objc_msgSend(this.id, OS.sel_autoenablesItems) != 0;
+public void addItem(NSMenuItem newItem) {
+	OS.objc_msgSend(this.id, OS.sel_addItem_, newItem != null ? newItem.id : 0);
 }
 
 public void cancelTracking() {
 	OS.objc_msgSend(this.id, OS.sel_cancelTracking);
 }
 
-public id contextMenuRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_contextMenuRepresentation);
-	return result != 0 ? new id(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void helpRequested(NSEvent eventPtr) {
-	OS.objc_msgSend(this.id, OS.sel_helpRequested_1, eventPtr != null ? eventPtr.id : 0);
-}
-
-public NSMenuItem highlightedItem() {
-	int result = OS.objc_msgSend(this.id, OS.sel_highlightedItem);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
-public int indexOfItem(NSMenuItem index) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItem_1, index != null ? index.id : 0);
-}
-
-public int indexOfItemWithRepresentedObject(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithRepresentedObject_1, object != null ? object.id : 0);
-}
-
-public int indexOfItemWithSubmenu(NSMenu submenu) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithSubmenu_1, submenu != null ? submenu.id : 0);
-}
-
-public int indexOfItemWithTag(int aTag) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithTag_1, aTag);
-}
-
-public int indexOfItemWithTarget(id target, int actionSelector) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithTarget_1andAction_1, target != null ? target.id : 0, actionSelector);
-}
-
-public int indexOfItemWithTitle(NSString aTitle) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithTitle_1, aTitle != null ? aTitle.id : 0);
-}
-
 public NSMenu initWithTitle(NSString aTitle) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithTitle_1, aTitle != null ? aTitle.id : 0);
-	return result != 0 ? this : null;
+	int 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) {
-	OS.objc_msgSend(this.id, OS.sel_insertItem_1atIndex_1, newItem != null ? newItem.id : 0, index);
-}
-
-public NSMenuItem insertItemWithTitle(NSString aString, int aSelector, NSString charCode, int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_insertItemWithTitle_1action_1keyEquivalent_1atIndex_1, aString != null ? aString.id : 0, aSelector, charCode != null ? charCode.id : 0, index);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
-public boolean isAttached() {
-	return OS.objc_msgSend(this.id, OS.sel_isAttached) != 0;
-}
-
-public boolean isTornOff() {
-	return OS.objc_msgSend(this.id, OS.sel_isTornOff) != 0;
+	OS.objc_msgSend(this.id, OS.sel_insertItem_atIndex_, newItem != null ? newItem.id : 0, index);
 }
 
 public NSArray itemArray() {
@@ -113,156 +47,36 @@ public NSArray itemArray() {
 }
 
 public NSMenuItem itemAtIndex(int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_1, index);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
-public void itemChanged(NSMenuItem item) {
-	OS.objc_msgSend(this.id, OS.sel_itemChanged_1, item != null ? item.id : 0);
-}
-
-public NSMenuItem itemWithTag(int tag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemWithTag_1, tag);
+	int result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_, index);
 	return result != 0 ? new NSMenuItem(result) : null;
 }
 
-public NSMenuItem itemWithTitle(NSString aTitle) {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemWithTitle_1, aTitle != null ? aTitle.id : 0);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
-public NSPoint locationForSubmenu(NSMenu aSubmenu) {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_locationForSubmenu_1, aSubmenu != null ? aSubmenu.id : 0);
-	return result;
-}
-
-public float menuBarHeight() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_menuBarHeight);
-}
-
-public static boolean menuBarVisible() {
-	return OS.objc_msgSend(OS.class_NSMenu, OS.sel_menuBarVisible) != 0;
-}
-
-public boolean menuChangedMessagesEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_menuChangedMessagesEnabled) != 0;
-}
-
-public id menuRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_menuRepresentation);
-	return result != 0 ? new id(result) : null;
-}
-
-public static int menuZone() {
-	return OS.objc_msgSend(OS.class_NSMenu, OS.sel_menuZone);
-}
-
 public int numberOfItems() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfItems);
 }
 
-public void performActionForItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_performActionForItemAtIndex_1, index);
-}
-
-public boolean performKeyEquivalent(NSEvent theEvent) {
-	return OS.objc_msgSend(this.id, OS.sel_performKeyEquivalent_1, theEvent != null ? theEvent.id : 0) != 0;
-}
-
-public static void static_popUpContextMenu_withEvent_forView_(NSMenu menu, NSEvent event, NSView view) {
-	OS.objc_msgSend(OS.class_NSMenu, OS.sel_popUpContextMenu_1withEvent_1forView_1, menu != null ? menu.id : 0, event != null ? event.id : 0, view != null ? view.id : 0);
-}
-
-public static void static_popUpContextMenu_withEvent_forView_withFont_(NSMenu menu, NSEvent event, NSView view, NSFont font) {
-	OS.objc_msgSend(OS.class_NSMenu, OS.sel_popUpContextMenu_1withEvent_1forView_1withFont_1, menu != null ? menu.id : 0, event != null ? event.id : 0, view != null ? view.id : 0, font != null ? font.id : 0);
+public static void popUpContextMenu(NSMenu menu, NSEvent event, NSView view) {
+	OS.objc_msgSend(OS.class_NSMenu, OS.sel_popUpContextMenu_withEvent_forView_, menu != null ? menu.id : 0, event != null ? event.id : 0, view != null ? view.id : 0);
 }
 
 public void removeItem(NSMenuItem item) {
-	OS.objc_msgSend(this.id, OS.sel_removeItem_1, item != null ? item.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_removeItem_, item != null ? item.id : 0);
 }
 
 public void removeItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_1, index);
+	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index);
 }
 
 public void setAutoenablesItems(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutoenablesItems_1, flag);
-}
-
-public void setContextMenuRepresentation(id menuRep) {
-	OS.objc_msgSend(this.id, OS.sel_setContextMenuRepresentation_1, menuRep != null ? menuRep.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setAutoenablesItems_, flag);
 }
 
 public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public static void setMenuBarVisible(boolean visible) {
-	OS.objc_msgSend(OS.class_NSMenu, OS.sel_setMenuBarVisible_1, visible);
-}
-
-public void setMenuChangedMessagesEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setMenuChangedMessagesEnabled_1, flag);
-}
-
-public void setMenuRepresentation(id menuRep) {
-	OS.objc_msgSend(this.id, OS.sel_setMenuRepresentation_1, menuRep != null ? menuRep.id : 0);
-}
-
-public static void setMenuZone(int aZone) {
-	OS.objc_msgSend(OS.class_NSMenu, OS.sel_setMenuZone_1, aZone);
-}
-
-public void setShowsStateColumn(boolean showsState) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsStateColumn_1, showsState);
-}
-
-public void setSubmenu(NSMenu aMenu, NSMenuItem anItem) {
-	OS.objc_msgSend(this.id, OS.sel_setSubmenu_1forItem_1, aMenu != null ? aMenu.id : 0, anItem != null ? anItem.id : 0);
-}
-
-public void setSupermenu(NSMenu supermenu) {
-	OS.objc_msgSend(this.id, OS.sel_setSupermenu_1, supermenu != null ? supermenu.id : 0);
-}
-
-public void setTearOffMenuRepresentation(id menuRep) {
-	OS.objc_msgSend(this.id, OS.sel_setTearOffMenuRepresentation_1, menuRep != null ? menuRep.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0);
 }
 
 public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, aString != null ? aString.id : 0);
-}
-
-public boolean showsStateColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_showsStateColumn) != 0;
-}
-
-public void sizeToFit() {
-	OS.objc_msgSend(this.id, OS.sel_sizeToFit);
-}
-
-public void submenuAction(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_submenuAction_1, sender != null ? sender.id : 0);
-}
-
-public NSMenu supermenu() {
-	int result = OS.objc_msgSend(this.id, OS.sel_supermenu);
-	return result == this.id ? this : (result != 0 ? new NSMenu(result) : null);
-}
-
-public id tearOffMenuRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_tearOffMenuRepresentation);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString title() {
-	int result = OS.objc_msgSend(this.id, OS.sel_title);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void update() {
-	OS.objc_msgSend(this.id, OS.sel_update);
+	OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0);
 }
 
 }
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 b2dd8de1f7..56ce04afb8 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,102 +16,17 @@ public NSMenuItem() {
 	super();
 }
 
-public NSMenuItem(int id) {
+public NSMenuItem(int /*long*/ id) {
 	super(id);
 }
 
-public int action() {
-	return OS.objc_msgSend(this.id, OS.sel_action);
-}
-
-public NSAttributedString attributedTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedTitle);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public boolean hasSubmenu() {
-	return OS.objc_msgSend(this.id, OS.sel_hasSubmenu) != 0;
-}
-
-public NSImage image() {
-	int result = OS.objc_msgSend(this.id, OS.sel_image);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public int indentationLevel() {
-	return OS.objc_msgSend(this.id, OS.sel_indentationLevel);
+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_1action_1keyEquivalent_1, aString != null ? aString.id : 0, aSelector, charCode != null ? charCode.id : 0);
-	return result != 0 ? this : null;
-}
-
-public boolean isAlternate() {
-	return OS.objc_msgSend(this.id, OS.sel_isAlternate) != 0;
-}
-
-public boolean isEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isEnabled) != 0;
-}
-
-public boolean isHidden() {
-	return OS.objc_msgSend(this.id, OS.sel_isHidden) != 0;
-}
-
-public boolean isHiddenOrHasHiddenAncestor() {
-	return OS.objc_msgSend(this.id, OS.sel_isHiddenOrHasHiddenAncestor) != 0;
-}
-
-public boolean isHighlighted() {
-	return OS.objc_msgSend(this.id, OS.sel_isHighlighted) != 0;
-}
-
-public boolean isSeparatorItem() {
-	return OS.objc_msgSend(this.id, OS.sel_isSeparatorItem) != 0;
-}
-
-public NSString keyEquivalent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keyEquivalent);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int keyEquivalentModifierMask() {
-	return OS.objc_msgSend(this.id, OS.sel_keyEquivalentModifierMask);
-}
-
-public NSMenu menu() {
-	int result = OS.objc_msgSend(this.id, OS.sel_menu);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
-public NSImage mixedStateImage() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mixedStateImage);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSString mnemonic() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mnemonic);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int mnemonicLocation() {
-	return OS.objc_msgSend(this.id, OS.sel_mnemonicLocation);
-}
-
-public NSImage offStateImage() {
-	int result = OS.objc_msgSend(this.id, OS.sel_offStateImage);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSImage onStateImage() {
-	int result = OS.objc_msgSend(this.id, OS.sel_onStateImage);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public id representedObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_representedObject);
-	return result != 0 ? new id(result) : null;
+	int 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() {
@@ -120,99 +35,43 @@ public static NSMenuItem separatorItem() {
 }
 
 public void setAction(int aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_setAction_1, aSelector);
-}
-
-public void setAlternate(boolean isAlternate) {
-	OS.objc_msgSend(this.id, OS.sel_setAlternate_1, isAlternate);
-}
-
-public void setAttributedTitle(NSAttributedString string) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedTitle_1, string != null ? string.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setAction_, aSelector);
 }
 
 public void setEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEnabled_1, flag);
-}
-
-public void setHidden(boolean hidden) {
-	OS.objc_msgSend(this.id, OS.sel_setHidden_1, hidden);
+	OS.objc_msgSend(this.id, OS.sel_setEnabled_, flag);
 }
 
 public void setImage(NSImage menuImage) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1, menuImage != null ? menuImage.id : 0);
-}
-
-public void setIndentationLevel(int indentationLevel) {
-	OS.objc_msgSend(this.id, OS.sel_setIndentationLevel_1, indentationLevel);
+	OS.objc_msgSend(this.id, OS.sel_setImage_, menuImage != null ? menuImage.id : 0);
 }
 
 public void setKeyEquivalent(NSString aKeyEquivalent) {
-	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalent_1, aKeyEquivalent != null ? aKeyEquivalent.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalent_, aKeyEquivalent != null ? aKeyEquivalent.id : 0);
 }
 
 public void setKeyEquivalentModifierMask(int mask) {
-	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalentModifierMask_1, mask);
+	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalentModifierMask_, mask);
 }
 
 public void setMenu(NSMenu menu) {
-	OS.objc_msgSend(this.id, OS.sel_setMenu_1, menu != null ? menu.id : 0);
-}
-
-public void setMixedStateImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setMixedStateImage_1, image != null ? image.id : 0);
-}
-
-public void setMnemonicLocation(int location) {
-	OS.objc_msgSend(this.id, OS.sel_setMnemonicLocation_1, location);
-}
-
-public void setOffStateImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setOffStateImage_1, image != null ? image.id : 0);
-}
-
-public void setOnStateImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setOnStateImage_1, image != null ? image.id : 0);
-}
-
-public void setRepresentedObject(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setRepresentedObject_1, anObject != null ? anObject.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setMenu_, menu != null ? menu.id : 0);
 }
 
 public void setState(int state) {
-	OS.objc_msgSend(this.id, OS.sel_setState_1, state);
+	OS.objc_msgSend(this.id, OS.sel_setState_, state);
 }
 
 public void setSubmenu(NSMenu submenu) {
-	OS.objc_msgSend(this.id, OS.sel_setSubmenu_1, submenu != null ? submenu.id : 0);
-}
-
-public void setTag(int anInt) {
-	OS.objc_msgSend(this.id, OS.sel_setTag_1, anInt);
+	OS.objc_msgSend(this.id, OS.sel_setSubmenu_, submenu != null ? submenu.id : 0);
 }
 
 public void setTarget(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setTarget_1, anObject != null ? anObject.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setTarget_, anObject != null ? anObject.id : 0);
 }
 
 public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, aString != null ? aString.id : 0);
-}
-
-public void setTitleWithMnemonic(NSString stringWithAmpersand) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleWithMnemonic_1, stringWithAmpersand != null ? stringWithAmpersand.id : 0);
-}
-
-public void setToolTip(NSString toolTip) {
-	OS.objc_msgSend(this.id, OS.sel_setToolTip_1, toolTip != null ? toolTip.id : 0);
-}
-
-public static void setUsesUserKeyEquivalents(boolean flag) {
-	OS.objc_msgSend(OS.class_NSMenuItem, OS.sel_setUsesUserKeyEquivalents_1, flag);
-}
-
-public void setView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setView_1, view != null ? view.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0);
 }
 
 public int state() {
@@ -224,37 +83,9 @@ public NSMenu submenu() {
 	return result != 0 ? new NSMenu(result) : null;
 }
 
-public int tag() {
-	return OS.objc_msgSend(this.id, OS.sel_tag);
-}
-
-public id target() {
-	int result = OS.objc_msgSend(this.id, OS.sel_target);
-	return result != 0 ? new id(result) : null;
-}
-
 public NSString title() {
 	int result = OS.objc_msgSend(this.id, OS.sel_title);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public NSString toolTip() {
-	int result = OS.objc_msgSend(this.id, OS.sel_toolTip);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString userKeyEquivalent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_userKeyEquivalent);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static boolean usesUserKeyEquivalents() {
-	return OS.objc_msgSend(OS.class_NSMenuItem, OS.sel_usesUserKeyEquivalents) != 0;
-}
-
-public NSView view() {
-	int result = OS.objc_msgSend(this.id, OS.sel_view);
-	return result != 0 ? new NSView(result) : null;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItemCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItemCell.java
deleted file mode 100644
index db4cd2a4a4..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItemCell.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMenuItemCell extends NSButtonCell {
-
-public NSMenuItemCell() {
-	super();
-}
-
-public NSMenuItemCell(int id) {
-	super(id);
-}
-
-public void calcSize() {
-	OS.objc_msgSend(this.id, OS.sel_calcSize);
-}
-
-public void drawBorderAndBackgroundWithFrame(NSRect cellFrame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_drawBorderAndBackgroundWithFrame_1inView_1, cellFrame, controlView != null ? controlView.id : 0);
-}
-
-public void drawImageWithFrame(NSRect cellFrame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_drawImageWithFrame_1inView_1, cellFrame, controlView != null ? controlView.id : 0);
-}
-
-public void drawKeyEquivalentWithFrame(NSRect cellFrame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_drawKeyEquivalentWithFrame_1inView_1, cellFrame, controlView != null ? controlView.id : 0);
-}
-
-public void drawSeparatorItemWithFrame(NSRect cellFrame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_drawSeparatorItemWithFrame_1inView_1, cellFrame, controlView != null ? controlView.id : 0);
-}
-
-public void drawStateImageWithFrame(NSRect cellFrame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_drawStateImageWithFrame_1inView_1, cellFrame, controlView != null ? controlView.id : 0);
-}
-
-public void drawTitleWithFrame(NSRect cellFrame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_drawTitleWithFrame_1inView_1, cellFrame, controlView != null ? controlView.id : 0);
-}
-
-public float imageWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_imageWidth);
-}
-
-public NSRect keyEquivalentRectForBounds(NSRect cellFrame) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_keyEquivalentRectForBounds_1, cellFrame);
-	return result;
-}
-
-public float keyEquivalentWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_keyEquivalentWidth);
-}
-
-public NSMenuItem menuItem() {
-	int result = OS.objc_msgSend(this.id, OS.sel_menuItem);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
-public NSMenuView menuView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_menuView);
-	return result != 0 ? new NSMenuView(result) : null;
-}
-
-public boolean needsDisplay() {
-	return OS.objc_msgSend(this.id, OS.sel_needsDisplay) != 0;
-}
-
-public boolean needsSizing() {
-	return OS.objc_msgSend(this.id, OS.sel_needsSizing) != 0;
-}
-
-public void setMenuItem(NSMenuItem item) {
-	OS.objc_msgSend(this.id, OS.sel_setMenuItem_1, item != null ? item.id : 0);
-}
-
-public void setMenuView(NSMenuView menuView) {
-	OS.objc_msgSend(this.id, OS.sel_setMenuView_1, menuView != null ? menuView.id : 0);
-}
-
-public void setNeedsDisplay(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setNeedsDisplay_1, flag);
-}
-
-public void setNeedsSizing(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setNeedsSizing_1, flag);
-}
-
-public NSRect stateImageRectForBounds(NSRect cellFrame) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_stateImageRectForBounds_1, cellFrame);
-	return result;
-}
-
-public float stateImageWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_stateImageWidth);
-}
-
-public int tag() {
-	return OS.objc_msgSend(this.id, OS.sel_tag);
-}
-
-public NSRect titleRectForBounds(NSRect cellFrame) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_titleRectForBounds_1, cellFrame);
-	return result;
-}
-
-public float titleWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_titleWidth);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuView.java
deleted file mode 100644
index f9f8828da7..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuView.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMenuView extends NSView {
-
-public NSMenuView() {
-	super();
-}
-
-public NSMenuView(int id) {
-	super(id);
-}
-
-public void attachSubmenuForItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_attachSubmenuForItemAtIndex_1, index);
-}
-
-public NSMenu attachedMenu() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attachedMenu);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
-public NSMenuView attachedMenuView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attachedMenuView);
-	return result == this.id ? this : (result != 0 ? new NSMenuView(result) : null);
-}
-
-public void detachSubmenu() {
-	OS.objc_msgSend(this.id, OS.sel_detachSubmenu);
-}
-
-public NSFont font() {
-	int result = OS.objc_msgSend(this.id, OS.sel_font);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public int highlightedItemIndex() {
-	return OS.objc_msgSend(this.id, OS.sel_highlightedItemIndex);
-}
-
-public float horizontalEdgePadding() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_horizontalEdgePadding);
-}
-
-public float imageAndTitleOffset() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_imageAndTitleOffset);
-}
-
-public float imageAndTitleWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_imageAndTitleWidth);
-}
-
-public int indexOfItemAtPoint(NSPoint point) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemAtPoint_1, point);
-}
-
-public NSMenuView initAsTearOff() {
-	int result = OS.objc_msgSend(this.id, OS.sel_initAsTearOff);
-	return result != 0 ? this : null;
-}
-
-public NSRect innerRect() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_innerRect);
-	return result;
-}
-
-public boolean isAttached() {
-	return OS.objc_msgSend(this.id, OS.sel_isAttached) != 0;
-}
-
-public boolean isHorizontal() {
-	return OS.objc_msgSend(this.id, OS.sel_isHorizontal) != 0;
-}
-
-public boolean isTornOff() {
-	return OS.objc_msgSend(this.id, OS.sel_isTornOff) != 0;
-}
-
-public void itemAdded(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_itemAdded_1, notification != null ? notification.id : 0);
-}
-
-public void itemChanged(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_itemChanged_1, notification != null ? notification.id : 0);
-}
-
-public void itemRemoved(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_itemRemoved_1, notification != null ? notification.id : 0);
-}
-
-public float keyEquivalentOffset() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_keyEquivalentOffset);
-}
-
-public float keyEquivalentWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_keyEquivalentWidth);
-}
-
-public NSPoint locationForSubmenu(NSMenu aSubmenu) {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_locationForSubmenu_1, aSubmenu != null ? aSubmenu.id : 0);
-	return result;
-}
-
-public NSMenu menu() {
-	int result = OS.objc_msgSend(this.id, OS.sel_menu);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
-public static float menuBarHeight() {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSMenuView, OS.sel_menuBarHeight);
-}
-
-public NSMenuItemCell menuItemCellForItemAtIndex(int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_menuItemCellForItemAtIndex_1, index);
-	return result != 0 ? new NSMenuItemCell(result) : null;
-}
-
-public boolean needsSizing() {
-	return OS.objc_msgSend(this.id, OS.sel_needsSizing) != 0;
-}
-
-public void performActionWithHighlightingForItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_performActionWithHighlightingForItemAtIndex_1, index);
-}
-
-public NSRect rectOfItemAtIndex(int index) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfItemAtIndex_1, index);
-	return result;
-}
-
-public void setFont(NSFont font) {
-	OS.objc_msgSend(this.id, OS.sel_setFont_1, font != null ? font.id : 0);
-}
-
-public void setHighlightedItemIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_setHighlightedItemIndex_1, index);
-}
-
-public void setHorizontal(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHorizontal_1, flag);
-}
-
-public void setHorizontalEdgePadding(float pad) {
-	OS.objc_msgSend(this.id, OS.sel_setHorizontalEdgePadding_1, pad);
-}
-
-public void setMenu(NSMenu menu) {
-	OS.objc_msgSend(this.id, OS.sel_setMenu_1, menu != null ? menu.id : 0);
-}
-
-public void setMenuItemCell(NSMenuItemCell cell, int index) {
-	OS.objc_msgSend(this.id, OS.sel_setMenuItemCell_1forItemAtIndex_1, cell != null ? cell.id : 0, index);
-}
-
-public void setNeedsDisplayForItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_setNeedsDisplayForItemAtIndex_1, index);
-}
-
-public void setNeedsSizing(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setNeedsSizing_1, flag);
-}
-
-public void setWindowFrameForAttachingToRect(NSRect screenRect, NSScreen screen, int edge, int selectedItemIndex) {
-	OS.objc_msgSend(this.id, OS.sel_setWindowFrameForAttachingToRect_1onScreen_1preferredEdge_1popUpSelectedItem_1, screenRect, screen != null ? screen.id : 0, edge, selectedItemIndex);
-}
-
-public void sizeToFit() {
-	OS.objc_msgSend(this.id, OS.sel_sizeToFit);
-}
-
-public float stateImageOffset() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_stateImageOffset);
-}
-
-public float stateImageWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_stateImageWidth);
-}
-
-public boolean trackWithEvent(NSEvent event) {
-	return OS.objc_msgSend(this.id, OS.sel_trackWithEvent_1, event != null ? event.id : 0) != 0;
-}
-
-public void update() {
-	OS.objc_msgSend(this.id, OS.sel_update);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMessagePortNameServer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMessagePortNameServer.java
deleted file mode 100644
index 0d990e3d22..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMessagePortNameServer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMessagePortNameServer extends NSPortNameServer {
-
-public NSMessagePortNameServer() {
-	super();
-}
-
-public NSMessagePortNameServer(int id) {
-	super(id);
-}
-
-public NSPort portForName_(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_portForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public NSPort portForName_host_(NSString name, NSString host) {
-	int result = OS.objc_msgSend(this.id, OS.sel_portForName_1host_1, name != null ? name.id : 0, host != null ? host.id : 0);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public static id sharedInstance() {
-	int result = OS.objc_msgSend(OS.class_NSMessagePortNameServer, OS.sel_sharedInstance);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMetadataItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMetadataItem.java
deleted file mode 100644
index 60445e014b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMetadataItem.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMetadataItem extends NSObject {
-
-public NSMetadataItem() {
-	super();
-}
-
-public NSMetadataItem(int id) {
-	super(id);
-}
-
-public NSArray attributes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id valueForAttribute(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueForAttribute_1, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSDictionary valuesForAttributes(NSArray keys) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valuesForAttributes_1, keys != null ? keys.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMetadataQuery.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMetadataQuery.java
deleted file mode 100644
index 371778c048..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMetadataQuery.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMetadataQuery extends NSObject {
-
-public NSMetadataQuery() {
-	super();
-}
-
-public NSMetadataQuery(int id) {
-	super(id);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void disableUpdates() {
-	OS.objc_msgSend(this.id, OS.sel_disableUpdates);
-}
-
-public void enableUpdates() {
-	OS.objc_msgSend(this.id, OS.sel_enableUpdates);
-}
-
-public NSArray groupedResults() {
-	int result = OS.objc_msgSend(this.id, OS.sel_groupedResults);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray groupingAttributes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_groupingAttributes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public int indexOfResult(id result) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfResult_1, result != null ? result.id : 0);
-}
-
-public boolean isGathering() {
-	return OS.objc_msgSend(this.id, OS.sel_isGathering) != 0;
-}
-
-public boolean isStarted() {
-	return OS.objc_msgSend(this.id, OS.sel_isStarted) != 0;
-}
-
-public boolean isStopped() {
-	return OS.objc_msgSend(this.id, OS.sel_isStopped) != 0;
-}
-
-public double notificationBatchingInterval() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_notificationBatchingInterval);
-}
-
-public NSPredicate predicate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_predicate);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public id resultAtIndex(int idx) {
-	int result = OS.objc_msgSend(this.id, OS.sel_resultAtIndex_1, idx);
-	return result != 0 ? new id(result) : null;
-}
-
-public int resultCount() {
-	return OS.objc_msgSend(this.id, OS.sel_resultCount);
-}
-
-public NSArray results() {
-	int result = OS.objc_msgSend(this.id, OS.sel_results);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray searchScopes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_searchScopes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setGroupingAttributes(NSArray attrs) {
-	OS.objc_msgSend(this.id, OS.sel_setGroupingAttributes_1, attrs != null ? attrs.id : 0);
-}
-
-public void setNotificationBatchingInterval(double ti) {
-	OS.objc_msgSend(this.id, OS.sel_setNotificationBatchingInterval_1, ti);
-}
-
-public void setPredicate(NSPredicate predicate) {
-	OS.objc_msgSend(this.id, OS.sel_setPredicate_1, predicate != null ? predicate.id : 0);
-}
-
-public void setSearchScopes(NSArray scopes) {
-	OS.objc_msgSend(this.id, OS.sel_setSearchScopes_1, scopes != null ? scopes.id : 0);
-}
-
-public void setSortDescriptors(NSArray descriptors) {
-	OS.objc_msgSend(this.id, OS.sel_setSortDescriptors_1, descriptors != null ? descriptors.id : 0);
-}
-
-public void setValueListAttributes(NSArray attrs) {
-	OS.objc_msgSend(this.id, OS.sel_setValueListAttributes_1, attrs != null ? attrs.id : 0);
-}
-
-public NSArray sortDescriptors() {
-	int result = OS.objc_msgSend(this.id, OS.sel_sortDescriptors);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean startQuery() {
-	return OS.objc_msgSend(this.id, OS.sel_startQuery) != 0;
-}
-
-public void stopQuery() {
-	OS.objc_msgSend(this.id, OS.sel_stopQuery);
-}
-
-public NSArray valueListAttributes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueListAttributes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSDictionary valueLists() {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueLists);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public id valueOfAttribute(NSString attrName, int idx) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueOfAttribute_1forResultAtIndex_1, attrName != null ? attrName.id : 0, idx);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMetadataQueryAttributeValueTuple.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMetadataQueryAttributeValueTuple.java
deleted file mode 100644
index d2cc9807d9..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMetadataQueryAttributeValueTuple.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMetadataQueryAttributeValueTuple extends NSObject {
-
-public NSMetadataQueryAttributeValueTuple() {
-	super();
-}
-
-public NSMetadataQueryAttributeValueTuple(int id) {
-	super(id);
-}
-
-public NSString attribute() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attribute);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int count() {
-	return OS.objc_msgSend(this.id, OS.sel_count);
-}
-
-public id value() {
-	int result = OS.objc_msgSend(this.id, OS.sel_value);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMetadataQueryResultGroup.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMetadataQueryResultGroup.java
deleted file mode 100644
index 73034d3d22..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMetadataQueryResultGroup.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMetadataQueryResultGroup extends NSObject {
-
-public NSMetadataQueryResultGroup() {
-	super();
-}
-
-public NSMetadataQueryResultGroup(int id) {
-	super(id);
-}
-
-public NSString attribute() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attribute);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id resultAtIndex(int idx) {
-	int result = OS.objc_msgSend(this.id, OS.sel_resultAtIndex_1, idx);
-	return result != 0 ? new id(result) : null;
-}
-
-public int resultCount() {
-	return OS.objc_msgSend(this.id, OS.sel_resultCount);
-}
-
-public NSArray results() {
-	int result = OS.objc_msgSend(this.id, OS.sel_results);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray subgroups() {
-	int result = OS.objc_msgSend(this.id, OS.sel_subgroups);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id value() {
-	int result = OS.objc_msgSend(this.id, OS.sel_value);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMethodSignature.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMethodSignature.java
deleted file mode 100644
index 6875b222d4..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMethodSignature.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMethodSignature extends NSObject {
-
-public NSMethodSignature() {
-	super();
-}
-
-public NSMethodSignature(int id) {
-	super(id);
-}
-
-public int frameLength() {
-	return OS.objc_msgSend(this.id, OS.sel_frameLength);
-}
-
-public int getArgumentTypeAtIndex(int idx) {
-	return OS.objc_msgSend(this.id, OS.sel_getArgumentTypeAtIndex_1, idx);
-}
-
-public boolean isOneway() {
-	return OS.objc_msgSend(this.id, OS.sel_isOneway) != 0;
-}
-
-public int methodReturnLength() {
-	return OS.objc_msgSend(this.id, OS.sel_methodReturnLength);
-}
-
-public int methodReturnType() {
-	return OS.objc_msgSend(this.id, OS.sel_methodReturnType);
-}
-
-public int numberOfArguments() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfArguments);
-}
-
-public static NSMethodSignature signatureWithObjCTypes(int types) {
-	int result = OS.objc_msgSend(OS.class_NSMethodSignature, OS.sel_signatureWithObjCTypes_1, types);
-	return result != 0 ? new NSMethodSignature(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMoveCommand.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMoveCommand.java
deleted file mode 100644
index 2a1f1c5886..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMoveCommand.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMoveCommand extends NSScriptCommand {
-
-public NSMoveCommand() {
-	super();
-}
-
-public NSMoveCommand(int id) {
-	super(id);
-}
-
-public NSScriptObjectSpecifier keySpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keySpecifier);
-	return result != 0 ? new NSScriptObjectSpecifier(result) : null;
-}
-
-public void setReceiversSpecifier(NSScriptObjectSpecifier receiversRef) {
-	OS.objc_msgSend(this.id, OS.sel_setReceiversSpecifier_1, receiversRef != null ? receiversRef.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMovie.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMovie.java
deleted file mode 100644
index d7cb8fe933..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMovie.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMovie extends NSObject {
-
-public NSMovie() {
-	super();
-}
-
-public NSMovie(int id) {
-	super(id);
-}
-
-public int QTMovie() {
-	return OS.objc_msgSend(this.id, OS.sel_QTMovie);
-}
-
-public NSURL URL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_URL);
-	return result != 0 ? new NSURL(result) : null;
-}
-
-public static boolean canInitWithPasteboard(NSPasteboard pasteboard) {
-	return OS.objc_msgSend(OS.class_NSMovie, OS.sel_canInitWithPasteboard_1, pasteboard != null ? pasteboard.id : 0) != 0;
-}
-
-public NSMovie initWithMovie(int movie) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithMovie_1, movie);
-	return result != 0 ? this : null;
-}
-
-public NSMovie initWithPasteboard(NSPasteboard pasteboard) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithPasteboard_1, pasteboard != null ? pasteboard.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSMovie initWithURL(NSURL url, boolean byRef) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithURL_1byReference_1, url != null ? url.id : 0, byRef);
-	return result != 0 ? this : null;
-}
-
-public static NSArray movieUnfilteredFileTypes() {
-	int result = OS.objc_msgSend(OS.class_NSMovie, OS.sel_movieUnfilteredFileTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray movieUnfilteredPasteboardTypes() {
-	int result = OS.objc_msgSend(OS.class_NSMovie, OS.sel_movieUnfilteredPasteboardTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMovieView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMovieView.java
deleted file mode 100644
index 988c9d7b01..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMovieView.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMovieView extends NSView {
-
-public NSMovieView() {
-	super();
-}
-
-public NSMovieView(int id) {
-	super(id);
-}
-
-public void clear(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_clear_1, sender != null ? sender.id : 0);
-}
-
-public void copy(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_copy_1, sender != null ? sender.id : 0);
-}
-
-public void cut(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_cut_1, sender != null ? sender.id : 0);
-}
-
-public void delete(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_delete_1, sender != null ? sender.id : 0);
-}
-
-public void gotoBeginning(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_gotoBeginning_1, sender != null ? sender.id : 0);
-}
-
-public void gotoEnd(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_gotoEnd_1, sender != null ? sender.id : 0);
-}
-
-public void gotoPosterFrame(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_gotoPosterFrame_1, sender != null ? sender.id : 0);
-}
-
-public boolean isControllerVisible() {
-	return OS.objc_msgSend(this.id, OS.sel_isControllerVisible) != 0;
-}
-
-public boolean isEditable() {
-	return OS.objc_msgSend(this.id, OS.sel_isEditable) != 0;
-}
-
-public boolean isMuted() {
-	return OS.objc_msgSend(this.id, OS.sel_isMuted) != 0;
-}
-
-public boolean isPlaying() {
-	return OS.objc_msgSend(this.id, OS.sel_isPlaying) != 0;
-}
-
-public int loopMode() {
-	return OS.objc_msgSend(this.id, OS.sel_loopMode);
-}
-
-public NSMovie movie() {
-	int result = OS.objc_msgSend(this.id, OS.sel_movie);
-	return result != 0 ? new NSMovie(result) : null;
-}
-
-public int movieController() {
-	return OS.objc_msgSend(this.id, OS.sel_movieController);
-}
-
-public NSRect movieRect() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_movieRect);
-	return result;
-}
-
-public void paste(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_paste_1, sender != null ? sender.id : 0);
-}
-
-public boolean playsEveryFrame() {
-	return OS.objc_msgSend(this.id, OS.sel_playsEveryFrame) != 0;
-}
-
-public boolean playsSelectionOnly() {
-	return OS.objc_msgSend(this.id, OS.sel_playsSelectionOnly) != 0;
-}
-
-public float rate() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rate);
-}
-
-public void resizeWithMagnification(float magnification) {
-	OS.objc_msgSend(this.id, OS.sel_resizeWithMagnification_1, magnification);
-}
-
-public void selectAll(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectAll_1, sender != null ? sender.id : 0);
-}
-
-public void setEditable(boolean editable) {
-	OS.objc_msgSend(this.id, OS.sel_setEditable_1, editable);
-}
-
-public void setLoopMode(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setLoopMode_1, mode);
-}
-
-public void setMovie(NSMovie movie) {
-	OS.objc_msgSend(this.id, OS.sel_setMovie_1, movie != null ? movie.id : 0);
-}
-
-public void setMuted(boolean mute) {
-	OS.objc_msgSend(this.id, OS.sel_setMuted_1, mute);
-}
-
-public void setPlaysEveryFrame(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setPlaysEveryFrame_1, flag);
-}
-
-public void setPlaysSelectionOnly(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setPlaysSelectionOnly_1, flag);
-}
-
-public void setRate(float rate) {
-	OS.objc_msgSend(this.id, OS.sel_setRate_1, rate);
-}
-
-public void setVolume(float volume) {
-	OS.objc_msgSend(this.id, OS.sel_setVolume_1, volume);
-}
-
-public void showController(boolean show, boolean adjustSize) {
-	OS.objc_msgSend(this.id, OS.sel_showController_1adjustingSize_1, show, adjustSize);
-}
-
-public NSSize sizeForMagnification(float magnification) {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_sizeForMagnification_1, magnification);
-	return result;
-}
-
-public void start(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_start_1, sender != null ? sender.id : 0);
-}
-
-public void stepBack(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_stepBack_1, sender != null ? sender.id : 0);
-}
-
-public void stepForward(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_stepForward_1, sender != null ? sender.id : 0);
-}
-
-public void stop(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_stop_1, sender != null ? sender.id : 0);
-}
-
-public float volume() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_volume);
-}
-
-}
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 71da7786c6..c2e047fbbf 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,118 +16,26 @@ public NSMutableArray() {
 	super();
 }
 
-public NSMutableArray(int id) {
+public NSMutableArray(int /*long*/ id) {
 	super(id);
 }
 
-public void addObject(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_addObject_1, anObject != null ? anObject.id : 0);
+public NSMutableArray(id id) {
+	super(id);
 }
 
-public void addObjectsFromArray(NSArray otherArray) {
-	OS.objc_msgSend(this.id, OS.sel_addObjectsFromArray_1, otherArray != null ? otherArray.id : 0);
+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_1, numItems);
+	int result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithCapacity_, numItems);
 	return result != 0 ? new NSMutableArray(result) : null;
 }
 
-public void exchangeObjectAtIndex(int idx1, int idx2) {
-	OS.objc_msgSend(this.id, OS.sel_exchangeObjectAtIndex_1withObjectAtIndex_1, idx1, idx2);
-}
-
-public void filterUsingPredicate(NSPredicate predicate) {
-	OS.objc_msgSend(this.id, OS.sel_filterUsingPredicate_1, predicate != null ? predicate.id : 0);
-}
-
-public NSMutableArray initWithCapacity(int numItems) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_1, numItems);
-	return result != 0 ? this : null;
-}
-
-public void insertObject(id anObject, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertObject_1atIndex_1, anObject != null ? anObject.id : 0, index);
-}
-
-public void insertObjects(NSArray objects, NSIndexSet indexes) {
-	OS.objc_msgSend(this.id, OS.sel_insertObjects_1atIndexes_1, objects != null ? objects.id : 0, indexes != null ? indexes.id : 0);
-}
-
-public void removeAllObjects() {
-	OS.objc_msgSend(this.id, OS.sel_removeAllObjects);
-}
-
-public void removeLastObject() {
-	OS.objc_msgSend(this.id, OS.sel_removeLastObject);
-}
-
-public void removeObject_(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_removeObject_1, anObject != null ? anObject.id : 0);
-}
-
-public void removeObject_inRange_(id anObject, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_removeObject_1inRange_1, anObject != null ? anObject.id : 0, range);
-}
-
-public void removeObjectAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectAtIndex_1, index);
-}
-
-public void removeObjectIdenticalTo_(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectIdenticalTo_1, anObject != null ? anObject.id : 0);
-}
-
-public void removeObjectIdenticalTo_inRange_(id anObject, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectIdenticalTo_1inRange_1, anObject != null ? anObject.id : 0, range);
-}
-
-public void removeObjectsAtIndexes(NSIndexSet indexes) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectsAtIndexes_1, indexes != null ? indexes.id : 0);
-}
-
-public void removeObjectsFromIndices(int indices, int cnt) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectsFromIndices_1numIndices_1, indices, cnt);
-}
-
-public void removeObjectsInArray(NSArray otherArray) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectsInArray_1, otherArray != null ? otherArray.id : 0);
-}
-
-public void removeObjectsInRange(NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectsInRange_1, range);
-}
-
-public void replaceObjectAtIndex(int index, id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_replaceObjectAtIndex_1withObject_1, index, anObject != null ? anObject.id : 0);
-}
-
-public void replaceObjectsAtIndexes(NSIndexSet indexes, NSArray objects) {
-	OS.objc_msgSend(this.id, OS.sel_replaceObjectsAtIndexes_1withObjects_1, indexes != null ? indexes.id : 0, objects != null ? objects.id : 0);
-}
-
-public void replaceObjectsInRange_withObjectsFromArray_(NSRange range, NSArray otherArray) {
-	OS.objc_msgSend(this.id, OS.sel_replaceObjectsInRange_1withObjectsFromArray_1, range, otherArray != null ? otherArray.id : 0);
-}
-
-public void replaceObjectsInRange_withObjectsFromArray_range_(NSRange range, NSArray otherArray, NSRange otherRange) {
-	OS.objc_msgSend(this.id, OS.sel_replaceObjectsInRange_1withObjectsFromArray_1range_1, range, otherArray != null ? otherArray.id : 0, otherRange);
-}
-
-public void setArray(NSArray otherArray) {
-	OS.objc_msgSend(this.id, OS.sel_setArray_1, otherArray != null ? otherArray.id : 0);
-}
-
-public void sortUsingDescriptors(NSArray sortDescriptors) {
-	OS.objc_msgSend(this.id, OS.sel_sortUsingDescriptors_1, sortDescriptors != null ? sortDescriptors.id : 0);
-}
-
-public void sortUsingFunction(int compare, int context) {
-	OS.objc_msgSend(this.id, OS.sel_sortUsingFunction_1context_1, compare, context);
-}
-
-public void sortUsingSelector(int comparator) {
-	OS.objc_msgSend(this.id, OS.sel_sortUsingSelector_1, comparator);
+public static NSArray arrayWithObject(id anObject) {
+	int 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 93ebcaeecb..c717b6947f 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,36 +16,12 @@ public NSMutableAttributedString() {
 	super();
 }
 
-public NSMutableAttributedString(int id) {
+public NSMutableAttributedString(int /*long*/ id) {
 	super(id);
 }
 
-public void addAttribute(int name, id value, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_addAttribute_1value_1range_1, name, value != null ? value.id : 0, range);
-}
-
-public void addAttributes(NSDictionary attrs, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_addAttributes_1range_1, attrs != null ? attrs.id : 0, range);
-}
-
-public void appendAttributedString(NSAttributedString attrString) {
-	OS.objc_msgSend(this.id, OS.sel_appendAttributedString_1, attrString != null ? attrString.id : 0);
-}
-
-public void beginEditing() {
-	OS.objc_msgSend(this.id, OS.sel_beginEditing);
-}
-
-public void deleteCharactersInRange(NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_deleteCharactersInRange_1, range);
-}
-
-public void endEditing() {
-	OS.objc_msgSend(this.id, OS.sel_endEditing);
-}
-
-public void insertAttributedString(NSAttributedString attrString, int loc) {
-	OS.objc_msgSend(this.id, OS.sel_insertAttributedString_1atIndex_1, attrString != null ? attrString.id : 0, loc);
+public NSMutableAttributedString(id id) {
+	super(id);
 }
 
 public NSMutableString mutableString() {
@@ -53,24 +29,20 @@ public NSMutableString mutableString() {
 	return result != 0 ? new NSMutableString(result) : null;
 }
 
-public void removeAttribute(NSString name, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_removeAttribute_1range_1, name != null ? name.id : 0, range);
+public void replaceCharactersInRange(NSRange range, NSString str) {
+	OS.objc_msgSend(this.id, OS.sel_replaceCharactersInRange_withString_, range, str != null ? str.id : 0);
 }
 
-public void replaceCharactersInRange_withAttributedString_(NSRange range, NSAttributedString attrString) {
-	OS.objc_msgSend(this.id, OS.sel_replaceCharactersInRange_1withAttributedString_1, range, attrString != null ? attrString.id : 0);
+public void addAttribute(NSString name, id value, NSRange range) {
+	OS.objc_msgSend(this.id, OS.sel_addAttribute_value_range_, name != null ? name.id : 0, value != null ? value.id : 0, range);
 }
 
-public void replaceCharactersInRange_withString_(NSRange range, NSString str) {
-	OS.objc_msgSend(this.id, OS.sel_replaceCharactersInRange_1withString_1, range, str != null ? str.id : 0);
-}
-
-public void setAttributedString(NSAttributedString attrString) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedString_1, attrString != null ? attrString.id : 0);
+public void beginEditing() {
+	OS.objc_msgSend(this.id, OS.sel_beginEditing);
 }
 
-public void setAttributes(NSDictionary attrs, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributes_1range_1, attrs != null ? attrs.id : 0, range);
+public void endEditing() {
+	OS.objc_msgSend(this.id, OS.sel_endEditing);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableCharacterSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableCharacterSet.java
deleted file mode 100644
index e9f15bc30c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableCharacterSet.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMutableCharacterSet extends NSCharacterSet {
-
-public NSMutableCharacterSet() {
-	super();
-}
-
-public NSMutableCharacterSet(int id) {
-	super(id);
-}
-
-public void addCharactersInRange(NSRange aRange) {
-	OS.objc_msgSend(this.id, OS.sel_addCharactersInRange_1, aRange);
-}
-
-public void addCharactersInString(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_addCharactersInString_1, aString != null ? aString.id : 0);
-}
-
-public void formIntersectionWithCharacterSet(NSCharacterSet otherSet) {
-	OS.objc_msgSend(this.id, OS.sel_formIntersectionWithCharacterSet_1, otherSet != null ? otherSet.id : 0);
-}
-
-public void formUnionWithCharacterSet(NSCharacterSet otherSet) {
-	OS.objc_msgSend(this.id, OS.sel_formUnionWithCharacterSet_1, otherSet != null ? otherSet.id : 0);
-}
-
-public void invert() {
-	OS.objc_msgSend(this.id, OS.sel_invert);
-}
-
-public void removeCharactersInRange(NSRange aRange) {
-	OS.objc_msgSend(this.id, OS.sel_removeCharactersInRange_1, aRange);
-}
-
-public void removeCharactersInString(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_removeCharactersInString_1, aString != null ? aString.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableData.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableData.java
deleted file mode 100644
index 3d9e9bc066..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableData.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSMutableData extends NSData {
-
-public NSMutableData() {
-	super();
-}
-
-public NSMutableData(int id) {
-	super(id);
-}
-
-public void appendBytes(int bytes, int length) {
-	OS.objc_msgSend(this.id, OS.sel_appendBytes_1length_1, bytes, length);
-}
-
-public void appendData(NSData other) {
-	OS.objc_msgSend(this.id, OS.sel_appendData_1, other != null ? other.id : 0);
-}
-
-public static id dataWithCapacity(int aNumItems) {
-	int result = OS.objc_msgSend(OS.class_NSMutableData, OS.sel_dataWithCapacity_1, aNumItems);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id dataWithLength(int length) {
-	int result = OS.objc_msgSend(OS.class_NSMutableData, OS.sel_dataWithLength_1, length);
-	return result != 0 ? new id(result) : null;
-}
-
-public void increaseLengthBy(int extraLength) {
-	OS.objc_msgSend(this.id, OS.sel_increaseLengthBy_1, extraLength);
-}
-
-public NSMutableData initWithCapacity(int capacity) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_1, capacity);
-	return result != 0 ? this : null;
-}
-
-public NSMutableData initWithLength(int length) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithLength_1, length);
-	return result != 0 ? this : null;
-}
-
-public int mutableBytes() {
-	return OS.objc_msgSend(this.id, OS.sel_mutableBytes);
-}
-
-public void replaceBytesInRange_withBytes_(NSRange range, int bytes) {
-	OS.objc_msgSend(this.id, OS.sel_replaceBytesInRange_1withBytes_1, range, bytes);
-}
-
-public void replaceBytesInRange_withBytes_length_(NSRange range, int replacementBytes, int replacementLength) {
-	OS.objc_msgSend(this.id, OS.sel_replaceBytesInRange_1withBytes_1length_1, range, replacementBytes, replacementLength);
-}
-
-public void resetBytesInRange(NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_resetBytesInRange_1, range);
-}
-
-public void setData(NSData data) {
-	OS.objc_msgSend(this.id, OS.sel_setData_1, data != null ? data.id : 0);
-}
-
-public void setLength(int length) {
-	OS.objc_msgSend(this.id, OS.sel_setLength_1, length);
-}
-
-}
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 bccee1df56..d2ce57c316 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,50 +16,30 @@ public NSMutableDictionary() {
 	super();
 }
 
-public NSMutableDictionary(int id) {
+public NSMutableDictionary(int /*long*/ id) {
 	super(id);
 }
 
-public void addEntriesFromDictionary(NSDictionary otherDictionary) {
-	OS.objc_msgSend(this.id, OS.sel_addEntriesFromDictionary_1, otherDictionary != null ? otherDictionary.id : 0);
+public NSMutableDictionary(id id) {
+	super(id);
 }
 
 public static NSMutableDictionary dictionaryWithCapacity(int numItems) {
-	int result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithCapacity_1, numItems);
+	int result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithCapacity_, numItems);
 	return result != 0 ? new NSMutableDictionary(result) : null;
 }
 
-public NSMutableDictionary initWithCapacity(int numItems) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_1, numItems);
-	return result != 0 ? this : null;
-}
-
-public void removeAllObjects() {
-	OS.objc_msgSend(this.id, OS.sel_removeAllObjects);
-}
-
-public void removeObjectForKey(id aKey) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectForKey_1, aKey != null ? aKey.id : 0);
-}
-
-public void removeObjectsForKeys(NSArray keyArray) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectsForKeys_1, keyArray != null ? keyArray.id : 0);
-}
-
-public void setDictionary(NSDictionary otherDictionary) {
-	OS.objc_msgSend(this.id, OS.sel_setDictionary_1, otherDictionary != null ? otherDictionary.id : 0);
-}
-
 public void setObject(id anObject, id aKey) {
-	OS.objc_msgSend(this.id, OS.sel_setObject_1forKey_1, anObject != null ? anObject.id : 0, aKey != null ? aKey.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setObject_forKey_, anObject != null ? anObject.id : 0, aKey != null ? aKey.id : 0);
 }
 
-public void setObject(id anObject, int aKey) {
-	OS.objc_msgSend(this.id, OS.sel_setObject_1forKey_1, anObject != null ? anObject.id : 0, aKey);
+public void setValue(id value, NSString key) {
+	OS.objc_msgSend(this.id, OS.sel_setValue_forKey_, value != null ? value.id : 0, key != null ? key.id : 0);
 }
 
-public void setValue(id value, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_setValue_1forKey_1, value != null ? value.id : 0, key != null ? key.id : 0);
+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);
+	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 c596d587bb..82cf05dc48 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,40 +16,16 @@ public NSMutableIndexSet() {
 	super();
 }
 
-public NSMutableIndexSet(int id) {
+public NSMutableIndexSet(int /*long*/ id) {
 	super(id);
 }
 
-public void addIndex(int value) {
-	OS.objc_msgSend(this.id, OS.sel_addIndex_1, value);
-}
-
-public void addIndexes(NSIndexSet indexSet) {
-	OS.objc_msgSend(this.id, OS.sel_addIndexes_1, indexSet != null ? indexSet.id : 0);
-}
-
-public void addIndexesInRange(NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_addIndexesInRange_1, range);
-}
-
-public void removeAllIndexes() {
-	OS.objc_msgSend(this.id, OS.sel_removeAllIndexes);
-}
-
-public void removeIndex(int value) {
-	OS.objc_msgSend(this.id, OS.sel_removeIndex_1, value);
-}
-
-public void removeIndexes(NSIndexSet indexSet) {
-	OS.objc_msgSend(this.id, OS.sel_removeIndexes_1, indexSet != null ? indexSet.id : 0);
-}
-
-public void removeIndexesInRange(NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_removeIndexesInRange_1, range);
+public NSMutableIndexSet(id id) {
+	super(id);
 }
 
-public void shiftIndexesStartingAtIndex(int index, int delta) {
-	OS.objc_msgSend(this.id, OS.sel_shiftIndexesStartingAtIndex_1by_1, index, delta);
+public void addIndex(int 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 c8909f8d9a..2e28025891 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,96 +16,24 @@ public NSMutableParagraphStyle() {
 	super();
 }
 
-public NSMutableParagraphStyle(int id) {
+public NSMutableParagraphStyle(int /*long*/ id) {
 	super(id);
 }
 
-public void addTabStop(NSTextTab anObject) {
-	OS.objc_msgSend(this.id, OS.sel_addTabStop_1, anObject != null ? anObject.id : 0);
-}
-
-public void removeTabStop(NSTextTab anObject) {
-	OS.objc_msgSend(this.id, OS.sel_removeTabStop_1, anObject != null ? anObject.id : 0);
+public NSMutableParagraphStyle(id id) {
+	super(id);
 }
 
 public void setAlignment(int alignment) {
-	OS.objc_msgSend(this.id, OS.sel_setAlignment_1, alignment);
-}
-
-public void setBaseWritingDirection(int writingDirection) {
-	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_1, writingDirection);
-}
-
-public void setDefaultTabInterval(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setDefaultTabInterval_1, aFloat);
+	OS.objc_msgSend(this.id, OS.sel_setAlignment_, alignment);
 }
 
 public void setFirstLineHeadIndent(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setFirstLineHeadIndent_1, aFloat);
-}
-
-public void setHeadIndent(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setHeadIndent_1, aFloat);
-}
-
-public void setHeaderLevel(int level) {
-	OS.objc_msgSend(this.id, OS.sel_setHeaderLevel_1, level);
-}
-
-public void setHyphenationFactor(float aFactor) {
-	OS.objc_msgSend(this.id, OS.sel_setHyphenationFactor_1, aFactor);
-}
-
-public void setLineBreakMode(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setLineBreakMode_1, mode);
-}
-
-public void setLineHeightMultiple(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setLineHeightMultiple_1, aFloat);
+	OS.objc_msgSend(this.id, OS.sel_setFirstLineHeadIndent_, aFloat);
 }
 
 public void setLineSpacing(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setLineSpacing_1, aFloat);
-}
-
-public void setMaximumLineHeight(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setMaximumLineHeight_1, aFloat);
-}
-
-public void setMinimumLineHeight(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setMinimumLineHeight_1, aFloat);
-}
-
-public void setParagraphSpacing(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setParagraphSpacing_1, aFloat);
-}
-
-public void setParagraphSpacingBefore(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setParagraphSpacingBefore_1, aFloat);
-}
-
-public void setParagraphStyle(NSParagraphStyle obj) {
-	OS.objc_msgSend(this.id, OS.sel_setParagraphStyle_1, obj != null ? obj.id : 0);
-}
-
-public void setTabStops(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setTabStops_1, array != null ? array.id : 0);
-}
-
-public void setTailIndent(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setTailIndent_1, aFloat);
-}
-
-public void setTextBlocks(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setTextBlocks_1, array != null ? array.id : 0);
-}
-
-public void setTextLists(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setTextLists_1, array != null ? array.id : 0);
-}
-
-public void setTighteningFactorForTruncation(float aFactor) {
-	OS.objc_msgSend(this.id, OS.sel_setTighteningFactorForTruncation_1, aFactor);
+	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 511b4f03c4..42f22e2848 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,41 +16,16 @@ public NSMutableSet() {
 	super();
 }
 
-public NSMutableSet(int id) {
+public NSMutableSet(int /*long*/ id) {
 	super(id);
 }
 
-public void addObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_addObject_1, object != null ? object.id : 0);
+public NSMutableSet(id id) {
+	super(id);
 }
 
 public void addObjectsFromArray(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_addObjectsFromArray_1, array != null ? array.id : 0);
-}
-
-public void filterUsingPredicate(NSPredicate predicate) {
-	OS.objc_msgSend(this.id, OS.sel_filterUsingPredicate_1, predicate != null ? predicate.id : 0);
-}
-
-public NSMutableSet initWithCapacity(int numItems) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_1, numItems);
-	return result != 0 ? this : null;
-}
-
-public void intersectSet(NSSet otherSet) {
-	OS.objc_msgSend(this.id, OS.sel_intersectSet_1, otherSet != null ? otherSet.id : 0);
-}
-
-public void minusSet(NSSet otherSet) {
-	OS.objc_msgSend(this.id, OS.sel_minusSet_1, otherSet != null ? otherSet.id : 0);
-}
-
-public void removeAllObjects() {
-	OS.objc_msgSend(this.id, OS.sel_removeAllObjects);
-}
-
-public void removeObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_removeObject_1, object != null ? object.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_addObjectsFromArray_, array != null ? array.id : 0);
 }
 
 public static NSSet set() {
@@ -58,17 +33,4 @@ public static NSSet set() {
 	return result != 0 ? new NSMutableSet(result) : null;
 }
 
-public void setSet(NSSet otherSet) {
-	OS.objc_msgSend(this.id, OS.sel_setSet_1, otherSet != null ? otherSet.id : 0);
-}
-
-public static id setWithCapacity(int numItems) {
-	int result = OS.objc_msgSend(OS.class_NSMutableSet, OS.sel_setWithCapacity_1, numItems);
-	return result != 0 ? new id(result) : null;
-}
-
-public void unionSet(NSSet otherSet) {
-	OS.objc_msgSend(this.id, OS.sel_unionSet_1, otherSet != null ? otherSet.id : 0);
-}
-
 }
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 e6d7af8233..311ec127e0 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,46 +16,21 @@ public NSMutableString() {
 	super();
 }
 
-public NSMutableString(int id) {
+public NSMutableString(int /*long*/ id) {
 	super(id);
 }
 
-public void appendFormat(NSString appendFormat) {
-	OS.objc_msgSend(this.id, OS.sel_appendFormat_1, appendFormat != null ? appendFormat.id : 0);
+public NSMutableString(id id) {
+	super(id);
 }
 
 public void appendString(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_appendString_1, aString != null ? aString.id : 0);
-}
-
-public void deleteCharactersInRange(NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_deleteCharactersInRange_1, range);
-}
-
-public NSMutableString initWithCapacity(int capacity) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_1, capacity);
-	return result != 0 ? this : null;
-}
-
-public void insertString(NSString aString, int loc) {
-	OS.objc_msgSend(this.id, OS.sel_insertString_1atIndex_1, aString != null ? aString.id : 0, loc);
-}
-
-public void replaceCharactersInRange(NSRange range, NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_replaceCharactersInRange_1withString_1, range, aString != null ? aString.id : 0);
-}
-
-public int replaceOccurrencesOfString(NSString target, NSString replacement, int options, NSRange searchRange) {
-	return OS.objc_msgSend(this.id, OS.sel_replaceOccurrencesOfString_1withString_1options_1range_1, target != null ? target.id : 0, replacement != null ? replacement.id : 0, options, searchRange);
-}
-
-public void setString(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setString_1, aString != null ? aString.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_appendString_, aString != null ? aString.id : 0);
 }
 
-public static id stringWithCapacity(int capacity) {
-	int result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithCapacity_1, capacity);
-	return result != 0 ? new id(result) : null;
+public static NSString stringWithCharacters(char[] characters, int length) {
+	int 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 964a887430..634f466b61 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,52 +16,21 @@ public NSMutableURLRequest() {
 	super();
 }
 
-public NSMutableURLRequest(int id) {
+public NSMutableURLRequest(int /*long*/ id) {
 	super(id);
 }
 
-public void addValue(NSString value, NSString field) {
-	OS.objc_msgSend(this.id, OS.sel_addValue_1forHTTPHeaderField_1, value != null ? value.id : 0, field != null ? field.id : 0);
-}
-
-public void setAllHTTPHeaderFields(NSDictionary headerFields) {
-	OS.objc_msgSend(this.id, OS.sel_setAllHTTPHeaderFields_1, headerFields != null ? headerFields.id : 0);
-}
-
-public void setCachePolicy(int policy) {
-	OS.objc_msgSend(this.id, OS.sel_setCachePolicy_1, policy);
-}
-
-public void setHTTPBody(NSData data) {
-	OS.objc_msgSend(this.id, OS.sel_setHTTPBody_1, data != null ? data.id : 0);
-}
-
-public void setHTTPBodyStream(NSInputStream inputStream) {
-	OS.objc_msgSend(this.id, OS.sel_setHTTPBodyStream_1, inputStream != null ? inputStream.id : 0);
-}
-
-public void setHTTPMethod(NSString method) {
-	OS.objc_msgSend(this.id, OS.sel_setHTTPMethod_1, method != null ? method.id : 0);
-}
-
-public void setHTTPShouldHandleCookies(boolean should) {
-	OS.objc_msgSend(this.id, OS.sel_setHTTPShouldHandleCookies_1, should);
-}
-
-public void setMainDocumentURL(NSURL URL) {
-	OS.objc_msgSend(this.id, OS.sel_setMainDocumentURL_1, URL != null ? URL.id : 0);
-}
-
-public void setTimeoutInterval(double seconds) {
-	OS.objc_msgSend(this.id, OS.sel_setTimeoutInterval_1, seconds);
+public NSMutableURLRequest(id id) {
+	super(id);
 }
 
 public void setURL(NSURL URL) {
-	OS.objc_msgSend(this.id, OS.sel_setURL_1, URL != null ? URL.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setURL_, URL != null ? URL.id : 0);
 }
 
-public void setValue(NSString value, NSString field) {
-	OS.objc_msgSend(this.id, OS.sel_setValue_1forHTTPHeaderField_1, value != null ? value.id : 0, field != null ? field.id : 0);
+public static NSURLRequest requestWithURL(NSURL URL) {
+	int 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/NSNameSpecifier.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNameSpecifier.java
deleted file mode 100644
index 2f50563693..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNameSpecifier.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSNameSpecifier extends NSScriptObjectSpecifier {
-
-public NSNameSpecifier() {
-	super();
-}
-
-public NSNameSpecifier(int id) {
-	super(id);
-}
-
-public id initWithContainerClassDescription(NSScriptClassDescription classDesc, NSScriptObjectSpecifier container, NSString property, NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContainerClassDescription_1containerSpecifier_1key_1name_1, classDesc != null ? classDesc.id : 0, container != null ? container.id : 0, property != null ? property.id : 0, name != null ? name.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setName(NSString name) {
-	OS.objc_msgSend(this.id, OS.sel_setName_1, name != null ? name.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNetService.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNetService.java
deleted file mode 100644
index cc67b71d55..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNetService.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSNetService extends NSObject {
-
-public NSNetService() {
-	super();
-}
-
-public NSNetService(int id) {
-	super(id);
-}
-
-public NSData TXTRecordData() {
-	int result = OS.objc_msgSend(this.id, OS.sel_TXTRecordData);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSArray addresses() {
-	int result = OS.objc_msgSend(this.id, OS.sel_addresses);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSData dataFromTXTRecordDictionary(NSDictionary txtDictionary) {
-	int result = OS.objc_msgSend(OS.class_NSNetService, OS.sel_dataFromTXTRecordDictionary_1, txtDictionary != null ? txtDictionary.id : 0);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSDictionary dictionaryFromTXTRecordData(NSData txtData) {
-	int result = OS.objc_msgSend(OS.class_NSNetService, OS.sel_dictionaryFromTXTRecordData_1, txtData != null ? txtData.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSString domain() {
-	int result = OS.objc_msgSend(this.id, OS.sel_domain);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean getInputStream(int inputStream, int outputStream) {
-	return OS.objc_msgSend(this.id, OS.sel_getInputStream_1outputStream_1, inputStream, outputStream) != 0;
-}
-
-public NSString hostName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_hostName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id initWithDomain_type_name_(NSString domain, NSString type, NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDomain_1type_1name_1, domain != null ? domain.id : 0, type != null ? type.id : 0, name != null ? name.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithDomain_type_name_port_(NSString domain, NSString type, NSString name, int port) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDomain_1type_1name_1port_1, domain != null ? domain.id : 0, type != null ? type.id : 0, name != null ? name.id : 0, port);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int port() {
-	return OS.objc_msgSend(this.id, OS.sel_port);
-}
-
-public NSString protocolSpecificInformation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_protocolSpecificInformation);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void publish() {
-	OS.objc_msgSend(this.id, OS.sel_publish);
-}
-
-public void publishWithOptions(int options) {
-	OS.objc_msgSend(this.id, OS.sel_publishWithOptions_1, options);
-}
-
-public void removeFromRunLoop(NSRunLoop aRunLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_removeFromRunLoop_1forMode_1, aRunLoop != null ? aRunLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-public void resolve() {
-	OS.objc_msgSend(this.id, OS.sel_resolve);
-}
-
-public void resolveWithTimeout(double timeout) {
-	OS.objc_msgSend(this.id, OS.sel_resolveWithTimeout_1, timeout);
-}
-
-public void scheduleInRunLoop(NSRunLoop aRunLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_scheduleInRunLoop_1forMode_1, aRunLoop != null ? aRunLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setProtocolSpecificInformation(NSString specificInformation) {
-	OS.objc_msgSend(this.id, OS.sel_setProtocolSpecificInformation_1, specificInformation != null ? specificInformation.id : 0);
-}
-
-public boolean setTXTRecordData(NSData recordData) {
-	return OS.objc_msgSend(this.id, OS.sel_setTXTRecordData_1, recordData != null ? recordData.id : 0) != 0;
-}
-
-public void startMonitoring() {
-	OS.objc_msgSend(this.id, OS.sel_startMonitoring);
-}
-
-public void stop() {
-	OS.objc_msgSend(this.id, OS.sel_stop);
-}
-
-public void stopMonitoring() {
-	OS.objc_msgSend(this.id, OS.sel_stopMonitoring);
-}
-
-public NSString type() {
-	int result = OS.objc_msgSend(this.id, OS.sel_type);
-	return result != 0 ? new NSString(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNetServiceBrowser.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNetServiceBrowser.java
deleted file mode 100644
index aafcb0f904..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNetServiceBrowser.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSNetServiceBrowser extends NSObject {
-
-public NSNetServiceBrowser() {
-	super();
-}
-
-public NSNetServiceBrowser(int id) {
-	super(id);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void removeFromRunLoop(NSRunLoop aRunLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_removeFromRunLoop_1forMode_1, aRunLoop != null ? aRunLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-public void scheduleInRunLoop(NSRunLoop aRunLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_scheduleInRunLoop_1forMode_1, aRunLoop != null ? aRunLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-public void searchForAllDomains() {
-	OS.objc_msgSend(this.id, OS.sel_searchForAllDomains);
-}
-
-public void searchForBrowsableDomains() {
-	OS.objc_msgSend(this.id, OS.sel_searchForBrowsableDomains);
-}
-
-public void searchForRegistrationDomains() {
-	OS.objc_msgSend(this.id, OS.sel_searchForRegistrationDomains);
-}
-
-public void searchForServicesOfType(NSString type, NSString domainString) {
-	OS.objc_msgSend(this.id, OS.sel_searchForServicesOfType_1inDomain_1, type != null ? type.id : 0, domainString != null ? domainString.id : 0);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void stop() {
-	OS.objc_msgSend(this.id, OS.sel_stop);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNib.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNib.java
deleted file mode 100644
index 396ae37dd1..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNib.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSNib extends NSObject {
-
-public NSNib() {
-	super();
-}
-
-public NSNib(int id) {
-	super(id);
-}
-
-public id initWithContentsOfURL(NSURL nibFileURL) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1, nibFileURL != null ? nibFileURL.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithNibNamed(NSString nibName, NSBundle bundle) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithNibNamed_1bundle_1, nibName != null ? nibName.id : 0, bundle != null ? bundle.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean instantiateNibWithExternalNameTable(NSDictionary externalNameTable) {
-	return OS.objc_msgSend(this.id, OS.sel_instantiateNibWithExternalNameTable_1, externalNameTable != null ? externalNameTable.id : 0) != 0;
-}
-
-public boolean instantiateNibWithOwner(id owner, int topLevelObjects) {
-	return OS.objc_msgSend(this.id, OS.sel_instantiateNibWithOwner_1topLevelObjects_1, owner != null ? owner.id : 0, topLevelObjects) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNibConnector.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNibConnector.java
deleted file mode 100644
index 4b3ddeb07f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNibConnector.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSNibConnector extends NSObject {
-
-public NSNibConnector() {
-	super();
-}
-
-public NSNibConnector(int id) {
-	super(id);
-}
-
-public id destination() {
-	int result = OS.objc_msgSend(this.id, OS.sel_destination);
-	return result != 0 ? new id(result) : null;
-}
-
-public void establishConnection() {
-	OS.objc_msgSend(this.id, OS.sel_establishConnection);
-}
-
-public NSString label() {
-	int result = OS.objc_msgSend(this.id, OS.sel_label);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void replaceObject(id oldObject, id newObject) {
-	OS.objc_msgSend(this.id, OS.sel_replaceObject_1withObject_1, oldObject != null ? oldObject.id : 0, newObject != null ? newObject.id : 0);
-}
-
-public void setDestination(id destination) {
-	OS.objc_msgSend(this.id, OS.sel_setDestination_1, destination != null ? destination.id : 0);
-}
-
-public void setLabel(NSString label) {
-	OS.objc_msgSend(this.id, OS.sel_setLabel_1, label != null ? label.id : 0);
-}
-
-public void setSource(id source) {
-	OS.objc_msgSend(this.id, OS.sel_setSource_1, source != null ? source.id : 0);
-}
-
-public id source() {
-	int result = OS.objc_msgSend(this.id, OS.sel_source);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNibControlConnector.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNibControlConnector.java
deleted file mode 100644
index 0f7072f6ad..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNibControlConnector.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSNibControlConnector extends NSObject {
-
-public NSNibControlConnector() {
-	super();
-}
-
-public NSNibControlConnector(int id) {
-	super(id);
-}
-
-public void establishConnection() {
-	OS.objc_msgSend(this.id, OS.sel_establishConnection);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNibOutletConnector.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNibOutletConnector.java
deleted file mode 100644
index 0a14fe7792..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNibOutletConnector.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSNibOutletConnector extends NSNibConnector {
-
-public NSNibOutletConnector() {
-	super();
-}
-
-public NSNibOutletConnector(int id) {
-	super(id);
-}
-
-public void establishConnection() {
-	OS.objc_msgSend(this.id, OS.sel_establishConnection);
-}
-
-}
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 6499c90d9c..6d87b85bfa 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,23 +16,12 @@ public NSNotification() {
 	super();
 }
 
-public NSNotification(int id) {
+public NSNotification(int /*long*/ id) {
 	super(id);
 }
 
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static id static_notificationWithName_object_(NSString aName, id anObject) {
-	int result = OS.objc_msgSend(OS.class_NSNotification, OS.sel_notificationWithName_1object_1, aName != null ? aName.id : 0, anObject != null ? anObject.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_notificationWithName_object_userInfo_(NSString aName, id anObject, NSDictionary aUserInfo) {
-	int result = OS.objc_msgSend(OS.class_NSNotification, OS.sel_notificationWithName_1object_1userInfo_1, aName != null ? aName.id : 0, anObject != null ? anObject.id : 0, aUserInfo != null ? aUserInfo.id : 0);
-	return result != 0 ? new id(result) : null;
+public NSNotification(id id) {
+	super(id);
 }
 
 public id object() {
@@ -40,9 +29,4 @@ public id object() {
 	return result != 0 ? new id(result) : null;
 }
 
-public NSDictionary userInfo() {
-	int 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/NSNotificationCenter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationCenter.java
index 25eae3a0c6..bd88acec39 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,12 +16,16 @@ public NSNotificationCenter() {
 	super();
 }
 
-public NSNotificationCenter(int id) {
+public NSNotificationCenter(int /*long*/ id) {
+	super(id);
+}
+
+public NSNotificationCenter(id id) {
 	super(id);
 }
 
 public void addObserver(id observer, int aSelector, NSString aName, id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_addObserver_1selector_1name_1object_1, observer != null ? observer.id : 0, aSelector, aName != null ? aName.id : 0, anObject != null ? anObject.id : 0);
+	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() {
@@ -29,24 +33,8 @@ public static NSNotificationCenter defaultCenter() {
 	return result != 0 ? new NSNotificationCenter(result) : null;
 }
 
-public void postNotification(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_postNotification_1, notification != null ? notification.id : 0);
-}
-
-public void postNotificationName_object_(NSString aName, id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_postNotificationName_1object_1, aName != null ? aName.id : 0, anObject != null ? anObject.id : 0);
-}
-
-public void postNotificationName_object_userInfo_(NSString aName, id anObject, NSDictionary aUserInfo) {
-	OS.objc_msgSend(this.id, OS.sel_postNotificationName_1object_1userInfo_1, aName != null ? aName.id : 0, anObject != null ? anObject.id : 0, aUserInfo != null ? aUserInfo.id : 0);
-}
-
-public void removeObserver_(id observer) {
-	OS.objc_msgSend(this.id, OS.sel_removeObserver_1, observer != null ? observer.id : 0);
-}
-
-public void removeObserver_name_object_(id observer, NSString aName, id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_removeObserver_1name_1object_1, observer != null ? observer.id : 0, aName != null ? aName.id : 0, anObject != null ? anObject.id : 0);
+public void removeObserver(id observer) {
+	OS.objc_msgSend(this.id, OS.sel_removeObserver_, observer != null ? observer.id : 0);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationQueue.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationQueue.java
deleted file mode 100644
index 4a881bdb4f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationQueue.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSNotificationQueue extends NSObject {
-
-public NSNotificationQueue() {
-	super();
-}
-
-public NSNotificationQueue(int id) {
-	super(id);
-}
-
-public static id defaultQueue() {
-	int result = OS.objc_msgSend(OS.class_NSNotificationQueue, OS.sel_defaultQueue);
-	return result != 0 ? new id(result) : null;
-}
-
-public void dequeueNotificationsMatching(NSNotification notification, int coalesceMask) {
-	OS.objc_msgSend(this.id, OS.sel_dequeueNotificationsMatching_1coalesceMask_1, notification != null ? notification.id : 0, coalesceMask);
-}
-
-public void enqueueNotification_postingStyle_(NSNotification notification, int postingStyle) {
-	OS.objc_msgSend(this.id, OS.sel_enqueueNotification_1postingStyle_1, notification != null ? notification.id : 0, postingStyle);
-}
-
-public void enqueueNotification_postingStyle_coalesceMask_forModes_(NSNotification notification, int postingStyle, int coalesceMask, NSArray modes) {
-	OS.objc_msgSend(this.id, OS.sel_enqueueNotification_1postingStyle_1coalesceMask_1forModes_1, notification != null ? notification.id : 0, postingStyle, coalesceMask, modes != null ? modes.id : 0);
-}
-
-public id initWithNotificationCenter(NSNotificationCenter notificationCenter) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithNotificationCenter_1, notificationCenter != null ? notificationCenter.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/NSNull.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNull.java
deleted file mode 100644
index cd1a4bf687..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNull.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSNull extends NSObject {
-
-public NSNull() {
-	super();
-}
-
-public NSNull(int id) {
-	super(id);
-}
-
-public static NSNull null_() {
-	int result = OS.objc_msgSend(OS.class_NSNull, OS.sel_null);
-	return result != 0 ? new NSNull(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 f54db90556..e46f1a42d3 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,242 +16,46 @@ public NSNumber() {
 	super();
 }
 
-public NSNumber(int id) {
+public NSNumber(int /*long*/ id) {
 	super(id);
 }
 
-public boolean boolValue() {
-	return OS.objc_msgSend(this.id, OS.sel_boolValue) != 0;
-}
-
-public byte charValue() {
-	return (byte)OS.objc_msgSend(this.id, OS.sel_charValue);
-}
-
-public int compare(NSNumber otherNumber) {
-	return OS.objc_msgSend(this.id, OS.sel_compare_1, otherNumber != null ? otherNumber.id : 0);
-}
-
-public NSDecimal decimalValue() {
-	NSDecimal result = new NSDecimal();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_decimalValue);
-	return result;
-}
-
-public NSString descriptionWithLocale(id locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptionWithLocale_1, locale != null ? locale.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public double doubleValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_doubleValue);
-}
-
-public float floatValue() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_floatValue);
-}
-
-public id initWithBool(boolean value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithBool_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithChar(byte value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithChar_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithDouble(double value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDouble_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithFloat(float value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFloat_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithInt(int value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithInt_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithInteger(int value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithInteger_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithLong(int value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithLong_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithLongLong(long value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithLongLong_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithShort(short value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithShort_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithUnsignedChar(byte value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithUnsignedChar_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithUnsignedInt(int value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithUnsignedInt_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithUnsignedInteger(int value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithUnsignedInteger_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithUnsignedLong(int value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithUnsignedLong_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithUnsignedLongLong(long value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithUnsignedLongLong_1, value);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithUnsignedShort(short value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithUnsignedShort_1, value);
-	return result != 0 ? new id(result) : null;
+public NSNumber(id id) {
+	super(id);
 }
 
 public int intValue() {
 	return OS.objc_msgSend(this.id, OS.sel_intValue);
 }
 
-public int integerValue() {
-	return OS.objc_msgSend(this.id, OS.sel_integerValue);
-}
-
-public boolean isEqualToNumber(NSNumber number) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualToNumber_1, number != null ? number.id : 0) != 0;
-}
-
-public long longLongValue() {
-	return (long)OS.objc_msgSend(this.id, OS.sel_longLongValue);
-}
-
-public int longValue() {
-	return OS.objc_msgSend(this.id, OS.sel_longValue);
-}
-
 public static NSNumber numberWithBool(boolean value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithBool_1, value);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public static NSNumber numberWithChar(byte value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithChar_1, value);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public static NSNumber numberWithDouble(double value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithDouble_1, value);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public static NSNumber numberWithFloat(float value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithFloat_1, value);
+	int 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_1, value);
+	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithInt_, value);
 	return result != 0 ? new NSNumber(result) : null;
 }
 
-public static NSNumber numberWithInteger(int value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithInteger_1, value);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public static NSNumber numberWithLong(int value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithLong_1, value);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public static NSNumber numberWithLongLong(long value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithLongLong_1, value);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public static NSNumber numberWithShort(short value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithShort_1, value);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public static NSNumber numberWithUnsignedChar(byte value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithUnsignedChar_1, value);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public static NSNumber numberWithUnsignedInt(int value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithUnsignedInt_1, value);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public static NSNumber numberWithUnsignedInteger(int value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithUnsignedInteger_1, value);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public static NSNumber numberWithUnsignedLong(int value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithUnsignedLong_1, value);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public static NSNumber numberWithUnsignedLongLong(long value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithUnsignedLongLong_1, value);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public static NSNumber numberWithUnsignedShort(short value) {
-	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithUnsignedShort_1, value);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public short shortValue() {
-	return (short)OS.objc_msgSend(this.id, OS.sel_shortValue);
-}
-
-public NSString stringValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringValue);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public byte unsignedCharValue() {
-	return (byte)OS.objc_msgSend(this.id, OS.sel_unsignedCharValue);
-}
-
-public int unsignedIntValue() {
-	return OS.objc_msgSend(this.id, OS.sel_unsignedIntValue);
-}
-
-public int unsignedIntegerValue() {
-	return OS.objc_msgSend(this.id, OS.sel_unsignedIntegerValue);
+public static NSValue valueWithPoint(NSPoint point) {
+	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithPoint_, point);
+	return result != 0 ? new NSValue(result) : null;
 }
 
-public long unsignedLongLongValue() {
-	return (long)OS.objc_msgSend(this.id, OS.sel_unsignedLongLongValue);
+public static NSValue valueWithRange(NSRange range) {
+	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRange_, range);
+	return result != 0 ? new NSValue(result) : null;
 }
 
-public int unsignedLongValue() {
-	return OS.objc_msgSend(this.id, OS.sel_unsignedLongValue);
+public static NSValue valueWithRect(NSRect rect) {
+	int result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRect_, rect);
+	return result != 0 ? new NSValue(result) : null;
 }
 
-public short unsignedShortValue() {
-	return (short)OS.objc_msgSend(this.id, OS.sel_unsignedShortValue);
+public static NSValue valueWithSize(NSSize size) {
+	int 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/NSNumberFormatter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java
deleted file mode 100644
index d69cf51ec5..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java
+++ /dev/null
@@ -1,599 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSNumberFormatter extends NSFormatter {
-
-public NSNumberFormatter() {
-	super();
-}
-
-public NSNumberFormatter(int id) {
-	super(id);
-}
-
-public boolean allowsFloats() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsFloats) != 0;
-}
-
-public boolean alwaysShowsDecimalSeparator() {
-	return OS.objc_msgSend(this.id, OS.sel_alwaysShowsDecimalSeparator) != 0;
-}
-
-public NSAttributedString attributedStringForNil() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedStringForNil);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public NSAttributedString attributedStringForNotANumber() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedStringForNotANumber);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public NSAttributedString attributedStringForZero() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedStringForZero);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public NSString currencyCode() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currencyCode);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString currencyDecimalSeparator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currencyDecimalSeparator);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString currencyGroupingSeparator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currencyGroupingSeparator);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString currencySymbol() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currencySymbol);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString decimalSeparator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_decimalSeparator);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static int defaultFormatterBehavior() {
-	return OS.objc_msgSend(OS.class_NSNumberFormatter, OS.sel_defaultFormatterBehavior);
-}
-
-public NSString exponentSymbol() {
-	int result = OS.objc_msgSend(this.id, OS.sel_exponentSymbol);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString format() {
-	int result = OS.objc_msgSend(this.id, OS.sel_format);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int formatWidth() {
-	return OS.objc_msgSend(this.id, OS.sel_formatWidth);
-}
-
-public int formatterBehavior() {
-	return OS.objc_msgSend(this.id, OS.sel_formatterBehavior);
-}
-
-public boolean generatesDecimalNumbers() {
-	return OS.objc_msgSend(this.id, OS.sel_generatesDecimalNumbers) != 0;
-}
-
-public boolean getObjectValue(int obj, NSString string, int rangep, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_getObjectValue_1forString_1range_1error_1, obj, string != null ? string.id : 0, rangep, error) != 0;
-}
-
-public NSString groupingSeparator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_groupingSeparator);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int groupingSize() {
-	return OS.objc_msgSend(this.id, OS.sel_groupingSize);
-}
-
-public boolean hasThousandSeparators() {
-	return OS.objc_msgSend(this.id, OS.sel_hasThousandSeparators) != 0;
-}
-
-public NSString internationalCurrencySymbol() {
-	int result = OS.objc_msgSend(this.id, OS.sel_internationalCurrencySymbol);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean isLenient() {
-	return OS.objc_msgSend(this.id, OS.sel_isLenient) != 0;
-}
-
-public boolean isPartialStringValidationEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isPartialStringValidationEnabled) != 0;
-}
-
-public NSLocale locale() {
-	int result = OS.objc_msgSend(this.id, OS.sel_locale);
-	return result != 0 ? new NSLocale(result) : null;
-}
-
-public boolean localizesFormat() {
-	return OS.objc_msgSend(this.id, OS.sel_localizesFormat) != 0;
-}
-
-public NSNumber maximum() {
-	int result = OS.objc_msgSend(this.id, OS.sel_maximum);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public int maximumFractionDigits() {
-	return OS.objc_msgSend(this.id, OS.sel_maximumFractionDigits);
-}
-
-public int maximumIntegerDigits() {
-	return OS.objc_msgSend(this.id, OS.sel_maximumIntegerDigits);
-}
-
-public int maximumSignificantDigits() {
-	return OS.objc_msgSend(this.id, OS.sel_maximumSignificantDigits);
-}
-
-public NSNumber minimum() {
-	int result = OS.objc_msgSend(this.id, OS.sel_minimum);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public int minimumFractionDigits() {
-	return OS.objc_msgSend(this.id, OS.sel_minimumFractionDigits);
-}
-
-public int minimumIntegerDigits() {
-	return OS.objc_msgSend(this.id, OS.sel_minimumIntegerDigits);
-}
-
-public int minimumSignificantDigits() {
-	return OS.objc_msgSend(this.id, OS.sel_minimumSignificantDigits);
-}
-
-public NSString minusSign() {
-	int result = OS.objc_msgSend(this.id, OS.sel_minusSign);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSNumber multiplier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_multiplier);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public NSString negativeFormat() {
-	int result = OS.objc_msgSend(this.id, OS.sel_negativeFormat);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString negativeInfinitySymbol() {
-	int result = OS.objc_msgSend(this.id, OS.sel_negativeInfinitySymbol);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString negativePrefix() {
-	int result = OS.objc_msgSend(this.id, OS.sel_negativePrefix);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString negativeSuffix() {
-	int result = OS.objc_msgSend(this.id, OS.sel_negativeSuffix);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString nilSymbol() {
-	int result = OS.objc_msgSend(this.id, OS.sel_nilSymbol);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString notANumberSymbol() {
-	int result = OS.objc_msgSend(this.id, OS.sel_notANumberSymbol);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSNumber numberFromString(NSString string) {
-	int result = OS.objc_msgSend(this.id, OS.sel_numberFromString_1, string != null ? string.id : 0);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public int numberStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_numberStyle);
-}
-
-public NSString paddingCharacter() {
-	int result = OS.objc_msgSend(this.id, OS.sel_paddingCharacter);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int paddingPosition() {
-	return OS.objc_msgSend(this.id, OS.sel_paddingPosition);
-}
-
-public NSString perMillSymbol() {
-	int result = OS.objc_msgSend(this.id, OS.sel_perMillSymbol);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString percentSymbol() {
-	int result = OS.objc_msgSend(this.id, OS.sel_percentSymbol);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString plusSign() {
-	int result = OS.objc_msgSend(this.id, OS.sel_plusSign);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString positiveFormat() {
-	int result = OS.objc_msgSend(this.id, OS.sel_positiveFormat);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString positiveInfinitySymbol() {
-	int result = OS.objc_msgSend(this.id, OS.sel_positiveInfinitySymbol);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString positivePrefix() {
-	int result = OS.objc_msgSend(this.id, OS.sel_positivePrefix);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString positiveSuffix() {
-	int result = OS.objc_msgSend(this.id, OS.sel_positiveSuffix);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSDecimalNumberHandler roundingBehavior() {
-	int result = OS.objc_msgSend(this.id, OS.sel_roundingBehavior);
-	return result != 0 ? new NSDecimalNumberHandler(result) : null;
-}
-
-public NSNumber roundingIncrement() {
-	int result = OS.objc_msgSend(this.id, OS.sel_roundingIncrement);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public int roundingMode() {
-	return OS.objc_msgSend(this.id, OS.sel_roundingMode);
-}
-
-public int secondaryGroupingSize() {
-	return OS.objc_msgSend(this.id, OS.sel_secondaryGroupingSize);
-}
-
-public void setAllowsFloats(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsFloats_1, flag);
-}
-
-public void setAlwaysShowsDecimalSeparator(boolean b) {
-	OS.objc_msgSend(this.id, OS.sel_setAlwaysShowsDecimalSeparator_1, b);
-}
-
-public void setAttributedStringForNil(NSAttributedString newAttributedString) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedStringForNil_1, newAttributedString != null ? newAttributedString.id : 0);
-}
-
-public void setAttributedStringForNotANumber(NSAttributedString newAttributedString) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedStringForNotANumber_1, newAttributedString != null ? newAttributedString.id : 0);
-}
-
-public void setAttributedStringForZero(NSAttributedString newAttributedString) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedStringForZero_1, newAttributedString != null ? newAttributedString.id : 0);
-}
-
-public void setCurrencyCode(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setCurrencyCode_1, string != null ? string.id : 0);
-}
-
-public void setCurrencyDecimalSeparator(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setCurrencyDecimalSeparator_1, string != null ? string.id : 0);
-}
-
-public void setCurrencyGroupingSeparator(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setCurrencyGroupingSeparator_1, string != null ? string.id : 0);
-}
-
-public void setCurrencySymbol(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setCurrencySymbol_1, string != null ? string.id : 0);
-}
-
-public void setDecimalSeparator(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setDecimalSeparator_1, string != null ? string.id : 0);
-}
-
-public static void setDefaultFormatterBehavior(int behavior) {
-	OS.objc_msgSend(OS.class_NSNumberFormatter, OS.sel_setDefaultFormatterBehavior_1, behavior);
-}
-
-public void setExponentSymbol(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setExponentSymbol_1, string != null ? string.id : 0);
-}
-
-public void setFormat(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setFormat_1, string != null ? string.id : 0);
-}
-
-public void setFormatWidth(int number) {
-	OS.objc_msgSend(this.id, OS.sel_setFormatWidth_1, number);
-}
-
-public void setFormatterBehavior(int behavior) {
-	OS.objc_msgSend(this.id, OS.sel_setFormatterBehavior_1, behavior);
-}
-
-public void setGeneratesDecimalNumbers(boolean b) {
-	OS.objc_msgSend(this.id, OS.sel_setGeneratesDecimalNumbers_1, b);
-}
-
-public void setGroupingSeparator(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setGroupingSeparator_1, string != null ? string.id : 0);
-}
-
-public void setGroupingSize(int number) {
-	OS.objc_msgSend(this.id, OS.sel_setGroupingSize_1, number);
-}
-
-public void setHasThousandSeparators(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHasThousandSeparators_1, flag);
-}
-
-public void setInternationalCurrencySymbol(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setInternationalCurrencySymbol_1, string != null ? string.id : 0);
-}
-
-public void setLenient(boolean b) {
-	OS.objc_msgSend(this.id, OS.sel_setLenient_1, b);
-}
-
-public void setLocale(NSLocale locale) {
-	OS.objc_msgSend(this.id, OS.sel_setLocale_1, locale != null ? locale.id : 0);
-}
-
-public void setLocalizesFormat(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setLocalizesFormat_1, flag);
-}
-
-public void setMaximum(NSNumber number) {
-	OS.objc_msgSend(this.id, OS.sel_setMaximum_1, number != null ? number.id : 0);
-}
-
-public void setMaximumFractionDigits(int number) {
-	OS.objc_msgSend(this.id, OS.sel_setMaximumFractionDigits_1, number);
-}
-
-public void setMaximumIntegerDigits(int number) {
-	OS.objc_msgSend(this.id, OS.sel_setMaximumIntegerDigits_1, number);
-}
-
-public void setMaximumSignificantDigits(int number) {
-	OS.objc_msgSend(this.id, OS.sel_setMaximumSignificantDigits_1, number);
-}
-
-public void setMinimum(NSNumber number) {
-	OS.objc_msgSend(this.id, OS.sel_setMinimum_1, number != null ? number.id : 0);
-}
-
-public void setMinimumFractionDigits(int number) {
-	OS.objc_msgSend(this.id, OS.sel_setMinimumFractionDigits_1, number);
-}
-
-public void setMinimumIntegerDigits(int number) {
-	OS.objc_msgSend(this.id, OS.sel_setMinimumIntegerDigits_1, number);
-}
-
-public void setMinimumSignificantDigits(int number) {
-	OS.objc_msgSend(this.id, OS.sel_setMinimumSignificantDigits_1, number);
-}
-
-public void setMinusSign(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setMinusSign_1, string != null ? string.id : 0);
-}
-
-public void setMultiplier(NSNumber number) {
-	OS.objc_msgSend(this.id, OS.sel_setMultiplier_1, number != null ? number.id : 0);
-}
-
-public void setNegativeFormat(NSString format) {
-	OS.objc_msgSend(this.id, OS.sel_setNegativeFormat_1, format != null ? format.id : 0);
-}
-
-public void setNegativeInfinitySymbol(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setNegativeInfinitySymbol_1, string != null ? string.id : 0);
-}
-
-public void setNegativePrefix(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setNegativePrefix_1, string != null ? string.id : 0);
-}
-
-public void setNegativeSuffix(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setNegativeSuffix_1, string != null ? string.id : 0);
-}
-
-public void setNilSymbol(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setNilSymbol_1, string != null ? string.id : 0);
-}
-
-public void setNotANumberSymbol(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setNotANumberSymbol_1, string != null ? string.id : 0);
-}
-
-public void setNumberStyle(int style) {
-	OS.objc_msgSend(this.id, OS.sel_setNumberStyle_1, style);
-}
-
-public void setPaddingCharacter(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPaddingCharacter_1, string != null ? string.id : 0);
-}
-
-public void setPaddingPosition(int position) {
-	OS.objc_msgSend(this.id, OS.sel_setPaddingPosition_1, position);
-}
-
-public void setPartialStringValidationEnabled(boolean b) {
-	OS.objc_msgSend(this.id, OS.sel_setPartialStringValidationEnabled_1, b);
-}
-
-public void setPerMillSymbol(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPerMillSymbol_1, string != null ? string.id : 0);
-}
-
-public void setPercentSymbol(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPercentSymbol_1, string != null ? string.id : 0);
-}
-
-public void setPlusSign(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPlusSign_1, string != null ? string.id : 0);
-}
-
-public void setPositiveFormat(NSString format) {
-	OS.objc_msgSend(this.id, OS.sel_setPositiveFormat_1, format != null ? format.id : 0);
-}
-
-public void setPositiveInfinitySymbol(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPositiveInfinitySymbol_1, string != null ? string.id : 0);
-}
-
-public void setPositivePrefix(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPositivePrefix_1, string != null ? string.id : 0);
-}
-
-public void setPositiveSuffix(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPositiveSuffix_1, string != null ? string.id : 0);
-}
-
-public void setRoundingBehavior(NSDecimalNumberHandler newRoundingBehavior) {
-	OS.objc_msgSend(this.id, OS.sel_setRoundingBehavior_1, newRoundingBehavior != null ? newRoundingBehavior.id : 0);
-}
-
-public void setRoundingIncrement(NSNumber number) {
-	OS.objc_msgSend(this.id, OS.sel_setRoundingIncrement_1, number != null ? number.id : 0);
-}
-
-public void setRoundingMode(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setRoundingMode_1, mode);
-}
-
-public void setSecondaryGroupingSize(int number) {
-	OS.objc_msgSend(this.id, OS.sel_setSecondaryGroupingSize_1, number);
-}
-
-public void setTextAttributesForNegativeInfinity(NSDictionary newAttributes) {
-	OS.objc_msgSend(this.id, OS.sel_setTextAttributesForNegativeInfinity_1, newAttributes != null ? newAttributes.id : 0);
-}
-
-public void setTextAttributesForNegativeValues(NSDictionary newAttributes) {
-	OS.objc_msgSend(this.id, OS.sel_setTextAttributesForNegativeValues_1, newAttributes != null ? newAttributes.id : 0);
-}
-
-public void setTextAttributesForNil(NSDictionary newAttributes) {
-	OS.objc_msgSend(this.id, OS.sel_setTextAttributesForNil_1, newAttributes != null ? newAttributes.id : 0);
-}
-
-public void setTextAttributesForNotANumber(NSDictionary newAttributes) {
-	OS.objc_msgSend(this.id, OS.sel_setTextAttributesForNotANumber_1, newAttributes != null ? newAttributes.id : 0);
-}
-
-public void setTextAttributesForPositiveInfinity(NSDictionary newAttributes) {
-	OS.objc_msgSend(this.id, OS.sel_setTextAttributesForPositiveInfinity_1, newAttributes != null ? newAttributes.id : 0);
-}
-
-public void setTextAttributesForPositiveValues(NSDictionary newAttributes) {
-	OS.objc_msgSend(this.id, OS.sel_setTextAttributesForPositiveValues_1, newAttributes != null ? newAttributes.id : 0);
-}
-
-public void setTextAttributesForZero(NSDictionary newAttributes) {
-	OS.objc_msgSend(this.id, OS.sel_setTextAttributesForZero_1, newAttributes != null ? newAttributes.id : 0);
-}
-
-public void setThousandSeparator(NSString newSeparator) {
-	OS.objc_msgSend(this.id, OS.sel_setThousandSeparator_1, newSeparator != null ? newSeparator.id : 0);
-}
-
-public void setUsesGroupingSeparator(boolean b) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesGroupingSeparator_1, b);
-}
-
-public void setUsesSignificantDigits(boolean b) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesSignificantDigits_1, b);
-}
-
-public void setZeroSymbol(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setZeroSymbol_1, string != null ? string.id : 0);
-}
-
-public NSString stringFromNumber(NSNumber number) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringFromNumber_1, number != null ? number.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSDictionary textAttributesForNegativeInfinity() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textAttributesForNegativeInfinity);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDictionary textAttributesForNegativeValues() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textAttributesForNegativeValues);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDictionary textAttributesForNil() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textAttributesForNil);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDictionary textAttributesForNotANumber() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textAttributesForNotANumber);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDictionary textAttributesForPositiveInfinity() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textAttributesForPositiveInfinity);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDictionary textAttributesForPositiveValues() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textAttributesForPositiveValues);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDictionary textAttributesForZero() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textAttributesForZero);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSString thousandSeparator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_thousandSeparator);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean usesGroupingSeparator() {
-	return OS.objc_msgSend(this.id, OS.sel_usesGroupingSeparator) != 0;
-}
-
-public boolean usesSignificantDigits() {
-	return OS.objc_msgSend(this.id, OS.sel_usesSignificantDigits) != 0;
-}
-
-public NSString zeroSymbol() {
-	int result = OS.objc_msgSend(this.id, OS.sel_zeroSymbol);
-	return result != 0 ? new NSString(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 34ac958dd8..e2ae3a46e3 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,149 +16,17 @@ public NSObject() {
 	super();
 }
 
-public NSObject(int id) {
+public NSObject(int /*long*/ id) {
 	super(id);
 }
 
-public void URL_resourceDataDidBecomeAvailable_(NSURL sender, NSData newBytes) {
-	OS.objc_msgSend(this.id, OS.sel_URL_1resourceDataDidBecomeAvailable_1, sender != null ? sender.id : 0, newBytes != null ? newBytes.id : 0);
-}
-
-public void URL_resourceDidFailLoadingWithReason_(NSURL sender, NSString reason) {
-	OS.objc_msgSend(this.id, OS.sel_URL_1resourceDidFailLoadingWithReason_1, sender != null ? sender.id : 0, reason != null ? reason.id : 0);
-}
-
-public void URLHandle_resourceDataDidBecomeAvailable_(NSURLHandle sender, NSData newBytes) {
-	OS.objc_msgSend(this.id, OS.sel_URLHandle_1resourceDataDidBecomeAvailable_1, sender != null ? sender.id : 0, newBytes != null ? newBytes.id : 0);
-}
-
-public void URLHandle_resourceDidFailLoadingWithReason_(NSURLHandle sender, NSString reason) {
-	OS.objc_msgSend(this.id, OS.sel_URLHandle_1resourceDidFailLoadingWithReason_1, sender != null ? sender.id : 0, reason != null ? reason.id : 0);
-}
-
-public void URLHandleResourceDidBeginLoading(NSURLHandle sender) {
-	OS.objc_msgSend(this.id, OS.sel_URLHandleResourceDidBeginLoading_1, sender != null ? sender.id : 0);
-}
-
-public void URLHandleResourceDidCancelLoading(NSURLHandle sender) {
-	OS.objc_msgSend(this.id, OS.sel_URLHandleResourceDidCancelLoading_1, sender != null ? sender.id : 0);
-}
-
-public void URLHandleResourceDidFinishLoading(NSURLHandle sender) {
-	OS.objc_msgSend(this.id, OS.sel_URLHandleResourceDidFinishLoading_1, sender != null ? sender.id : 0);
-}
-
-public void URLProtocol_cachedResponseIsValid_(NSURLProtocol protocol, NSCachedURLResponse cachedResponse) {
-	OS.objc_msgSend(this.id, OS.sel_URLProtocol_1cachedResponseIsValid_1, protocol != null ? protocol.id : 0, cachedResponse != null ? cachedResponse.id : 0);
-}
-
-public void URLProtocol_didCancelAuthenticationChallenge_(NSURLProtocol protocol, NSURLAuthenticationChallenge challenge) {
-	OS.objc_msgSend(this.id, OS.sel_URLProtocol_1didCancelAuthenticationChallenge_1, protocol != null ? protocol.id : 0, challenge != null ? challenge.id : 0);
-}
-
-public void URLProtocol_didFailWithError_(NSURLProtocol protocol, NSError error) {
-	OS.objc_msgSend(this.id, OS.sel_URLProtocol_1didFailWithError_1, protocol != null ? protocol.id : 0, error != null ? error.id : 0);
-}
-
-public void URLProtocol_didLoadData_(NSURLProtocol protocol, NSData data) {
-	OS.objc_msgSend(this.id, OS.sel_URLProtocol_1didLoadData_1, protocol != null ? protocol.id : 0, data != null ? data.id : 0);
-}
-
-public void URLProtocol_didReceiveAuthenticationChallenge_(NSURLProtocol protocol, NSURLAuthenticationChallenge challenge) {
-	OS.objc_msgSend(this.id, OS.sel_URLProtocol_1didReceiveAuthenticationChallenge_1, protocol != null ? protocol.id : 0, challenge != null ? challenge.id : 0);
-}
-
-public void URLProtocol_didReceiveResponse_cacheStoragePolicy_(NSURLProtocol protocol, NSURLResponse response, int policy) {
-	OS.objc_msgSend(this.id, OS.sel_URLProtocol_1didReceiveResponse_1cacheStoragePolicy_1, protocol != null ? protocol.id : 0, response != null ? response.id : 0, policy);
-}
-
-public void URLProtocol_wasRedirectedToRequest_redirectResponse_(NSURLProtocol protocol, NSURLRequest request, NSURLResponse redirectResponse) {
-	OS.objc_msgSend(this.id, OS.sel_URLProtocol_1wasRedirectedToRequest_1redirectResponse_1, protocol != null ? protocol.id : 0, request != null ? request.id : 0, redirectResponse != null ? redirectResponse.id : 0);
-}
-
-public void URLProtocolDidFinishLoading(NSURLProtocol protocol) {
-	OS.objc_msgSend(this.id, OS.sel_URLProtocolDidFinishLoading_1, protocol != null ? protocol.id : 0);
-}
-
-public void URLResourceDidCancelLoading(NSURL sender) {
-	OS.objc_msgSend(this.id, OS.sel_URLResourceDidCancelLoading_1, sender != null ? sender.id : 0);
-}
-
-public void URLResourceDidFinishLoading(NSURL sender) {
-	OS.objc_msgSend(this.id, OS.sel_URLResourceDidFinishLoading_1, sender != null ? sender.id : 0);
-}
-
-public static boolean accessInstanceVariablesDirectly() {
-	return OS.objc_msgSend(OS.class_NSObject, OS.sel_accessInstanceVariablesDirectly) != 0;
-}
-
-public void addObserver(NSObject observer, NSString keyPath, int options, int context) {
-	OS.objc_msgSend(this.id, OS.sel_addObserver_1forKeyPath_1options_1context_1, observer != null ? observer.id : 0, keyPath != null ? keyPath.id : 0, options, context);
+public NSObject(id id) {
+	super(id);
 }
 
 public NSObject alloc() {
-	int result = OS.objc_msgSend(get_class(), OS.sel_alloc);
-	this.id = result;
-	return result != 0 ? this : null;
-}
-
-public int get_class() {
-	String name = getClass().getName();
-	int index = name.lastIndexOf('.');
-	if (index != -1) name = name.substring(index + 1);
-	return OS.objc_getClass(name);
-}
-
-public static id allocWithZone(int zone) {
-	int result = OS.objc_msgSend(OS.class_NSObject, OS.sel_allocWithZone_1, zone);
-	return result != 0 ? new id(result) : null;
-}
-
-public void archiver_didEncodeObject_(NSKeyedArchiver archiver, id object) {
-	OS.objc_msgSend(this.id, OS.sel_archiver_1didEncodeObject_1, archiver != null ? archiver.id : 0, object != null ? object.id : 0);
-}
-
-public id archiver_willEncodeObject_(NSKeyedArchiver archiver, id object) {
-	int result = OS.objc_msgSend(this.id, OS.sel_archiver_1willEncodeObject_1, archiver != null ? archiver.id : 0, object != null ? object.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void archiver_willReplaceObject_withObject_(NSKeyedArchiver archiver, id object, id newObject) {
-	OS.objc_msgSend(this.id, OS.sel_archiver_1willReplaceObject_1withObject_1, archiver != null ? archiver.id : 0, object != null ? object.id : 0, newObject != null ? newObject.id : 0);
-}
-
-public void archiverDidFinish(NSKeyedArchiver archiver) {
-	OS.objc_msgSend(this.id, OS.sel_archiverDidFinish_1, archiver != null ? archiver.id : 0);
-}
-
-public void archiverWillFinish(NSKeyedArchiver archiver) {
-	OS.objc_msgSend(this.id, OS.sel_archiverWillFinish_1, archiver != null ? archiver.id : 0);
-}
-
-public boolean attemptRecoveryFromError_optionIndex_(NSError error, int recoveryOptionIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_attemptRecoveryFromError_1optionIndex_1, error != null ? error.id : 0, recoveryOptionIndex) != 0;
-}
-
-public void attemptRecoveryFromError_optionIndex_delegate_didRecoverSelector_contextInfo_(NSError error, int recoveryOptionIndex, id delegate, int didRecoverSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_attemptRecoveryFromError_1optionIndex_1delegate_1didRecoverSelector_1contextInfo_1, error != null ? error.id : 0, recoveryOptionIndex, delegate != null ? delegate.id : 0, didRecoverSelector, contextInfo);
-}
-
-public NSArray attributeKeys() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributeKeys);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean authenticateComponents(NSArray components, NSData signature) {
-	return OS.objc_msgSend(this.id, OS.sel_authenticateComponents_1withData_1, components != null ? components.id : 0, signature != null ? signature.id : 0) != 0;
-}
-
-public NSData authenticationDataForComponents(NSArray components) {
-	int result = OS.objc_msgSend(this.id, OS.sel_authenticationDataForComponents_1, components != null ? components.id : 0);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public static boolean automaticallyNotifiesObserversForKey(NSString key) {
-	return OS.objc_msgSend(OS.class_NSObject, OS.sel_automaticallyNotifiesObserversForKey_1, key != null ? key.id : 0) != 0;
+	this.id = OS.objc_msgSend(objc_getClass(), OS.sel_alloc);
+	return this;
 }
 
 public id autorelease() {
@@ -166,131 +34,8 @@ public id autorelease() {
 	return result != 0 ? new id(result) : null;
 }
 
-public id awakeAfterUsingCoder(NSCoder aDecoder) {
-	int result = OS.objc_msgSend(this.id, OS.sel_awakeAfterUsingCoder_1, aDecoder != null ? aDecoder.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void cancelAuthenticationChallenge(NSURLAuthenticationChallenge challenge) {
-	OS.objc_msgSend(this.id, OS.sel_cancelAuthenticationChallenge_1, challenge != null ? challenge.id : 0);
-}
-
-public boolean conformsToProtocol (int protocol) {
-	return OS.objc_msgSend (id, OS.sel_conformsToProtocol_1, protocol) != 0;
-}
-
-public static void static_cancelPreviousPerformRequestsWithTarget_(id aTarget) {
-	OS.objc_msgSend(OS.class_NSObject, OS.sel_cancelPreviousPerformRequestsWithTarget_1, aTarget != null ? aTarget.id : 0);
-}
-
-public static void static_cancelPreviousPerformRequestsWithTarget_selector_object_(id aTarget, int aSelector, id anArgument) {
-	OS.objc_msgSend(OS.class_NSObject, OS.sel_cancelPreviousPerformRequestsWithTarget_1selector_1object_1, aTarget != null ? aTarget.id : 0, aSelector, anArgument != null ? anArgument.id : 0);
-}
-
-public static int static_class() {
-	return OS.objc_msgSend(OS.class_NSObject, OS.sel_class);
-}
-
-//public int class() {
-//	return OS.objc_msgSend(this.id, OS.sel_class);
-//}
-
-public int classCode() {
-	return OS.objc_msgSend(this.id, OS.sel_classCode);
-}
-
-public NSClassDescription classDescription() {
-	int result = OS.objc_msgSend(this.id, OS.sel_classDescription);
-	return result != 0 ? new NSClassDescription(result) : null;
-}
-
-public static NSArray classFallbacksForKeyedArchiver() {
-	int result = OS.objc_msgSend(OS.class_NSObject, OS.sel_classFallbacksForKeyedArchiver);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public int classForArchiver() {
-	return OS.objc_msgSend(this.id, OS.sel_classForArchiver);
-}
-
-public int classForCoder() {
-	return OS.objc_msgSend(this.id, OS.sel_classForCoder);
-}
-
-public int classForKeyedArchiver() {
-	return OS.objc_msgSend(this.id, OS.sel_classForKeyedArchiver);
-}
-
-public static int classForKeyedUnarchiver() {
-	return OS.objc_msgSend(OS.class_NSObject, OS.sel_classForKeyedUnarchiver);
-}
-
-public int classForPortCoder() {
-	return OS.objc_msgSend(this.id, OS.sel_classForPortCoder);
-}
-
-public NSString className() {
-	int result = OS.objc_msgSend(this.id, OS.sel_className);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id coerceValue(id value, NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_coerceValue_1forKey_1, value != null ? value.id : 0, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-//public boolean conformsToProtocol_(Protocol aProtocol) {
-//	return OS.objc_msgSend(this.id, OS.sel_conformsToProtocol_1, aProtocol != null ? aProtocol.id : 0) != 0;
-//}
-//
-//public static boolean static_conformsToProtocol_(Protocol protocol) {
-//	return OS.objc_msgSend(OS.class_NSObject, OS.sel_conformsToProtocol_1, protocol != null ? protocol.id : 0) != 0;
-//}
-
-public void connection_didCancelAuthenticationChallenge_(NSURLConnection connection, NSURLAuthenticationChallenge challenge) {
-	OS.objc_msgSend(this.id, OS.sel_connection_1didCancelAuthenticationChallenge_1, connection != null ? connection.id : 0, challenge != null ? challenge.id : 0);
-}
-
-public void connection_didFailWithError_(NSURLConnection connection, NSError error) {
-	OS.objc_msgSend(this.id, OS.sel_connection_1didFailWithError_1, connection != null ? connection.id : 0, error != null ? error.id : 0);
-}
-
-public void connection_didReceiveAuthenticationChallenge_(NSURLConnection connection, NSURLAuthenticationChallenge challenge) {
-	OS.objc_msgSend(this.id, OS.sel_connection_1didReceiveAuthenticationChallenge_1, connection != null ? connection.id : 0, challenge != null ? challenge.id : 0);
-}
-
-public void connection_didReceiveData_(NSURLConnection connection, NSData data) {
-	OS.objc_msgSend(this.id, OS.sel_connection_1didReceiveData_1, connection != null ? connection.id : 0, data != null ? data.id : 0);
-}
-
-public void connection_didReceiveResponse_(NSURLConnection connection, NSURLResponse response) {
-	OS.objc_msgSend(this.id, OS.sel_connection_1didReceiveResponse_1, connection != null ? connection.id : 0, response != null ? response.id : 0);
-}
-
-public boolean connection_handleRequest_(NSConnection connection, NSDistantObjectRequest doreq) {
-	return OS.objc_msgSend(this.id, OS.sel_connection_1handleRequest_1, connection != null ? connection.id : 0, doreq != null ? doreq.id : 0) != 0;
-}
-
-public boolean connection_shouldMakeNewConnection_(NSConnection ancestor, NSConnection conn) {
-	return OS.objc_msgSend(this.id, OS.sel_connection_1shouldMakeNewConnection_1, ancestor != null ? ancestor.id : 0, conn != null ? conn.id : 0) != 0;
-}
-
-public NSCachedURLResponse connection_willCacheResponse_(NSURLConnection connection, NSCachedURLResponse cachedResponse) {
-	int result = OS.objc_msgSend(this.id, OS.sel_connection_1willCacheResponse_1, connection != null ? connection.id : 0, cachedResponse != null ? cachedResponse.id : 0);
-	return result != 0 ? new NSCachedURLResponse(result) : null;
-}
-
-public NSURLRequest connection_willSendRequest_redirectResponse_(NSURLConnection connection, NSURLRequest request, NSURLResponse response) {
-	int result = OS.objc_msgSend(this.id, OS.sel_connection_1willSendRequest_1redirectResponse_1, connection != null ? connection.id : 0, request != null ? request.id : 0, response != null ? response.id : 0);
-	return result != 0 ? new NSURLRequest(result) : null;
-}
-
-public void connectionDidFinishLoading(NSURLConnection connection) {
-	OS.objc_msgSend(this.id, OS.sel_connectionDidFinishLoading_1, connection != null ? connection.id : 0);
-}
-
-public void continueWithoutCredentialForAuthenticationChallenge(NSURLAuthenticationChallenge challenge) {
-	OS.objc_msgSend(this.id, OS.sel_continueWithoutCredentialForAuthenticationChallenge_1, challenge != null ? challenge.id : 0);
+public boolean conformsToProtocol(Protocol aProtocol) {
+	return OS.objc_msgSend(this.id, OS.sel_conformsToProtocol_, aProtocol != null ? aProtocol.id : 0) != 0;
 }
 
 public id copy() {
@@ -298,625 +43,33 @@ public id copy() {
 	return result != 0 ? new id(result) : null;
 }
 
-public id copyScriptingValue(id value, NSString key, NSDictionary properties) {
-	int result = OS.objc_msgSend(this.id, OS.sel_copyScriptingValue_1forKey_1withProperties_1, value != null ? value.id : 0, key != null ? key.id : 0, properties != null ? properties.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id copyWithZone_(int zone) {
-	int result = OS.objc_msgSend(this.id, OS.sel_copyWithZone_1, zone);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_copyWithZone_(int zone) {
-	int result = OS.objc_msgSend(OS.class_NSObject, OS.sel_copyWithZone_1, zone);
-	return result != 0 ? new id(result) : null;
-}
-
-public int countByEnumeratingWithState(int state, int stackbuf, int len) {
-	return OS.objc_msgSend(this.id, OS.sel_countByEnumeratingWithState_1objects_1count_1, state, stackbuf, len);
-}
-
-public id createConversationForConnection(NSConnection conn) {
-	int result = OS.objc_msgSend(this.id, OS.sel_createConversationForConnection_1, conn != null ? conn.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void dealloc() {
-	OS.objc_msgSend(this.id, OS.sel_dealloc);
-}
-
-public NSString description() {
-	int result = OS.objc_msgSend(this.id, OS.sel_description);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSString static_description() {
-	int result = OS.objc_msgSend(OS.class_NSObject, OS.sel_description);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSDictionary dictionaryWithValuesForKeys(NSArray keys) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dictionaryWithValuesForKeys_1, keys != null ? keys.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public void didChange(int changeKind, NSIndexSet indexes, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_didChange_1valuesAtIndexes_1forKey_1, changeKind, indexes != null ? indexes.id : 0, key != null ? key.id : 0);
-}
-
-public void didChangeValueForKey_(NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_didChangeValueForKey_1, key != null ? key.id : 0);
-}
-
-public void didChangeValueForKey_withSetMutation_usingObjects_(NSString key, int mutationKind, NSSet objects) {
-	OS.objc_msgSend(this.id, OS.sel_didChangeValueForKey_1withSetMutation_1usingObjects_1, key != null ? key.id : 0, mutationKind, objects != null ? objects.id : 0);
-}
-
-public boolean doesContain(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_doesContain_1, object != null ? object.id : 0) != 0;
-}
-
-public void doesNotRecognizeSelector(int aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_doesNotRecognizeSelector_1, aSelector);
-}
-
-public void download_decideDestinationWithSuggestedFilename_(NSURLDownload download, NSString filename) {
-	OS.objc_msgSend(this.id, OS.sel_download_1decideDestinationWithSuggestedFilename_1, download != null ? download.id : 0, filename != null ? filename.id : 0);
-}
-
-public void download_didCancelAuthenticationChallenge_(NSURLDownload download, NSURLAuthenticationChallenge challenge) {
-	OS.objc_msgSend(this.id, OS.sel_download_1didCancelAuthenticationChallenge_1, download != null ? download.id : 0, challenge != null ? challenge.id : 0);
-}
-
-public void download_didCreateDestination_(NSURLDownload download, NSString path) {
-	OS.objc_msgSend(this.id, OS.sel_download_1didCreateDestination_1, download != null ? download.id : 0, path != null ? path.id : 0);
-}
-
-public void download_didFailWithError_(NSURLDownload download, NSError error) {
-	OS.objc_msgSend(this.id, OS.sel_download_1didFailWithError_1, download != null ? download.id : 0, error != null ? error.id : 0);
-}
-
-public void download_didReceiveAuthenticationChallenge_(NSURLDownload download, NSURLAuthenticationChallenge challenge) {
-	OS.objc_msgSend(this.id, OS.sel_download_1didReceiveAuthenticationChallenge_1, download != null ? download.id : 0, challenge != null ? challenge.id : 0);
-}
-
-public void download_didReceiveDataOfLength_(NSURLDownload download, int length) {
-	OS.objc_msgSend(this.id, OS.sel_download_1didReceiveDataOfLength_1, download != null ? download.id : 0, length);
-}
-
-public void download_didReceiveResponse_(NSURLDownload download, NSURLResponse response) {
-	OS.objc_msgSend(this.id, OS.sel_download_1didReceiveResponse_1, download != null ? download.id : 0, response != null ? response.id : 0);
-}
-
-public boolean download_shouldDecodeSourceDataOfMIMEType_(NSURLDownload download, NSString encodingType) {
-	return OS.objc_msgSend(this.id, OS.sel_download_1shouldDecodeSourceDataOfMIMEType_1, download != null ? download.id : 0, encodingType != null ? encodingType.id : 0) != 0;
-}
-
-public void download_willResumeWithResponse_fromByte_(NSURLDownload download, NSURLResponse response, long startingByte) {
-	OS.objc_msgSend(this.id, OS.sel_download_1willResumeWithResponse_1fromByte_1, download != null ? download.id : 0, response != null ? response.id : 0, startingByte);
-}
-
-public NSURLRequest download_willSendRequest_redirectResponse_(NSURLDownload download, NSURLRequest request, NSURLResponse redirectResponse) {
-	int result = OS.objc_msgSend(this.id, OS.sel_download_1willSendRequest_1redirectResponse_1, download != null ? download.id : 0, request != null ? request.id : 0, redirectResponse != null ? redirectResponse.id : 0);
-	return result != 0 ? new NSURLRequest(result) : null;
-}
-
-public void downloadDidBegin(NSURLDownload download) {
-	OS.objc_msgSend(this.id, OS.sel_downloadDidBegin_1, download != null ? download.id : 0);
-}
-
-public void downloadDidFinish(NSURLDownload download) {
-	OS.objc_msgSend(this.id, OS.sel_downloadDidFinish_1, download != null ? download.id : 0);
-}
-
-public void encodeWithCoder(NSCoder aCoder) {
-	OS.objc_msgSend(this.id, OS.sel_encodeWithCoder_1, aCoder != null ? aCoder.id : 0);
-}
-
-public NSDecimalNumber exceptionDuringOperation(int operation, int error, NSDecimalNumber leftOperand, NSDecimalNumber rightOperand) {
-	int result = OS.objc_msgSend(this.id, OS.sel_exceptionDuringOperation_1error_1leftOperand_1rightOperand_1, operation, error, leftOperand != null ? leftOperand.id : 0, rightOperand != null ? rightOperand.id : 0);
-	return result != 0 ? new NSDecimalNumber(result) : null;
-}
-
-public boolean fileManager_shouldCopyItemAtPath_toPath_(NSFileManager fileManager, NSString srcPath, NSString dstPath) {
-	return OS.objc_msgSend(this.id, OS.sel_fileManager_1shouldCopyItemAtPath_1toPath_1, fileManager != null ? fileManager.id : 0, srcPath != null ? srcPath.id : 0, dstPath != null ? dstPath.id : 0) != 0;
-}
-
-public boolean fileManager_shouldLinkItemAtPath_toPath_(NSFileManager fileManager, NSString srcPath, NSString dstPath) {
-	return OS.objc_msgSend(this.id, OS.sel_fileManager_1shouldLinkItemAtPath_1toPath_1, fileManager != null ? fileManager.id : 0, srcPath != null ? srcPath.id : 0, dstPath != null ? dstPath.id : 0) != 0;
-}
-
-public boolean fileManager_shouldMoveItemAtPath_toPath_(NSFileManager fileManager, NSString srcPath, NSString dstPath) {
-	return OS.objc_msgSend(this.id, OS.sel_fileManager_1shouldMoveItemAtPath_1toPath_1, fileManager != null ? fileManager.id : 0, srcPath != null ? srcPath.id : 0, dstPath != null ? dstPath.id : 0) != 0;
-}
-
-public boolean fileManager_shouldProceedAfterError_(NSFileManager fm, NSDictionary errorInfo) {
-	return OS.objc_msgSend(this.id, OS.sel_fileManager_1shouldProceedAfterError_1, fm != null ? fm.id : 0, errorInfo != null ? errorInfo.id : 0) != 0;
-}
-
-public boolean fileManager_shouldProceedAfterError_copyingItemAtPath_toPath_(NSFileManager fileManager, NSError error, NSString srcPath, NSString dstPath) {
-	return OS.objc_msgSend(this.id, OS.sel_fileManager_1shouldProceedAfterError_1copyingItemAtPath_1toPath_1, fileManager != null ? fileManager.id : 0, error != null ? error.id : 0, srcPath != null ? srcPath.id : 0, dstPath != null ? dstPath.id : 0) != 0;
-}
-
-public boolean fileManager_shouldProceedAfterError_linkingItemAtPath_toPath_(NSFileManager fileManager, NSError error, NSString srcPath, NSString dstPath) {
-	return OS.objc_msgSend(this.id, OS.sel_fileManager_1shouldProceedAfterError_1linkingItemAtPath_1toPath_1, fileManager != null ? fileManager.id : 0, error != null ? error.id : 0, srcPath != null ? srcPath.id : 0, dstPath != null ? dstPath.id : 0) != 0;
-}
-
-public boolean fileManager_shouldProceedAfterError_movingItemAtPath_toPath_(NSFileManager fileManager, NSError error, NSString srcPath, NSString dstPath) {
-	return OS.objc_msgSend(this.id, OS.sel_fileManager_1shouldProceedAfterError_1movingItemAtPath_1toPath_1, fileManager != null ? fileManager.id : 0, error != null ? error.id : 0, srcPath != null ? srcPath.id : 0, dstPath != null ? dstPath.id : 0) != 0;
-}
-
-public boolean fileManager_shouldProceedAfterError_removingItemAtPath_(NSFileManager fileManager, NSError error, NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_fileManager_1shouldProceedAfterError_1removingItemAtPath_1, fileManager != null ? fileManager.id : 0, error != null ? error.id : 0, path != null ? path.id : 0) != 0;
-}
-
-public boolean fileManager_shouldRemoveItemAtPath_(NSFileManager fileManager, NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_fileManager_1shouldRemoveItemAtPath_1, fileManager != null ? fileManager.id : 0, path != null ? path.id : 0) != 0;
-}
-
-public void fileManager_willProcessPath_(NSFileManager fm, NSString path) {
-	OS.objc_msgSend(this.id, OS.sel_fileManager_1willProcessPath_1, fm != null ? fm.id : 0, path != null ? path.id : 0);
-}
-
-public void finalizeXX() {
-	OS.objc_msgSend(this.id, OS.sel_finalize);
-}
-
-public void forwardInvocation(NSInvocation anInvocation) {
-	OS.objc_msgSend(this.id, OS.sel_forwardInvocation_1, anInvocation != null ? anInvocation.id : 0);
-}
-
-public void handleMachMessage(int msg) {
-	OS.objc_msgSend(this.id, OS.sel_handleMachMessage_1, msg);
-}
-
-public void handlePortMessage(NSPortMessage message) {
-	OS.objc_msgSend(this.id, OS.sel_handlePortMessage_1, message != null ? message.id : 0);
-}
-
-public id handleQueryWithUnboundKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_handleQueryWithUnboundKey_1, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void handleTakeValue(id value, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_handleTakeValue_1forUnboundKey_1, value != null ? value.id : 0, key != null ? key.id : 0);
-}
-
-public int hash() {
-	return OS.objc_msgSend(this.id, OS.sel_hash);
-}
-
-public NSArray indicesOfObjectsByEvaluatingObjectSpecifier(NSScriptObjectSpecifier specifier) {
-	int result = OS.objc_msgSend(this.id, OS.sel_indicesOfObjectsByEvaluatingObjectSpecifier_1, specifier != null ? specifier.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
 public NSObject init() {
 	int result = OS.objc_msgSend(this.id, OS.sel_init);
-	return result != 0 ? this : null;
-}
-
-public NSObject initWithCoder(NSCoder aDecoder) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCoder_1, aDecoder != null ? aDecoder.id : 0);
-	return result != 0 ? this : null;
-}
-
-public static void initialize() {
-	OS.objc_msgSend(OS.class_NSObject, OS.sel_initialize);
-}
-
-public void insertValue_atIndex_inPropertyWithKey_(id value, int index, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_insertValue_1atIndex_1inPropertyWithKey_1, value != null ? value.id : 0, index, key != null ? key.id : 0);
-}
-
-public void insertValue_inPropertyWithKey_(id value, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_insertValue_1inPropertyWithKey_1, value != null ? value.id : 0, key != null ? key.id : 0);
-}
-
-public static int instanceMethodForSelector(int aSelector) {
-	return OS.objc_msgSend(OS.class_NSObject, OS.sel_instanceMethodForSelector_1, aSelector);
-}
-
-public static NSMethodSignature instanceMethodSignatureForSelector(int aSelector) {
-	int result = OS.objc_msgSend(OS.class_NSObject, OS.sel_instanceMethodSignatureForSelector_1, aSelector);
-	return result != 0 ? new NSMethodSignature(result) : null;
-}
-
-public static boolean instancesRespondToSelector(int aSelector) {
-	return OS.objc_msgSend(OS.class_NSObject, OS.sel_instancesRespondToSelector_1, aSelector) != 0;
-}
-
-public NSString inverseForRelationshipKey(NSString relationshipKey) {
-	int result = OS.objc_msgSend(this.id, OS.sel_inverseForRelationshipKey_1, relationshipKey != null ? relationshipKey.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean isCaseInsensitiveLike(NSString object) {
-	return OS.objc_msgSend(this.id, OS.sel_isCaseInsensitiveLike_1, object != null ? object.id : 0) != 0;
+	return result == this.id ? this : (result != 0 ? new NSObject(result) : null);
 }
 
 public boolean isEqual(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqual_1, object != null ? object.id : 0) != 0;
+	return OS.objc_msgSend(this.id, OS.sel_isEqual_, object != null ? object.id : 0) != 0;
 }
 
 public boolean isEqualTo(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualTo_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean isGreaterThan(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_isGreaterThan_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean isGreaterThanOrEqualTo(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_isGreaterThanOrEqualTo_1, object != null ? object.id : 0) != 0;
+	return OS.objc_msgSend(this.id, OS.sel_isEqualTo_, object != null ? object.id : 0) != 0;
 }
 
 public boolean isKindOfClass(int aClass) {
-	return OS.objc_msgSend(this.id, OS.sel_isKindOfClass_1, aClass) != 0;
-}
-
-public boolean isLessThan(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_isLessThan_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean isLessThanOrEqualTo(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_isLessThanOrEqualTo_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean isLike(NSString object) {
-	return OS.objc_msgSend(this.id, OS.sel_isLike_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean isMemberOfClass(int aClass) {
-	return OS.objc_msgSend(this.id, OS.sel_isMemberOfClass_1, aClass) != 0;
-}
-
-public boolean isNotEqualTo(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_isNotEqualTo_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean isProxy() {
-	return OS.objc_msgSend(this.id, OS.sel_isProxy) != 0;
-}
-
-public static boolean isSubclassOfClass(int aClass) {
-	return OS.objc_msgSend(OS.class_NSObject, OS.sel_isSubclassOfClass_1, aClass) != 0;
-}
-
-public static NSSet keyPathsForValuesAffectingValueForKey(NSString key) {
-	int result = OS.objc_msgSend(OS.class_NSObject, OS.sel_keyPathsForValuesAffectingValueForKey_1, key != null ? key.id : 0);
-	return result != 0 ? new NSSet(result) : null;
-}
-
-public static void load() {
-	OS.objc_msgSend(OS.class_NSObject, OS.sel_load);
-}
-
-public void lock() {
-	OS.objc_msgSend(this.id, OS.sel_lock);
-}
-
-public boolean makeNewConnection(NSConnection conn, NSConnection ancestor) {
-	return OS.objc_msgSend(this.id, OS.sel_makeNewConnection_1sender_1, conn != null ? conn.id : 0, ancestor != null ? ancestor.id : 0) != 0;
-}
-
-public id metadataQuery_replacementObjectForResultObject_(NSMetadataQuery query, NSMetadataItem result) {
-	int r = OS.objc_msgSend(this.id, OS.sel_metadataQuery_1replacementObjectForResultObject_1, query != null ? query.id : 0, result != null ? result.id : 0);
-	return r != 0 ? new id(r) : null;
-}
-
-public id metadataQuery_replacementValueForAttribute_value_(NSMetadataQuery query, NSString attrName, id attrValue) {
-	int result = OS.objc_msgSend(this.id, OS.sel_metadataQuery_1replacementValueForAttribute_1value_1, query != null ? query.id : 0, attrName != null ? attrName.id : 0, attrValue != null ? attrValue.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public int methodForSelector(int aSelector) {
-	return OS.objc_msgSend(this.id, OS.sel_methodForSelector_1, aSelector);
-}
-
-public NSMethodSignature methodSignatureForSelector(int aSelector) {
-	int result = OS.objc_msgSend(this.id, OS.sel_methodSignatureForSelector_1, aSelector);
-	return result != 0 ? new NSMethodSignature(result) : null;
+	return OS.objc_msgSend(this.id, OS.sel_isKindOfClass_, aClass) != 0;
 }
 
-public NSMutableArray mutableArrayValueForKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_mutableArrayValueForKey_1, key != null ? key.id : 0);
-	return result != 0 ? new NSMutableArray(result) : null;
-}
-
-public NSMutableArray mutableArrayValueForKeyPath(NSString keyPath) {
-	int result = OS.objc_msgSend(this.id, OS.sel_mutableArrayValueForKeyPath_1, keyPath != null ? keyPath.id : 0);
-	return result != 0 ? new NSMutableArray(result) : null;
-}
-
-public id mutableCopy() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mutableCopy);
-	return result != 0 ? new id(result) : null;
-}
-
-public id mutableCopyWithZone_(int zone) {
-	int result = OS.objc_msgSend(this.id, OS.sel_mutableCopyWithZone_1, zone);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_mutableCopyWithZone_(int zone) {
-	int result = OS.objc_msgSend(OS.class_NSObject, OS.sel_mutableCopyWithZone_1, zone);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSMutableSet mutableSetValueForKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_mutableSetValueForKey_1, key != null ? key.id : 0);
-	return result != 0 ? new NSMutableSet(result) : null;
-}
-
-public NSMutableSet mutableSetValueForKeyPath(NSString keyPath) {
-	int result = OS.objc_msgSend(this.id, OS.sel_mutableSetValueForKeyPath_1, keyPath != null ? keyPath.id : 0);
-	return result != 0 ? new NSMutableSet(result) : null;
-}
-
-public void netService_didNotPublish_(NSNetService sender, NSDictionary errorDict) {
-	OS.objc_msgSend(this.id, OS.sel_netService_1didNotPublish_1, sender != null ? sender.id : 0, errorDict != null ? errorDict.id : 0);
-}
-
-public void netService_didNotResolve_(NSNetService sender, NSDictionary errorDict) {
-	OS.objc_msgSend(this.id, OS.sel_netService_1didNotResolve_1, sender != null ? sender.id : 0, errorDict != null ? errorDict.id : 0);
-}
-
-public void netService_didUpdateTXTRecordData_(NSNetService sender, NSData data) {
-	OS.objc_msgSend(this.id, OS.sel_netService_1didUpdateTXTRecordData_1, sender != null ? sender.id : 0, data != null ? data.id : 0);
-}
-
-public void netServiceBrowser_didFindDomain_moreComing_(NSNetServiceBrowser aNetServiceBrowser, NSString domainString, boolean moreComing) {
-	OS.objc_msgSend(this.id, OS.sel_netServiceBrowser_1didFindDomain_1moreComing_1, aNetServiceBrowser != null ? aNetServiceBrowser.id : 0, domainString != null ? domainString.id : 0, moreComing);
-}
-
-public void netServiceBrowser_didFindService_moreComing_(NSNetServiceBrowser aNetServiceBrowser, NSNetService aNetService, boolean moreComing) {
-	OS.objc_msgSend(this.id, OS.sel_netServiceBrowser_1didFindService_1moreComing_1, aNetServiceBrowser != null ? aNetServiceBrowser.id : 0, aNetService != null ? aNetService.id : 0, moreComing);
-}
-
-public void netServiceBrowser_didNotSearch_(NSNetServiceBrowser aNetServiceBrowser, NSDictionary errorDict) {
-	OS.objc_msgSend(this.id, OS.sel_netServiceBrowser_1didNotSearch_1, aNetServiceBrowser != null ? aNetServiceBrowser.id : 0, errorDict != null ? errorDict.id : 0);
-}
-
-public void netServiceBrowser_didRemoveDomain_moreComing_(NSNetServiceBrowser aNetServiceBrowser, NSString domainString, boolean moreComing) {
-	OS.objc_msgSend(this.id, OS.sel_netServiceBrowser_1didRemoveDomain_1moreComing_1, aNetServiceBrowser != null ? aNetServiceBrowser.id : 0, domainString != null ? domainString.id : 0, moreComing);
-}
-
-public void netServiceBrowser_didRemoveService_moreComing_(NSNetServiceBrowser aNetServiceBrowser, NSNetService aNetService, boolean moreComing) {
-	OS.objc_msgSend(this.id, OS.sel_netServiceBrowser_1didRemoveService_1moreComing_1, aNetServiceBrowser != null ? aNetServiceBrowser.id : 0, aNetService != null ? aNetService.id : 0, moreComing);
-}
-
-public void netServiceBrowserDidStopSearch(NSNetServiceBrowser aNetServiceBrowser) {
-	OS.objc_msgSend(this.id, OS.sel_netServiceBrowserDidStopSearch_1, aNetServiceBrowser != null ? aNetServiceBrowser.id : 0);
-}
-
-public void netServiceBrowserWillSearch(NSNetServiceBrowser aNetServiceBrowser) {
-	OS.objc_msgSend(this.id, OS.sel_netServiceBrowserWillSearch_1, aNetServiceBrowser != null ? aNetServiceBrowser.id : 0);
-}
-
-public void netServiceDidPublish(NSNetService sender) {
-	OS.objc_msgSend(this.id, OS.sel_netServiceDidPublish_1, sender != null ? sender.id : 0);
-}
-
-public void netServiceDidResolveAddress(NSNetService sender) {
-	OS.objc_msgSend(this.id, OS.sel_netServiceDidResolveAddress_1, sender != null ? sender.id : 0);
-}
-
-public void netServiceDidStop(NSNetService sender) {
-	OS.objc_msgSend(this.id, OS.sel_netServiceDidStop_1, sender != null ? sender.id : 0);
-}
-
-public void netServiceWillPublish(NSNetService sender) {
-	OS.objc_msgSend(this.id, OS.sel_netServiceWillPublish_1, sender != null ? sender.id : 0);
-}
-
-public void netServiceWillResolve(NSNetService sender) {
-	OS.objc_msgSend(this.id, OS.sel_netServiceWillResolve_1, sender != null ? sender.id : 0);
-}
-
-//public static id new() {
-//	int result = OS.objc_msgSend(OS.class_NSObject, OS.sel_new);
-//	return result != 0 ? new id(result) : null;
-//}
-
-public id newScriptingObjectOfClass(int objectClass, NSString key, id contentsValue, NSDictionary properties) {
-	int result = OS.objc_msgSend(this.id, OS.sel_newScriptingObjectOfClass_1forValueForKey_1withContentsValue_1properties_1, objectClass, key != null ? key.id : 0, contentsValue != null ? contentsValue.id : 0, properties != null ? properties.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSScriptObjectSpecifier objectSpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectSpecifier);
-	return result != 0 ? new NSScriptObjectSpecifier(result) : null;
-}
-
-public int observationInfo() {
-	return OS.objc_msgSend(this.id, OS.sel_observationInfo);
-}
-
-public void observeValueForKeyPath(NSString keyPath, id object, NSDictionary change, int context) {
-	OS.objc_msgSend(this.id, OS.sel_observeValueForKeyPath_1ofObject_1change_1context_1, keyPath != null ? keyPath.id : 0, object != null ? object.id : 0, change != null ? change.id : 0, context);
-}
-
-public void parser_didEndElement_namespaceURI_qualifiedName_(NSXMLParser parser, NSString elementName, NSString namespaceURI, NSString qName) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1didEndElement_1namespaceURI_1qualifiedName_1, parser != null ? parser.id : 0, elementName != null ? elementName.id : 0, namespaceURI != null ? namespaceURI.id : 0, qName != null ? qName.id : 0);
-}
-
-public void parser_didEndMappingPrefix_(NSXMLParser parser, NSString prefix) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1didEndMappingPrefix_1, parser != null ? parser.id : 0, prefix != null ? prefix.id : 0);
-}
-
-public void parser_didStartElement_namespaceURI_qualifiedName_attributes_(NSXMLParser parser, NSString elementName, NSString namespaceURI, NSString qName, NSDictionary attributeDict) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1didStartElement_1namespaceURI_1qualifiedName_1attributes_1, parser != null ? parser.id : 0, elementName != null ? elementName.id : 0, namespaceURI != null ? namespaceURI.id : 0, qName != null ? qName.id : 0, attributeDict != null ? attributeDict.id : 0);
-}
-
-public void parser_didStartMappingPrefix_toURI_(NSXMLParser parser, NSString prefix, NSString namespaceURI) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1didStartMappingPrefix_1toURI_1, parser != null ? parser.id : 0, prefix != null ? prefix.id : 0, namespaceURI != null ? namespaceURI.id : 0);
-}
-
-public void parser_foundAttributeDeclarationWithName_forElement_type_defaultValue_(NSXMLParser parser, NSString attributeName, NSString elementName, NSString type, NSString defaultValue) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1foundAttributeDeclarationWithName_1forElement_1type_1defaultValue_1, parser != null ? parser.id : 0, attributeName != null ? attributeName.id : 0, elementName != null ? elementName.id : 0, type != null ? type.id : 0, defaultValue != null ? defaultValue.id : 0);
-}
-
-public void parser_foundCDATA_(NSXMLParser parser, NSData CDATABlock) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1foundCDATA_1, parser != null ? parser.id : 0, CDATABlock != null ? CDATABlock.id : 0);
-}
-
-public void parser_foundCharacters_(NSXMLParser parser, NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1foundCharacters_1, parser != null ? parser.id : 0, string != null ? string.id : 0);
-}
-
-public void parser_foundComment_(NSXMLParser parser, NSString comment) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1foundComment_1, parser != null ? parser.id : 0, comment != null ? comment.id : 0);
-}
-
-public void parser_foundElementDeclarationWithName_model_(NSXMLParser parser, NSString elementName, NSString model) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1foundElementDeclarationWithName_1model_1, parser != null ? parser.id : 0, elementName != null ? elementName.id : 0, model != null ? model.id : 0);
-}
-
-public void parser_foundExternalEntityDeclarationWithName_publicID_systemID_(NSXMLParser parser, NSString name, NSString publicID, NSString systemID) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1foundExternalEntityDeclarationWithName_1publicID_1systemID_1, parser != null ? parser.id : 0, name != null ? name.id : 0, publicID != null ? publicID.id : 0, systemID != null ? systemID.id : 0);
-}
-
-public void parser_foundIgnorableWhitespace_(NSXMLParser parser, NSString whitespaceString) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1foundIgnorableWhitespace_1, parser != null ? parser.id : 0, whitespaceString != null ? whitespaceString.id : 0);
-}
-
-public void parser_foundInternalEntityDeclarationWithName_value_(NSXMLParser parser, NSString name, NSString value) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1foundInternalEntityDeclarationWithName_1value_1, parser != null ? parser.id : 0, name != null ? name.id : 0, value != null ? value.id : 0);
-}
-
-public void parser_foundNotationDeclarationWithName_publicID_systemID_(NSXMLParser parser, NSString name, NSString publicID, NSString systemID) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1foundNotationDeclarationWithName_1publicID_1systemID_1, parser != null ? parser.id : 0, name != null ? name.id : 0, publicID != null ? publicID.id : 0, systemID != null ? systemID.id : 0);
-}
-
-public void parser_foundProcessingInstructionWithTarget_data_(NSXMLParser parser, NSString target, NSString data) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1foundProcessingInstructionWithTarget_1data_1, parser != null ? parser.id : 0, target != null ? target.id : 0, data != null ? data.id : 0);
-}
-
-public void parser_foundUnparsedEntityDeclarationWithName_publicID_systemID_notationName_(NSXMLParser parser, NSString name, NSString publicID, NSString systemID, NSString notationName) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1foundUnparsedEntityDeclarationWithName_1publicID_1systemID_1notationName_1, parser != null ? parser.id : 0, name != null ? name.id : 0, publicID != null ? publicID.id : 0, systemID != null ? systemID.id : 0, notationName != null ? notationName.id : 0);
-}
-
-public void parser_parseErrorOccurred_(NSXMLParser parser, NSError parseError) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1parseErrorOccurred_1, parser != null ? parser.id : 0, parseError != null ? parseError.id : 0);
-}
-
-public NSData parser_resolveExternalEntityName_systemID_(NSXMLParser parser, NSString name, NSString systemID) {
-	int result = OS.objc_msgSend(this.id, OS.sel_parser_1resolveExternalEntityName_1systemID_1, parser != null ? parser.id : 0, name != null ? name.id : 0, systemID != null ? systemID.id : 0);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public void parser_validationErrorOccurred_(NSXMLParser parser, NSError validationError) {
-	OS.objc_msgSend(this.id, OS.sel_parser_1validationErrorOccurred_1, parser != null ? parser.id : 0, validationError != null ? validationError.id : 0);
-}
-
-public void parserDidEndDocument(NSXMLParser parser) {
-	OS.objc_msgSend(this.id, OS.sel_parserDidEndDocument_1, parser != null ? parser.id : 0);
-}
-
-public void parserDidStartDocument(NSXMLParser parser) {
-	OS.objc_msgSend(this.id, OS.sel_parserDidStartDocument_1, parser != null ? parser.id : 0);
-}
-
-public id performSelector_(int aSelector) {
-	int result = OS.objc_msgSend(this.id, OS.sel_performSelector_1, aSelector);
-	return result != 0 ? new id(result) : null;
-}
-
-public void performSelector_onThread_withObject_waitUntilDone_(int aSelector, NSThread thr, id arg, boolean wait) {
-	OS.objc_msgSend(this.id, OS.sel_performSelector_1onThread_1withObject_1waitUntilDone_1, aSelector, thr != null ? thr.id : 0, arg != null ? arg.id : 0, wait);
-}
-
-public void performSelector_onThread_withObject_waitUntilDone_modes_(int aSelector, NSThread thr, id arg, boolean wait, NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_performSelector_1onThread_1withObject_1waitUntilDone_1modes_1, aSelector, thr != null ? thr.id : 0, arg != null ? arg.id : 0, wait, array != null ? array.id : 0);
-}
-
-public id performSelector_withObject_(int aSelector, id object) {
-	int result = OS.objc_msgSend(this.id, OS.sel_performSelector_1withObject_1, aSelector, object != null ? object.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void performSelector_withObject_afterDelay_(int aSelector, id anArgument, double delay) {
-	OS.objc_msgSend(this.id, OS.sel_performSelector_1withObject_1afterDelay_1, aSelector, anArgument != null ? anArgument.id : 0, delay);
-}
-
-public void performSelector_withObject_afterDelay_inModes_(int aSelector, id anArgument, double delay, NSArray modes) {
-	OS.objc_msgSend(this.id, OS.sel_performSelector_1withObject_1afterDelay_1inModes_1, aSelector, anArgument != null ? anArgument.id : 0, delay, modes != null ? modes.id : 0);
-}
-
-public id performSelector_withObject_withObject_(int aSelector, id object1, id object2) {
-	int result = OS.objc_msgSend(this.id, OS.sel_performSelector_1withObject_1withObject_1, aSelector, object1 != null ? object1.id : 0, object2 != null ? object2.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void performSelectorInBackground(int aSelector, id arg) {
-	OS.objc_msgSend(this.id, OS.sel_performSelectorInBackground_1withObject_1, aSelector, arg != null ? arg.id : 0);
-}
-
-public void performSelectorOnMainThread_withObject_waitUntilDone_(int aSelector, id arg, boolean wait) {
-	OS.objc_msgSend(this.id, OS.sel_performSelectorOnMainThread_1withObject_1waitUntilDone_1, aSelector, arg != null ? arg.id : 0, wait);
-}
-
-public void performSelectorOnMainThread_withObject_waitUntilDone_modes_(int aSelector, id arg, boolean wait, NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_performSelectorOnMainThread_1withObject_1waitUntilDone_1modes_1, aSelector, arg != null ? arg.id : 0, wait, array != null ? array.id : 0);
-}
-
-public static void poseAsClass(int aClass) {
-	OS.objc_msgSend(OS.class_NSObject, OS.sel_poseAsClass_1, aClass);
+public void performSelectorOnMainThread(int aSelector, id arg, boolean wait) {
+	OS.objc_msgSend(this.id, OS.sel_performSelectorOnMainThread_withObject_waitUntilDone_, aSelector, arg != null ? arg.id : 0, wait);
 }
 
 public void release() {
 	OS.objc_msgSend(this.id, OS.sel_release);
 }
 
-public void removeObserver(NSObject observer, NSString keyPath) {
-	OS.objc_msgSend(this.id, OS.sel_removeObserver_1forKeyPath_1, observer != null ? observer.id : 0, keyPath != null ? keyPath.id : 0);
-}
-
-public void removeObserver(NSObject observer) {
-	OS.objc_msgSend(this.id, OS.sel_removeObserver_1, observer != null ? observer.id : 0);
-}
-
-public void removeValueAtIndex(int index, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_removeValueAtIndex_1fromPropertyWithKey_1, index, key != null ? key.id : 0);
-}
-
-public void replaceValueAtIndex(int index, NSString key, id value) {
-	OS.objc_msgSend(this.id, OS.sel_replaceValueAtIndex_1inPropertyWithKey_1withValue_1, index, key != null ? key.id : 0, value != null ? value.id : 0);
-}
-
-public id replacementObjectForArchiver(NSArchiver archiver) {
-	int result = OS.objc_msgSend(this.id, OS.sel_replacementObjectForArchiver_1, archiver != null ? archiver.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id replacementObjectForCoder(NSCoder aCoder) {
-	int result = OS.objc_msgSend(this.id, OS.sel_replacementObjectForCoder_1, aCoder != null ? aCoder.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id replacementObjectForKeyedArchiver(NSKeyedArchiver archiver) {
-	int result = OS.objc_msgSend(this.id, OS.sel_replacementObjectForKeyedArchiver_1, archiver != null ? archiver.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id replacementObjectForPortCoder(NSPortCoder coder) {
-	int result = OS.objc_msgSend(this.id, OS.sel_replacementObjectForPortCoder_1, coder != null ? coder.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static boolean resolveClassMethod(int sel) {
-	return OS.objc_msgSend(OS.class_NSObject, OS.sel_resolveClassMethod_1, sel) != 0;
-}
-
-public static boolean resolveInstanceMethod(int sel) {
-	return OS.objc_msgSend(OS.class_NSObject, OS.sel_resolveInstanceMethod_1, sel) != 0;
-}
-
 public boolean respondsToSelector(int aSelector) {
-	return OS.objc_msgSend(this.id, OS.sel_respondsToSelector_1, aSelector) != 0;
+	return OS.objc_msgSend(this.id, OS.sel_respondsToSelector_, aSelector) != 0;
 }
 
 public id retain() {
@@ -928,268 +81,16 @@ public int retainCount() {
 	return OS.objc_msgSend(this.id, OS.sel_retainCount);
 }
 
-public int roundingMode() {
-	return OS.objc_msgSend(this.id, OS.sel_roundingMode);
-}
-
-public short scale() {
-	return (short)OS.objc_msgSend(this.id, OS.sel_scale);
-}
-
-public boolean scriptingBeginsWith(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_scriptingBeginsWith_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean scriptingContains(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_scriptingContains_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean scriptingEndsWith(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_scriptingEndsWith_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean scriptingIsEqualTo(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_scriptingIsEqualTo_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean scriptingIsGreaterThan(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_scriptingIsGreaterThan_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean scriptingIsGreaterThanOrEqualTo(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_scriptingIsGreaterThanOrEqualTo_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean scriptingIsLessThan(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_scriptingIsLessThan_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean scriptingIsLessThanOrEqualTo(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_scriptingIsLessThanOrEqualTo_1, object != null ? object.id : 0) != 0;
-}
-
-public NSDictionary scriptingProperties() {
-	int result = OS.objc_msgSend(this.id, OS.sel_scriptingProperties);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public id scriptingValueForSpecifier(NSScriptObjectSpecifier objectSpecifier) {
-	int result = OS.objc_msgSend(this.id, OS.sel_scriptingValueForSpecifier_1, objectSpecifier != null ? objectSpecifier.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id self() {
-	int result = OS.objc_msgSend(this.id, OS.sel_self);
-	return result != 0 ? new id(result) : null;
-}
-
-public static void setKeys(NSArray keys, NSString dependentKey) {
-	OS.objc_msgSend(OS.class_NSObject, OS.sel_setKeys_1triggerChangeNotificationsForDependentKey_1, keys != null ? keys.id : 0, dependentKey != null ? dependentKey.id : 0);
-}
-
-public void setNilValueForKey(NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_setNilValueForKey_1, key != null ? key.id : 0);
-}
-
-public void setObservationInfo(int observationInfo) {
-	OS.objc_msgSend(this.id, OS.sel_setObservationInfo_1, observationInfo);
-}
-
-public void setScriptingProperties(NSDictionary properties) {
-	OS.objc_msgSend(this.id, OS.sel_setScriptingProperties_1, properties != null ? properties.id : 0);
-}
-
-public void setValue_forKey_(id value, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_setValue_1forKey_1, value != null ? value.id : 0, key != null ? key.id : 0);
-}
-
-public void setValue_forKeyPath_(id value, NSString keyPath) {
-	OS.objc_msgSend(this.id, OS.sel_setValue_1forKeyPath_1, value != null ? value.id : 0, keyPath != null ? keyPath.id : 0);
-}
-
-public void setValue_forUndefinedKey_(id value, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_setValue_1forUndefinedKey_1, value != null ? value.id : 0, key != null ? key.id : 0);
-}
-
-public void setValuesForKeysWithDictionary(NSDictionary keyedValues) {
-	OS.objc_msgSend(this.id, OS.sel_setValuesForKeysWithDictionary_1, keyedValues != null ? keyedValues.id : 0);
-}
-
-public static void setVersion(int aVersion) {
-	OS.objc_msgSend(OS.class_NSObject, OS.sel_setVersion_1, aVersion);
-}
-
-public NSRange spellServer_checkGrammarInString_language_details_(NSSpellServer sender, NSString stringToCheck, NSString language, int details) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_spellServer_1checkGrammarInString_1language_1details_1, sender != null ? sender.id : 0, stringToCheck != null ? stringToCheck.id : 0, language != null ? language.id : 0, details);
-	return result;
-}
-
-public void spellServer_didForgetWord_inLanguage_(NSSpellServer sender, NSString word, NSString language) {
-	OS.objc_msgSend(this.id, OS.sel_spellServer_1didForgetWord_1inLanguage_1, sender != null ? sender.id : 0, word != null ? word.id : 0, language != null ? language.id : 0);
-}
-
-public void spellServer_didLearnWord_inLanguage_(NSSpellServer sender, NSString word, NSString language) {
-	OS.objc_msgSend(this.id, OS.sel_spellServer_1didLearnWord_1inLanguage_1, sender != null ? sender.id : 0, word != null ? word.id : 0, language != null ? language.id : 0);
-}
-
-public NSRange spellServer_findMisspelledWordInString_language_wordCount_countOnly_(NSSpellServer sender, NSString stringToCheck, NSString language, int wordCount, boolean countOnly) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_spellServer_1findMisspelledWordInString_1language_1wordCount_1countOnly_1, sender != null ? sender.id : 0, stringToCheck != null ? stringToCheck.id : 0, language != null ? language.id : 0, wordCount, countOnly);
-	return result;
-}
-
-public NSArray spellServer_suggestCompletionsForPartialWordRange_inString_language_(NSSpellServer sender, NSRange range, NSString string, NSString language) {
-	int result = OS.objc_msgSend(this.id, OS.sel_spellServer_1suggestCompletionsForPartialWordRange_1inString_1language_1, sender != null ? sender.id : 0, range, string != null ? string.id : 0, language != null ? language.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray spellServer_suggestGuessesForWord_inLanguage_(NSSpellServer sender, NSString word, NSString language) {
-	int result = OS.objc_msgSend(this.id, OS.sel_spellServer_1suggestGuessesForWord_1inLanguage_1, sender != null ? sender.id : 0, word != null ? word.id : 0, language != null ? language.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id storedValueForKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_storedValueForKey_1, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void stream(NSStream aStream, int eventCode) {
-	OS.objc_msgSend(this.id, OS.sel_stream_1handleEvent_1, aStream != null ? aStream.id : 0, eventCode);
-}
-
-public static int static_superclass() {
-	return OS.objc_msgSend(OS.class_NSObject, OS.sel_superclass);
-}
-
 public int superclass() {
 	return OS.objc_msgSend(this.id, OS.sel_superclass);
 }
 
-public void takeStoredValue(id value, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_takeStoredValue_1forKey_1, value != null ? value.id : 0, key != null ? key.id : 0);
-}
-
-public void takeValue_forKey_(id value, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_takeValue_1forKey_1, value != null ? value.id : 0, key != null ? key.id : 0);
-}
-
-public void takeValue_forKeyPath_(id value, NSString keyPath) {
-	OS.objc_msgSend(this.id, OS.sel_takeValue_1forKeyPath_1, value != null ? value.id : 0, keyPath != null ? keyPath.id : 0);
-}
-
-public void takeValuesFromDictionary(NSDictionary properties) {
-	OS.objc_msgSend(this.id, OS.sel_takeValuesFromDictionary_1, properties != null ? properties.id : 0);
-}
-
-public NSArray toManyRelationshipKeys() {
-	int result = OS.objc_msgSend(this.id, OS.sel_toManyRelationshipKeys);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray toOneRelationshipKeys() {
-	int result = OS.objc_msgSend(this.id, OS.sel_toOneRelationshipKeys);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void unableToSetNilForKey(NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_unableToSetNilForKey_1, key != null ? key.id : 0);
-}
-
-public int unarchiver_cannotDecodeObjectOfClassName_originalClasses_(NSKeyedUnarchiver unarchiver, NSString name, NSArray classNames) {
-	return OS.objc_msgSend(this.id, OS.sel_unarchiver_1cannotDecodeObjectOfClassName_1originalClasses_1, unarchiver != null ? unarchiver.id : 0, name != null ? name.id : 0, classNames != null ? classNames.id : 0);
-}
-
-public id unarchiver_didDecodeObject_(NSKeyedUnarchiver unarchiver, id object) {
-	int result = OS.objc_msgSend(this.id, OS.sel_unarchiver_1didDecodeObject_1, unarchiver != null ? unarchiver.id : 0, object != null ? object.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void unarchiver_willReplaceObject_withObject_(NSKeyedUnarchiver unarchiver, id object, id newObject) {
-	OS.objc_msgSend(this.id, OS.sel_unarchiver_1willReplaceObject_1withObject_1, unarchiver != null ? unarchiver.id : 0, object != null ? object.id : 0, newObject != null ? newObject.id : 0);
-}
-
-public void unarchiverDidFinish(NSKeyedUnarchiver unarchiver) {
-	OS.objc_msgSend(this.id, OS.sel_unarchiverDidFinish_1, unarchiver != null ? unarchiver.id : 0);
-}
-
-public void unarchiverWillFinish(NSKeyedUnarchiver unarchiver) {
-	OS.objc_msgSend(this.id, OS.sel_unarchiverWillFinish_1, unarchiver != null ? unarchiver.id : 0);
-}
-
-public void unlock() {
-	OS.objc_msgSend(this.id, OS.sel_unlock);
-}
-
-public void useCredential(NSURLCredential credential, NSURLAuthenticationChallenge challenge) {
-	OS.objc_msgSend(this.id, OS.sel_useCredential_1forAuthenticationChallenge_1, credential != null ? credential.id : 0, challenge != null ? challenge.id : 0);
-}
-
-public static boolean useStoredAccessor() {
-	return OS.objc_msgSend(OS.class_NSObject, OS.sel_useStoredAccessor) != 0;
-}
-
-public boolean validateValue_forKey_error_(int ioValue, NSString inKey, int outError) {
-	return OS.objc_msgSend(this.id, OS.sel_validateValue_1forKey_1error_1, ioValue, inKey != null ? inKey.id : 0, outError) != 0;
-}
-
-public boolean validateValue_forKeyPath_error_(int ioValue, NSString inKeyPath, int outError) {
-	return OS.objc_msgSend(this.id, OS.sel_validateValue_1forKeyPath_1error_1, ioValue, inKeyPath != null ? inKeyPath.id : 0, outError) != 0;
-}
-
-public id valueAtIndex(int index, NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueAtIndex_1inPropertyWithKey_1, index, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id valueForKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueForKey_1, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id valueForKeyPath(NSString keyPath) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueForKeyPath_1, keyPath != null ? keyPath.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id valueForUndefinedKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueForUndefinedKey_1, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id valueWithName(NSString name, NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueWithName_1inPropertyWithKey_1, name != null ? name.id : 0, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id valueWithUniqueID(id uniqueID, NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueWithUniqueID_1inPropertyWithKey_1, uniqueID != null ? uniqueID.id : 0, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSDictionary valuesForKeys(NSArray keys) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valuesForKeys_1, keys != null ? keys.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public static int version() {
-	return OS.objc_msgSend(OS.class_NSObject, OS.sel_version);
-}
-
-public void willChange(int changeKind, NSIndexSet indexes, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_willChange_1valuesAtIndexes_1forKey_1, changeKind, indexes != null ? indexes.id : 0, key != null ? key.id : 0);
-}
-
-public void willChangeValueForKey_(NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_willChangeValueForKey_1, key != null ? key.id : 0);
-}
-
-public void willChangeValueForKey_withSetMutation_usingObjects_(NSString key, int mutationKind, NSSet objects) {
-	OS.objc_msgSend(this.id, OS.sel_willChangeValueForKey_1withSetMutation_1usingObjects_1, key != null ? key.id : 0, mutationKind, objects != null ? objects.id : 0);
+public void addEventListener(NSString type, id  listener, boolean useCapture) {
+	OS.objc_msgSend(this.id, OS.sel_addEventListener_listener_useCapture_, type != null ? type.id : 0, listener != null ? listener.id : 0, useCapture);
 }
 
-public int zone() {
-	return OS.objc_msgSend(this.id, OS.sel_zone);
+public void handleEvent(DOMEvent evt) {
+	OS.objc_msgSend(this.id, OS.sel_handleEvent_, evt != null ? evt.id : 0);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObjectController.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObjectController.java
deleted file mode 100644
index da8e2f3c6d..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObjectController.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSObjectController extends NSController {
-
-public NSObjectController() {
-	super();
-}
-
-public NSObjectController(int id) {
-	super(id);
-}
-
-public void add(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_add_1, sender != null ? sender.id : 0);
-}
-
-public void addObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_addObject_1, object != null ? object.id : 0);
-}
-
-public boolean automaticallyPreparesContent() {
-	return OS.objc_msgSend(this.id, OS.sel_automaticallyPreparesContent) != 0;
-}
-
-public boolean canAdd() {
-	return OS.objc_msgSend(this.id, OS.sel_canAdd) != 0;
-}
-
-public boolean canRemove() {
-	return OS.objc_msgSend(this.id, OS.sel_canRemove) != 0;
-}
-
-public id content() {
-	int result = OS.objc_msgSend(this.id, OS.sel_content);
-	return result != 0 ? new id(result) : null;
-}
-
-//public NSFetchRequest defaultFetchRequest() {
-//	int result = OS.objc_msgSend(this.id, OS.sel_defaultFetchRequest);
-//	return result != 0 ? new NSFetchRequest(result) : null;
-//}
-
-public NSString entityName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_entityName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void fetch(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_fetch_1, sender != null ? sender.id : 0);
-}
-
-public NSPredicate fetchPredicate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fetchPredicate);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-//
-//public boolean fetchWithRequest(NSFetchRequest fetchRequest, boolean merge, int error) {
-//	return OS.objc_msgSend(this.id, OS.sel_fetchWithRequest_1merge_1error_1, fetchRequest != null ? fetchRequest.id : 0, merge, error) != 0;
-//}
-
-public NSObjectController initWithContent(id content) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContent_1, content != null ? content.id : 0);
-	return result != 0 ? this : null;
-}
-
-public boolean isEditable() {
-	return OS.objc_msgSend(this.id, OS.sel_isEditable) != 0;
-}
-
-//public NSManagedObjectContext managedObjectContext() {
-//	int result = OS.objc_msgSend(this.id, OS.sel_managedObjectContext);
-//	return result != 0 ? new NSManagedObjectContext(result) : null;
-//}
-
-public id newObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_newObject);
-	return result != 0 ? new id(result) : null;
-}
-
-public int objectClass() {
-	return OS.objc_msgSend(this.id, OS.sel_objectClass);
-}
-
-public void prepareContent() {
-	OS.objc_msgSend(this.id, OS.sel_prepareContent);
-}
-
-public void remove(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_remove_1, sender != null ? sender.id : 0);
-}
-
-public void removeObject(id object) {
-	OS.objc_msgSend(this.id, OS.sel_removeObject_1, object != null ? object.id : 0);
-}
-
-public NSArray selectedObjects() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedObjects);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id selection() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selection);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setAutomaticallyPreparesContent(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutomaticallyPreparesContent_1, flag);
-}
-
-public void setContent(id content) {
-	OS.objc_msgSend(this.id, OS.sel_setContent_1, content != null ? content.id : 0);
-}
-
-public void setEditable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEditable_1, flag);
-}
-
-public void setEntityName(NSString entityName) {
-	OS.objc_msgSend(this.id, OS.sel_setEntityName_1, entityName != null ? entityName.id : 0);
-}
-
-public void setFetchPredicate(NSPredicate predicate) {
-	OS.objc_msgSend(this.id, OS.sel_setFetchPredicate_1, predicate != null ? predicate.id : 0);
-}
-
-//public void setManagedObjectContext(NSManagedObjectContext managedObjectContext) {
-//	OS.objc_msgSend(this.id, OS.sel_setManagedObjectContext_1, managedObjectContext != null ? managedObjectContext.id : 0);
-//}
-
-public void setObjectClass(int objectClass) {
-	OS.objc_msgSend(this.id, OS.sel_setObjectClass_1, objectClass);
-}
-
-public void setUsesLazyFetching(boolean enabled) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesLazyFetching_1, enabled);
-}
-
-public boolean usesLazyFetching() {
-	return OS.objc_msgSend(this.id, OS.sel_usesLazyFetching) != 0;
-}
-
-public boolean validateUserInterfaceItem(id  item) {
-	return OS.objc_msgSend(this.id, OS.sel_validateUserInterfaceItem_1, item != null ? item.id : 0) != 0;
-}
-
-}
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 bf233674bb..3d7644031c 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,104 +16,29 @@ public NSOpenGLContext() {
 	super();
 }
 
-public NSOpenGLContext(int id) {
+public NSOpenGLContext(int /*long*/ id) {
 	super(id);
 }
 
-public int CGLContextObj() {
-	return OS.objc_msgSend(this.id, OS.sel_CGLContextObj);
+public NSOpenGLContext(id id) {
+	super(id);
 }
 
 public static void clearCurrentContext() {
 	OS.objc_msgSend(OS.class_NSOpenGLContext, OS.sel_clearCurrentContext);
 }
 
-public void clearDrawable() {
-	OS.objc_msgSend(this.id, OS.sel_clearDrawable);
-}
-
-public void copyAttributesFromContext(NSOpenGLContext context, int mask) {
-	OS.objc_msgSend(this.id, OS.sel_copyAttributesFromContext_1withMask_1, context != null ? context.id : 0, mask);
-}
-
-public void createTexture(int target, NSView view, int format) {
-	OS.objc_msgSend(this.id, OS.sel_createTexture_1fromView_1internalFormat_1, target, view != null ? view.id : 0, format);
-}
-
 public static NSOpenGLContext currentContext() {
 	int result = OS.objc_msgSend(OS.class_NSOpenGLContext, OS.sel_currentContext);
 	return result != 0 ? new NSOpenGLContext(result) : null;
 }
 
-public int currentVirtualScreen() {
-	return OS.objc_msgSend(this.id, OS.sel_currentVirtualScreen);
-}
-
 public void flushBuffer() {
 	OS.objc_msgSend(this.id, OS.sel_flushBuffer);
 }
 
-public void getValues(int vals, int param) {
-	OS.objc_msgSend(this.id, OS.sel_getValues_1forParameter_1, vals, param);
-}
-
-public NSOpenGLContext initWithFormat(NSOpenGLPixelFormat format, NSOpenGLContext share) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFormat_1shareContext_1, format != null ? format.id : 0, share != null ? share.id : 0);
-	return result != 0 ? this : null;
-}
-
 public void makeCurrentContext() {
 	OS.objc_msgSend(this.id, OS.sel_makeCurrentContext);
 }
 
-public NSOpenGLPixelBuffer pixelBuffer() {
-	int result = OS.objc_msgSend(this.id, OS.sel_pixelBuffer);
-	return result != 0 ? new NSOpenGLPixelBuffer(result) : null;
-}
-
-public int pixelBufferCubeMapFace() {
-	return OS.objc_msgSend(this.id, OS.sel_pixelBufferCubeMapFace);
-}
-
-public int pixelBufferMipMapLevel() {
-	return OS.objc_msgSend(this.id, OS.sel_pixelBufferMipMapLevel);
-}
-
-public void setCurrentVirtualScreen(int screen) {
-	OS.objc_msgSend(this.id, OS.sel_setCurrentVirtualScreen_1, screen);
-}
-
-public void setFullScreen() {
-	OS.objc_msgSend(this.id, OS.sel_setFullScreen);
-}
-
-public void setOffScreen(int baseaddr, int width, int height, int rowbytes) {
-	OS.objc_msgSend(this.id, OS.sel_setOffScreen_1width_1height_1rowbytes_1, baseaddr, width, height, rowbytes);
-}
-
-public void setPixelBuffer(NSOpenGLPixelBuffer pixelBuffer, int face, int level, int screen) {
-	OS.objc_msgSend(this.id, OS.sel_setPixelBuffer_1cubeMapFace_1mipMapLevel_1currentVirtualScreen_1, pixelBuffer != null ? pixelBuffer.id : 0, face, level, screen);
-}
-
-public void setTextureImageToPixelBuffer(NSOpenGLPixelBuffer pixelBuffer, int source) {
-	OS.objc_msgSend(this.id, OS.sel_setTextureImageToPixelBuffer_1colorBuffer_1, pixelBuffer != null ? pixelBuffer.id : 0, source);
-}
-
-public void setValues(int vals, int param) {
-	OS.objc_msgSend(this.id, OS.sel_setValues_1forParameter_1, vals, param);
-}
-
-public void setView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setView_1, view != null ? view.id : 0);
-}
-
-public void update() {
-	OS.objc_msgSend(this.id, OS.sel_update);
-}
-
-public NSView view() {
-	int result = OS.objc_msgSend(this.id, OS.sel_view);
-	return result != 0 ? new NSView(result) : null;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelBuffer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelBuffer.java
deleted file mode 100644
index a77d16ed20..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelBuffer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSOpenGLPixelBuffer extends NSObject {
-
-public NSOpenGLPixelBuffer() {
-	super();
-}
-
-public NSOpenGLPixelBuffer(int id) {
-	super(id);
-}
-
-public NSOpenGLPixelBuffer initWithTextureTarget(int target, int format, int maxLevel, int pixelsWide, int pixelsHigh) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithTextureTarget_1textureInternalFormat_1textureMaxMipMapLevel_1pixelsWide_1pixelsHigh_1, target, format, maxLevel, pixelsWide, pixelsHigh);
-	return result != 0 ? this : null;
-}
-
-public int pixelsHigh() {
-	return OS.objc_msgSend(this.id, OS.sel_pixelsHigh);
-}
-
-public int pixelsWide() {
-	return OS.objc_msgSend(this.id, OS.sel_pixelsWide);
-}
-
-public int textureInternalFormat() {
-	return OS.objc_msgSend(this.id, OS.sel_textureInternalFormat);
-}
-
-public int textureMaxMipMapLevel() {
-	return OS.objc_msgSend(this.id, OS.sel_textureMaxMipMapLevel);
-}
-
-public int textureTarget() {
-	return OS.objc_msgSend(this.id, OS.sel_textureTarget);
-}
-
-}
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 34921dd225..f86cde1e78 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,39 +16,17 @@ public NSOpenGLPixelFormat() {
 	super();
 }
 
-public NSOpenGLPixelFormat(int id) {
+public NSOpenGLPixelFormat(int /*long*/ id) {
 	super(id);
 }
 
-public int CGLPixelFormatObj() {
-	return OS.objc_msgSend(this.id, OS.sel_CGLPixelFormatObj);
-}
-
-public NSData attributes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributes);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public void getValues(int vals, int attrib, int screen) {
-	OS.objc_msgSend(this.id, OS.sel_getValues_1forAttribute_1forVirtualScreen_1, vals, attrib, screen);
-}
-
-public NSOpenGLPixelFormat initWithAttributes(int[] attribs) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithAttributes_1, attribs);
-	return result != 0 ? this : null;
-}
-
-public NSOpenGLPixelFormat initWithData(NSData attribs) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_1, attribs != null ? attribs.id : 0);
-	return result != 0 ? this : null;
-}
-
-public int numberOfVirtualScreens() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfVirtualScreens);
+public NSOpenGLPixelFormat(id id) {
+	super(id);
 }
 
-public void setAttributes(NSData attribs) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributes_1, attribs != null ? attribs.id : 0);
+public id initWithAttributes(int[] attribs) {
+	int 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 3e79b4379f..bf99815972 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,22 +16,21 @@ public NSOpenGLView() {
 	super();
 }
 
-public NSOpenGLView(int id) {
+public NSOpenGLView(int /*long*/ id) {
 	super(id);
 }
 
-public void clearGLContext() {
-	OS.objc_msgSend(this.id, OS.sel_clearGLContext);
+public NSOpenGLView(id id) {
+	super(id);
 }
 
-public static NSOpenGLPixelFormat defaultPixelFormat() {
-	int result = OS.objc_msgSend(OS.class_NSOpenGLView, OS.sel_defaultPixelFormat);
-	return result != 0 ? new NSOpenGLPixelFormat(result) : null;
+public void clearGLContext() {
+	OS.objc_msgSend(this.id, OS.sel_clearGLContext);
 }
 
-public NSOpenGLView initWithFrame(NSRect frameRect, NSOpenGLPixelFormat format) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_1pixelFormat_1, frameRect, format != null ? format.id : 0);
-	return result != 0 ? this : null;
+public id initWithFrame(NSRect frameRect, NSOpenGLPixelFormat format) {
+	int 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() {
@@ -39,29 +38,8 @@ public NSOpenGLContext openGLContext() {
 	return result != 0 ? new NSOpenGLContext(result) : null;
 }
 
-public NSOpenGLPixelFormat pixelFormat() {
-	int result = OS.objc_msgSend(this.id, OS.sel_pixelFormat);
-	return result != 0 ? new NSOpenGLPixelFormat(result) : null;
-}
-
-public void prepareOpenGL() {
-	OS.objc_msgSend(this.id, OS.sel_prepareOpenGL);
-}
-
-public void reshape() {
-	OS.objc_msgSend(this.id, OS.sel_reshape);
-}
-
-public void setOpenGLContext(NSOpenGLContext context) {
-	OS.objc_msgSend(this.id, OS.sel_setOpenGLContext_1, context != null ? context.id : 0);
-}
-
 public void setPixelFormat(NSOpenGLPixelFormat pixelFormat) {
-	OS.objc_msgSend(this.id, OS.sel_setPixelFormat_1, pixelFormat != null ? pixelFormat.id : 0);
-}
-
-public void update() {
-	OS.objc_msgSend(this.id, OS.sel_update);
+	OS.objc_msgSend(this.id, OS.sel_setPixelFormat_, pixelFormat != null ? pixelFormat.id : 0);
 }
 
 }
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 2dfcc231b4..b32a56feb9 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,33 +16,12 @@ public NSOpenPanel() {
 	super();
 }
 
-public NSOpenPanel(int id) {
+public NSOpenPanel(int /*long*/ id) {
 	super(id);
 }
 
-public NSArray URLs() {
-	int result = OS.objc_msgSend(this.id, OS.sel_URLs);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean allowsMultipleSelection() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsMultipleSelection) != 0;
-}
-
-public void beginForDirectory(NSString path, NSString name, NSArray fileTypes, id delegate, int didEndSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_beginForDirectory_1file_1types_1modelessDelegate_1didEndSelector_1contextInfo_1, path != null ? path.id : 0, name != null ? name.id : 0, fileTypes != null ? fileTypes.id : 0, delegate != null ? delegate.id : 0, didEndSelector, contextInfo);
-}
-
-public void beginSheetForDirectory(NSString path, NSString name, NSArray fileTypes, NSWindow docWindow, id delegate, int didEndSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_beginSheetForDirectory_1file_1types_1modalForWindow_1modalDelegate_1didEndSelector_1contextInfo_1, path != null ? path.id : 0, name != null ? name.id : 0, fileTypes != null ? fileTypes.id : 0, docWindow != null ? docWindow.id : 0, delegate != null ? delegate.id : 0, didEndSelector, contextInfo);
-}
-
-public boolean canChooseDirectories() {
-	return OS.objc_msgSend(this.id, OS.sel_canChooseDirectories) != 0;
-}
-
-public boolean canChooseFiles() {
-	return OS.objc_msgSend(this.id, OS.sel_canChooseFiles) != 0;
+public NSOpenPanel(id id) {
+	super(id);
 }
 
 public NSArray filenames() {
@@ -55,32 +34,21 @@ public static NSOpenPanel openPanel() {
 	return result != 0 ? new NSOpenPanel(result) : null;
 }
 
-public boolean resolvesAliases() {
-	return OS.objc_msgSend(this.id, OS.sel_resolvesAliases) != 0;
-}
-
-public int runModalForDirectory(NSString path, NSString name, NSArray fileTypes) {
-	return OS.objc_msgSend(this.id, OS.sel_runModalForDirectory_1file_1types_1, path != null ? path.id : 0, name != null ? name.id : 0, fileTypes != null ? fileTypes.id : 0);
-}
-
-public int runModalForTypes(NSArray fileTypes) {
-	return OS.objc_msgSend(this.id, OS.sel_runModalForTypes_1, fileTypes != null ? fileTypes.id : 0);
-}
-
 public void setAllowsMultipleSelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsMultipleSelection_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setAllowsMultipleSelection_, flag);
 }
 
 public void setCanChooseDirectories(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCanChooseDirectories_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setCanChooseDirectories_, flag);
 }
 
 public void setCanChooseFiles(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCanChooseFiles_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setCanChooseFiles_, flag);
 }
 
-public void setResolvesAliases(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setResolvesAliases_1, flag);
+public static NSSavePanel savePanel() {
+	int 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/NSOperation.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOperation.java
deleted file mode 100644
index 1af7945146..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOperation.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSOperation extends NSObject {
-
-public NSOperation() {
-	super();
-}
-
-public NSOperation(int id) {
-	super(id);
-}
-
-public void addDependency(NSOperation op) {
-	OS.objc_msgSend(this.id, OS.sel_addDependency_1, op != null ? op.id : 0);
-}
-
-public void cancel() {
-	OS.objc_msgSend(this.id, OS.sel_cancel);
-}
-
-public NSArray dependencies() {
-	int result = OS.objc_msgSend(this.id, OS.sel_dependencies);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean isCancelled() {
-	return OS.objc_msgSend(this.id, OS.sel_isCancelled) != 0;
-}
-
-public boolean isConcurrent() {
-	return OS.objc_msgSend(this.id, OS.sel_isConcurrent) != 0;
-}
-
-public boolean isExecuting() {
-	return OS.objc_msgSend(this.id, OS.sel_isExecuting) != 0;
-}
-
-public boolean isFinished() {
-	return OS.objc_msgSend(this.id, OS.sel_isFinished) != 0;
-}
-
-public boolean isReady() {
-	return OS.objc_msgSend(this.id, OS.sel_isReady) != 0;
-}
-
-public void main() {
-	OS.objc_msgSend(this.id, OS.sel_main);
-}
-
-public int queuePriority() {
-	return OS.objc_msgSend(this.id, OS.sel_queuePriority);
-}
-
-public void removeDependency(NSOperation op) {
-	OS.objc_msgSend(this.id, OS.sel_removeDependency_1, op != null ? op.id : 0);
-}
-
-public void setQueuePriority(int p) {
-	OS.objc_msgSend(this.id, OS.sel_setQueuePriority_1, p);
-}
-
-public void start() {
-	OS.objc_msgSend(this.id, OS.sel_start);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOperationQueue.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOperationQueue.java
deleted file mode 100644
index a57eb3000b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOperationQueue.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSOperationQueue extends NSObject {
-
-public NSOperationQueue() {
-	super();
-}
-
-public NSOperationQueue(int id) {
-	super(id);
-}
-
-public void addOperation(NSOperation op) {
-	OS.objc_msgSend(this.id, OS.sel_addOperation_1, op != null ? op.id : 0);
-}
-
-public void cancelAllOperations() {
-	OS.objc_msgSend(this.id, OS.sel_cancelAllOperations);
-}
-
-public boolean isSuspended() {
-	return OS.objc_msgSend(this.id, OS.sel_isSuspended) != 0;
-}
-
-public int maxConcurrentOperationCount() {
-	return OS.objc_msgSend(this.id, OS.sel_maxConcurrentOperationCount);
-}
-
-public NSArray operations() {
-	int result = OS.objc_msgSend(this.id, OS.sel_operations);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void setMaxConcurrentOperationCount(int cnt) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxConcurrentOperationCount_1, cnt);
-}
-
-public void setSuspended(boolean b) {
-	OS.objc_msgSend(this.id, OS.sel_setSuspended_1, b);
-}
-
-public void waitUntilAllOperationsAreFinished() {
-	OS.objc_msgSend(this.id, OS.sel_waitUntilAllOperationsAreFinished);
-}
-
-}
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 6ec87cbc65..b916ebbe00 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,117 +16,61 @@ public NSOutlineView() {
 	super();
 }
 
-public NSOutlineView(int id) {
+public NSOutlineView(int /*long*/ id) {
 	super(id);
 }
 
-public boolean autoresizesOutlineColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_autoresizesOutlineColumn) != 0;
-}
-
-public boolean autosaveExpandedItems() {
-	return OS.objc_msgSend(this.id, OS.sel_autosaveExpandedItems) != 0;
-}
-
-public void collapseItem_(id item) {
-	OS.objc_msgSend(this.id, OS.sel_collapseItem_1, item != null ? item.id : 0);
-}
-
-public void collapseItem_collapseChildren_(id item, boolean collapseChildren) {
-	OS.objc_msgSend(this.id, OS.sel_collapseItem_1collapseChildren_1, item != null ? item.id : 0, collapseChildren);
-}
-
-public void expandItem_(id item) {
-	OS.objc_msgSend(this.id, OS.sel_expandItem_1, item != null ? item.id : 0);
-}
-
-public void expandItem_expandChildren_(id item, boolean expandChildren) {
-	OS.objc_msgSend(this.id, OS.sel_expandItem_1expandChildren_1, item != null ? item.id : 0, expandChildren);
+public NSOutlineView(id id) {
+	super(id);
 }
 
-public NSRect frameOfOutlineCellAtRow(int row) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_frameOfOutlineCellAtRow_1, row);
-	return result;
+public void collapseItem(id item) {
+	OS.objc_msgSend(this.id, OS.sel_collapseItem_, item != null ? item.id : 0);
 }
 
-public boolean indentationMarkerFollowsCell() {
-	return OS.objc_msgSend(this.id, OS.sel_indentationMarkerFollowsCell) != 0;
+public void expandItem(id item) {
+	OS.objc_msgSend(this.id, OS.sel_expandItem_, item != null ? item.id : 0);
 }
 
 public float indentationPerLevel() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_indentationPerLevel);
 }
 
-public boolean isExpandable(id item) {
-	return OS.objc_msgSend(this.id, OS.sel_isExpandable_1, item != null ? item.id : 0) != 0;
-}
-
-public boolean isItemExpanded(id item) {
-	return OS.objc_msgSend(this.id, OS.sel_isItemExpanded_1, item != null ? item.id : 0) != 0;
-}
-
 public id itemAtRow(int row) {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemAtRow_1, row);
+	int 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_1, item != null ? item.id : 0);
-}
-
-public int levelForRow(int row) {
-	return OS.objc_msgSend(this.id, OS.sel_levelForRow_1, row);
-}
-
-public NSTableColumn outlineTableColumn() {
-	int result = OS.objc_msgSend(this.id, OS.sel_outlineTableColumn);
-	return result != 0 ? new NSTableColumn(result) : null;
-}
-
-public id parentForItem(id item) {
-	int result = OS.objc_msgSend(this.id, OS.sel_parentForItem_1, item != null ? item.id : 0);
-	return result != 0 ? new id(result) : null;
+	return OS.objc_msgSend(this.id, OS.sel_levelForItem_, item != null ? item.id : 0);
 }
 
-public void reloadItem_(id item) {
-	OS.objc_msgSend(this.id, OS.sel_reloadItem_1, item != null ? item.id : 0);
+public void reloadItem(id item) {
+	OS.objc_msgSend(this.id, OS.sel_reloadItem_, item != null ? item.id : 0);
 }
 
-public void reloadItem_reloadChildren_(id item, boolean reloadChildren) {
-	OS.objc_msgSend(this.id, OS.sel_reloadItem_1reloadChildren_1, item != null ? item.id : 0, reloadChildren);
+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_1, item != null ? item.id : 0);
+	return OS.objc_msgSend(this.id, OS.sel_rowForItem_, item != null ? item.id : 0);
 }
 
 public void setAutoresizesOutlineColumn(boolean resize) {
-	OS.objc_msgSend(this.id, OS.sel_setAutoresizesOutlineColumn_1, resize);
+	OS.objc_msgSend(this.id, OS.sel_setAutoresizesOutlineColumn_, resize);
 }
 
 public void setAutosaveExpandedItems(boolean save) {
-	OS.objc_msgSend(this.id, OS.sel_setAutosaveExpandedItems_1, save);
-}
-
-public void setDropItem(id item, int index) {
-	OS.objc_msgSend(this.id, OS.sel_setDropItem_1dropChildIndex_1, item != null ? item.id : 0, index);
-}
-
-public void setIndentationMarkerFollowsCell(boolean drawInCell) {
-	OS.objc_msgSend(this.id, OS.sel_setIndentationMarkerFollowsCell_1, drawInCell);
+	OS.objc_msgSend(this.id, OS.sel_setAutosaveExpandedItems_, save);
 }
 
 public void setIndentationPerLevel(float indentationPerLevel) {
-	OS.objc_msgSend(this.id, OS.sel_setIndentationPerLevel_1, indentationPerLevel);
+	OS.objc_msgSend(this.id, OS.sel_setIndentationPerLevel_, indentationPerLevel);
 }
 
 public void setOutlineTableColumn(NSTableColumn outlineTableColumn) {
-	OS.objc_msgSend(this.id, OS.sel_setOutlineTableColumn_1, outlineTableColumn != null ? outlineTableColumn.id : 0);
-}
-
-public boolean shouldCollapseAutoExpandedItemsForDeposited(boolean deposited) {
-	return OS.objc_msgSend(this.id, OS.sel_shouldCollapseAutoExpandedItemsForDeposited_1, deposited) != 0;
+	OS.objc_msgSend(this.id, OS.sel_setOutlineTableColumn_, outlineTableColumn != null ? outlineTableColumn.id : 0);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutputStream.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutputStream.java
deleted file mode 100644
index dad4403b09..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutputStream.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSOutputStream extends NSStream {
-
-public NSOutputStream() {
-	super();
-}
-
-public NSOutputStream(int id) {
-	super(id);
-}
-
-public boolean hasSpaceAvailable() {
-	return OS.objc_msgSend(this.id, OS.sel_hasSpaceAvailable) != 0;
-}
-
-public NSOutputStream initToBuffer(int buffer, int capacity) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initToBuffer_1capacity_1, buffer, capacity);
-	return result != 0 ? this : null;
-}
-
-public NSOutputStream initToFileAtPath(NSString path, boolean shouldAppend) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initToFileAtPath_1append_1, path != null ? path.id : 0, shouldAppend);
-	return result != 0 ? this : null;
-}
-
-public NSOutputStream initToMemory() {
-	int result = OS.objc_msgSend(this.id, OS.sel_initToMemory);
-	return result != 0 ? this : null;
-}
-
-public static id outputStreamToBuffer(int buffer, int capacity) {
-	int result = OS.objc_msgSend(OS.class_NSOutputStream, OS.sel_outputStreamToBuffer_1capacity_1, buffer, capacity);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id outputStreamToFileAtPath(NSString path, boolean shouldAppend) {
-	int result = OS.objc_msgSend(OS.class_NSOutputStream, OS.sel_outputStreamToFileAtPath_1append_1, path != null ? path.id : 0, shouldAppend);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id outputStreamToMemory() {
-	int result = OS.objc_msgSend(OS.class_NSOutputStream, OS.sel_outputStreamToMemory);
-	return result != 0 ? new id(result) : null;
-}
-
-public int write(int buffer, int len) {
-	return OS.objc_msgSend(this.id, OS.sel_write_1maxLength_1, buffer, len);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPDFImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPDFImageRep.java
deleted file mode 100644
index 9615b0a1e0..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPDFImageRep.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPDFImageRep extends NSImageRep {
-
-public NSPDFImageRep() {
-	super();
-}
-
-public NSPDFImageRep(int id) {
-	super(id);
-}
-
-public NSData PDFRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_PDFRepresentation);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSRect bounds() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_bounds);
-	return result;
-}
-
-public int currentPage() {
-	return OS.objc_msgSend(this.id, OS.sel_currentPage);
-}
-
-public static id imageRepWithData(NSData pdfData) {
-	int result = OS.objc_msgSend(OS.class_NSPDFImageRep, OS.sel_imageRepWithData_1, pdfData != null ? pdfData.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSPDFImageRep initWithData(NSData pdfData) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_1, pdfData != null ? pdfData.id : 0);
-	return result != 0 ? this : null;
-}
-
-public int pageCount() {
-	return OS.objc_msgSend(this.id, OS.sel_pageCount);
-}
-
-public void setCurrentPage(int page) {
-	OS.objc_msgSend(this.id, OS.sel_setCurrentPage_1, page);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPICTImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPICTImageRep.java
deleted file mode 100644
index 8fad0f7a3f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPICTImageRep.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPICTImageRep extends NSImageRep {
-
-public NSPICTImageRep() {
-	super();
-}
-
-public NSPICTImageRep(int id) {
-	super(id);
-}
-
-public NSData PICTRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_PICTRepresentation);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSRect boundingBox() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_boundingBox);
-	return result;
-}
-
-public static id imageRepWithData(NSData pictData) {
-	int result = OS.objc_msgSend(OS.class_NSPICTImageRep, OS.sel_imageRepWithData_1, pictData != null ? pictData.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSPICTImageRep initWithData(NSData pictData) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_1, pictData != null ? pictData.id : 0);
-	return result != 0 ? this : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPageLayout.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPageLayout.java
deleted file mode 100644
index 2837a0c52f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPageLayout.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPageLayout extends NSObject {
-
-public NSPageLayout() {
-	super();
-}
-
-public NSPageLayout(int id) {
-	super(id);
-}
-
-public NSArray accessoryControllers() {
-	int result = OS.objc_msgSend(this.id, OS.sel_accessoryControllers);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSView accessoryView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_accessoryView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public void addAccessoryController(NSViewController accessoryController) {
-	OS.objc_msgSend(this.id, OS.sel_addAccessoryController_1, accessoryController != null ? accessoryController.id : 0);
-}
-
-public void beginSheetWithPrintInfo(NSPrintInfo printInfo, NSWindow docWindow, id delegate, int didEndSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_beginSheetWithPrintInfo_1modalForWindow_1delegate_1didEndSelector_1contextInfo_1, printInfo != null ? printInfo.id : 0, docWindow != null ? docWindow.id : 0, delegate != null ? delegate.id : 0, didEndSelector, contextInfo);
-}
-
-public static NSPageLayout pageLayout() {
-	int result = OS.objc_msgSend(OS.class_NSPageLayout, OS.sel_pageLayout);
-	return result != 0 ? new NSPageLayout(result) : null;
-}
-
-public NSPrintInfo printInfo() {
-	int result = OS.objc_msgSend(this.id, OS.sel_printInfo);
-	return result != 0 ? new NSPrintInfo(result) : null;
-}
-
-public void readPrintInfo() {
-	OS.objc_msgSend(this.id, OS.sel_readPrintInfo);
-}
-
-public void removeAccessoryController(NSViewController accessoryController) {
-	OS.objc_msgSend(this.id, OS.sel_removeAccessoryController_1, accessoryController != null ? accessoryController.id : 0);
-}
-
-public int runModal() {
-	return OS.objc_msgSend(this.id, OS.sel_runModal);
-}
-
-public int runModalWithPrintInfo(NSPrintInfo printInfo) {
-	return OS.objc_msgSend(this.id, OS.sel_runModalWithPrintInfo_1, printInfo != null ? printInfo.id : 0);
-}
-
-public void setAccessoryView(NSView accessoryView) {
-	OS.objc_msgSend(this.id, OS.sel_setAccessoryView_1, accessoryView != null ? accessoryView.id : 0);
-}
-
-public void writePrintInfo() {
-	OS.objc_msgSend(this.id, OS.sel_writePrintInfo);
-}
-
-}
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 66c92512ba..b38b63a7c3 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,28 +16,16 @@ public NSPanel() {
 	super();
 }
 
-public NSPanel(int id) {
+public NSPanel(int /*long*/ id) {
 	super(id);
 }
 
-public boolean becomesKeyOnlyIfNeeded() {
-	return OS.objc_msgSend(this.id, OS.sel_becomesKeyOnlyIfNeeded) != 0;
-}
-
-public boolean isFloatingPanel() {
-	return OS.objc_msgSend(this.id, OS.sel_isFloatingPanel) != 0;
-}
-
-public void setBecomesKeyOnlyIfNeeded(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBecomesKeyOnlyIfNeeded_1, flag);
-}
-
-public void setFloatingPanel(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setFloatingPanel_1, flag);
+public NSPanel(id id) {
+	super(id);
 }
 
 public void setWorksWhenModal(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setWorksWhenModal_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setWorksWhenModal_, flag);
 }
 
 public boolean worksWhenModal() {
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 376549ec4e..c63cea3eba 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,96 +16,16 @@ public NSParagraphStyle() {
 	super();
 }
 
-public NSParagraphStyle(int id) {
+public NSParagraphStyle(int /*long*/ id) {
 	super(id);
 }
 
-public int alignment() {
-	return OS.objc_msgSend(this.id, OS.sel_alignment);
-}
-
-public int baseWritingDirection() {
-	return OS.objc_msgSend(this.id, OS.sel_baseWritingDirection);
-}
-
-public static NSParagraphStyle defaultParagraphStyle() {
-	int result = OS.objc_msgSend(OS.class_NSParagraphStyle, OS.sel_defaultParagraphStyle);
-	return result != 0 ? new NSParagraphStyle(result) : null;
-}
-
-public float defaultTabInterval() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_defaultTabInterval);
-}
-
-public static int defaultWritingDirectionForLanguage(NSString languageName) {
-	return OS.objc_msgSend(OS.class_NSParagraphStyle, OS.sel_defaultWritingDirectionForLanguage_1, languageName != null ? languageName.id : 0);
-}
-
-public float firstLineHeadIndent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_firstLineHeadIndent);
-}
-
-public float headIndent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_headIndent);
-}
-
-public int headerLevel() {
-	return OS.objc_msgSend(this.id, OS.sel_headerLevel);
-}
-
-public float hyphenationFactor() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_hyphenationFactor);
-}
-
-public int lineBreakMode() {
-	return OS.objc_msgSend(this.id, OS.sel_lineBreakMode);
-}
-
-public float lineHeightMultiple() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_lineHeightMultiple);
-}
-
-public float lineSpacing() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_lineSpacing);
-}
-
-public float maximumLineHeight() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_maximumLineHeight);
-}
-
-public float minimumLineHeight() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_minimumLineHeight);
-}
-
-public float paragraphSpacing() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_paragraphSpacing);
-}
-
-public float paragraphSpacingBefore() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_paragraphSpacingBefore);
-}
-
-public NSArray tabStops() {
-	int result = OS.objc_msgSend(this.id, OS.sel_tabStops);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public float tailIndent() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_tailIndent);
-}
-
-public NSArray textBlocks() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textBlocks);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray textLists() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textLists);
-	return result != 0 ? new NSArray(result) : null;
+public NSParagraphStyle(id id) {
+	super(id);
 }
 
-public float tighteningFactorForTruncation() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_tighteningFactorForTruncation);
+public int alignment() {
+	return 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 3ff80c9514..2e1369b98e 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,30 +16,30 @@ public NSPasteboard() {
 	super();
 }
 
-public NSPasteboard(int id) {
+public NSPasteboard(int /*long*/ id) {
+	super(id);
+}
+
+public NSPasteboard(id id) {
 	super(id);
 }
 
 public int addTypes(NSArray newTypes, id newOwner) {
-	return OS.objc_msgSend(this.id, OS.sel_addTypes_1owner_1, newTypes != null ? newTypes.id : 0, newOwner != null ? newOwner.id : 0);
+	return 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_1, types != null ? types.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_availableTypeFromArray_, types != null ? types.id : 0);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public int changeCount() {
-	return OS.objc_msgSend(this.id, OS.sel_changeCount);
-}
-
 public NSData dataForType(NSString dataType) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataForType_1, dataType != null ? dataType.id : 0);
+	int 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_1owner_1, newTypes != null ? newTypes.id : 0, newOwner != null ? newOwner.id : 0);
+	return OS.objc_msgSend(this.id, OS.sel_declareTypes_owner_, newTypes != null ? newTypes.id : 0, newOwner != null ? newOwner.id : 0);
 }
 
 public static NSPasteboard generalPasteboard() {
@@ -47,69 +47,30 @@ public static NSPasteboard generalPasteboard() {
 	return result != 0 ? new NSPasteboard(result) : null;
 }
 
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSPasteboard pasteboardByFilteringData(NSData data, NSString type) {
-	int result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardByFilteringData_1ofType_1, data != null ? data.id : 0, type != null ? type.id : 0);
-	return result != 0 ? new NSPasteboard(result) : null;
-}
-
-public static NSPasteboard pasteboardByFilteringFile(NSString filename) {
-	int result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardByFilteringFile_1, filename != null ? filename.id : 0);
-	return result != 0 ? new NSPasteboard(result) : null;
-}
-
-public static NSPasteboard pasteboardByFilteringTypesInPasteboard(NSPasteboard pboard) {
-	int result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardByFilteringTypesInPasteboard_1, pboard != null ? pboard.id : 0);
-	return result != 0 ? new NSPasteboard(result) : null;
-}
-
 public static NSPasteboard pasteboardWithName(NSString name) {
-	int result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardWithName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSPasteboard(result) : null;
-}
-
-public static NSPasteboard pasteboardWithUniqueName() {
-	int result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardWithUniqueName);
+	int 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_1, dataType != null ? dataType.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_propertyListForType_, dataType != null ? dataType.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
-public NSString readFileContentsType(NSString type, NSString filename) {
-	int result = OS.objc_msgSend(this.id, OS.sel_readFileContentsType_1toFile_1, type != null ? type.id : 0, filename != null ? filename.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSFileWrapper readFileWrapper() {
-	int result = OS.objc_msgSend(this.id, OS.sel_readFileWrapper);
-	return result != 0 ? new NSFileWrapper(result) : null;
-}
-
-public void releaseGlobally() {
-	OS.objc_msgSend(this.id, OS.sel_releaseGlobally);
-}
-
 public boolean setData(NSData data, NSString dataType) {
-	return OS.objc_msgSend(this.id, OS.sel_setData_1forType_1, data != null ? data.id : 0, dataType != null ? dataType.id : 0) != 0;
+	return OS.objc_msgSend(this.id, OS.sel_setData_forType_, data != null ? data.id : 0, dataType != null ? dataType.id : 0) != 0;
 }
 
 public boolean setPropertyList(id plist, NSString dataType) {
-	return OS.objc_msgSend(this.id, OS.sel_setPropertyList_1forType_1, plist != null ? plist.id : 0, dataType != null ? dataType.id : 0) != 0;
+	return OS.objc_msgSend(this.id, OS.sel_setPropertyList_forType_, plist != null ? plist.id : 0, dataType != null ? dataType.id : 0) != 0;
 }
 
 public boolean setString(NSString string, NSString dataType) {
-	return OS.objc_msgSend(this.id, OS.sel_setString_1forType_1, string != null ? string.id : 0, dataType != null ? dataType.id : 0) != 0;
+	return OS.objc_msgSend(this.id, OS.sel_setString_forType_, string != null ? string.id : 0, dataType != null ? dataType.id : 0) != 0;
 }
 
 public NSString stringForType(NSString dataType) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringForType_1, dataType != null ? dataType.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_stringForType_, dataType != null ? dataType.id : 0);
 	return result != 0 ? new NSString(result) : null;
 }
 
@@ -118,17 +79,4 @@ public NSArray types() {
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public static NSArray typesFilterableTo(NSString type) {
-	int result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_typesFilterableTo_1, type != null ? type.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean writeFileContents(NSString filename) {
-	return OS.objc_msgSend(this.id, OS.sel_writeFileContents_1, filename != null ? filename.id : 0) != 0;
-}
-
-public boolean writeFileWrapper(NSFileWrapper wrapper) {
-	return OS.objc_msgSend(this.id, OS.sel_writeFileWrapper_1, wrapper != null ? wrapper.id : 0) != 0;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPathCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPathCell.java
deleted file mode 100644
index 179916ce8e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPathCell.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPathCell extends NSActionCell {
-
-public NSPathCell() {
-	super();
-}
-
-public NSPathCell(int id) {
-	super(id);
-}
-
-public NSURL URL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_URL);
-	return result != 0 ? new NSURL(result) : null;
-}
-
-public NSArray allowedTypes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allowedTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSPathComponentCell clickedPathComponentCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_clickedPathComponentCell);
-	return result != 0 ? new NSPathComponentCell(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public int doubleAction() {
-	return OS.objc_msgSend(this.id, OS.sel_doubleAction);
-}
-
-public void mouseEntered(NSEvent event, NSRect frame, NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_mouseEntered_1withFrame_1inView_1, event != null ? event.id : 0, frame, view != null ? view.id : 0);
-}
-
-public void mouseExited(NSEvent event, NSRect frame, NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_mouseExited_1withFrame_1inView_1, event != null ? event.id : 0, frame, view != null ? view.id : 0);
-}
-
-public NSPathComponentCell pathComponentCellAtPoint(NSPoint point, NSRect frame, NSView view) {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathComponentCellAtPoint_1withFrame_1inView_1, point, frame, view != null ? view.id : 0);
-	return result != 0 ? new NSPathComponentCell(result) : null;
-}
-
-public static int pathComponentCellClass() {
-	return OS.objc_msgSend(OS.class_NSPathCell, OS.sel_pathComponentCellClass);
-}
-
-public NSArray pathComponentCells() {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathComponentCells);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public int pathStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_pathStyle);
-}
-
-public NSAttributedString placeholderAttributedString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_placeholderAttributedString);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public NSString placeholderString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_placeholderString);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSRect rectOfPathComponentCell(NSPathComponentCell cell, NSRect frame, NSView view) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfPathComponentCell_1withFrame_1inView_1, cell != null ? cell.id : 0, frame, view != null ? view.id : 0);
-	return result;
-}
-
-public void setAllowedTypes(NSArray allowedTypes) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowedTypes_1, allowedTypes != null ? allowedTypes.id : 0);
-}
-
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setControlSize(int size) {
-	OS.objc_msgSend(this.id, OS.sel_setControlSize_1, size);
-}
-
-public void setDelegate(id value) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, value != null ? value.id : 0);
-}
-
-public void setDoubleAction(int action) {
-	OS.objc_msgSend(this.id, OS.sel_setDoubleAction_1, action);
-}
-
-public void setObjectValue(id  obj) {
-	OS.objc_msgSend(this.id, OS.sel_setObjectValue_1, obj != null ? obj.id : 0);
-}
-
-public void setPathComponentCells(NSArray cells) {
-	OS.objc_msgSend(this.id, OS.sel_setPathComponentCells_1, cells != null ? cells.id : 0);
-}
-
-public void setPathStyle(int style) {
-	OS.objc_msgSend(this.id, OS.sel_setPathStyle_1, style);
-}
-
-public void setPlaceholderAttributedString(NSAttributedString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPlaceholderAttributedString_1, string != null ? string.id : 0);
-}
-
-public void setPlaceholderString(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPlaceholderString_1, string != null ? string.id : 0);
-}
-
-public void setURL(NSURL url) {
-	OS.objc_msgSend(this.id, OS.sel_setURL_1, url != null ? url.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPathComponentCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPathComponentCell.java
deleted file mode 100644
index e2c549da36..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPathComponentCell.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPathComponentCell extends NSTextFieldCell {
-
-public NSPathComponentCell() {
-	super();
-}
-
-public NSPathComponentCell(int id) {
-	super(id);
-}
-
-public NSURL URL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_URL);
-	return result != 0 ? new NSURL(result) : null;
-}
-
-public NSImage image() {
-	int result = OS.objc_msgSend(this.id, OS.sel_image);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public void setImage(NSImage value) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1, value != null ? value.id : 0);
-}
-
-public void setURL(NSURL url) {
-	OS.objc_msgSend(this.id, OS.sel_setURL_1, url != null ? url.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPathControl.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPathControl.java
deleted file mode 100644
index 934fd782c5..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPathControl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPathControl extends NSControl {
-
-public NSPathControl() {
-	super();
-}
-
-public NSPathControl(int id) {
-	super(id);
-}
-
-public NSURL URL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_URL);
-	return result != 0 ? new NSURL(result) : null;
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSPathComponentCell clickedPathComponentCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_clickedPathComponentCell);
-	return result != 0 ? new NSPathComponentCell(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public int doubleAction() {
-	return OS.objc_msgSend(this.id, OS.sel_doubleAction);
-}
-
-public NSArray pathComponentCells() {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathComponentCells);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public int pathStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_pathStyle);
-}
-
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setDoubleAction(int action) {
-	OS.objc_msgSend(this.id, OS.sel_setDoubleAction_1, action);
-}
-
-public void setDraggingSourceOperationMask(int mask, boolean isLocal) {
-	OS.objc_msgSend(this.id, OS.sel_setDraggingSourceOperationMask_1forLocal_1, mask, isLocal);
-}
-
-public void setPathComponentCells(NSArray cells) {
-	OS.objc_msgSend(this.id, OS.sel_setPathComponentCells_1, cells != null ? cells.id : 0);
-}
-
-public void setPathStyle(int style) {
-	OS.objc_msgSend(this.id, OS.sel_setPathStyle_1, style);
-}
-
-public void setURL(NSURL url) {
-	OS.objc_msgSend(this.id, OS.sel_setURL_1, url != null ? url.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPersistentDocument.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPersistentDocument.java
deleted file mode 100644
index 63abc7b52e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPersistentDocument.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPersistentDocument extends NSDocument {
-
-public NSPersistentDocument() {
-	super();
-}
-
-public NSPersistentDocument(int id) {
-	super(id);
-}
-
-public boolean configurePersistentStoreCoordinatorForURL_ofType_error_(NSURL url, NSString fileType, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_configurePersistentStoreCoordinatorForURL_1ofType_1error_1, url != null ? url.id : 0, fileType != null ? fileType.id : 0, error) != 0;
-}
-
-public boolean configurePersistentStoreCoordinatorForURL_ofType_modelConfiguration_storeOptions_error_(NSURL url, NSString fileType, NSString configuration, NSDictionary storeOptions, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_configurePersistentStoreCoordinatorForURL_1ofType_1modelConfiguration_1storeOptions_1error_1, url != null ? url.id : 0, fileType != null ? fileType.id : 0, configuration != null ? configuration.id : 0, storeOptions != null ? storeOptions.id : 0, error) != 0;
-}
-
-//public NSManagedObjectContext managedObjectContext() {
-//	int result = OS.objc_msgSend(this.id, OS.sel_managedObjectContext);
-//	return result != 0 ? new NSManagedObjectContext(result) : null;
-//}
-
-public id managedObjectModel() {
-	int result = OS.objc_msgSend(this.id, OS.sel_managedObjectModel);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString persistentStoreTypeForFileType(NSString fileType) {
-	int result = OS.objc_msgSend(this.id, OS.sel_persistentStoreTypeForFileType_1, fileType != null ? fileType.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean readFromURL(NSURL absoluteURL, NSString typeName, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_readFromURL_1ofType_1error_1, absoluteURL != null ? absoluteURL.id : 0, typeName != null ? typeName.id : 0, error) != 0;
-}
-
-public boolean revertToContentsOfURL(NSURL inAbsoluteURL, NSString inTypeName, int outError) {
-	return OS.objc_msgSend(this.id, OS.sel_revertToContentsOfURL_1ofType_1error_1, inAbsoluteURL != null ? inAbsoluteURL.id : 0, inTypeName != null ? inTypeName.id : 0, outError) != 0;
-}
-
-//public void setManagedObjectContext(NSManagedObjectContext managedObjectContext) {
-//	OS.objc_msgSend(this.id, OS.sel_setManagedObjectContext_1, managedObjectContext != null ? managedObjectContext.id : 0);
-//}
-
-public boolean writeToURL(NSURL absoluteURL, NSString typeName, int saveOperation, NSURL absoluteOriginalContentsURL, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToURL_1ofType_1forSaveOperation_1originalContentsURL_1error_1, absoluteURL != null ? absoluteURL.id : 0, typeName != null ? typeName.id : 0, saveOperation, absoluteOriginalContentsURL != null ? absoluteOriginalContentsURL.id : 0, error) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPipe.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPipe.java
deleted file mode 100644
index 4c24e52fc7..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPipe.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPipe extends NSObject {
-
-public NSPipe() {
-	super();
-}
-
-public NSPipe(int id) {
-	super(id);
-}
-
-public NSFileHandle fileHandleForReading() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileHandleForReading);
-	return result != 0 ? new NSFileHandle(result) : null;
-}
-
-public NSFileHandle fileHandleForWriting() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileHandleForWriting);
-	return result != 0 ? new NSFileHandle(result) : null;
-}
-
-public static id pipe() {
-	int result = OS.objc_msgSend(OS.class_NSPipe, OS.sel_pipe);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java
index d2e03de15e..55f02c7268 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java
@@ -25,5 +25,5 @@ package org.eclipse.swt.internal.cocoa;
 public class NSPoint {
 	public float x;
 	public float y;
-	public static final int sizeof = 8;
+	public static final int sizeof = OS.NSPoint_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPointerArray.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPointerArray.java
deleted file mode 100644
index 87661473e4..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPointerArray.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPointerArray extends NSObject {
-
-public NSPointerArray() {
-	super();
-}
-
-public NSPointerArray(int id) {
-	super(id);
-}
-
-public void addPointer(int pointer) {
-	OS.objc_msgSend(this.id, OS.sel_addPointer_1, pointer);
-}
-
-public NSArray allObjects() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allObjects);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void compact() {
-	OS.objc_msgSend(this.id, OS.sel_compact);
-}
-
-public int count() {
-	return OS.objc_msgSend(this.id, OS.sel_count);
-}
-
-public NSPointerArray initWithOptions(int options) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithOptions_1, options);
-	return result != 0 ? this : null;
-}
-
-public id initWithPointerFunctions(NSPointerFunctions functions) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithPointerFunctions_1, functions != null ? functions.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void insertPointer(int item, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertPointer_1atIndex_1, item, index);
-}
-
-public static id pointerArrayWithOptions(int options) {
-	int result = OS.objc_msgSend(OS.class_NSPointerArray, OS.sel_pointerArrayWithOptions_1, options);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id pointerArrayWithPointerFunctions(NSPointerFunctions functions) {
-	int result = OS.objc_msgSend(OS.class_NSPointerArray, OS.sel_pointerArrayWithPointerFunctions_1, functions != null ? functions.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id pointerArrayWithStrongObjects() {
-	int result = OS.objc_msgSend(OS.class_NSPointerArray, OS.sel_pointerArrayWithStrongObjects);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id pointerArrayWithWeakObjects() {
-	int result = OS.objc_msgSend(OS.class_NSPointerArray, OS.sel_pointerArrayWithWeakObjects);
-	return result != 0 ? new id(result) : null;
-}
-
-public int pointerAtIndex(int index) {
-	return OS.objc_msgSend(this.id, OS.sel_pointerAtIndex_1, index);
-}
-
-public NSPointerFunctions pointerFunctions() {
-	int result = OS.objc_msgSend(this.id, OS.sel_pointerFunctions);
-	return result != 0 ? new NSPointerFunctions(result) : null;
-}
-
-public void removePointerAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removePointerAtIndex_1, index);
-}
-
-public void replacePointerAtIndex(int index, int item) {
-	OS.objc_msgSend(this.id, OS.sel_replacePointerAtIndex_1withPointer_1, index, item);
-}
-
-public void setCount(int count) {
-	OS.objc_msgSend(this.id, OS.sel_setCount_1, count);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPointerFunctions.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPointerFunctions.java
deleted file mode 100644
index 9bb24c40a3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPointerFunctions.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPointerFunctions extends NSObject {
-
-public NSPointerFunctions() {
-	super();
-}
-
-public NSPointerFunctions(int id) {
-	super(id);
-}
-
-public NSPointerFunctions initWithOptions(int options) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithOptions_1, options);
-	return result != 0 ? this : null;
-}
-
-public static id pointerFunctionsWithOptions(int options) {
-	int result = OS.objc_msgSend(OS.class_NSPointerFunctions, OS.sel_pointerFunctionsWithOptions_1, options);
-	return result != 0 ? new id(result) : null;
-}
-
-//public void setUsesStrongWriteBarrier(boolean ) {
-//	OS.objc_msgSend(this.id, OS.sel_setUsesStrongWriteBarrier_1, );
-//}
-//
-//public void setUsesWeakReadAndWriteBarriers(boolean ) {
-//	OS.objc_msgSend(this.id, OS.sel_setUsesWeakReadAndWriteBarriers_1, );
-//}
-
-public boolean usesStrongWriteBarrier() {
-	return OS.objc_msgSend(this.id, OS.sel_usesStrongWriteBarrier) != 0;
-}
-
-public boolean usesWeakReadAndWriteBarriers() {
-	return OS.objc_msgSend(this.id, OS.sel_usesWeakReadAndWriteBarriers) != 0;
-}
-
-}
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 e9e63f49d7..7b44f26d71 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,40 +16,12 @@ public NSPopUpButton() {
 	super();
 }
 
-public NSPopUpButton(int id) {
+public NSPopUpButton(int /*long*/ id) {
 	super(id);
 }
 
-public void addItemWithTitle(NSString title) {
-	OS.objc_msgSend(this.id, OS.sel_addItemWithTitle_1, title != null ? title.id : 0);
-}
-
-public void addItemsWithTitles(NSArray itemTitles) {
-	OS.objc_msgSend(this.id, OS.sel_addItemsWithTitles_1, itemTitles != null ? itemTitles.id : 0);
-}
-
-public boolean autoenablesItems() {
-	return OS.objc_msgSend(this.id, OS.sel_autoenablesItems) != 0;
-}
-
-public int indexOfItem(NSMenuItem item) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItem_1, item != null ? item.id : 0);
-}
-
-public int indexOfItemWithRepresentedObject(id obj) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithRepresentedObject_1, obj != null ? obj.id : 0);
-}
-
-public int indexOfItemWithTag(int tag) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithTag_1, tag);
-}
-
-public int indexOfItemWithTarget(id target, int actionSelector) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithTarget_1andAction_1, target != null ? target.id : 0, actionSelector);
-}
-
-public int indexOfItemWithTitle(NSString title) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithTitle_1, title != null ? title.id : 0);
+public NSPopUpButton(id id) {
+	super(id);
 }
 
 public int indexOfSelectedItem() {
@@ -57,44 +29,20 @@ public int indexOfSelectedItem() {
 }
 
 public NSPopUpButton initWithFrame(NSRect buttonFrame, boolean flag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_1pullsDown_1, buttonFrame, flag);
-	return result != 0 ? this : null;
-}
-
-public void insertItemWithTitle(NSString title, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertItemWithTitle_1atIndex_1, title != null ? title.id : 0, index);
-}
-
-public NSArray itemArray() {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemArray);
-	return result != 0 ? new NSArray(result) : null;
+	int 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_1, index);
+	int 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_1, index);
+	int result = OS.objc_msgSend(this.id, OS.sel_itemTitleAtIndex_, index);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public NSArray itemTitles() {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemTitles);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSMenuItem itemWithTitle(NSString title) {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemWithTitle_1, title != null ? title.id : 0);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
-public NSMenuItem lastItem() {
-	int result = OS.objc_msgSend(this.id, OS.sel_lastItem);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
 public NSMenu menu() {
 	int result = OS.objc_msgSend(this.id, OS.sel_menu);
 	return result != 0 ? new NSMenu(result) : null;
@@ -104,69 +52,28 @@ public int numberOfItems() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfItems);
 }
 
-public int preferredEdge() {
-	return OS.objc_msgSend(this.id, OS.sel_preferredEdge);
-}
-
-public boolean pullsDown() {
-	return OS.objc_msgSend(this.id, OS.sel_pullsDown) != 0;
-}
-
 public void removeAllItems() {
 	OS.objc_msgSend(this.id, OS.sel_removeAllItems);
 }
 
 public void removeItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_1, index);
-}
-
-public void removeItemWithTitle(NSString title) {
-	OS.objc_msgSend(this.id, OS.sel_removeItemWithTitle_1, title != null ? title.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index);
 }
 
 public void selectItem(NSMenuItem item) {
-	OS.objc_msgSend(this.id, OS.sel_selectItem_1, item != null ? item.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_selectItem_, item != null ? item.id : 0);
 }
 
 public void selectItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_1, index);
-}
-
-public boolean selectItemWithTag(int tag) {
-	return OS.objc_msgSend(this.id, OS.sel_selectItemWithTag_1, tag) != 0;
-}
-
-public void selectItemWithTitle(NSString title) {
-	OS.objc_msgSend(this.id, OS.sel_selectItemWithTitle_1, title != null ? title.id : 0);
-}
-
-public NSMenuItem selectedItem() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedItem);
-	return result != 0 ? new NSMenuItem(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_, index);
 }
 
 public void setAutoenablesItems(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutoenablesItems_1, flag);
-}
-
-public void setMenu(NSMenu menu) {
-	OS.objc_msgSend(this.id, OS.sel_setMenu_1, menu != null ? menu.id : 0);
-}
-
-public void setPreferredEdge(int edge) {
-	OS.objc_msgSend(this.id, OS.sel_setPreferredEdge_1, edge);
+	OS.objc_msgSend(this.id, OS.sel_setAutoenablesItems_, flag);
 }
 
 public void setPullsDown(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setPullsDown_1, flag);
-}
-
-public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, aString != null ? aString.id : 0);
-}
-
-public void synchronizeTitleAndSelectedItem() {
-	OS.objc_msgSend(this.id, OS.sel_synchronizeTitleAndSelectedItem);
+	OS.objc_msgSend(this.id, OS.sel_setPullsDown_, flag);
 }
 
 public NSString titleOfSelectedItem() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButtonCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButtonCell.java
deleted file mode 100644
index 646aeaf9cf..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButtonCell.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPopUpButtonCell extends NSMenuItemCell {
-
-public NSPopUpButtonCell() {
-	super();
-}
-
-public NSPopUpButtonCell(int id) {
-	super(id);
-}
-
-public void addItemWithTitle(NSString title) {
-	OS.objc_msgSend(this.id, OS.sel_addItemWithTitle_1, title != null ? title.id : 0);
-}
-
-public void addItemsWithTitles(NSArray itemTitles) {
-	OS.objc_msgSend(this.id, OS.sel_addItemsWithTitles_1, itemTitles != null ? itemTitles.id : 0);
-}
-
-public boolean altersStateOfSelectedItem() {
-	return OS.objc_msgSend(this.id, OS.sel_altersStateOfSelectedItem) != 0;
-}
-
-public int arrowPosition() {
-	return OS.objc_msgSend(this.id, OS.sel_arrowPosition);
-}
-
-public void attachPopUpWithFrame(NSRect cellFrame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_attachPopUpWithFrame_1inView_1, cellFrame, controlView != null ? controlView.id : 0);
-}
-
-public boolean autoenablesItems() {
-	return OS.objc_msgSend(this.id, OS.sel_autoenablesItems) != 0;
-}
-
-public void dismissPopUp() {
-	OS.objc_msgSend(this.id, OS.sel_dismissPopUp);
-}
-
-public int indexOfItem(NSMenuItem item) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItem_1, item != null ? item.id : 0);
-}
-
-public int indexOfItemWithRepresentedObject(id obj) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithRepresentedObject_1, obj != null ? obj.id : 0);
-}
-
-public int indexOfItemWithTag(int tag) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithTag_1, tag);
-}
-
-public int indexOfItemWithTarget(id target, int actionSelector) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithTarget_1andAction_1, target != null ? target.id : 0, actionSelector);
-}
-
-public int indexOfItemWithTitle(NSString title) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithTitle_1, title != null ? title.id : 0);
-}
-
-public int indexOfSelectedItem() {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfSelectedItem);
-}
-
-public NSPopUpButtonCell initTextCell(NSString stringValue, boolean pullDown) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initTextCell_1pullsDown_1, stringValue != null ? stringValue.id : 0, pullDown);
-	return result != 0 ? this : null;
-}
-
-public void insertItemWithTitle(NSString title, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertItemWithTitle_1atIndex_1, title != null ? title.id : 0, index);
-}
-
-public NSArray itemArray() {
-	int 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_1, index);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
-public NSString itemTitleAtIndex(int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemTitleAtIndex_1, index);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSArray itemTitles() {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemTitles);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSMenuItem itemWithTitle(NSString title) {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemWithTitle_1, title != null ? title.id : 0);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
-public NSMenuItem lastItem() {
-	int result = OS.objc_msgSend(this.id, OS.sel_lastItem);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
-public NSMenu menu() {
-	int 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 id objectValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectValue);
-	return result != 0 ? new id(result) : null;
-}
-
-public void performClickWithFrame(NSRect frame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_performClickWithFrame_1inView_1, frame, controlView != null ? controlView.id : 0);
-}
-
-public int preferredEdge() {
-	return OS.objc_msgSend(this.id, OS.sel_preferredEdge);
-}
-
-public boolean pullsDown() {
-	return OS.objc_msgSend(this.id, OS.sel_pullsDown) != 0;
-}
-
-public void removeAllItems() {
-	OS.objc_msgSend(this.id, OS.sel_removeAllItems);
-}
-
-public void removeItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_1, index);
-}
-
-public void removeItemWithTitle(NSString title) {
-	OS.objc_msgSend(this.id, OS.sel_removeItemWithTitle_1, title != null ? title.id : 0);
-}
-
-public void selectItem(NSMenuItem item) {
-	OS.objc_msgSend(this.id, OS.sel_selectItem_1, item != null ? item.id : 0);
-}
-
-public void selectItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_1, index);
-}
-
-public boolean selectItemWithTag(int tag) {
-	return OS.objc_msgSend(this.id, OS.sel_selectItemWithTag_1, tag) != 0;
-}
-
-public void selectItemWithTitle(NSString title) {
-	OS.objc_msgSend(this.id, OS.sel_selectItemWithTitle_1, title != null ? title.id : 0);
-}
-
-public NSMenuItem selectedItem() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedItem);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
-public void setAltersStateOfSelectedItem(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAltersStateOfSelectedItem_1, flag);
-}
-
-public void setArrowPosition(int position) {
-	OS.objc_msgSend(this.id, OS.sel_setArrowPosition_1, position);
-}
-
-public void setAutoenablesItems(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutoenablesItems_1, flag);
-}
-
-public void setMenu(NSMenu menu) {
-	OS.objc_msgSend(this.id, OS.sel_setMenu_1, menu != null ? menu.id : 0);
-}
-
-public void setObjectValue(id obj) {
-	OS.objc_msgSend(this.id, OS.sel_setObjectValue_1, obj != null ? obj.id : 0);
-}
-
-public void setPreferredEdge(int edge) {
-	OS.objc_msgSend(this.id, OS.sel_setPreferredEdge_1, edge);
-}
-
-public void setPullsDown(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setPullsDown_1, flag);
-}
-
-public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, aString != null ? aString.id : 0);
-}
-
-public void setUsesItemFromMenu(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesItemFromMenu_1, flag);
-}
-
-public void synchronizeTitleAndSelectedItem() {
-	OS.objc_msgSend(this.id, OS.sel_synchronizeTitleAndSelectedItem);
-}
-
-public NSString titleOfSelectedItem() {
-	int result = OS.objc_msgSend(this.id, OS.sel_titleOfSelectedItem);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean usesItemFromMenu() {
-	return OS.objc_msgSend(this.id, OS.sel_usesItemFromMenu) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPort.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPort.java
deleted file mode 100644
index 6ea1c1ae60..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPort.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPort extends NSObject {
-
-public NSPort() {
-	super();
-}
-
-public NSPort(int id) {
-	super(id);
-}
-
-public void addConnection(NSConnection conn, NSRunLoop runLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_addConnection_1toRunLoop_1forMode_1, conn != null ? conn.id : 0, runLoop != null ? runLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-public static id allocWithZone(int zone) {
-	int result = OS.objc_msgSend(OS.class_NSPort, OS.sel_allocWithZone_1, zone);
-	return result != 0 ? new id(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void invalidate() {
-	OS.objc_msgSend(this.id, OS.sel_invalidate);
-}
-
-public boolean isValid() {
-	return OS.objc_msgSend(this.id, OS.sel_isValid) != 0;
-}
-
-public static NSPort port() {
-	int result = OS.objc_msgSend(OS.class_NSPort, OS.sel_port);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public void removeConnection(NSConnection conn, NSRunLoop runLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_removeConnection_1fromRunLoop_1forMode_1, conn != null ? conn.id : 0, runLoop != null ? runLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-public void removeFromRunLoop(NSRunLoop runLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_removeFromRunLoop_1forMode_1, runLoop != null ? runLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-public int reservedSpaceLength() {
-	return OS.objc_msgSend(this.id, OS.sel_reservedSpaceLength);
-}
-
-public void scheduleInRunLoop(NSRunLoop runLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_scheduleInRunLoop_1forMode_1, runLoop != null ? runLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-public boolean sendBeforeDate_components_from_reserved_(NSDate limitDate, NSMutableArray components, NSPort receivePort, int headerSpaceReserved) {
-	return OS.objc_msgSend(this.id, OS.sel_sendBeforeDate_1components_1from_1reserved_1, limitDate != null ? limitDate.id : 0, components != null ? components.id : 0, receivePort != null ? receivePort.id : 0, headerSpaceReserved) != 0;
-}
-
-public boolean sendBeforeDate_msgid_components_from_reserved_(NSDate limitDate, int msgID, NSMutableArray components, NSPort receivePort, int headerSpaceReserved) {
-	return OS.objc_msgSend(this.id, OS.sel_sendBeforeDate_1msgid_1components_1from_1reserved_1, limitDate != null ? limitDate.id : 0, msgID, components != null ? components.id : 0, receivePort != null ? receivePort.id : 0, headerSpaceReserved) != 0;
-}
-
-public void setDelegate(id anId) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anId != null ? anId.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPortCoder.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPortCoder.java
deleted file mode 100644
index b2f2cb06ef..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPortCoder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPortCoder extends NSCoder {
-
-public NSPortCoder() {
-	super();
-}
-
-public NSPortCoder(int id) {
-	super(id);
-}
-
-public NSConnection connection() {
-	int result = OS.objc_msgSend(this.id, OS.sel_connection);
-	return result != 0 ? new NSConnection(result) : null;
-}
-
-public NSPort decodePortObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_decodePortObject);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public void dispatch() {
-	OS.objc_msgSend(this.id, OS.sel_dispatch);
-}
-
-public void encodePortObject(NSPort aport) {
-	OS.objc_msgSend(this.id, OS.sel_encodePortObject_1, aport != null ? aport.id : 0);
-}
-
-public NSPortCoder initWithReceivePort(NSPort rcvPort, NSPort sndPort, NSArray comps) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithReceivePort_1sendPort_1components_1, rcvPort != null ? rcvPort.id : 0, sndPort != null ? sndPort.id : 0, comps != null ? comps.id : 0);
-	return result != 0 ? this : null;
-}
-
-public boolean isBycopy() {
-	return OS.objc_msgSend(this.id, OS.sel_isBycopy) != 0;
-}
-
-public boolean isByref() {
-	return OS.objc_msgSend(this.id, OS.sel_isByref) != 0;
-}
-
-public static id portCoderWithReceivePort(NSPort rcvPort, NSPort sndPort, NSArray comps) {
-	int result = OS.objc_msgSend(OS.class_NSPortCoder, OS.sel_portCoderWithReceivePort_1sendPort_1components_1, rcvPort != null ? rcvPort.id : 0, sndPort != null ? sndPort.id : 0, comps != null ? comps.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/NSPortMessage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPortMessage.java
deleted file mode 100644
index 3950bfd146..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPortMessage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPortMessage extends NSObject {
-
-public NSPortMessage() {
-	super();
-}
-
-public NSPortMessage(int id) {
-	super(id);
-}
-
-public NSArray components() {
-	int result = OS.objc_msgSend(this.id, OS.sel_components);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSPortMessage initWithSendPort(NSPort sendPort, NSPort replyPort, NSArray components) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithSendPort_1receivePort_1components_1, sendPort != null ? sendPort.id : 0, replyPort != null ? replyPort.id : 0, components != null ? components.id : 0);
-	return result != 0 ? this : null;
-}
-
-public int msgid() {
-	return OS.objc_msgSend(this.id, OS.sel_msgid);
-}
-
-public NSPort receivePort() {
-	int result = OS.objc_msgSend(this.id, OS.sel_receivePort);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public boolean sendBeforeDate(NSDate date) {
-	return OS.objc_msgSend(this.id, OS.sel_sendBeforeDate_1, date != null ? date.id : 0) != 0;
-}
-
-public NSPort sendPort() {
-	int result = OS.objc_msgSend(this.id, OS.sel_sendPort);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public void setMsgid(int msgid) {
-	OS.objc_msgSend(this.id, OS.sel_setMsgid_1, msgid);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPortNameServer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPortNameServer.java
deleted file mode 100644
index d20e0a30f2..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPortNameServer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPortNameServer extends NSObject {
-
-public NSPortNameServer() {
-	super();
-}
-
-public NSPortNameServer(int id) {
-	super(id);
-}
-
-public NSPort portForName_(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_portForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public NSPort portForName_host_(NSString name, NSString host) {
-	int result = OS.objc_msgSend(this.id, OS.sel_portForName_1host_1, name != null ? name.id : 0, host != null ? host.id : 0);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public boolean registerPort(NSPort port, NSString name) {
-	return OS.objc_msgSend(this.id, OS.sel_registerPort_1name_1, port != null ? port.id : 0, name != null ? name.id : 0) != 0;
-}
-
-public boolean removePortForName(NSString name) {
-	return OS.objc_msgSend(this.id, OS.sel_removePortForName_1, name != null ? name.id : 0) != 0;
-}
-
-public static NSPortNameServer systemDefaultPortNameServer() {
-	int result = OS.objc_msgSend(OS.class_NSPortNameServer, OS.sel_systemDefaultPortNameServer);
-	return result != 0 ? new NSPortNameServer(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPositionalSpecifier.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPositionalSpecifier.java
deleted file mode 100644
index d4c4e60a0b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPositionalSpecifier.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPositionalSpecifier extends NSObject {
-
-public NSPositionalSpecifier() {
-	super();
-}
-
-public NSPositionalSpecifier(int id) {
-	super(id);
-}
-
-public void evaluate() {
-	OS.objc_msgSend(this.id, OS.sel_evaluate);
-}
-
-public NSPositionalSpecifier initWithPosition(int position, NSScriptObjectSpecifier specifier) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithPosition_1objectSpecifier_1, position, specifier != null ? specifier.id : 0);
-	return result != 0 ? this : null;
-}
-
-public id insertionContainer() {
-	int result = OS.objc_msgSend(this.id, OS.sel_insertionContainer);
-	return result != 0 ? new id(result) : null;
-}
-
-public int insertionIndex() {
-	return OS.objc_msgSend(this.id, OS.sel_insertionIndex);
-}
-
-public NSString insertionKey() {
-	int result = OS.objc_msgSend(this.id, OS.sel_insertionKey);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean insertionReplaces() {
-	return OS.objc_msgSend(this.id, OS.sel_insertionReplaces) != 0;
-}
-
-public NSScriptObjectSpecifier objectSpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectSpecifier);
-	return result != 0 ? new NSScriptObjectSpecifier(result) : null;
-}
-
-public int position() {
-	return OS.objc_msgSend(this.id, OS.sel_position);
-}
-
-public void setInsertionClassDescription(NSScriptClassDescription classDescription) {
-	OS.objc_msgSend(this.id, OS.sel_setInsertionClassDescription_1, classDescription != null ? classDescription.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPredicate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPredicate.java
deleted file mode 100644
index b11f8a850f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPredicate.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPredicate extends NSObject {
-
-public NSPredicate() {
-	super();
-}
-
-public NSPredicate(int id) {
-	super(id);
-}
-
-public boolean evaluateWithObject_(id object) {
-	return OS.objc_msgSend(this.id, OS.sel_evaluateWithObject_1, object != null ? object.id : 0) != 0;
-}
-
-public boolean evaluateWithObject_substitutionVariables_(id object, NSDictionary bindings) {
-	return OS.objc_msgSend(this.id, OS.sel_evaluateWithObject_1substitutionVariables_1, object != null ? object.id : 0, bindings != null ? bindings.id : 0) != 0;
-}
-
-public NSString predicateFormat() {
-	int result = OS.objc_msgSend(this.id, OS.sel_predicateFormat);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSPredicate static_predicateWithFormat_(NSString predicateWithFormat) {
-	int result = OS.objc_msgSend(OS.class_NSPredicate, OS.sel_predicateWithFormat_1, predicateWithFormat != null ? predicateWithFormat.id : 0);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public static NSPredicate static_predicateWithFormat_argumentArray_(NSString predicateFormat, NSArray arguments) {
-	int result = OS.objc_msgSend(OS.class_NSPredicate, OS.sel_predicateWithFormat_1argumentArray_1, predicateFormat != null ? predicateFormat.id : 0, arguments != null ? arguments.id : 0);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public static NSPredicate static_predicateWithFormat_arguments_(NSString predicateFormat, int argList) {
-	int result = OS.objc_msgSend(OS.class_NSPredicate, OS.sel_predicateWithFormat_1arguments_1, predicateFormat != null ? predicateFormat.id : 0, argList);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public NSPredicate predicateWithSubstitutionVariables(NSDictionary variables) {
-	int result = OS.objc_msgSend(this.id, OS.sel_predicateWithSubstitutionVariables_1, variables != null ? variables.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSPredicate(result) : null);
-}
-
-public static NSPredicate predicateWithValue(boolean value) {
-	int result = OS.objc_msgSend(OS.class_NSPredicate, OS.sel_predicateWithValue_1, value);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPredicateEditor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPredicateEditor.java
deleted file mode 100644
index 24bec71f51..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPredicateEditor.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPredicateEditor extends NSRuleEditor {
-
-public NSPredicateEditor() {
-	super();
-}
-
-public NSPredicateEditor(int id) {
-	super(id);
-}
-
-public NSArray rowTemplates() {
-	int result = OS.objc_msgSend(this.id, OS.sel_rowTemplates);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void setRowTemplates(NSArray rowTemplates) {
-	OS.objc_msgSend(this.id, OS.sel_setRowTemplates_1, rowTemplates != null ? rowTemplates.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPredicateEditorRowTemplate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPredicateEditorRowTemplate.java
deleted file mode 100644
index 4df59831ba..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPredicateEditorRowTemplate.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPredicateEditorRowTemplate extends NSObject {
-
-public NSPredicateEditorRowTemplate() {
-	super();
-}
-
-public NSPredicateEditorRowTemplate(int id) {
-	super(id);
-}
-
-public NSArray compoundTypes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_compoundTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray displayableSubpredicatesOfPredicate(NSPredicate predicate) {
-	int result = OS.objc_msgSend(this.id, OS.sel_displayableSubpredicatesOfPredicate_1, predicate != null ? predicate.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id initWithCompoundTypes(NSArray compoundTypes) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCompoundTypes_1, compoundTypes != null ? compoundTypes.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithLeftExpressions_rightExpressionAttributeType_modifier_operators_options_(NSArray leftExpressions, int attributeType, int modifier, NSArray operators, int options) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithLeftExpressions_1rightExpressionAttributeType_1modifier_1operators_1options_1, leftExpressions != null ? leftExpressions.id : 0, attributeType, modifier, operators != null ? operators.id : 0, options);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithLeftExpressions_rightExpressions_modifier_operators_options_(NSArray leftExpressions, NSArray rightExpressions, int modifier, NSArray operators, int options) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithLeftExpressions_1rightExpressions_1modifier_1operators_1options_1, leftExpressions != null ? leftExpressions.id : 0, rightExpressions != null ? rightExpressions.id : 0, modifier, operators != null ? operators.id : 0, options);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSArray leftExpressions() {
-	int result = OS.objc_msgSend(this.id, OS.sel_leftExpressions);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public double matchForPredicate(NSPredicate predicate) {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_matchForPredicate_1, predicate != null ? predicate.id : 0);
-}
-
-public int modifier() {
-	return OS.objc_msgSend(this.id, OS.sel_modifier);
-}
-
-public NSArray operators() {
-	int result = OS.objc_msgSend(this.id, OS.sel_operators);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public int options() {
-	return OS.objc_msgSend(this.id, OS.sel_options);
-}
-
-public NSPredicate predicateWithSubpredicates(NSArray subpredicates) {
-	int result = OS.objc_msgSend(this.id, OS.sel_predicateWithSubpredicates_1, subpredicates != null ? subpredicates.id : 0);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public int rightExpressionAttributeType() {
-	return OS.objc_msgSend(this.id, OS.sel_rightExpressionAttributeType);
-}
-
-public NSArray rightExpressions() {
-	int result = OS.objc_msgSend(this.id, OS.sel_rightExpressions);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void setPredicate(NSPredicate predicate) {
-	OS.objc_msgSend(this.id, OS.sel_setPredicate_1, predicate != null ? predicate.id : 0);
-}
-
-public NSArray templateViews() {
-	int result = OS.objc_msgSend(this.id, OS.sel_templateViews);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-//public static NSArray templatesWithAttributeKeyPaths(NSArray keyPaths, NSEntityDescription entityDescription) {
-//	int result = OS.objc_msgSend(OS.class_NSPredicateEditorRowTemplate, OS.sel_templatesWithAttributeKeyPaths_1inEntityDescription_1, keyPaths != null ? keyPaths.id : 0, entityDescription != null ? entityDescription.id : 0);
-//	return result != 0 ? new NSArray(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 e48762a335..81c42bb862 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
@@ -16,24 +16,12 @@ public NSPrintInfo() {
 	super();
 }
 
-public NSPrintInfo(int id) {
+public NSPrintInfo(int /*long*/ id) {
 	super(id);
 }
 
-public int PMPageFormat() {
-	return OS.objc_msgSend(this.id, OS.sel_PMPageFormat);
-}
-
-public int PMPrintSession() {
-	return OS.objc_msgSend(this.id, OS.sel_PMPrintSession);
-}
-
-public int PMPrintSettings() {
-	return OS.objc_msgSend(this.id, OS.sel_PMPrintSettings);
-}
-
-public float bottomMargin() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_bottomMargin);
+public NSPrintInfo(id id) {
+	super(id);
 }
 
 public static NSPrinter defaultPrinter() {
@@ -46,27 +34,15 @@ public NSMutableDictionary dictionary() {
 	return result != 0 ? new NSMutableDictionary(result) : null;
 }
 
-public int horizontalPagination() {
-	return OS.objc_msgSend(this.id, OS.sel_horizontalPagination);
-}
-
 public NSRect imageablePageBounds() {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_imageablePageBounds);
 	return result;
 }
 
-public id initWithDictionary(NSDictionary attributes) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDictionary_1, attributes != null ? attributes.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isHorizontallyCentered() {
-	return OS.objc_msgSend(this.id, OS.sel_isHorizontallyCentered) != 0;
-}
-
-public boolean isVerticallyCentered() {
-	return OS.objc_msgSend(this.id, OS.sel_isVerticallyCentered) != 0;
+public NSPrintInfo initWithDictionary(NSDictionary attributes) {
+	int 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() {
@@ -74,133 +50,32 @@ public NSString jobDisposition() {
 	return result != 0 ? new NSString(result) : null;
 }
 
-public float leftMargin() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_leftMargin);
-}
-
-public NSString localizedPaperName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedPaperName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int orientation() {
-	return OS.objc_msgSend(this.id, OS.sel_orientation);
-}
-
-public NSString paperName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_paperName);
-	return result != 0 ? new NSString(result) : null;
-}
-
 public NSSize paperSize() {
 	NSSize result = new NSSize();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_paperSize);
 	return result;
 }
 
-public NSMutableDictionary printSettings() {
-	int result = OS.objc_msgSend(this.id, OS.sel_printSettings);
-	return result != 0 ? new NSMutableDictionary(result) : null;
-}
-
 public NSPrinter printer() {
 	int result = OS.objc_msgSend(this.id, OS.sel_printer);
 	return result != 0 ? new NSPrinter(result) : null;
 }
 
-public float rightMargin() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rightMargin);
-}
-
-public void setBottomMargin(float margin) {
-	OS.objc_msgSend(this.id, OS.sel_setBottomMargin_1, margin);
-}
-
-public static void setDefaultPrinter(NSPrinter printer) {
-	OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_setDefaultPrinter_1, printer != null ? printer.id : 0);
-}
-
-public void setHorizontalPagination(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setHorizontalPagination_1, mode);
-}
-
-public void setHorizontallyCentered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHorizontallyCentered_1, flag);
-}
-
 public void setJobDisposition(NSString disposition) {
-	OS.objc_msgSend(this.id, OS.sel_setJobDisposition_1, disposition != null ? disposition.id : 0);
-}
-
-public void setLeftMargin(float margin) {
-	OS.objc_msgSend(this.id, OS.sel_setLeftMargin_1, margin);
-}
-
-public void setOrientation(int orientation) {
-	OS.objc_msgSend(this.id, OS.sel_setOrientation_1, orientation);
-}
-
-public void setPaperName(NSString name) {
-	OS.objc_msgSend(this.id, OS.sel_setPaperName_1, name != null ? name.id : 0);
-}
-
-public void setPaperSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setPaperSize_1, size);
+	OS.objc_msgSend(this.id, OS.sel_setJobDisposition_, disposition != null ? disposition.id : 0);
 }
 
 public void setPrinter(NSPrinter printer) {
-	OS.objc_msgSend(this.id, OS.sel_setPrinter_1, printer != null ? printer.id : 0);
-}
-
-public void setRightMargin(float margin) {
-	OS.objc_msgSend(this.id, OS.sel_setRightMargin_1, margin);
-}
-
-public static void setSharedPrintInfo(NSPrintInfo printInfo) {
-	OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_setSharedPrintInfo_1, printInfo != null ? printInfo.id : 0);
-}
-
-public void setTopMargin(float margin) {
-	OS.objc_msgSend(this.id, OS.sel_setTopMargin_1, margin);
+	OS.objc_msgSend(this.id, OS.sel_setPrinter_, printer != null ? printer.id : 0);
 }
 
 public void setUpPrintOperationDefaultValues() {
 	OS.objc_msgSend(this.id, OS.sel_setUpPrintOperationDefaultValues);
 }
 
-public void setVerticalPagination(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setVerticalPagination_1, mode);
-}
-
-public void setVerticallyCentered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setVerticallyCentered_1, flag);
-}
-
 public static NSPrintInfo sharedPrintInfo() {
 	int result = OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_sharedPrintInfo);
 	return result != 0 ? new NSPrintInfo(result) : null;
 }
 
-public static NSSize sizeForPaperName(NSString name) {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, OS.class_NSPrintInfo, OS.sel_sizeForPaperName_1, name != null ? name.id : 0);
-	return result;
-}
-
-public float topMargin() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_topMargin);
-}
-
-public void updateFromPMPageFormat() {
-	OS.objc_msgSend(this.id, OS.sel_updateFromPMPageFormat);
-}
-
-public void updateFromPMPrintSettings() {
-	OS.objc_msgSend(this.id, OS.sel_updateFromPMPrintSettings);
-}
-
-public int verticalPagination() {
-	return OS.objc_msgSend(this.id, OS.sel_verticalPagination);
-}
-
 }
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 501cbc1f3f..dfdceb8fa8 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
@@ -16,47 +16,12 @@ public NSPrintOperation() {
 	super();
 }
 
-public NSPrintOperation(int id) {
+public NSPrintOperation(int /*long*/ id) {
 	super(id);
 }
 
-public static NSPrintOperation static_EPSOperationWithView_insideRect_toData_(NSView view, NSRect rect, NSMutableData data) {
-	int result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_EPSOperationWithView_1insideRect_1toData_1, view != null ? view.id : 0, rect, data != null ? data.id : 0);
-	return result != 0 ? new NSPrintOperation(result) : null;
-}
-
-public static NSPrintOperation static_EPSOperationWithView_insideRect_toData_printInfo_(NSView view, NSRect rect, NSMutableData data, NSPrintInfo printInfo) {
-	int result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_EPSOperationWithView_1insideRect_1toData_1printInfo_1, view != null ? view.id : 0, rect, data != null ? data.id : 0, printInfo != null ? printInfo.id : 0);
-	return result != 0 ? new NSPrintOperation(result) : null;
-}
-
-public static NSPrintOperation static_EPSOperationWithView_insideRect_toPath_printInfo_(NSView view, NSRect rect, NSString path, NSPrintInfo printInfo) {
-	int result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_EPSOperationWithView_1insideRect_1toPath_1printInfo_1, view != null ? view.id : 0, rect, path != null ? path.id : 0, printInfo != null ? printInfo.id : 0);
-	return result != 0 ? new NSPrintOperation(result) : null;
-}
-
-public static NSPrintOperation static_PDFOperationWithView_insideRect_toData_(NSView view, NSRect rect, NSMutableData data) {
-	int result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_PDFOperationWithView_1insideRect_1toData_1, view != null ? view.id : 0, rect, data != null ? data.id : 0);
-	return result != 0 ? new NSPrintOperation(result) : null;
-}
-
-public static NSPrintOperation static_PDFOperationWithView_insideRect_toData_printInfo_(NSView view, NSRect rect, NSMutableData data, NSPrintInfo printInfo) {
-	int result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_PDFOperationWithView_1insideRect_1toData_1printInfo_1, view != null ? view.id : 0, rect, data != null ? data.id : 0, printInfo != null ? printInfo.id : 0);
-	return result != 0 ? new NSPrintOperation(result) : null;
-}
-
-public static NSPrintOperation static_PDFOperationWithView_insideRect_toPath_printInfo_(NSView view, NSRect rect, NSString path, NSPrintInfo printInfo) {
-	int result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_PDFOperationWithView_1insideRect_1toPath_1printInfo_1, view != null ? view.id : 0, rect, path != null ? path.id : 0, printInfo != null ? printInfo.id : 0);
-	return result != 0 ? new NSPrintOperation(result) : null;
-}
-
-public NSView accessoryView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_accessoryView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public boolean canSpawnSeparateThread() {
-	return OS.objc_msgSend(this.id, OS.sel_canSpawnSeparateThread) != 0;
+public NSPrintOperation(id id) {
+	super(id);
 }
 
 public void cleanUpOperation() {
@@ -73,15 +38,6 @@ public NSGraphicsContext createContext() {
 	return result != 0 ? new NSGraphicsContext(result) : null;
 }
 
-public static NSPrintOperation currentOperation() {
-	int result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_currentOperation);
-	return result != 0 ? new NSPrintOperation(result) : null;
-}
-
-public int currentPage() {
-	return OS.objc_msgSend(this.id, OS.sel_currentPage);
-}
-
 public boolean deliverResult() {
 	return OS.objc_msgSend(this.id, OS.sel_deliverResult) != 0;
 }
@@ -90,117 +46,29 @@ public void destroyContext() {
 	OS.objc_msgSend(this.id, OS.sel_destroyContext);
 }
 
-public boolean isCopyingOperation() {
-	return OS.objc_msgSend(this.id, OS.sel_isCopyingOperation) != 0;
-}
-
-public NSString jobStyleHint() {
-	int result = OS.objc_msgSend(this.id, OS.sel_jobStyleHint);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString jobTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_jobTitle);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int pageOrder() {
-	return OS.objc_msgSend(this.id, OS.sel_pageOrder);
-}
-
-public NSRange pageRange() {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_pageRange);
-	return result;
-}
-
-public NSPrintInfo printInfo() {
-	int result = OS.objc_msgSend(this.id, OS.sel_printInfo);
-	return result != 0 ? new NSPrintInfo(result) : null;
-}
-
-public static NSPrintOperation static_printOperationWithView_(NSView view) {
-	int result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_printOperationWithView_1, view != null ? view.id : 0);
+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);
 	return result != 0 ? new NSPrintOperation(result) : null;
 }
 
-public static NSPrintOperation static_printOperationWithView_printInfo_(NSView view, NSPrintInfo printInfo) {
-	int result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_printOperationWithView_1printInfo_1, view != null ? view.id : 0, printInfo != null ? printInfo.id : 0);
-	return result != 0 ? new NSPrintOperation(result) : null;
-}
-
-public NSPrintPanel printPanel() {
-	int result = OS.objc_msgSend(this.id, OS.sel_printPanel);
-	return result != 0 ? new NSPrintPanel(result) : null;
-}
-
 public boolean runOperation() {
 	return OS.objc_msgSend(this.id, OS.sel_runOperation) != 0;
 }
 
-public void runOperationModalForWindow(NSWindow docWindow, id delegate, int didRunSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_runOperationModalForWindow_1delegate_1didRunSelector_1contextInfo_1, docWindow != null ? docWindow.id : 0, delegate != null ? delegate.id : 0, didRunSelector, contextInfo);
-}
-
-public void setAccessoryView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setAccessoryView_1, view != null ? view.id : 0);
-}
-
-public void setCanSpawnSeparateThread(boolean canSpawnSeparateThread) {
-	OS.objc_msgSend(this.id, OS.sel_setCanSpawnSeparateThread_1, canSpawnSeparateThread);
-}
-
 public static void setCurrentOperation(NSPrintOperation operation) {
-	OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_setCurrentOperation_1, operation != null ? operation.id : 0);
-}
-
-public void setJobStyleHint(NSString hint) {
-	OS.objc_msgSend(this.id, OS.sel_setJobStyleHint_1, hint != null ? hint.id : 0);
+	OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_setCurrentOperation_, operation != null ? operation.id : 0);
 }
 
 public void setJobTitle(NSString jobTitle) {
-	OS.objc_msgSend(this.id, OS.sel_setJobTitle_1, jobTitle != null ? jobTitle.id : 0);
-}
-
-public void setPageOrder(int pageOrder) {
-	OS.objc_msgSend(this.id, OS.sel_setPageOrder_1, pageOrder);
-}
-
-public void setPrintInfo(NSPrintInfo printInfo) {
-	OS.objc_msgSend(this.id, OS.sel_setPrintInfo_1, printInfo != null ? printInfo.id : 0);
-}
-
-public void setPrintPanel(NSPrintPanel panel) {
-	OS.objc_msgSend(this.id, OS.sel_setPrintPanel_1, panel != null ? panel.id : 0);
-}
-
-public void setShowPanels(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShowPanels_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setJobTitle_, jobTitle != null ? jobTitle.id : 0);
 }
 
 public void setShowsPrintPanel(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsPrintPanel_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setShowsPrintPanel_, flag);
 }
 
 public void setShowsProgressPanel(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsProgressPanel_1, flag);
-}
-
-public boolean showPanels() {
-	return OS.objc_msgSend(this.id, OS.sel_showPanels) != 0;
-}
-
-public boolean showsPrintPanel() {
-	return OS.objc_msgSend(this.id, OS.sel_showsPrintPanel) != 0;
-}
-
-public boolean showsProgressPanel() {
-	return OS.objc_msgSend(this.id, OS.sel_showsProgressPanel) != 0;
-}
-
-public NSView view() {
-	int result = OS.objc_msgSend(this.id, OS.sel_view);
-	return result != 0 ? new NSView(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setShowsProgressPanel_, flag);
 }
 
 }
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 67f2680955..ffc55018d8 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
@@ -16,95 +16,29 @@ public NSPrintPanel() {
 	super();
 }
 
-public NSPrintPanel(int id) {
+public NSPrintPanel(int /*long*/ id) {
 	super(id);
 }
 
-public NSArray accessoryControllers() {
-	int result = OS.objc_msgSend(this.id, OS.sel_accessoryControllers);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSView accessoryView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_accessoryView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public void addAccessoryController(NSViewController accessoryController) {
-	OS.objc_msgSend(this.id, OS.sel_addAccessoryController_1, accessoryController != null ? accessoryController.id : 0);
-}
-
-public void beginSheetWithPrintInfo(NSPrintInfo printInfo, NSWindow docWindow, id delegate, int didEndSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_beginSheetWithPrintInfo_1modalForWindow_1delegate_1didEndSelector_1contextInfo_1, printInfo != null ? printInfo.id : 0, docWindow != null ? docWindow.id : 0, delegate != null ? delegate.id : 0, didEndSelector, contextInfo);
-}
-
-public NSString defaultButtonTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_defaultButtonTitle);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void finalWritePrintInfo() {
-	OS.objc_msgSend(this.id, OS.sel_finalWritePrintInfo);
-}
-
-public NSString helpAnchor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_helpAnchor);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString jobStyleHint() {
-	int result = OS.objc_msgSend(this.id, OS.sel_jobStyleHint);
-	return result != 0 ? new NSString(result) : null;
+public NSPrintPanel(id id) {
+	super(id);
 }
 
 public int options() {
 	return OS.objc_msgSend(this.id, OS.sel_options);
 }
 
-public NSPrintInfo printInfo() {
-	int result = OS.objc_msgSend(this.id, OS.sel_printInfo);
-	return result != 0 ? new NSPrintInfo(result) : null;
-}
-
 public static NSPrintPanel printPanel() {
 	int result = OS.objc_msgSend(OS.class_NSPrintPanel, OS.sel_printPanel);
 	return result != 0 ? new NSPrintPanel(result) : null;
 }
 
-public void removeAccessoryController(NSViewController accessoryController) {
-	OS.objc_msgSend(this.id, OS.sel_removeAccessoryController_1, accessoryController != null ? accessoryController.id : 0);
-}
-
-public int runModal() {
-	return OS.objc_msgSend(this.id, OS.sel_runModal);
-}
-
 public int runModalWithPrintInfo(NSPrintInfo printInfo) {
-	return OS.objc_msgSend(this.id, OS.sel_runModalWithPrintInfo_1, printInfo != null ? printInfo.id : 0);
-}
-
-public void setAccessoryView(NSView accessoryView) {
-	OS.objc_msgSend(this.id, OS.sel_setAccessoryView_1, accessoryView != null ? accessoryView.id : 0);
-}
-
-public void setDefaultButtonTitle(NSString defaultButtonTitle) {
-	OS.objc_msgSend(this.id, OS.sel_setDefaultButtonTitle_1, defaultButtonTitle != null ? defaultButtonTitle.id : 0);
-}
-
-public void setHelpAnchor(NSString helpAnchor) {
-	OS.objc_msgSend(this.id, OS.sel_setHelpAnchor_1, helpAnchor != null ? helpAnchor.id : 0);
-}
-
-public void setJobStyleHint(NSString hint) {
-	OS.objc_msgSend(this.id, OS.sel_setJobStyleHint_1, hint != null ? hint.id : 0);
+	return OS.objc_msgSend(this.id, OS.sel_runModalWithPrintInfo_, printInfo != null ? printInfo.id : 0);
 }
 
 public void setOptions(int options) {
-	OS.objc_msgSend(this.id, OS.sel_setOptions_1, options);
-}
-
-public void updateFromPrintInfo() {
-	OS.objc_msgSend(this.id, OS.sel_updateFromPrintInfo);
+	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 6404e1c9b4..d0920d6312 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
@@ -16,65 +16,12 @@ public NSPrinter() {
 	super();
 }
 
-public NSPrinter(int id) {
+public NSPrinter(int /*long*/ id) {
 	super(id);
 }
 
-public boolean acceptsBinary() {
-	return OS.objc_msgSend(this.id, OS.sel_acceptsBinary) != 0;
-}
-
-public boolean booleanForKey(NSString key, NSString table) {
-	return OS.objc_msgSend(this.id, OS.sel_booleanForKey_1inTable_1, key != null ? key.id : 0, table != null ? table.id : 0) != 0;
-}
-
-public NSDictionary deviceDescription() {
-	int result = OS.objc_msgSend(this.id, OS.sel_deviceDescription);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSString domain() {
-	int result = OS.objc_msgSend(this.id, OS.sel_domain);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public float floatForKey(NSString key, NSString table) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_floatForKey_1inTable_1, key != null ? key.id : 0, table != null ? table.id : 0);
-}
-
-public NSString host() {
-	int result = OS.objc_msgSend(this.id, OS.sel_host);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSRect imageRectForPaper(NSString paperName) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_imageRectForPaper_1, paperName != null ? paperName.id : 0);
-	return result;
-}
-
-public int intForKey(NSString key, NSString table) {
-	return OS.objc_msgSend(this.id, OS.sel_intForKey_1inTable_1, key != null ? key.id : 0, table != null ? table.id : 0);
-}
-
-public boolean isColor() {
-	return OS.objc_msgSend(this.id, OS.sel_isColor) != 0;
-}
-
-public boolean isFontAvailable(NSString faceName) {
-	return OS.objc_msgSend(this.id, OS.sel_isFontAvailable_1, faceName != null ? faceName.id : 0) != 0;
-}
-
-public boolean isKey(NSString key, NSString table) {
-	return OS.objc_msgSend(this.id, OS.sel_isKey_1inTable_1, key != null ? key.id : 0, table != null ? table.id : 0) != 0;
-}
-
-public boolean isOutputStackInReverseOrder() {
-	return OS.objc_msgSend(this.id, OS.sel_isOutputStackInReverseOrder) != 0;
-}
-
-public int languageLevel() {
-	return OS.objc_msgSend(this.id, OS.sel_languageLevel);
+public NSPrinter(id id) {
+	super(id);
 }
 
 public NSString name() {
@@ -82,71 +29,14 @@ public NSString name() {
 	return result != 0 ? new NSString(result) : null;
 }
 
-public NSString note() {
-	int result = OS.objc_msgSend(this.id, OS.sel_note);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSSize pageSizeForPaper(NSString paperName) {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_pageSizeForPaper_1, paperName != null ? paperName.id : 0);
-	return result;
-}
-
 public static NSArray printerNames() {
 	int result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerNames);
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public static NSArray printerTypes() {
-	int result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSPrinter static_printerWithName_(NSString name) {
-	int result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerWithName_1, name != null ? name.id : 0);
+public static NSPrinter printerWithName(NSString name) {
+	int result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerWithName_, name != null ? name.id : 0);
 	return result != 0 ? new NSPrinter(result) : null;
 }
 
-public static NSPrinter static_printerWithName_domain_includeUnavailable_(NSString name, NSString domain, boolean flag) {
-	int result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerWithName_1domain_1includeUnavailable_1, name != null ? name.id : 0, domain != null ? domain.id : 0, flag);
-	return result != 0 ? new NSPrinter(result) : null;
-}
-
-public static NSPrinter printerWithType(NSString type) {
-	int result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerWithType_1, type != null ? type.id : 0);
-	return result != 0 ? new NSPrinter(result) : null;
-}
-
-public NSRect rectForKey(NSString key, NSString table) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectForKey_1inTable_1, key != null ? key.id : 0, table != null ? table.id : 0);
-	return result;
-}
-
-public NSSize sizeForKey(NSString key, NSString table) {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_sizeForKey_1inTable_1, key != null ? key.id : 0, table != null ? table.id : 0);
-	return result;
-}
-
-public int statusForTable(NSString tableName) {
-	return OS.objc_msgSend(this.id, OS.sel_statusForTable_1, tableName != null ? tableName.id : 0);
-}
-
-public NSString stringForKey(NSString key, NSString table) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringForKey_1inTable_1, key != null ? key.id : 0, table != null ? table.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSArray stringListForKey(NSString key, NSString table) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringListForKey_1inTable_1, key != null ? key.id : 0, table != null ? table.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString type() {
-	int result = OS.objc_msgSend(this.id, OS.sel_type);
-	return result != 0 ? new NSString(result) : null;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProcessInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProcessInfo.java
deleted file mode 100644
index aafce414c2..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProcessInfo.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSProcessInfo extends NSObject {
-
-public NSProcessInfo() {
-	super();
-}
-
-public NSProcessInfo(int id) {
-	super(id);
-}
-
-public int activeProcessorCount() {
-	return OS.objc_msgSend(this.id, OS.sel_activeProcessorCount);
-}
-
-public NSArray arguments() {
-	int result = OS.objc_msgSend(this.id, OS.sel_arguments);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSDictionary environment() {
-	int result = OS.objc_msgSend(this.id, OS.sel_environment);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSString globallyUniqueString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_globallyUniqueString);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString hostName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_hostName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int operatingSystem() {
-	return OS.objc_msgSend(this.id, OS.sel_operatingSystem);
-}
-
-public NSString operatingSystemName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_operatingSystemName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString operatingSystemVersionString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_operatingSystemVersionString);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public long physicalMemory() {
-	return (long)OS.objc_msgSend(this.id, OS.sel_physicalMemory);
-}
-
-public int processIdentifier() {
-	return OS.objc_msgSend(this.id, OS.sel_processIdentifier);
-}
-
-public static NSProcessInfo processInfo() {
-	int result = OS.objc_msgSend(OS.class_NSProcessInfo, OS.sel_processInfo);
-	return result != 0 ? new NSProcessInfo(result) : null;
-}
-
-public NSString processName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_processName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int processorCount() {
-	return OS.objc_msgSend(this.id, OS.sel_processorCount);
-}
-
-public void setProcessName(NSString newName) {
-	OS.objc_msgSend(this.id, OS.sel_setProcessName_1, newName != null ? newName.id : 0);
-}
-
-}
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 43ea11f449..29b348b804 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
@@ -16,46 +16,18 @@ public NSProgressIndicator() {
 	super();
 }
 
-public NSProgressIndicator(int id) {
+public NSProgressIndicator(int /*long*/ id) {
 	super(id);
 }
 
-public void animate(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_animate_1, sender != null ? sender.id : 0);
-}
-
-public double animationDelay() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_animationDelay);
-}
-
-public int controlSize() {
-	return OS.objc_msgSend(this.id, OS.sel_controlSize);
-}
-
-public int controlTint() {
-	return OS.objc_msgSend(this.id, OS.sel_controlTint);
+public NSProgressIndicator(id id) {
+	super(id);
 }
 
 public double doubleValue() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_doubleValue);
 }
 
-public void incrementBy(double delta) {
-	OS.objc_msgSend(this.id, OS.sel_incrementBy_1, delta);
-}
-
-public boolean isBezeled() {
-	return OS.objc_msgSend(this.id, OS.sel_isBezeled) != 0;
-}
-
-public boolean isDisplayedWhenStopped() {
-	return OS.objc_msgSend(this.id, OS.sel_isDisplayedWhenStopped) != 0;
-}
-
-public boolean isIndeterminate() {
-	return OS.objc_msgSend(this.id, OS.sel_isIndeterminate) != 0;
-}
-
 public double maxValue() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_maxValue);
 }
@@ -64,48 +36,24 @@ public double minValue() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_minValue);
 }
 
-public void setAnimationDelay(double delay) {
-	OS.objc_msgSend(this.id, OS.sel_setAnimationDelay_1, delay);
-}
-
-public void setBezeled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBezeled_1, flag);
-}
-
-public void setControlSize(int size) {
-	OS.objc_msgSend(this.id, OS.sel_setControlSize_1, size);
-}
-
-public void setControlTint(int tint) {
-	OS.objc_msgSend(this.id, OS.sel_setControlTint_1, tint);
-}
-
-public void setDisplayedWhenStopped(boolean isDisplayed) {
-	OS.objc_msgSend(this.id, OS.sel_setDisplayedWhenStopped_1, isDisplayed);
-}
-
 public void setDoubleValue(double doubleValue) {
-	OS.objc_msgSend(this.id, OS.sel_setDoubleValue_1, doubleValue);
+	OS.objc_msgSend(this.id, OS.sel_setDoubleValue_, doubleValue);
 }
 
 public void setIndeterminate(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setIndeterminate_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setIndeterminate_, flag);
 }
 
 public void setMaxValue(double newMaximum) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxValue_1, newMaximum);
+	OS.objc_msgSend(this.id, OS.sel_setMaxValue_, newMaximum);
 }
 
 public void setMinValue(double newMinimum) {
-	OS.objc_msgSend(this.id, OS.sel_setMinValue_1, newMinimum);
-}
-
-public void setStyle(int style) {
-	OS.objc_msgSend(this.id, OS.sel_setStyle_1, style);
+	OS.objc_msgSend(this.id, OS.sel_setMinValue_, newMinimum);
 }
 
 public void setUsesThreadedAnimation(boolean threadedAnimation) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesThreadedAnimation_1, threadedAnimation);
+	OS.objc_msgSend(this.id, OS.sel_setUsesThreadedAnimation_, threadedAnimation);
 }
 
 public void sizeToFit() {
@@ -113,19 +61,7 @@ public void sizeToFit() {
 }
 
 public void startAnimation(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_startAnimation_1, sender != null ? sender.id : 0);
-}
-
-public void stopAnimation(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_stopAnimation_1, sender != null ? sender.id : 0);
-}
-
-public int style() {
-	return OS.objc_msgSend(this.id, OS.sel_style);
-}
-
-public boolean usesThreadedAnimation() {
-	return OS.objc_msgSend(this.id, OS.sel_usesThreadedAnimation) != 0;
+	OS.objc_msgSend(this.id, OS.sel_startAnimation_, sender != null ? sender.id : 0);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPropertyListSerialization.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPropertyListSerialization.java
deleted file mode 100644
index 8b821e2393..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPropertyListSerialization.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSPropertyListSerialization extends NSObject {
-
-public NSPropertyListSerialization() {
-	super();
-}
-
-public NSPropertyListSerialization(int id) {
-	super(id);
-}
-
-public static NSData dataFromPropertyList(id plist, int format, int errorString) {
-	int result = OS.objc_msgSend(OS.class_NSPropertyListSerialization, OS.sel_dataFromPropertyList_1format_1errorDescription_1, plist != null ? plist.id : 0, format, errorString);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public static boolean propertyList(id plist, int format) {
-	return OS.objc_msgSend(OS.class_NSPropertyListSerialization, OS.sel_propertyList_1isValidForFormat_1, plist != null ? plist.id : 0, format) != 0;
-}
-
-public static id propertyListFromData(NSData data, int opt, int format, int errorString) {
-	int result = OS.objc_msgSend(OS.class_NSPropertyListSerialization, OS.sel_propertyListFromData_1mutabilityOption_1format_1errorDescription_1, data != null ? data.id : 0, opt, format, errorString);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProtocolChecker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProtocolChecker.java
deleted file mode 100644
index 05b735e978..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProtocolChecker.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSProtocolChecker extends NSProxy {
-
-public NSProtocolChecker() {
-	super();
-}
-
-public NSProtocolChecker(int id) {
-	super(id);
-}
-
-//public id initWithTarget(NSObject anObject, Protocol aProtocol) {
-//	int result = OS.objc_msgSend(this.id, OS.sel_initWithTarget_1protocol_1, anObject != null ? anObject.id : 0, aProtocol != null ? aProtocol.id : 0);
-//	return result != 0 ? new id(result) : null;
-//}
-//
-//public Protocol protocol() {
-//	int result = OS.objc_msgSend(this.id, OS.sel_protocol);
-//	return result != 0 ? new Protocol(result) : null;
-//}
-//
-//public static id protocolCheckerWithTarget(NSObject anObject, Protocol aProtocol) {
-//	int result = OS.objc_msgSend(OS.class_NSProtocolChecker, OS.sel_protocolCheckerWithTarget_1protocol_1, anObject != null ? anObject.id : 0, aProtocol != null ? aProtocol.id : 0);
-//	return result != 0 ? new id(result) : null;
-//}
-
-public NSObject target() {
-	int result = OS.objc_msgSend(this.id, OS.sel_target);
-	return result != 0 ? new NSObject(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProxy.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProxy.java
deleted file mode 100644
index 024bc5a353..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProxy.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSProxy extends NSObject {
-
-public NSProxy() {
-	super();
-}
-
-public NSProxy(int id) {
-	super(id);
-}
-
-//public static id alloc() {
-//	int result = OS.objc_msgSend(OS.class_NSProxy, OS.sel_alloc);
-//	return result != 0 ? new id(result) : null;
-//}
-
-public static id allocWithZone(int zone) {
-	int result = OS.objc_msgSend(OS.class_NSProxy, OS.sel_allocWithZone_1, zone);
-	return result != 0 ? new id(result) : null;
-}
-
-//public static int class() {
-//	return OS.objc_msgSend(OS.class_NSProxy, OS.sel_class);
-//}
-
-public void dealloc() {
-	OS.objc_msgSend(this.id, OS.sel_dealloc);
-}
-
-public NSString description() {
-	int result = OS.objc_msgSend(this.id, OS.sel_description);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void finalize() {
-	OS.objc_msgSend(this.id, OS.sel_finalize);
-}
-
-public void forwardInvocation(NSInvocation invocation) {
-	OS.objc_msgSend(this.id, OS.sel_forwardInvocation_1, invocation != null ? invocation.id : 0);
-}
-
-public NSMethodSignature methodSignatureForSelector(int sel) {
-	int result = OS.objc_msgSend(this.id, OS.sel_methodSignatureForSelector_1, sel);
-	return result != 0 ? new NSMethodSignature(result) : null;
-}
-
-//public static boolean respondsToSelector(int aSelector) {
-//	return OS.objc_msgSend(OS.class_NSProxy, OS.sel_respondsToSelector_1, aSelector) != 0;
-//}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSQuitCommand.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSQuitCommand.java
deleted file mode 100644
index d8d965802b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSQuitCommand.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSQuitCommand extends NSScriptCommand {
-
-public NSQuitCommand() {
-	super();
-}
-
-public NSQuitCommand(int id) {
-	super(id);
-}
-
-public int saveOptions() {
-	return OS.objc_msgSend(this.id, OS.sel_saveOptions);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java
index a7053b0bda..49d343fad0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java
@@ -11,8 +11,7 @@
 package org.eclipse.swt.internal.cocoa;
 
 public class NSRange {
-public int location;
-public int length;
-
-public static int sizeof = 8;
+	public int /*long*/ location;
+	public int /*long*/ length;
+	public static int sizeof = OS.NSRange_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRangeSpecifier.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRangeSpecifier.java
deleted file mode 100644
index f664b248cd..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRangeSpecifier.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSRangeSpecifier extends NSScriptObjectSpecifier {
-
-public NSRangeSpecifier() {
-	super();
-}
-
-public NSRangeSpecifier(int id) {
-	super(id);
-}
-
-public NSScriptObjectSpecifier endSpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_endSpecifier);
-	return result != 0 ? new NSScriptObjectSpecifier(result) : null;
-}
-
-public id initWithContainerClassDescription(NSScriptClassDescription classDesc, NSScriptObjectSpecifier container, NSString property, NSScriptObjectSpecifier startSpec, NSScriptObjectSpecifier endSpec) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContainerClassDescription_1containerSpecifier_1key_1startSpecifier_1endSpecifier_1, classDesc != null ? classDesc.id : 0, container != null ? container.id : 0, property != null ? property.id : 0, startSpec != null ? startSpec.id : 0, endSpec != null ? endSpec.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setEndSpecifier(NSScriptObjectSpecifier endSpec) {
-	OS.objc_msgSend(this.id, OS.sel_setEndSpecifier_1, endSpec != null ? endSpec.id : 0);
-}
-
-public void setStartSpecifier(NSScriptObjectSpecifier startSpec) {
-	OS.objc_msgSend(this.id, OS.sel_setStartSpecifier_1, startSpec != null ? startSpec.id : 0);
-}
-
-public NSScriptObjectSpecifier startSpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_startSpecifier);
-	return result != 0 ? new NSScriptObjectSpecifier(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java
index 2decf78ffb..18d112f7a0 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java
@@ -27,5 +27,5 @@ public class NSRect {
 	public float y;
 	public float width;
 	public float height;
-	public static final int sizeof = 16;
+	public static final int sizeof = OS.NSRect_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRecursiveLock.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRecursiveLock.java
deleted file mode 100644
index eb7547fd94..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRecursiveLock.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSRecursiveLock extends NSObject {
-
-public NSRecursiveLock() {
-	super();
-}
-
-public NSRecursiveLock(int id) {
-	super(id);
-}
-
-public boolean lockBeforeDate(NSDate limit) {
-	return OS.objc_msgSend(this.id, OS.sel_lockBeforeDate_1, limit != null ? limit.id : 0) != 0;
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setName(NSString n) {
-	OS.objc_msgSend(this.id, OS.sel_setName_1, n != null ? n.id : 0);
-}
-
-public boolean tryLock() {
-	return OS.objc_msgSend(this.id, OS.sel_tryLock) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRelativeSpecifier.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRelativeSpecifier.java
deleted file mode 100644
index 72c5797e83..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRelativeSpecifier.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSRelativeSpecifier extends NSScriptObjectSpecifier {
-
-public NSRelativeSpecifier() {
-	super();
-}
-
-public NSRelativeSpecifier(int id) {
-	super(id);
-}
-
-public NSScriptObjectSpecifier baseSpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_baseSpecifier);
-	return result != 0 ? new NSScriptObjectSpecifier(result) : null;
-}
-
-public id initWithContainerClassDescription(NSScriptClassDescription classDesc, NSScriptObjectSpecifier container, NSString property, int relPos, NSScriptObjectSpecifier baseSpecifier) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContainerClassDescription_1containerSpecifier_1key_1relativePosition_1baseSpecifier_1, classDesc != null ? classDesc.id : 0, container != null ? container.id : 0, property != null ? property.id : 0, relPos, baseSpecifier != null ? baseSpecifier.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public int relativePosition() {
-	return OS.objc_msgSend(this.id, OS.sel_relativePosition);
-}
-
-public void setBaseSpecifier(NSScriptObjectSpecifier baseSpecifier) {
-	OS.objc_msgSend(this.id, OS.sel_setBaseSpecifier_1, baseSpecifier != null ? baseSpecifier.id : 0);
-}
-
-public void setRelativePosition(int relPos) {
-	OS.objc_msgSend(this.id, OS.sel_setRelativePosition_1, relPos);
-}
-
-}
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 fbd38495fe..137ee7cf40 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
@@ -16,7 +16,11 @@ public NSResponder() {
 	super();
 }
 
-public NSResponder(int id) {
+public NSResponder(int /*long*/ id) {
+	super(id);
+}
+
+public NSResponder(id id) {
 	super(id);
 }
 
@@ -28,322 +32,80 @@ public boolean becomeFirstResponder() {
 	return OS.objc_msgSend(this.id, OS.sel_becomeFirstResponder) != 0;
 }
 
-public void cancelOperation(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_cancelOperation_1, sender != null ? sender.id : 0);
-}
-
-public void capitalizeWord(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_capitalizeWord_1, sender != null ? sender.id : 0);
-}
-
-public void centerSelectionInVisibleArea(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_centerSelectionInVisibleArea_1, sender != null ? sender.id : 0);
-}
-
-public void changeCaseOfLetter(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_changeCaseOfLetter_1, sender != null ? sender.id : 0);
-}
-
-public void complete(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_complete_1, sender != null ? sender.id : 0);
-}
-
-public void cursorUpdate(NSEvent event) {
-	OS.objc_msgSend(this.id, OS.sel_cursorUpdate_1, event != null ? event.id : 0);
-}
-
-public void deleteBackward(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_deleteBackward_1, sender != null ? sender.id : 0);
-}
-
-public void deleteBackwardByDecomposingPreviousCharacter(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_deleteBackwardByDecomposingPreviousCharacter_1, sender != null ? sender.id : 0);
-}
-
-public void deleteForward(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_deleteForward_1, sender != null ? sender.id : 0);
-}
-
-public void deleteToBeginningOfLine(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_deleteToBeginningOfLine_1, sender != null ? sender.id : 0);
-}
-
-public void deleteToBeginningOfParagraph(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_deleteToBeginningOfParagraph_1, sender != null ? sender.id : 0);
-}
-
-public void deleteToEndOfLine(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_deleteToEndOfLine_1, sender != null ? sender.id : 0);
-}
-
-public void deleteToEndOfParagraph(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_deleteToEndOfParagraph_1, sender != null ? sender.id : 0);
-}
-
-public void deleteToMark(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_deleteToMark_1, sender != null ? sender.id : 0);
-}
-
-public void deleteWordBackward(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_deleteWordBackward_1, sender != null ? sender.id : 0);
-}
-
-public void deleteWordForward(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_deleteWordForward_1, sender != null ? sender.id : 0);
-}
-
 public void doCommandBySelector(int aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_doCommandBySelector_1, aSelector);
+	OS.objc_msgSend(this.id, OS.sel_doCommandBySelector_, aSelector);
 }
 
 public void flagsChanged(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_flagsChanged_1, theEvent != null ? theEvent.id : 0);
-}
-
-public void flushBufferedKeyEvents() {
-	OS.objc_msgSend(this.id, OS.sel_flushBufferedKeyEvents);
+	OS.objc_msgSend(this.id, OS.sel_flagsChanged_, theEvent != null ? theEvent.id : 0);
 }
 
 public void helpRequested(NSEvent eventPtr) {
-	OS.objc_msgSend(this.id, OS.sel_helpRequested_1, eventPtr != null ? eventPtr.id : 0);
-}
-
-public void indent(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_indent_1, sender != null ? sender.id : 0);
-}
-
-public void insertBacktab(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_insertBacktab_1, sender != null ? sender.id : 0);
-}
-
-public void insertContainerBreak(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_insertContainerBreak_1, sender != null ? sender.id : 0);
-}
-
-public void insertLineBreak(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_insertLineBreak_1, sender != null ? sender.id : 0);
-}
-
-public void insertNewline(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_insertNewline_1, sender != null ? sender.id : 0);
-}
-
-public void insertNewlineIgnoringFieldEditor(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_insertNewlineIgnoringFieldEditor_1, sender != null ? sender.id : 0);
-}
-
-public void insertParagraphSeparator(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_insertParagraphSeparator_1, sender != null ? sender.id : 0);
-}
-
-public void insertTab(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_insertTab_1, sender != null ? sender.id : 0);
-}
-
-public void insertTabIgnoringFieldEditor(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_insertTabIgnoringFieldEditor_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_helpRequested_, eventPtr != null ? eventPtr.id : 0);
 }
 
 public void insertText(id insertString) {
-	OS.objc_msgSend(this.id, OS.sel_insertText_1, insertString != null ? insertString.id : 0);
-}
-
-public int interfaceStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_interfaceStyle);
+	OS.objc_msgSend(this.id, OS.sel_insertText_, insertString != null ? insertString.id : 0);
 }
 
 public void interpretKeyEvents(NSArray eventArray) {
-	OS.objc_msgSend(this.id, OS.sel_interpretKeyEvents_1, eventArray != null ? eventArray.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_interpretKeyEvents_, eventArray != null ? eventArray.id : 0);
 }
 
 public void keyDown(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_keyDown_1, theEvent != null ? theEvent.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_keyDown_, theEvent != null ? theEvent.id : 0);
 }
 
 public void keyUp(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_keyUp_1, theEvent != null ? theEvent.id : 0);
-}
-
-public void lowercaseWord(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_lowercaseWord_1, sender != null ? sender.id : 0);
-}
-
-public NSMenu menu() {
-	int result = OS.objc_msgSend(this.id, OS.sel_menu);
-	return result != 0 ? new NSMenu(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_keyUp_, theEvent != null ? theEvent.id : 0);
 }
 
 public void mouseDown(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_mouseDown_1, theEvent != null ? theEvent.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_mouseDown_, theEvent != null ? theEvent.id : 0);
 }
 
 public void mouseDragged(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_mouseDragged_1, theEvent != null ? theEvent.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_mouseDragged_, theEvent != null ? theEvent.id : 0);
 }
 
 public void mouseEntered(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_mouseEntered_1, theEvent != null ? theEvent.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_mouseEntered_, theEvent != null ? theEvent.id : 0);
 }
 
 public void mouseExited(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_mouseExited_1, theEvent != null ? theEvent.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_mouseExited_, theEvent != null ? theEvent.id : 0);
 }
 
 public void mouseMoved(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_mouseMoved_1, theEvent != null ? theEvent.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_mouseMoved_, theEvent != null ? theEvent.id : 0);
 }
 
 public void mouseUp(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_mouseUp_1, theEvent != null ? theEvent.id : 0);
-}
-
-public void moveBackward(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveBackward_1, sender != null ? sender.id : 0);
-}
-
-public void moveBackwardAndModifySelection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveBackwardAndModifySelection_1, sender != null ? sender.id : 0);
-}
-
-public void moveDown(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveDown_1, sender != null ? sender.id : 0);
-}
-
-public void moveDownAndModifySelection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveDownAndModifySelection_1, sender != null ? sender.id : 0);
-}
-
-public void moveForward(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveForward_1, sender != null ? sender.id : 0);
-}
-
-public void moveForwardAndModifySelection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveForwardAndModifySelection_1, sender != null ? sender.id : 0);
-}
-
-public void moveLeft(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveLeft_1, sender != null ? sender.id : 0);
-}
-
-public void moveLeftAndModifySelection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveLeftAndModifySelection_1, sender != null ? sender.id : 0);
-}
-
-public void moveRight(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveRight_1, sender != null ? sender.id : 0);
-}
-
-public void moveRightAndModifySelection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveRightAndModifySelection_1, sender != null ? sender.id : 0);
-}
-
-public void moveToBeginningOfDocument(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveToBeginningOfDocument_1, sender != null ? sender.id : 0);
-}
-
-public void moveToBeginningOfLine(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveToBeginningOfLine_1, sender != null ? sender.id : 0);
-}
-
-public void moveToBeginningOfParagraph(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveToBeginningOfParagraph_1, sender != null ? sender.id : 0);
-}
-
-public void moveToEndOfDocument(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveToEndOfDocument_1, sender != null ? sender.id : 0);
-}
-
-public void moveToEndOfLine(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveToEndOfLine_1, sender != null ? sender.id : 0);
-}
-
-public void moveToEndOfParagraph(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveToEndOfParagraph_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_mouseUp_, theEvent != null ? theEvent.id : 0);
 }
 
 public void moveUp(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveUp_1, sender != null ? sender.id : 0);
-}
-
-public void moveUpAndModifySelection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveUpAndModifySelection_1, sender != null ? sender.id : 0);
-}
-
-public void moveWordBackward(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveWordBackward_1, sender != null ? sender.id : 0);
-}
-
-public void moveWordBackwardAndModifySelection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveWordBackwardAndModifySelection_1, sender != null ? sender.id : 0);
-}
-
-public void moveWordForward(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveWordForward_1, sender != null ? sender.id : 0);
-}
-
-public void moveWordForwardAndModifySelection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveWordForwardAndModifySelection_1, sender != null ? sender.id : 0);
-}
-
-public void moveWordLeft(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveWordLeft_1, sender != null ? sender.id : 0);
-}
-
-public void moveWordLeftAndModifySelection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveWordLeftAndModifySelection_1, sender != null ? sender.id : 0);
-}
-
-public void moveWordRight(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveWordRight_1, sender != null ? sender.id : 0);
-}
-
-public void moveWordRightAndModifySelection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveWordRightAndModifySelection_1, sender != null ? sender.id : 0);
-}
-
-public NSResponder nextResponder() {
-	int result = OS.objc_msgSend(this.id, OS.sel_nextResponder);
-	return result == this.id ? this : (result != 0 ? new NSResponder(result) : null);
-}
-
-public void noResponderFor(int eventSelector) {
-	OS.objc_msgSend(this.id, OS.sel_noResponderFor_1, eventSelector);
+	OS.objc_msgSend(this.id, OS.sel_moveUp_, sender != null ? sender.id : 0);
 }
 
 public void otherMouseDown(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_otherMouseDown_1, theEvent != null ? theEvent.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_otherMouseDown_, theEvent != null ? theEvent.id : 0);
 }
 
 public void otherMouseDragged(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_otherMouseDragged_1, theEvent != null ? theEvent.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_otherMouseDragged_, theEvent != null ? theEvent.id : 0);
 }
 
 public void otherMouseUp(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_otherMouseUp_1, theEvent != null ? theEvent.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_otherMouseUp_, theEvent != null ? theEvent.id : 0);
 }
 
 public void pageDown(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_pageDown_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_pageDown_, sender != null ? sender.id : 0);
 }
 
 public void pageUp(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_pageUp_1, sender != null ? sender.id : 0);
-}
-
-public boolean performKeyEquivalent(NSEvent theEvent) {
-	return OS.objc_msgSend(this.id, OS.sel_performKeyEquivalent_1, theEvent != null ? theEvent.id : 0) != 0;
-}
-
-public boolean performMnemonic(NSString theString) {
-	return OS.objc_msgSend(this.id, OS.sel_performMnemonic_1, theString != null ? theString.id : 0) != 0;
-}
-
-public boolean presentError_(NSError error) {
-	return OS.objc_msgSend(this.id, OS.sel_presentError_1, error != null ? error.id : 0) != 0;
-}
-
-public void presentError_modalForWindow_delegate_didPresentSelector_contextInfo_(NSError error, NSWindow window, id delegate, int didPresentSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_presentError_1modalForWindow_1delegate_1didPresentSelector_1contextInfo_1, error != null ? error.id : 0, window != null ? window.id : 0, delegate != null ? delegate.id : 0, didPresentSelector, contextInfo);
+	OS.objc_msgSend(this.id, OS.sel_pageUp_, sender != null ? sender.id : 0);
 }
 
 public boolean resignFirstResponder() {
@@ -351,126 +113,19 @@ public boolean resignFirstResponder() {
 }
 
 public void rightMouseDown(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_rightMouseDown_1, theEvent != null ? theEvent.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_rightMouseDown_, theEvent != null ? theEvent.id : 0);
 }
 
 public void rightMouseDragged(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_rightMouseDragged_1, theEvent != null ? theEvent.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_rightMouseDragged_, theEvent != null ? theEvent.id : 0);
 }
 
 public void rightMouseUp(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_rightMouseUp_1, theEvent != null ? theEvent.id : 0);
-}
-
-public void scrollLineDown(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_scrollLineDown_1, sender != null ? sender.id : 0);
-}
-
-public void scrollLineUp(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_scrollLineUp_1, sender != null ? sender.id : 0);
-}
-
-public void scrollPageDown(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_scrollPageDown_1, sender != null ? sender.id : 0);
-}
-
-public void scrollPageUp(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_scrollPageUp_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_rightMouseUp_, theEvent != null ? theEvent.id : 0);
 }
 
 public void scrollWheel(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_scrollWheel_1, theEvent != null ? theEvent.id : 0);
-}
-
-public void selectAll(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectAll_1, sender != null ? sender.id : 0);
-}
-
-public void selectLine(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectLine_1, sender != null ? sender.id : 0);
-}
-
-public void selectParagraph(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectParagraph_1, sender != null ? sender.id : 0);
-}
-
-public void selectToMark(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectToMark_1, sender != null ? sender.id : 0);
-}
-
-public void selectWord(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectWord_1, sender != null ? sender.id : 0);
-}
-
-public void setInterfaceStyle(int interfaceStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setInterfaceStyle_1, interfaceStyle);
-}
-
-public void setMark(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_setMark_1, sender != null ? sender.id : 0);
-}
-
-public void setMenu(NSMenu menu) {
-	OS.objc_msgSend(this.id, OS.sel_setMenu_1, menu != null ? menu.id : 0);
-}
-
-public void setNextResponder(NSResponder aResponder) {
-	OS.objc_msgSend(this.id, OS.sel_setNextResponder_1, aResponder != null ? aResponder.id : 0);
-}
-
-public boolean shouldBeTreatedAsInkEvent(NSEvent theEvent) {
-	return OS.objc_msgSend(this.id, OS.sel_shouldBeTreatedAsInkEvent_1, theEvent != null ? theEvent.id : 0) != 0;
-}
-
-public void showContextHelp(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_showContextHelp_1, sender != null ? sender.id : 0);
-}
-
-public void swapWithMark(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_swapWithMark_1, sender != null ? sender.id : 0);
-}
-
-public void tabletPoint(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_tabletPoint_1, theEvent != null ? theEvent.id : 0);
-}
-
-public void tabletProximity(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_tabletProximity_1, theEvent != null ? theEvent.id : 0);
-}
-
-public void transpose(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_transpose_1, sender != null ? sender.id : 0);
-}
-
-public void transposeWords(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_transposeWords_1, sender != null ? sender.id : 0);
-}
-
-public boolean tryToPerform(int anAction, id anObject) {
-	return OS.objc_msgSend(this.id, OS.sel_tryToPerform_1with_1, anAction, anObject != null ? anObject.id : 0) != 0;
-}
-
-public NSUndoManager undoManager() {
-	int result = OS.objc_msgSend(this.id, OS.sel_undoManager);
-	return result != 0 ? new NSUndoManager(result) : null;
-}
-
-public void uppercaseWord(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_uppercaseWord_1, sender != null ? sender.id : 0);
-}
-
-public id validRequestorForSendType(NSString sendType, NSString returnType) {
-	int result = OS.objc_msgSend(this.id, OS.sel_validRequestorForSendType_1returnType_1, sendType != null ? sendType.id : 0, returnType != null ? returnType.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSError willPresentError(NSError error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_willPresentError_1, error != null ? error.id : 0);
-	return result != 0 ? new NSError(result) : null;
-}
-
-public void yank(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_yank_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_scrollWheel_, theEvent != null ? theEvent.id : 0);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRuleEditor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRuleEditor.java
deleted file mode 100644
index 8af22c4ba2..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRuleEditor.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSRuleEditor extends NSControl {
-
-public NSRuleEditor() {
-	super();
-}
-
-public NSRuleEditor(int id) {
-	super(id);
-}
-
-public void addRow(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_addRow_1, sender != null ? sender.id : 0);
-}
-
-public boolean canRemoveAllRows() {
-	return OS.objc_msgSend(this.id, OS.sel_canRemoveAllRows) != 0;
-}
-
-public NSArray criteriaForRow(int row) {
-	int result = OS.objc_msgSend(this.id, OS.sel_criteriaForRow_1, row);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString criteriaKeyPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_criteriaKeyPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSArray displayValuesForRow(int row) {
-	int result = OS.objc_msgSend(this.id, OS.sel_displayValuesForRow_1, row);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString displayValuesKeyPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_displayValuesKeyPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSDictionary formattingDictionary() {
-	int result = OS.objc_msgSend(this.id, OS.sel_formattingDictionary);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSString formattingStringsFilename() {
-	int result = OS.objc_msgSend(this.id, OS.sel_formattingStringsFilename);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void insertRowAtIndex(int rowIndex, int rowType, int parentRow, boolean shouldAnimate) {
-	OS.objc_msgSend(this.id, OS.sel_insertRowAtIndex_1withType_1asSubrowOfRow_1animate_1, rowIndex, rowType, parentRow, shouldAnimate);
-}
-
-public boolean isEditable() {
-	return OS.objc_msgSend(this.id, OS.sel_isEditable) != 0;
-}
-
-public int nestingMode() {
-	return OS.objc_msgSend(this.id, OS.sel_nestingMode);
-}
-
-public int numberOfRows() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfRows);
-}
-
-public int parentRowForRow(int rowIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_parentRowForRow_1, rowIndex);
-}
-
-public NSPredicate predicate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_predicate);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public NSPredicate predicateForRow(int row) {
-	int result = OS.objc_msgSend(this.id, OS.sel_predicateForRow_1, row);
-	return result != 0 ? new NSPredicate(result) : null;
-}
-
-public void reloadCriteria() {
-	OS.objc_msgSend(this.id, OS.sel_reloadCriteria);
-}
-
-public void reloadPredicate() {
-	OS.objc_msgSend(this.id, OS.sel_reloadPredicate);
-}
-
-public void removeRowAtIndex(int rowIndex) {
-	OS.objc_msgSend(this.id, OS.sel_removeRowAtIndex_1, rowIndex);
-}
-
-public void removeRowsAtIndexes(NSIndexSet rowIndexes, boolean includeSubrows) {
-	OS.objc_msgSend(this.id, OS.sel_removeRowsAtIndexes_1includeSubrows_1, rowIndexes != null ? rowIndexes.id : 0, includeSubrows);
-}
-
-public int rowClass() {
-	return OS.objc_msgSend(this.id, OS.sel_rowClass);
-}
-
-public int rowForDisplayValue(id displayValue) {
-	return OS.objc_msgSend(this.id, OS.sel_rowForDisplayValue_1, displayValue != null ? displayValue.id : 0);
-}
-
-public float rowHeight() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rowHeight);
-}
-
-public int rowTypeForRow(int rowIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_rowTypeForRow_1, rowIndex);
-}
-
-public NSString rowTypeKeyPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_rowTypeKeyPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void selectRowIndexes(NSIndexSet indexes, boolean extend) {
-	OS.objc_msgSend(this.id, OS.sel_selectRowIndexes_1byExtendingSelection_1, indexes != null ? indexes.id : 0, extend);
-}
-
-public NSIndexSet selectedRowIndexes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedRowIndexes);
-	return result != 0 ? new NSIndexSet(result) : null;
-}
-
-public void setCanRemoveAllRows(boolean val) {
-	OS.objc_msgSend(this.id, OS.sel_setCanRemoveAllRows_1, val);
-}
-
-public void setCriteria(NSArray criteria, NSArray values, int rowIndex) {
-	OS.objc_msgSend(this.id, OS.sel_setCriteria_1andDisplayValues_1forRowAtIndex_1, criteria != null ? criteria.id : 0, values != null ? values.id : 0, rowIndex);
-}
-
-public void setCriteriaKeyPath(NSString keyPath) {
-	OS.objc_msgSend(this.id, OS.sel_setCriteriaKeyPath_1, keyPath != null ? keyPath.id : 0);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setDisplayValuesKeyPath(NSString keyPath) {
-	OS.objc_msgSend(this.id, OS.sel_setDisplayValuesKeyPath_1, keyPath != null ? keyPath.id : 0);
-}
-
-public void setEditable(boolean editable) {
-	OS.objc_msgSend(this.id, OS.sel_setEditable_1, editable);
-}
-
-public void setFormattingDictionary(NSDictionary dictionary) {
-	OS.objc_msgSend(this.id, OS.sel_setFormattingDictionary_1, dictionary != null ? dictionary.id : 0);
-}
-
-public void setFormattingStringsFilename(NSString stringsFilename) {
-	OS.objc_msgSend(this.id, OS.sel_setFormattingStringsFilename_1, stringsFilename != null ? stringsFilename.id : 0);
-}
-
-public void setNestingMode(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setNestingMode_1, mode);
-}
-
-public void setRowClass(int rowClass) {
-	OS.objc_msgSend(this.id, OS.sel_setRowClass_1, rowClass);
-}
-
-public void setRowHeight(float height) {
-	OS.objc_msgSend(this.id, OS.sel_setRowHeight_1, height);
-}
-
-public void setRowTypeKeyPath(NSString keyPath) {
-	OS.objc_msgSend(this.id, OS.sel_setRowTypeKeyPath_1, keyPath != null ? keyPath.id : 0);
-}
-
-public void setSubrowsKeyPath(NSString keyPath) {
-	OS.objc_msgSend(this.id, OS.sel_setSubrowsKeyPath_1, keyPath != null ? keyPath.id : 0);
-}
-
-public NSIndexSet subrowIndexesForRow(int rowIndex) {
-	int result = OS.objc_msgSend(this.id, OS.sel_subrowIndexesForRow_1, rowIndex);
-	return result != 0 ? new NSIndexSet(result) : null;
-}
-
-public NSString subrowsKeyPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_subrowsKeyPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRulerMarker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRulerMarker.java
deleted file mode 100644
index 1b3f056671..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRulerMarker.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSRulerMarker extends NSObject {
-
-public NSRulerMarker() {
-	super();
-}
-
-public NSRulerMarker(int id) {
-	super(id);
-}
-
-public void drawRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_drawRect_1, rect);
-}
-
-public NSImage image() {
-	int result = OS.objc_msgSend(this.id, OS.sel_image);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSPoint imageOrigin() {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_imageOrigin);
-	return result;
-}
-
-public NSRect imageRectInRuler() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_imageRectInRuler);
-	return result;
-}
-
-public id initWithRulerView(NSRulerView ruler, float location, NSImage image, NSPoint imageOrigin) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithRulerView_1markerLocation_1image_1imageOrigin_1, ruler != null ? ruler.id : 0, location, image != null ? image.id : 0, imageOrigin);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isDragging() {
-	return OS.objc_msgSend(this.id, OS.sel_isDragging) != 0;
-}
-
-public boolean isMovable() {
-	return OS.objc_msgSend(this.id, OS.sel_isMovable) != 0;
-}
-
-public boolean isRemovable() {
-	return OS.objc_msgSend(this.id, OS.sel_isRemovable) != 0;
-}
-
-public float markerLocation() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_markerLocation);
-}
-
-public id  representedObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_representedObject);
-	return result != 0 ? new id (result) : null;
-}
-
-public NSRulerView ruler() {
-	int result = OS.objc_msgSend(this.id, OS.sel_ruler);
-	return result != 0 ? new NSRulerView(result) : null;
-}
-
-public void setImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1, image != null ? image.id : 0);
-}
-
-public void setImageOrigin(NSPoint imageOrigin) {
-	OS.objc_msgSend(this.id, OS.sel_setImageOrigin_1, imageOrigin);
-}
-
-public void setMarkerLocation(float location) {
-	OS.objc_msgSend(this.id, OS.sel_setMarkerLocation_1, location);
-}
-
-public void setMovable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setMovable_1, flag);
-}
-
-public void setRemovable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setRemovable_1, flag);
-}
-
-public void setRepresentedObject(id  representedObject) {
-	OS.objc_msgSend(this.id, OS.sel_setRepresentedObject_1, representedObject != null ? representedObject.id : 0);
-}
-
-public float thicknessRequiredInRuler() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_thicknessRequiredInRuler);
-}
-
-public boolean trackMouse(NSEvent mouseDownEvent, boolean isAdding) {
-	return OS.objc_msgSend(this.id, OS.sel_trackMouse_1adding_1, mouseDownEvent != null ? mouseDownEvent.id : 0, isAdding) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRulerView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRulerView.java
deleted file mode 100644
index 0da7897a4a..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRulerView.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSRulerView extends NSView {
-
-public NSRulerView() {
-	super();
-}
-
-public NSRulerView(int id) {
-	super(id);
-}
-
-public NSView accessoryView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_accessoryView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public void addMarker(NSRulerMarker marker) {
-	OS.objc_msgSend(this.id, OS.sel_addMarker_1, marker != null ? marker.id : 0);
-}
-
-public float baselineLocation() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_baselineLocation);
-}
-
-public NSView clientView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_clientView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public void drawHashMarksAndLabelsInRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_drawHashMarksAndLabelsInRect_1, rect);
-}
-
-public void drawMarkersInRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_drawMarkersInRect_1, rect);
-}
-
-public NSRulerView initWithScrollView(NSScrollView scrollView, int orientation) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithScrollView_1orientation_1, scrollView != null ? scrollView.id : 0, orientation);
-	return result != 0 ? this : null;
-}
-
-public void invalidateHashMarks() {
-	OS.objc_msgSend(this.id, OS.sel_invalidateHashMarks);
-}
-
-public boolean isFlipped() {
-	return OS.objc_msgSend(this.id, OS.sel_isFlipped) != 0;
-}
-
-public NSArray markers() {
-	int result = OS.objc_msgSend(this.id, OS.sel_markers);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString measurementUnits() {
-	int result = OS.objc_msgSend(this.id, OS.sel_measurementUnits);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void moveRulerlineFromLocation(float oldLocation, float newLocation) {
-	OS.objc_msgSend(this.id, OS.sel_moveRulerlineFromLocation_1toLocation_1, oldLocation, newLocation);
-}
-
-public int orientation() {
-	return OS.objc_msgSend(this.id, OS.sel_orientation);
-}
-
-public float originOffset() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_originOffset);
-}
-
-public static void registerUnitWithName(NSString unitName, NSString abbreviation, float conversionFactor, NSArray stepUpCycle, NSArray stepDownCycle) {
-	OS.objc_msgSend(OS.class_NSRulerView, OS.sel_registerUnitWithName_1abbreviation_1unitToPointsConversionFactor_1stepUpCycle_1stepDownCycle_1, unitName != null ? unitName.id : 0, abbreviation != null ? abbreviation.id : 0, conversionFactor, stepUpCycle != null ? stepUpCycle.id : 0, stepDownCycle != null ? stepDownCycle.id : 0);
-}
-
-public void removeMarker(NSRulerMarker marker) {
-	OS.objc_msgSend(this.id, OS.sel_removeMarker_1, marker != null ? marker.id : 0);
-}
-
-public float requiredThickness() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_requiredThickness);
-}
-
-public float reservedThicknessForAccessoryView() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_reservedThicknessForAccessoryView);
-}
-
-public float reservedThicknessForMarkers() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_reservedThicknessForMarkers);
-}
-
-public float ruleThickness() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_ruleThickness);
-}
-
-public NSScrollView scrollView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_scrollView);
-	return result != 0 ? new NSScrollView(result) : null;
-}
-
-public void setAccessoryView(NSView accessory) {
-	OS.objc_msgSend(this.id, OS.sel_setAccessoryView_1, accessory != null ? accessory.id : 0);
-}
-
-public void setClientView(NSView client) {
-	OS.objc_msgSend(this.id, OS.sel_setClientView_1, client != null ? client.id : 0);
-}
-
-public void setMarkers(NSArray markers) {
-	OS.objc_msgSend(this.id, OS.sel_setMarkers_1, markers != null ? markers.id : 0);
-}
-
-public void setMeasurementUnits(NSString unitName) {
-	OS.objc_msgSend(this.id, OS.sel_setMeasurementUnits_1, unitName != null ? unitName.id : 0);
-}
-
-public void setOrientation(int orientation) {
-	OS.objc_msgSend(this.id, OS.sel_setOrientation_1, orientation);
-}
-
-public void setOriginOffset(float offset) {
-	OS.objc_msgSend(this.id, OS.sel_setOriginOffset_1, offset);
-}
-
-public void setReservedThicknessForAccessoryView(float thickness) {
-	OS.objc_msgSend(this.id, OS.sel_setReservedThicknessForAccessoryView_1, thickness);
-}
-
-public void setReservedThicknessForMarkers(float thickness) {
-	OS.objc_msgSend(this.id, OS.sel_setReservedThicknessForMarkers_1, thickness);
-}
-
-public void setRuleThickness(float thickness) {
-	OS.objc_msgSend(this.id, OS.sel_setRuleThickness_1, thickness);
-}
-
-public void setScrollView(NSScrollView scrollView) {
-	OS.objc_msgSend(this.id, OS.sel_setScrollView_1, scrollView != null ? scrollView.id : 0);
-}
-
-public boolean trackMarker(NSRulerMarker marker, NSEvent event) {
-	return OS.objc_msgSend(this.id, OS.sel_trackMarker_1withMouseEvent_1, marker != null ? marker.id : 0, event != null ? event.id : 0) != 0;
-}
-
-}
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 84826dcca6..82684a0c61 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
@@ -16,37 +16,12 @@ public NSRunLoop() {
 	super();
 }
 
-public NSRunLoop(int id) {
+public NSRunLoop(int /*long*/ id) {
 	super(id);
 }
 
-public void acceptInputForMode(NSString mode, NSDate limitDate) {
-	OS.objc_msgSend(this.id, OS.sel_acceptInputForMode_1beforeDate_1, mode != null ? mode.id : 0, limitDate != null ? limitDate.id : 0);
-}
-
-public void addPort(NSPort aPort, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_addPort_1forMode_1, aPort != null ? aPort.id : 0, mode != null ? mode.id : 0);
-}
-
-public void addTimer(NSTimer timer, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_addTimer_1forMode_1, timer != null ? timer.id : 0, mode != null ? mode.id : 0);
-}
-
-public void cancelPerformSelector(int aSelector, id target, id arg) {
-	OS.objc_msgSend(this.id, OS.sel_cancelPerformSelector_1target_1argument_1, aSelector, target != null ? target.id : 0, arg != null ? arg.id : 0);
-}
-
-public void cancelPerformSelectorsWithTarget(id target) {
-	OS.objc_msgSend(this.id, OS.sel_cancelPerformSelectorsWithTarget_1, target != null ? target.id : 0);
-}
-
-public void configureAsServer() {
-	OS.objc_msgSend(this.id, OS.sel_configureAsServer);
-}
-
-public NSString currentMode() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currentMode);
-	return result != 0 ? new NSString(result) : null;
+public NSRunLoop(id id) {
+	super(id);
 }
 
 public static NSRunLoop currentRunLoop() {
@@ -54,38 +29,13 @@ public static NSRunLoop currentRunLoop() {
 	return result != 0 ? new NSRunLoop(result) : null;
 }
 
-public int getCFRunLoop() {
-	return OS.objc_msgSend(this.id, OS.sel_getCFRunLoop);
-}
-
-public NSDate limitDateForMode(NSString mode) {
-	int result = OS.objc_msgSend(this.id, OS.sel_limitDateForMode_1, mode != null ? mode.id : 0);
-	return result != 0 ? new NSDate(result) : null;
-}
-
 public static NSRunLoop mainRunLoop() {
 	int result = OS.objc_msgSend(OS.class_NSRunLoop, OS.sel_mainRunLoop);
 	return result != 0 ? new NSRunLoop(result) : null;
 }
 
-public void performSelector(int aSelector, id target, id arg, int order, NSArray modes) {
-	OS.objc_msgSend(this.id, OS.sel_performSelector_1target_1argument_1order_1modes_1, aSelector, target != null ? target.id : 0, arg != null ? arg.id : 0, order, modes != null ? modes.id : 0);
-}
-
-public void removePort(NSPort aPort, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_removePort_1forMode_1, aPort != null ? aPort.id : 0, mode != null ? mode.id : 0);
-}
-
-public void run() {
-	OS.objc_msgSend(this.id, OS.sel_run);
-}
-
 public boolean runMode(NSString mode, NSDate limitDate) {
-	return OS.objc_msgSend(this.id, OS.sel_runMode_1beforeDate_1, mode != null ? mode.id : 0, limitDate != null ? limitDate.id : 0) != 0;
-}
-
-public void runUntilDate(NSDate limitDate) {
-	OS.objc_msgSend(this.id, OS.sel_runUntilDate_1, limitDate != null ? limitDate.id : 0);
+	return OS.objc_msgSend(this.id, OS.sel_runMode_beforeDate_, mode != null ? mode.id : 0, limitDate != null ? limitDate.id : 0) != 0;
 }
 
 }
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 2abd1190c9..325bb80301 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
@@ -16,53 +16,12 @@ public NSSavePanel() {
 	super();
 }
 
-public NSSavePanel(int id) {
+public NSSavePanel(int /*long*/ id) {
 	super(id);
 }
 
-public NSURL URL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_URL);
-	return result != 0 ? new NSURL(result) : null;
-}
-
-public NSView accessoryView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_accessoryView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public NSArray allowedFileTypes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allowedFileTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean allowsOtherFileTypes() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsOtherFileTypes) != 0;
-}
-
-public void beginSheetForDirectory(NSString path, NSString name, NSWindow docWindow, id delegate, int didEndSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_beginSheetForDirectory_1file_1modalForWindow_1modalDelegate_1didEndSelector_1contextInfo_1, path != null ? path.id : 0, name != null ? name.id : 0, docWindow != null ? docWindow.id : 0, delegate != null ? delegate.id : 0, didEndSelector, contextInfo);
-}
-
-public boolean canCreateDirectories() {
-	return OS.objc_msgSend(this.id, OS.sel_canCreateDirectories) != 0;
-}
-
-public boolean canSelectHiddenExtension() {
-	return OS.objc_msgSend(this.id, OS.sel_canSelectHiddenExtension) != 0;
-}
-
-public void cancel(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_cancel_1, sender != null ? sender.id : 0);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString directory() {
-	int result = OS.objc_msgSend(this.id, OS.sel_directory);
-	return result != 0 ? new NSString(result) : null;
+public NSSavePanel(id id) {
+	super(id);
 }
 
 public NSString filename() {
@@ -70,122 +29,21 @@ public NSString filename() {
 	return result != 0 ? new NSString(result) : null;
 }
 
-public boolean isExpanded() {
-	return OS.objc_msgSend(this.id, OS.sel_isExpanded) != 0;
-}
-
-public boolean isExtensionHidden() {
-	return OS.objc_msgSend(this.id, OS.sel_isExtensionHidden) != 0;
-}
-
-public NSString message() {
-	int result = OS.objc_msgSend(this.id, OS.sel_message);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString nameFieldLabel() {
-	int result = OS.objc_msgSend(this.id, OS.sel_nameFieldLabel);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void ok(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_ok_1, sender != null ? sender.id : 0);
-}
-
-public NSString prompt() {
-	int result = OS.objc_msgSend(this.id, OS.sel_prompt);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString requiredFileType() {
-	int result = OS.objc_msgSend(this.id, OS.sel_requiredFileType);
-	return result != 0 ? new NSString(result) : null;
-}
-
 public int runModal() {
 	return OS.objc_msgSend(this.id, OS.sel_runModal);
 }
 
-public int runModalForDirectory(NSString path, NSString name) {
-	return OS.objc_msgSend(this.id, OS.sel_runModalForDirectory_1file_1, path != null ? path.id : 0, name != null ? name.id : 0);
-}
-
 public static NSSavePanel savePanel() {
 	int result = OS.objc_msgSend(OS.class_NSSavePanel, OS.sel_savePanel);
 	return result != 0 ? new NSSavePanel(result) : null;
 }
 
-public void selectText(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectText_1, sender != null ? sender.id : 0);
-}
-
-public void setAccessoryView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setAccessoryView_1, view != null ? view.id : 0);
-}
-
-public void setAllowedFileTypes(NSArray types) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowedFileTypes_1, types != null ? types.id : 0);
-}
-
-public void setAllowsOtherFileTypes(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsOtherFileTypes_1, flag);
-}
-
-public void setCanCreateDirectories(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCanCreateDirectories_1, flag);
-}
-
-public void setCanSelectHiddenExtension(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCanSelectHiddenExtension_1, flag);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
 public void setDirectory(NSString path) {
-	OS.objc_msgSend(this.id, OS.sel_setDirectory_1, path != null ? path.id : 0);
-}
-
-public void setExtensionHidden(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setExtensionHidden_1, flag);
-}
-
-public void setMessage(NSString message) {
-	OS.objc_msgSend(this.id, OS.sel_setMessage_1, message != null ? message.id : 0);
-}
-
-public void setNameFieldLabel(NSString label) {
-	OS.objc_msgSend(this.id, OS.sel_setNameFieldLabel_1, label != null ? label.id : 0);
-}
-
-public void setPrompt(NSString prompt) {
-	OS.objc_msgSend(this.id, OS.sel_setPrompt_1, prompt != null ? prompt.id : 0);
-}
-
-public void setRequiredFileType(NSString type) {
-	OS.objc_msgSend(this.id, OS.sel_setRequiredFileType_1, type != null ? type.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setDirectory_, path != null ? path.id : 0);
 }
 
 public void setTitle(NSString title) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, title != null ? title.id : 0);
-}
-
-public void setTreatsFilePackagesAsDirectories(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setTreatsFilePackagesAsDirectories_1, flag);
-}
-
-public NSString title() {
-	int result = OS.objc_msgSend(this.id, OS.sel_title);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean treatsFilePackagesAsDirectories() {
-	return OS.objc_msgSend(this.id, OS.sel_treatsFilePackagesAsDirectories) != 0;
-}
-
-public void validateVisibleColumns() {
-	OS.objc_msgSend(this.id, OS.sel_validateVisibleColumns);
+	OS.objc_msgSend(this.id, OS.sel_setTitle_, title != null ? title.id : 0);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScanner.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScanner.java
deleted file mode 100644
index af3a011516..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScanner.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSScanner extends NSObject {
-
-public NSScanner() {
-	super();
-}
-
-public NSScanner(int id) {
-	super(id);
-}
-
-public boolean caseSensitive() {
-	return OS.objc_msgSend(this.id, OS.sel_caseSensitive) != 0;
-}
-
-public NSCharacterSet charactersToBeSkipped() {
-	int result = OS.objc_msgSend(this.id, OS.sel_charactersToBeSkipped);
-	return result != 0 ? new NSCharacterSet(result) : null;
-}
-
-public NSScanner initWithString(NSString string) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithString_1, string != null ? string.id : 0);
-	return result != 0 ? this : null;
-}
-
-public boolean isAtEnd() {
-	return OS.objc_msgSend(this.id, OS.sel_isAtEnd) != 0;
-}
-
-public id locale() {
-	int result = OS.objc_msgSend(this.id, OS.sel_locale);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id localizedScannerWithString(NSString string) {
-	int result = OS.objc_msgSend(OS.class_NSScanner, OS.sel_localizedScannerWithString_1, string != null ? string.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean scanCharactersFromSet(NSCharacterSet set, int value) {
-	return OS.objc_msgSend(this.id, OS.sel_scanCharactersFromSet_1intoString_1, set != null ? set.id : 0, value) != 0;
-}
-
-public boolean scanDecimal(int dcm) {
-	return OS.objc_msgSend(this.id, OS.sel_scanDecimal_1, dcm) != 0;
-}
-
-public boolean scanDouble(int value) {
-	return OS.objc_msgSend(this.id, OS.sel_scanDouble_1, value) != 0;
-}
-
-public boolean scanFloat(int value) {
-	return OS.objc_msgSend(this.id, OS.sel_scanFloat_1, value) != 0;
-}
-
-public boolean scanHexDouble(int result) {
-	return OS.objc_msgSend(this.id, OS.sel_scanHexDouble_1, result) != 0;
-}
-
-public boolean scanHexFloat(int result) {
-	return OS.objc_msgSend(this.id, OS.sel_scanHexFloat_1, result) != 0;
-}
-
-public boolean scanHexInt(int value) {
-	return OS.objc_msgSend(this.id, OS.sel_scanHexInt_1, value) != 0;
-}
-
-public boolean scanHexLongLong(int result) {
-	return OS.objc_msgSend(this.id, OS.sel_scanHexLongLong_1, result) != 0;
-}
-
-public boolean scanInt(int value) {
-	return OS.objc_msgSend(this.id, OS.sel_scanInt_1, value) != 0;
-}
-
-public boolean scanInteger(int value) {
-	return OS.objc_msgSend(this.id, OS.sel_scanInteger_1, value) != 0;
-}
-
-public int scanLocation() {
-	return OS.objc_msgSend(this.id, OS.sel_scanLocation);
-}
-
-public boolean scanLongLong(int value) {
-	return OS.objc_msgSend(this.id, OS.sel_scanLongLong_1, value) != 0;
-}
-
-public boolean scanString(NSString string, int value) {
-	return OS.objc_msgSend(this.id, OS.sel_scanString_1intoString_1, string != null ? string.id : 0, value) != 0;
-}
-
-public boolean scanUpToCharactersFromSet(NSCharacterSet set, int value) {
-	return OS.objc_msgSend(this.id, OS.sel_scanUpToCharactersFromSet_1intoString_1, set != null ? set.id : 0, value) != 0;
-}
-
-public boolean scanUpToString(NSString string, int value) {
-	return OS.objc_msgSend(this.id, OS.sel_scanUpToString_1intoString_1, string != null ? string.id : 0, value) != 0;
-}
-
-public static id scannerWithString(NSString string) {
-	int result = OS.objc_msgSend(OS.class_NSScanner, OS.sel_scannerWithString_1, string != null ? string.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setCaseSensitive(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCaseSensitive_1, flag);
-}
-
-public void setCharactersToBeSkipped(NSCharacterSet set) {
-	OS.objc_msgSend(this.id, OS.sel_setCharactersToBeSkipped_1, set != null ? set.id : 0);
-}
-
-public void setLocale(id locale) {
-	OS.objc_msgSend(this.id, OS.sel_setLocale_1, locale != null ? locale.id : 0);
-}
-
-public void setScanLocation(int pos) {
-	OS.objc_msgSend(this.id, OS.sel_setScanLocation_1, pos);
-}
-
-public NSString string() {
-	int 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/NSScreen.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScreen.java
index 1fcce585df..0aab84a946 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
@@ -16,13 +16,12 @@ public NSScreen() {
 	super();
 }
 
-public NSScreen(int id) {
+public NSScreen(int /*long*/ id) {
 	super(id);
 }
 
-public static NSScreen deepestScreen() {
-	int result = OS.objc_msgSend(OS.class_NSScreen, OS.sel_deepestScreen);
-	return result != 0 ? new NSScreen(result) : null;
+public NSScreen(id id) {
+	super(id);
 }
 
 public int depth() {
@@ -50,14 +49,6 @@ public static NSArray screens() {
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public int supportedWindowDepths() {
-	return OS.objc_msgSend(this.id, OS.sel_supportedWindowDepths);
-}
-
-public float userSpaceScaleFactor() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_userSpaceScaleFactor);
-}
-
 public NSRect visibleFrame() {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_visibleFrame);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptClassDescription.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptClassDescription.java
deleted file mode 100644
index 95e71d586d..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptClassDescription.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSScriptClassDescription extends NSClassDescription {
-
-public NSScriptClassDescription() {
-	super();
-}
-
-public NSScriptClassDescription(int id) {
-	super(id);
-}
-
-public int appleEventCode() {
-	return OS.objc_msgSend(this.id, OS.sel_appleEventCode);
-}
-
-public int appleEventCodeForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_appleEventCodeForKey_1, key != null ? key.id : 0);
-}
-
-//public static NSScriptClassDescription classDescriptionForClass(int aClass) {
-//	int result = OS.objc_msgSend(OS.class_NSScriptClassDescription, OS.sel_classDescriptionForClass_1, aClass);
-//	return result != 0 ? new NSScriptClassDescription(result) : null;
-//}
-
-public NSScriptClassDescription classDescriptionForKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_classDescriptionForKey_1, key != null ? key.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSScriptClassDescription(result) : null);
-}
-
-public NSString className() {
-	int result = OS.objc_msgSend(this.id, OS.sel_className);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString defaultSubcontainerAttributeKey() {
-	int result = OS.objc_msgSend(this.id, OS.sel_defaultSubcontainerAttributeKey);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean hasOrderedToManyRelationshipForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_hasOrderedToManyRelationshipForKey_1, key != null ? key.id : 0) != 0;
-}
-
-public boolean hasPropertyForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_hasPropertyForKey_1, key != null ? key.id : 0) != 0;
-}
-
-public boolean hasReadablePropertyForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_hasReadablePropertyForKey_1, key != null ? key.id : 0) != 0;
-}
-
-public boolean hasWritablePropertyForKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_hasWritablePropertyForKey_1, key != null ? key.id : 0) != 0;
-}
-
-public NSString implementationClassName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_implementationClassName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id initWithSuiteName(NSString suiteName, NSString className, NSDictionary classDeclaration) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithSuiteName_1className_1dictionary_1, suiteName != null ? suiteName.id : 0, className != null ? className.id : 0, classDeclaration != null ? classDeclaration.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isLocationRequiredToCreateForKey(NSString toManyRelationshipKey) {
-	return OS.objc_msgSend(this.id, OS.sel_isLocationRequiredToCreateForKey_1, toManyRelationshipKey != null ? toManyRelationshipKey.id : 0) != 0;
-}
-
-public boolean isReadOnlyKey(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_isReadOnlyKey_1, key != null ? key.id : 0) != 0;
-}
-
-public NSString keyWithAppleEventCode(int appleEventCode) {
-	int result = OS.objc_msgSend(this.id, OS.sel_keyWithAppleEventCode_1, appleEventCode);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean matchesAppleEventCode(int appleEventCode) {
-	return OS.objc_msgSend(this.id, OS.sel_matchesAppleEventCode_1, appleEventCode) != 0;
-}
-
-public int selectorForCommand(NSScriptCommandDescription commandDescription) {
-	return OS.objc_msgSend(this.id, OS.sel_selectorForCommand_1, commandDescription != null ? commandDescription.id : 0);
-}
-
-public NSString suiteName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_suiteName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSScriptClassDescription superclassDescription() {
-	int result = OS.objc_msgSend(this.id, OS.sel_superclassDescription);
-	return result == this.id ? this : (result != 0 ? new NSScriptClassDescription(result) : null);
-}
-
-public boolean supportsCommand(NSScriptCommandDescription commandDescription) {
-	return OS.objc_msgSend(this.id, OS.sel_supportsCommand_1, commandDescription != null ? commandDescription.id : 0) != 0;
-}
-
-public NSString typeForKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_typeForKey_1, key != null ? key.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptCoercionHandler.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptCoercionHandler.java
deleted file mode 100644
index d7be6b5c9c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptCoercionHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSScriptCoercionHandler extends NSObject {
-
-public NSScriptCoercionHandler() {
-	super();
-}
-
-public NSScriptCoercionHandler(int id) {
-	super(id);
-}
-
-public id coerceValue(id value, int toClass) {
-	int result = OS.objc_msgSend(this.id, OS.sel_coerceValue_1toClass_1, value != null ? value.id : 0, toClass);
-	return result != 0 ? new id(result) : null;
-}
-
-public void registerCoercer(id coercer, int selector, int fromClass, int toClass) {
-	OS.objc_msgSend(this.id, OS.sel_registerCoercer_1selector_1toConvertFromClass_1toClass_1, coercer != null ? coercer.id : 0, selector, fromClass, toClass);
-}
-
-public static NSScriptCoercionHandler sharedCoercionHandler() {
-	int result = OS.objc_msgSend(OS.class_NSScriptCoercionHandler, OS.sel_sharedCoercionHandler);
-	return result != 0 ? new NSScriptCoercionHandler(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptCommand.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptCommand.java
deleted file mode 100644
index d3ce95f17f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptCommand.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSScriptCommand extends NSObject {
-
-public NSScriptCommand() {
-	super();
-}
-
-public NSScriptCommand(int id) {
-	super(id);
-}
-
-public NSAppleEventDescriptor appleEvent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_appleEvent);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public NSDictionary arguments() {
-	int result = OS.objc_msgSend(this.id, OS.sel_arguments);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSScriptCommandDescription commandDescription() {
-	int result = OS.objc_msgSend(this.id, OS.sel_commandDescription);
-	return result != 0 ? new NSScriptCommandDescription(result) : null;
-}
-
-public static NSScriptCommand currentCommand() {
-	int result = OS.objc_msgSend(OS.class_NSScriptCommand, OS.sel_currentCommand);
-	return result != 0 ? new NSScriptCommand(result) : null;
-}
-
-public id directParameter() {
-	int result = OS.objc_msgSend(this.id, OS.sel_directParameter);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSDictionary evaluatedArguments() {
-	int result = OS.objc_msgSend(this.id, OS.sel_evaluatedArguments);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public id evaluatedReceivers() {
-	int result = OS.objc_msgSend(this.id, OS.sel_evaluatedReceivers);
-	return result != 0 ? new id(result) : null;
-}
-
-public id executeCommand() {
-	int result = OS.objc_msgSend(this.id, OS.sel_executeCommand);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithCommandDescription(NSScriptCommandDescription commandDef) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCommandDescription_1, commandDef != null ? commandDef.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isWellFormed() {
-	return OS.objc_msgSend(this.id, OS.sel_isWellFormed) != 0;
-}
-
-public id performDefaultImplementation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_performDefaultImplementation);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSScriptObjectSpecifier receiversSpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_receiversSpecifier);
-	return result != 0 ? new NSScriptObjectSpecifier(result) : null;
-}
-
-public void resumeExecutionWithResult(id result) {
-	OS.objc_msgSend(this.id, OS.sel_resumeExecutionWithResult_1, result != null ? result.id : 0);
-}
-
-public NSAppleEventDescriptor scriptErrorExpectedTypeDescriptor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_scriptErrorExpectedTypeDescriptor);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public int scriptErrorNumber() {
-	return OS.objc_msgSend(this.id, OS.sel_scriptErrorNumber);
-}
-
-public NSAppleEventDescriptor scriptErrorOffendingObjectDescriptor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_scriptErrorOffendingObjectDescriptor);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public NSString scriptErrorString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_scriptErrorString);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setArguments(NSDictionary args) {
-	OS.objc_msgSend(this.id, OS.sel_setArguments_1, args != null ? args.id : 0);
-}
-
-public void setDirectParameter(id directParameter) {
-	OS.objc_msgSend(this.id, OS.sel_setDirectParameter_1, directParameter != null ? directParameter.id : 0);
-}
-
-public void setReceiversSpecifier(NSScriptObjectSpecifier receiversRef) {
-	OS.objc_msgSend(this.id, OS.sel_setReceiversSpecifier_1, receiversRef != null ? receiversRef.id : 0);
-}
-
-public void setScriptErrorExpectedTypeDescriptor(NSAppleEventDescriptor errorExpectedTypeDescriptor) {
-	OS.objc_msgSend(this.id, OS.sel_setScriptErrorExpectedTypeDescriptor_1, errorExpectedTypeDescriptor != null ? errorExpectedTypeDescriptor.id : 0);
-}
-
-public void setScriptErrorNumber(int errorNumber) {
-	OS.objc_msgSend(this.id, OS.sel_setScriptErrorNumber_1, errorNumber);
-}
-
-public void setScriptErrorOffendingObjectDescriptor(NSAppleEventDescriptor errorOffendingObjectDescriptor) {
-	OS.objc_msgSend(this.id, OS.sel_setScriptErrorOffendingObjectDescriptor_1, errorOffendingObjectDescriptor != null ? errorOffendingObjectDescriptor.id : 0);
-}
-
-public void setScriptErrorString(NSString errorString) {
-	OS.objc_msgSend(this.id, OS.sel_setScriptErrorString_1, errorString != null ? errorString.id : 0);
-}
-
-public void suspendExecution() {
-	OS.objc_msgSend(this.id, OS.sel_suspendExecution);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptCommandDescription.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptCommandDescription.java
deleted file mode 100644
index 8e391e9314..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptCommandDescription.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSScriptCommandDescription extends NSObject {
-
-public NSScriptCommandDescription() {
-	super();
-}
-
-public NSScriptCommandDescription(int id) {
-	super(id);
-}
-
-public int appleEventClassCode() {
-	return OS.objc_msgSend(this.id, OS.sel_appleEventClassCode);
-}
-
-public int appleEventCode() {
-	return OS.objc_msgSend(this.id, OS.sel_appleEventCode);
-}
-
-public int appleEventCodeForArgumentWithName(NSString argumentName) {
-	return OS.objc_msgSend(this.id, OS.sel_appleEventCodeForArgumentWithName_1, argumentName != null ? argumentName.id : 0);
-}
-
-public int appleEventCodeForReturnType() {
-	return OS.objc_msgSend(this.id, OS.sel_appleEventCodeForReturnType);
-}
-
-public NSArray argumentNames() {
-	int result = OS.objc_msgSend(this.id, OS.sel_argumentNames);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString commandClassName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_commandClassName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString commandName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_commandName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSScriptCommand createCommandInstance() {
-	int result = OS.objc_msgSend(this.id, OS.sel_createCommandInstance);
-	return result != 0 ? new NSScriptCommand(result) : null;
-}
-
-public NSScriptCommand createCommandInstanceWithZone(int zone) {
-	int result = OS.objc_msgSend(this.id, OS.sel_createCommandInstanceWithZone_1, zone);
-	return result != 0 ? new NSScriptCommand(result) : null;
-}
-
-public id initWithSuiteName(NSString suiteName, NSString commandName, NSDictionary commandDeclaration) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithSuiteName_1commandName_1dictionary_1, suiteName != null ? suiteName.id : 0, commandName != null ? commandName.id : 0, commandDeclaration != null ? commandDeclaration.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isOptionalArgumentWithName(NSString argumentName) {
-	return OS.objc_msgSend(this.id, OS.sel_isOptionalArgumentWithName_1, argumentName != null ? argumentName.id : 0) != 0;
-}
-
-public NSString returnType() {
-	int result = OS.objc_msgSend(this.id, OS.sel_returnType);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString suiteName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_suiteName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString typeForArgumentWithName(NSString argumentName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_typeForArgumentWithName_1, argumentName != null ? argumentName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptExecutionContext.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptExecutionContext.java
deleted file mode 100644
index 94aacad90b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptExecutionContext.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSScriptExecutionContext extends NSObject {
-
-public NSScriptExecutionContext() {
-	super();
-}
-
-public NSScriptExecutionContext(int id) {
-	super(id);
-}
-
-public id objectBeingTested() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectBeingTested);
-	return result != 0 ? new id(result) : null;
-}
-
-public id rangeContainerObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_rangeContainerObject);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setObjectBeingTested(id obj) {
-	OS.objc_msgSend(this.id, OS.sel_setObjectBeingTested_1, obj != null ? obj.id : 0);
-}
-
-public void setRangeContainerObject(id obj) {
-	OS.objc_msgSend(this.id, OS.sel_setRangeContainerObject_1, obj != null ? obj.id : 0);
-}
-
-public void setTopLevelObject(id obj) {
-	OS.objc_msgSend(this.id, OS.sel_setTopLevelObject_1, obj != null ? obj.id : 0);
-}
-
-public static NSScriptExecutionContext sharedScriptExecutionContext() {
-	int result = OS.objc_msgSend(OS.class_NSScriptExecutionContext, OS.sel_sharedScriptExecutionContext);
-	return result != 0 ? new NSScriptExecutionContext(result) : null;
-}
-
-public id topLevelObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_topLevelObject);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptObjectSpecifier.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptObjectSpecifier.java
deleted file mode 100644
index 4bffe33e8a..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptObjectSpecifier.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSScriptObjectSpecifier extends NSObject {
-
-public NSScriptObjectSpecifier() {
-	super();
-}
-
-public NSScriptObjectSpecifier(int id) {
-	super(id);
-}
-
-public NSScriptObjectSpecifier childSpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_childSpecifier);
-	return result == this.id ? this : (result != 0 ? new NSScriptObjectSpecifier(result) : null);
-}
-
-public NSScriptClassDescription containerClassDescription() {
-	int result = OS.objc_msgSend(this.id, OS.sel_containerClassDescription);
-	return result != 0 ? new NSScriptClassDescription(result) : null;
-}
-
-public boolean containerIsObjectBeingTested() {
-	return OS.objc_msgSend(this.id, OS.sel_containerIsObjectBeingTested) != 0;
-}
-
-public boolean containerIsRangeContainerObject() {
-	return OS.objc_msgSend(this.id, OS.sel_containerIsRangeContainerObject) != 0;
-}
-
-public NSScriptObjectSpecifier containerSpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_containerSpecifier);
-	return result == this.id ? this : (result != 0 ? new NSScriptObjectSpecifier(result) : null);
-}
-
-public NSAppleEventDescriptor descriptor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptor);
-	return result != 0 ? new NSAppleEventDescriptor(result) : null;
-}
-
-public int evaluationErrorNumber() {
-	return OS.objc_msgSend(this.id, OS.sel_evaluationErrorNumber);
-}
-
-public NSScriptObjectSpecifier evaluationErrorSpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_evaluationErrorSpecifier);
-	return result == this.id ? this : (result != 0 ? new NSScriptObjectSpecifier(result) : null);
-}
-
-public int indicesOfObjectsByEvaluatingWithContainer(id container, int count) {
-	return OS.objc_msgSend(this.id, OS.sel_indicesOfObjectsByEvaluatingWithContainer_1count_1, container != null ? container.id : 0, count);
-}
-
-public id initWithContainerClassDescription(NSScriptClassDescription classDesc, NSScriptObjectSpecifier container, NSString property) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContainerClassDescription_1containerSpecifier_1key_1, classDesc != null ? classDesc.id : 0, container != null ? container.id : 0, property != null ? property.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithContainerSpecifier(NSScriptObjectSpecifier container, NSString property) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContainerSpecifier_1key_1, container != null ? container.id : 0, property != null ? property.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString key() {
-	int result = OS.objc_msgSend(this.id, OS.sel_key);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSScriptClassDescription keyClassDescription() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keyClassDescription);
-	return result != 0 ? new NSScriptClassDescription(result) : null;
-}
-
-public static NSScriptObjectSpecifier objectSpecifierWithDescriptor(NSAppleEventDescriptor descriptor) {
-	int result = OS.objc_msgSend(OS.class_NSScriptObjectSpecifier, OS.sel_objectSpecifierWithDescriptor_1, descriptor != null ? descriptor.id : 0);
-	return result != 0 ? new NSScriptObjectSpecifier(result) : null;
-}
-
-public id objectsByEvaluatingSpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectsByEvaluatingSpecifier);
-	return result != 0 ? new id(result) : null;
-}
-
-public id objectsByEvaluatingWithContainers(id containers) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectsByEvaluatingWithContainers_1, containers != null ? containers.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setChildSpecifier(NSScriptObjectSpecifier child) {
-	OS.objc_msgSend(this.id, OS.sel_setChildSpecifier_1, child != null ? child.id : 0);
-}
-
-public void setContainerClassDescription(NSScriptClassDescription classDesc) {
-	OS.objc_msgSend(this.id, OS.sel_setContainerClassDescription_1, classDesc != null ? classDesc.id : 0);
-}
-
-public void setContainerIsObjectBeingTested(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setContainerIsObjectBeingTested_1, flag);
-}
-
-public void setContainerIsRangeContainerObject(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setContainerIsRangeContainerObject_1, flag);
-}
-
-public void setContainerSpecifier(NSScriptObjectSpecifier subRef) {
-	OS.objc_msgSend(this.id, OS.sel_setContainerSpecifier_1, subRef != null ? subRef.id : 0);
-}
-
-public void setEvaluationErrorNumber(int error) {
-	OS.objc_msgSend(this.id, OS.sel_setEvaluationErrorNumber_1, error);
-}
-
-public void setKey(NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_setKey_1, key != null ? key.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptSuiteRegistry.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptSuiteRegistry.java
deleted file mode 100644
index c87f0dba37..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScriptSuiteRegistry.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSScriptSuiteRegistry extends NSObject {
-
-public NSScriptSuiteRegistry() {
-	super();
-}
-
-public NSScriptSuiteRegistry(int id) {
-	super(id);
-}
-
-public NSData aeteResource(NSString languageName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_aeteResource_1, languageName != null ? languageName.id : 0);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public int appleEventCodeForSuite(NSString suiteName) {
-	return OS.objc_msgSend(this.id, OS.sel_appleEventCodeForSuite_1, suiteName != null ? suiteName.id : 0);
-}
-
-public NSBundle bundleForSuite(NSString suiteName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_bundleForSuite_1, suiteName != null ? suiteName.id : 0);
-	return result != 0 ? new NSBundle(result) : null;
-}
-
-public NSScriptClassDescription classDescriptionWithAppleEventCode(int appleEventCode) {
-	int result = OS.objc_msgSend(this.id, OS.sel_classDescriptionWithAppleEventCode_1, appleEventCode);
-	return result != 0 ? new NSScriptClassDescription(result) : null;
-}
-
-public NSDictionary classDescriptionsInSuite(NSString suiteName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_classDescriptionsInSuite_1, suiteName != null ? suiteName.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSScriptCommandDescription commandDescriptionWithAppleEventClass(int appleEventClassCode, int appleEventIDCode) {
-	int result = OS.objc_msgSend(this.id, OS.sel_commandDescriptionWithAppleEventClass_1andAppleEventCode_1, appleEventClassCode, appleEventIDCode);
-	return result != 0 ? new NSScriptCommandDescription(result) : null;
-}
-
-public NSDictionary commandDescriptionsInSuite(NSString suiteName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_commandDescriptionsInSuite_1, suiteName != null ? suiteName.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public void loadSuiteWithDictionary(NSDictionary suiteDeclaration, NSBundle bundle) {
-	OS.objc_msgSend(this.id, OS.sel_loadSuiteWithDictionary_1fromBundle_1, suiteDeclaration != null ? suiteDeclaration.id : 0, bundle != null ? bundle.id : 0);
-}
-
-public void loadSuitesFromBundle(NSBundle bundle) {
-	OS.objc_msgSend(this.id, OS.sel_loadSuitesFromBundle_1, bundle != null ? bundle.id : 0);
-}
-
-public void registerClassDescription(NSScriptClassDescription classDescription) {
-	OS.objc_msgSend(this.id, OS.sel_registerClassDescription_1, classDescription != null ? classDescription.id : 0);
-}
-
-public void registerCommandDescription(NSScriptCommandDescription commandDescription) {
-	OS.objc_msgSend(this.id, OS.sel_registerCommandDescription_1, commandDescription != null ? commandDescription.id : 0);
-}
-
-public static void setSharedScriptSuiteRegistry(NSScriptSuiteRegistry registry) {
-	OS.objc_msgSend(OS.class_NSScriptSuiteRegistry, OS.sel_setSharedScriptSuiteRegistry_1, registry != null ? registry.id : 0);
-}
-
-public static NSScriptSuiteRegistry sharedScriptSuiteRegistry() {
-	int result = OS.objc_msgSend(OS.class_NSScriptSuiteRegistry, OS.sel_sharedScriptSuiteRegistry);
-	return result != 0 ? new NSScriptSuiteRegistry(result) : null;
-}
-
-public NSString suiteForAppleEventCode(int appleEventCode) {
-	int result = OS.objc_msgSend(this.id, OS.sel_suiteForAppleEventCode_1, appleEventCode);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSArray suiteNames() {
-	int result = OS.objc_msgSend(this.id, OS.sel_suiteNames);
-	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 5435d5f735..7ee496e3ee 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
@@ -16,21 +16,12 @@ public NSScrollView() {
 	super();
 }
 
-public NSScrollView(int id) {
+public NSScrollView(int /*long*/ id) {
 	super(id);
 }
 
-public boolean autohidesScrollers() {
-	return OS.objc_msgSend(this.id, OS.sel_autohidesScrollers) != 0;
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public int borderType() {
-	return OS.objc_msgSend(this.id, OS.sel_borderType);
+public NSScrollView(id id) {
+	super(id);
 }
 
 public NSSize contentSize() {
@@ -41,7 +32,7 @@ public NSSize contentSize() {
 
 public static NSSize contentSizeForFrameSize(NSSize fSize, boolean hFlag, boolean vFlag, int aType) {
 	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, OS.class_NSScrollView, OS.sel_contentSizeForFrameSize_1hasHorizontalScroller_1hasVerticalScroller_1borderType_1, fSize, hFlag, vFlag, aType);
+	OS.objc_msgSend_stret(result, OS.class_NSScrollView, OS.sel_contentSizeForFrameSize_hasHorizontalScroller_hasVerticalScroller_borderType_, fSize, hFlag, vFlag, aType);
 	return result;
 }
 
@@ -50,11 +41,6 @@ public NSClipView contentView() {
 	return result != 0 ? new NSClipView(result) : null;
 }
 
-public NSCursor documentCursor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_documentCursor);
-	return result != 0 ? new NSCursor(result) : null;
-}
-
 public NSView documentView() {
 	int result = OS.objc_msgSend(this.id, OS.sel_documentView);
 	return result != 0 ? new NSView(result) : null;
@@ -66,194 +52,42 @@ public NSRect documentVisibleRect() {
 	return result;
 }
 
-public boolean drawsBackground() {
-	return OS.objc_msgSend(this.id, OS.sel_drawsBackground) != 0;
-}
-
 public static NSSize frameSizeForContentSize(NSSize cSize, boolean hFlag, boolean vFlag, int aType) {
 	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, OS.class_NSScrollView, OS.sel_frameSizeForContentSize_1hasHorizontalScroller_1hasVerticalScroller_1borderType_1, cSize, hFlag, vFlag, aType);
+	OS.objc_msgSend_stret(result, OS.class_NSScrollView, OS.sel_frameSizeForContentSize_hasHorizontalScroller_hasVerticalScroller_borderType_, cSize, hFlag, vFlag, aType);
 	return result;
 }
 
-public boolean hasHorizontalRuler() {
-	return OS.objc_msgSend(this.id, OS.sel_hasHorizontalRuler) != 0;
-}
-
-public boolean hasHorizontalScroller() {
-	return OS.objc_msgSend(this.id, OS.sel_hasHorizontalScroller) != 0;
-}
-
-public boolean hasVerticalRuler() {
-	return OS.objc_msgSend(this.id, OS.sel_hasVerticalRuler) != 0;
-}
-
-public boolean hasVerticalScroller() {
-	return OS.objc_msgSend(this.id, OS.sel_hasVerticalScroller) != 0;
-}
-
-public float horizontalLineScroll() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_horizontalLineScroll);
-}
-
-public float horizontalPageScroll() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_horizontalPageScroll);
-}
-
-public NSRulerView horizontalRulerView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_horizontalRulerView);
-	return result != 0 ? new NSRulerView(result) : null;
-}
-
-public NSScroller horizontalScroller() {
-	int result = OS.objc_msgSend(this.id, OS.sel_horizontalScroller);
-	return result != 0 ? new NSScroller(result) : null;
-}
-
-public float lineScroll() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_lineScroll);
-}
-
-public float pageScroll() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_pageScroll);
-}
-
-public void reflectScrolledClipView(NSClipView cView) {
-	OS.objc_msgSend(this.id, OS.sel_reflectScrolledClipView_1, cView != null ? cView.id : 0);
-}
-
-public static int rulerViewClass() {
-	return OS.objc_msgSend(OS.class_NSScrollView, OS.sel_rulerViewClass);
-}
-
-public boolean rulersVisible() {
-	return OS.objc_msgSend(this.id, OS.sel_rulersVisible) != 0;
-}
-
-public void scrollWheel(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_scrollWheel_1, theEvent != null ? theEvent.id : 0);
-}
-
-public boolean scrollsDynamically() {
-	return OS.objc_msgSend(this.id, OS.sel_scrollsDynamically) != 0;
-}
-
 public void setAutohidesScrollers(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutohidesScrollers_1, flag);
-}
-
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setAutohidesScrollers_, flag);
 }
 
 public void setBorderType(int aType) {
-	OS.objc_msgSend(this.id, OS.sel_setBorderType_1, aType);
-}
-
-public void setContentView(NSClipView contentView) {
-	OS.objc_msgSend(this.id, OS.sel_setContentView_1, contentView != null ? contentView.id : 0);
-}
-
-public void setDocumentCursor(NSCursor anObj) {
-	OS.objc_msgSend(this.id, OS.sel_setDocumentCursor_1, anObj != null ? anObj.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setBorderType_, aType);
 }
 
 public void setDocumentView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_setDocumentView_1, aView != null ? aView.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setDocumentView_, aView != null ? aView.id : 0);
 }
 
 public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_1, flag);
-}
-
-public void setHasHorizontalRuler(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHasHorizontalRuler_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, flag);
 }
 
 public void setHasHorizontalScroller(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHasHorizontalScroller_1, flag);
-}
-
-public void setHasVerticalRuler(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHasVerticalRuler_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setHasHorizontalScroller_, flag);
 }
 
 public void setHasVerticalScroller(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHasVerticalScroller_1, flag);
-}
-
-public void setHorizontalLineScroll(float value) {
-	OS.objc_msgSend(this.id, OS.sel_setHorizontalLineScroll_1, value);
-}
-
-public void setHorizontalPageScroll(float value) {
-	OS.objc_msgSend(this.id, OS.sel_setHorizontalPageScroll_1, value);
-}
-
-public void setHorizontalRulerView(NSRulerView ruler) {
-	OS.objc_msgSend(this.id, OS.sel_setHorizontalRulerView_1, ruler != null ? ruler.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setHasVerticalScroller_, flag);
 }
 
 public void setHorizontalScroller(NSScroller anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setHorizontalScroller_1, anObject != null ? anObject.id : 0);
-}
-
-public void setLineScroll(float value) {
-	OS.objc_msgSend(this.id, OS.sel_setLineScroll_1, value);
-}
-
-public void setPageScroll(float value) {
-	OS.objc_msgSend(this.id, OS.sel_setPageScroll_1, value);
-}
-
-public static void setRulerViewClass(int rulerViewClass) {
-	OS.objc_msgSend(OS.class_NSScrollView, OS.sel_setRulerViewClass_1, rulerViewClass);
-}
-
-public void setRulersVisible(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setRulersVisible_1, flag);
-}
-
-public void setScrollsDynamically(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setScrollsDynamically_1, flag);
-}
-
-public void setVerticalLineScroll(float value) {
-	OS.objc_msgSend(this.id, OS.sel_setVerticalLineScroll_1, value);
-}
-
-public void setVerticalPageScroll(float value) {
-	OS.objc_msgSend(this.id, OS.sel_setVerticalPageScroll_1, value);
-}
-
-public void setVerticalRulerView(NSRulerView ruler) {
-	OS.objc_msgSend(this.id, OS.sel_setVerticalRulerView_1, ruler != null ? ruler.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setHorizontalScroller_, anObject != null ? anObject.id : 0);
 }
 
 public void setVerticalScroller(NSScroller anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setVerticalScroller_1, anObject != null ? anObject.id : 0);
-}
-
-public void tile() {
-	OS.objc_msgSend(this.id, OS.sel_tile);
-}
-
-public float verticalLineScroll() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_verticalLineScroll);
-}
-
-public float verticalPageScroll() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_verticalPageScroll);
-}
-
-public NSRulerView verticalRulerView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_verticalRulerView);
-	return result != 0 ? new NSRulerView(result) : null;
-}
-
-public NSScroller verticalScroller() {
-	int result = OS.objc_msgSend(this.id, OS.sel_verticalScroller);
-	return result != 0 ? new NSScroller(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setVerticalScroller_, anObject != null ? anObject.id : 0);
 }
 
 }
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 9895dbe5df..3492309e60 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
@@ -16,102 +16,24 @@ public NSScroller() {
 	super();
 }
 
-public NSScroller(int id) {
+public NSScroller(int /*long*/ id) {
 	super(id);
 }
 
-public int arrowsPosition() {
-	return OS.objc_msgSend(this.id, OS.sel_arrowsPosition);
-}
-
-public void checkSpaceForParts() {
-	OS.objc_msgSend(this.id, OS.sel_checkSpaceForParts);
-}
-
-public int controlSize() {
-	return OS.objc_msgSend(this.id, OS.sel_controlSize);
-}
-
-public int controlTint() {
-	return OS.objc_msgSend(this.id, OS.sel_controlTint);
-}
-
-public void drawArrow(int whichArrow, boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_drawArrow_1highlight_1, whichArrow, flag);
-}
-
-public void drawKnob() {
-	OS.objc_msgSend(this.id, OS.sel_drawKnob);
-}
-
-public void drawKnobSlotInRect(NSRect slotRect, boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_drawKnobSlotInRect_1highlight_1, slotRect, flag);
-}
-
-public void drawParts() {
-	OS.objc_msgSend(this.id, OS.sel_drawParts);
-}
-
-public void highlight(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_highlight_1, flag);
+public NSScroller(id id) {
+	super(id);
 }
 
 public int hitPart() {
 	return OS.objc_msgSend(this.id, OS.sel_hitPart);
 }
 
-public float knobProportion() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_knobProportion);
-}
-
-public NSRect rectForPart(int partCode) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectForPart_1, partCode);
-	return result;
-}
-
 public static float scrollerWidth() {
 	return (float)OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidth);
 }
 
-public static float scrollerWidthForControlSize(int controlSize) {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidthForControlSize_1, controlSize);
-}
-
-public void setArrowsPosition(int where) {
-	OS.objc_msgSend(this.id, OS.sel_setArrowsPosition_1, where);
-}
-
-public void setControlSize(int controlSize) {
-	OS.objc_msgSend(this.id, OS.sel_setControlSize_1, controlSize);
-}
-
-public void setControlTint(int controlTint) {
-	OS.objc_msgSend(this.id, OS.sel_setControlTint_1, controlTint);
-}
-
 public void setFloatValue(float aFloat, float proportion) {
-	OS.objc_msgSend(this.id, OS.sel_setFloatValue_1knobProportion_1, aFloat, proportion);
-}
-
-public void setKnobProportion(float proportion) {
-	OS.objc_msgSend(this.id, OS.sel_setKnobProportion_1, proportion);
-}
-
-public int testPart(NSPoint thePoint) {
-	return OS.objc_msgSend(this.id, OS.sel_testPart_1, thePoint);
-}
-
-public void trackKnob(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_trackKnob_1, theEvent != null ? theEvent.id : 0);
-}
-
-public void trackScrollButtons(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_trackScrollButtons_1, theEvent != null ? theEvent.id : 0);
-}
-
-public int usableParts() {
-	return OS.objc_msgSend(this.id, OS.sel_usableParts);
+	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 432eb35efa..2dd0070a3e 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
@@ -16,7 +16,11 @@ public NSSearchField() {
 	super();
 }
 
-public NSSearchField(int id) {
+public NSSearchField(int /*long*/ id) {
+	super(id);
+}
+
+public NSSearchField(id id) {
 	super(id);
 }
 
@@ -25,17 +29,4 @@ public NSArray recentSearches() {
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public NSString recentsAutosaveName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_recentsAutosaveName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setRecentSearches(NSArray searches) {
-	OS.objc_msgSend(this.id, OS.sel_setRecentSearches_1, searches != null ? searches.id : 0);
-}
-
-public void setRecentsAutosaveName(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setRecentsAutosaveName_1, string != null ? string.id : 0);
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java
deleted file mode 100644
index fc17d5c596..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSearchFieldCell extends NSTextFieldCell {
-
-public NSSearchFieldCell() {
-	super();
-}
-
-public NSSearchFieldCell(int id) {
-	super(id);
-}
-
-public NSButtonCell cancelButtonCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_cancelButtonCell);
-	return result != 0 ? new NSButtonCell(result) : null;
-}
-
-public NSRect cancelButtonRectForBounds(NSRect rect) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_cancelButtonRectForBounds_1, rect);
-	return result;
-}
-
-public int maximumRecents() {
-	return OS.objc_msgSend(this.id, OS.sel_maximumRecents);
-}
-
-public NSArray recentSearches() {
-	int result = OS.objc_msgSend(this.id, OS.sel_recentSearches);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString recentsAutosaveName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_recentsAutosaveName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void resetCancelButtonCell() {
-	OS.objc_msgSend(this.id, OS.sel_resetCancelButtonCell);
-}
-
-public void resetSearchButtonCell() {
-	OS.objc_msgSend(this.id, OS.sel_resetSearchButtonCell);
-}
-
-public NSButtonCell searchButtonCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_searchButtonCell);
-	return result != 0 ? new NSButtonCell(result) : null;
-}
-
-public NSRect searchButtonRectForBounds(NSRect rect) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_searchButtonRectForBounds_1, rect);
-	return result;
-}
-
-public NSMenu searchMenuTemplate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_searchMenuTemplate);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
-public NSRect searchTextRectForBounds(NSRect rect) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_searchTextRectForBounds_1, rect);
-	return result;
-}
-
-public boolean sendsSearchStringImmediately() {
-	return OS.objc_msgSend(this.id, OS.sel_sendsSearchStringImmediately) != 0;
-}
-
-public boolean sendsWholeSearchString() {
-	return OS.objc_msgSend(this.id, OS.sel_sendsWholeSearchString) != 0;
-}
-
-public void setCancelButtonCell(NSButtonCell cell) {
-	OS.objc_msgSend(this.id, OS.sel_setCancelButtonCell_1, cell != null ? cell.id : 0);
-}
-
-public void setMaximumRecents(int maxRecents) {
-	OS.objc_msgSend(this.id, OS.sel_setMaximumRecents_1, maxRecents);
-}
-
-public void setRecentSearches(NSArray searches) {
-	OS.objc_msgSend(this.id, OS.sel_setRecentSearches_1, searches != null ? searches.id : 0);
-}
-
-public void setRecentsAutosaveName(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setRecentsAutosaveName_1, string != null ? string.id : 0);
-}
-
-public void setSearchButtonCell(NSButtonCell cell) {
-	OS.objc_msgSend(this.id, OS.sel_setSearchButtonCell_1, cell != null ? cell.id : 0);
-}
-
-public void setSearchMenuTemplate(NSMenu menu) {
-	OS.objc_msgSend(this.id, OS.sel_setSearchMenuTemplate_1, menu != null ? menu.id : 0);
-}
-
-public void setSendsSearchStringImmediately(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSendsSearchStringImmediately_1, flag);
-}
-
-public void setSendsWholeSearchString(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSendsWholeSearchString_1, flag);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextField.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextField.java
index fd489c9065..371e3da155 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextField.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextField.java
@@ -1,22 +1,26 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
-public class NSSecureTextField extends NSTextField {
+public class NSSecureTextField extends NSObject {
 
 public NSSecureTextField() {
 	super();
 }
 
-public NSSecureTextField(int id) {
+public NSSecureTextField(int /*long*/ id) {
+	super(id);
+}
+
+public NSSecureTextField(id id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextFieldCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextFieldCell.java
deleted file mode 100644
index 1342c4304c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextFieldCell.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSecureTextFieldCell extends NSTextFieldCell {
-
-public NSSecureTextFieldCell() {
-	super();
-}
-
-public NSSecureTextFieldCell(int id) {
-	super(id);
-}
-
-public boolean echosBullets() {
-	return OS.objc_msgSend(this.id, OS.sel_echosBullets) != 0;
-}
-
-public void setEchosBullets(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEchosBullets_1, flag);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java
deleted file mode 100644
index e9e011e1b7..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSegmentedCell extends NSActionCell {
-
-public NSSegmentedCell() {
-	super();
-}
-
-public NSSegmentedCell(int id) {
-	super(id);
-}
-
-public void drawSegment(int segment, NSRect frame, NSView controlView) {
-	OS.objc_msgSend(this.id, OS.sel_drawSegment_1inFrame_1withView_1, segment, frame, controlView != null ? controlView.id : 0);
-}
-
-public NSImage imageForSegment(int segment) {
-	int result = OS.objc_msgSend(this.id, OS.sel_imageForSegment_1, segment);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public int imageScalingForSegment(int segment) {
-	return OS.objc_msgSend(this.id, OS.sel_imageScalingForSegment_1, segment);
-}
-
-public int interiorBackgroundStyleForSegment(int segment) {
-	return OS.objc_msgSend(this.id, OS.sel_interiorBackgroundStyleForSegment_1, segment);
-}
-
-public boolean isEnabledForSegment(int segment) {
-	return OS.objc_msgSend(this.id, OS.sel_isEnabledForSegment_1, segment) != 0;
-}
-
-public boolean isSelectedForSegment(int segment) {
-	return OS.objc_msgSend(this.id, OS.sel_isSelectedForSegment_1, segment) != 0;
-}
-
-public NSString labelForSegment(int segment) {
-	int result = OS.objc_msgSend(this.id, OS.sel_labelForSegment_1, segment);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void makeNextSegmentKey() {
-	OS.objc_msgSend(this.id, OS.sel_makeNextSegmentKey);
-}
-
-public void makePreviousSegmentKey() {
-	OS.objc_msgSend(this.id, OS.sel_makePreviousSegmentKey);
-}
-
-public NSMenu menuForSegment(int segment) {
-	int result = OS.objc_msgSend(this.id, OS.sel_menuForSegment_1, segment);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
-public int segmentCount() {
-	return OS.objc_msgSend(this.id, OS.sel_segmentCount);
-}
-
-public int segmentStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_segmentStyle);
-}
-
-public boolean selectSegmentWithTag(int tag) {
-	return OS.objc_msgSend(this.id, OS.sel_selectSegmentWithTag_1, tag) != 0;
-}
-
-public int selectedSegment() {
-	return OS.objc_msgSend(this.id, OS.sel_selectedSegment);
-}
-
-public void setEnabled(boolean enabled, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setEnabled_1forSegment_1, enabled, segment);
-}
-
-public void setImage(NSImage image, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1forSegment_1, image != null ? image.id : 0, segment);
-}
-
-public void setImageScaling(int scaling, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setImageScaling_1forSegment_1, scaling, segment);
-}
-
-public void setLabel(NSString label, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setLabel_1forSegment_1, label != null ? label.id : 0, segment);
-}
-
-public void setMenu(NSMenu menu, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setMenu_1forSegment_1, menu != null ? menu.id : 0, segment);
-}
-
-public void setSegmentCount(int count) {
-	OS.objc_msgSend(this.id, OS.sel_setSegmentCount_1, count);
-}
-
-public void setSegmentStyle(int segmentStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setSegmentStyle_1, segmentStyle);
-}
-
-public void setSelected(boolean selected, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setSelected_1forSegment_1, selected, segment);
-}
-
-public void setSelectedSegment(int selectedSegment) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedSegment_1, selectedSegment);
-}
-
-public void setTag(int tag, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setTag_1forSegment_1, tag, segment);
-}
-
-public void setToolTip(NSString toolTip, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setToolTip_1forSegment_1, toolTip != null ? toolTip.id : 0, segment);
-}
-
-public void setTrackingMode(int trackingMode) {
-	OS.objc_msgSend(this.id, OS.sel_setTrackingMode_1, trackingMode);
-}
-
-public void setWidth(float width, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setWidth_1forSegment_1, width, segment);
-}
-
-public int tagForSegment(int segment) {
-	return OS.objc_msgSend(this.id, OS.sel_tagForSegment_1, segment);
-}
-
-public NSString toolTipForSegment(int segment) {
-	int result = OS.objc_msgSend(this.id, OS.sel_toolTipForSegment_1, segment);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int trackingMode() {
-	return OS.objc_msgSend(this.id, OS.sel_trackingMode);
-}
-
-public float widthForSegment(int segment) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_widthForSegment_1, segment);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedControl.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedControl.java
deleted file mode 100644
index 09ffd47047..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedControl.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSegmentedControl extends NSControl {
-
-public NSSegmentedControl() {
-	super();
-}
-
-public NSSegmentedControl(int id) {
-	super(id);
-}
-
-public NSImage imageForSegment(int segment) {
-	int result = OS.objc_msgSend(this.id, OS.sel_imageForSegment_1, segment);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public int imageScalingForSegment(int segment) {
-	return OS.objc_msgSend(this.id, OS.sel_imageScalingForSegment_1, segment);
-}
-
-public boolean isEnabledForSegment(int segment) {
-	return OS.objc_msgSend(this.id, OS.sel_isEnabledForSegment_1, segment) != 0;
-}
-
-public boolean isSelectedForSegment(int segment) {
-	return OS.objc_msgSend(this.id, OS.sel_isSelectedForSegment_1, segment) != 0;
-}
-
-public NSString labelForSegment(int segment) {
-	int result = OS.objc_msgSend(this.id, OS.sel_labelForSegment_1, segment);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSMenu menuForSegment(int segment) {
-	int result = OS.objc_msgSend(this.id, OS.sel_menuForSegment_1, segment);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
-public int segmentCount() {
-	return OS.objc_msgSend(this.id, OS.sel_segmentCount);
-}
-
-public int segmentStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_segmentStyle);
-}
-
-public boolean selectSegmentWithTag(int tag) {
-	return OS.objc_msgSend(this.id, OS.sel_selectSegmentWithTag_1, tag) != 0;
-}
-
-public int selectedSegment() {
-	return OS.objc_msgSend(this.id, OS.sel_selectedSegment);
-}
-
-public void setEnabled(boolean enabled, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setEnabled_1forSegment_1, enabled, segment);
-}
-
-public void setImage(NSImage image, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1forSegment_1, image != null ? image.id : 0, segment);
-}
-
-public void setImageScaling(int scaling, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setImageScaling_1forSegment_1, scaling, segment);
-}
-
-public void setLabel(NSString label, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setLabel_1forSegment_1, label != null ? label.id : 0, segment);
-}
-
-public void setMenu(NSMenu menu, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setMenu_1forSegment_1, menu != null ? menu.id : 0, segment);
-}
-
-public void setSegmentCount(int count) {
-	OS.objc_msgSend(this.id, OS.sel_setSegmentCount_1, count);
-}
-
-public void setSegmentStyle(int segmentStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setSegmentStyle_1, segmentStyle);
-}
-
-public void setSelected(boolean selected, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setSelected_1forSegment_1, selected, segment);
-}
-
-public void setSelectedSegment(int selectedSegment) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedSegment_1, selectedSegment);
-}
-
-public void setWidth(float width, int segment) {
-	OS.objc_msgSend(this.id, OS.sel_setWidth_1forSegment_1, width, segment);
-}
-
-public float widthForSegment(int segment) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_widthForSegment_1, segment);
-}
-
-}
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 a94bd7dbfa..281b382565 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,158 +16,26 @@ public NSSet() {
 	super();
 }
 
-public NSSet(int id) {
+public NSSet(int /*long*/ id) {
 	super(id);
 }
 
-public void addObserver(NSObject observer, NSString keyPath, int options, int context) {
-	OS.objc_msgSend(this.id, OS.sel_addObserver_1forKeyPath_1options_1context_1, observer != null ? observer.id : 0, keyPath != null ? keyPath.id : 0, options, context);
-}
-
-public NSArray allObjects() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allObjects);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id anyObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_anyObject);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean containsObject(id anObject) {
-	return OS.objc_msgSend(this.id, OS.sel_containsObject_1, anObject != null ? anObject.id : 0) != 0;
+public NSSet(id id) {
+	super(id);
 }
 
 public int count() {
 	return OS.objc_msgSend(this.id, OS.sel_count);
 }
 
-public NSString description() {
-	int result = OS.objc_msgSend(this.id, OS.sel_description);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString descriptionWithLocale(id locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descriptionWithLocale_1, locale != null ? locale.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSSet filteredSetUsingPredicate(NSPredicate predicate) {
-	int result = OS.objc_msgSend(this.id, OS.sel_filteredSetUsingPredicate_1, predicate != null ? predicate.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSSet(result) : null);
-}
-
-public NSSet initWithArray(NSArray array) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithArray_1, array != null ? array.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSSet initWithObjects_(id initWithObjects) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithObjects_1, initWithObjects != null ? initWithObjects.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSSet initWithObjects_count_(int objects, int cnt) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithObjects_1count_1, objects, cnt);
-	return result != 0 ? this : null;
-}
-
-public NSSet initWithSet_(NSSet set) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithSet_1, set != null ? set.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSSet initWithSet_copyItems_(NSSet set, boolean flag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithSet_1copyItems_1, set != null ? set.id : 0, flag);
-	return result != 0 ? this : null;
-}
-
-public boolean intersectsSet(NSSet otherSet) {
-	return OS.objc_msgSend(this.id, OS.sel_intersectsSet_1, otherSet != null ? otherSet.id : 0) != 0;
-}
-
-public boolean isEqualToSet(NSSet otherSet) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualToSet_1, otherSet != null ? otherSet.id : 0) != 0;
-}
-
-public boolean isSubsetOfSet(NSSet otherSet) {
-	return OS.objc_msgSend(this.id, OS.sel_isSubsetOfSet_1, otherSet != null ? otherSet.id : 0) != 0;
-}
-
-public void makeObjectsPerformSelector_(int aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_makeObjectsPerformSelector_1, aSelector);
-}
-
-public void makeObjectsPerformSelector_withObject_(int aSelector, id argument) {
-	OS.objc_msgSend(this.id, OS.sel_makeObjectsPerformSelector_1withObject_1, aSelector, argument != null ? argument.id : 0);
-}
-
-public id member(id object) {
-	int result = OS.objc_msgSend(this.id, OS.sel_member_1, object != null ? object.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
 public NSEnumerator objectEnumerator() {
 	int result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
 	return result != 0 ? new NSEnumerator(result) : null;
 }
 
-public void removeObserver(NSObject observer, NSString keyPath) {
-	OS.objc_msgSend(this.id, OS.sel_removeObserver_1forKeyPath_1, observer != null ? observer.id : 0, keyPath != null ? keyPath.id : 0);
-}
-
 public static NSSet set() {
 	int result = OS.objc_msgSend(OS.class_NSSet, OS.sel_set);
 	return result != 0 ? new NSSet(result) : null;
 }
 
-public NSSet setByAddingObject(id anObject) {
-	int result = OS.objc_msgSend(this.id, OS.sel_setByAddingObject_1, anObject != null ? anObject.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSSet(result) : null);
-}
-
-public NSSet setByAddingObjectsFromArray(NSArray other) {
-	int result = OS.objc_msgSend(this.id, OS.sel_setByAddingObjectsFromArray_1, other != null ? other.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSSet(result) : null);
-}
-
-public NSSet setByAddingObjectsFromSet(NSSet other) {
-	int result = OS.objc_msgSend(this.id, OS.sel_setByAddingObjectsFromSet_1, other != null ? other.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSSet(result) : null);
-}
-
-public void setValue(id value, NSString key) {
-	OS.objc_msgSend(this.id, OS.sel_setValue_1forKey_1, value != null ? value.id : 0, key != null ? key.id : 0);
-}
-
-public static id setWithArray(NSArray array) {
-	int result = OS.objc_msgSend(OS.class_NSSet, OS.sel_setWithArray_1, array != null ? array.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id setWithObject(id object) {
-	int result = OS.objc_msgSend(OS.class_NSSet, OS.sel_setWithObject_1, object != null ? object.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_setWithObjects_(id setWithObjects) {
-	int result = OS.objc_msgSend(OS.class_NSSet, OS.sel_setWithObjects_1, setWithObjects != null ? setWithObjects.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_setWithObjects_count_(int objects, int cnt) {
-	int result = OS.objc_msgSend(OS.class_NSSet, OS.sel_setWithObjects_1count_1, objects, cnt);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id setWithSet(NSSet set) {
-	int result = OS.objc_msgSend(OS.class_NSSet, OS.sel_setWithSet_1, set != null ? set.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id valueForKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueForKey_1, 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/NSSetCommand.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSetCommand.java
deleted file mode 100644
index b3b11dad1b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSetCommand.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSetCommand extends NSScriptCommand {
-
-public NSSetCommand() {
-	super();
-}
-
-public NSSetCommand(int id) {
-	super(id);
-}
-
-public NSScriptObjectSpecifier keySpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_keySpecifier);
-	return result != 0 ? new NSScriptObjectSpecifier(result) : null;
-}
-
-public void setReceiversSpecifier(NSScriptObjectSpecifier receiversRef) {
-	OS.objc_msgSend(this.id, OS.sel_setReceiversSpecifier_1, receiversRef != null ? receiversRef.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSShadow.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSShadow.java
deleted file mode 100644
index f5d2161aaa..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSShadow.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSShadow extends NSObject {
-
-public NSShadow() {
-	super();
-}
-
-public NSShadow(int id) {
-	super(id);
-}
-
-public void set() {
-	OS.objc_msgSend(this.id, OS.sel_set);
-}
-
-public void setShadowBlurRadius(float val) {
-	OS.objc_msgSend(this.id, OS.sel_setShadowBlurRadius_1, val);
-}
-
-public void setShadowColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setShadowColor_1, color != null ? color.id : 0);
-}
-
-public void setShadowOffset(NSSize offset) {
-	OS.objc_msgSend(this.id, OS.sel_setShadowOffset_1, offset);
-}
-
-public float shadowBlurRadius() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_shadowBlurRadius);
-}
-
-public NSColor shadowColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_shadowColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSSize shadowOffset() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_shadowOffset);
-	return result;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java
index fee826e965..e59726e97c 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java
@@ -15,5 +15,5 @@ package org.eclipse.swt.internal.cocoa;
 public class NSSize {
 	public float width;
 	public float height;
-	public static final int sizeof = 8;
+	public static final int sizeof = OS.NSSize_sizeof();
 }
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 ec4158b595..c8c5923b1b 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,41 +16,12 @@ public NSSlider() {
 	super();
 }
 
-public NSSlider(int id) {
+public NSSlider(int /*long*/ id) {
 	super(id);
 }
 
-public boolean acceptsFirstMouse(NSEvent theEvent) {
-	return OS.objc_msgSend(this.id, OS.sel_acceptsFirstMouse_1, theEvent != null ? theEvent.id : 0) != 0;
-}
-
-public boolean allowsTickMarkValuesOnly() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsTickMarkValuesOnly) != 0;
-}
-
-public double altIncrementValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_altIncrementValue);
-}
-
-public double closestTickMarkValueToValue(double value) {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_closestTickMarkValueToValue_1, value);
-}
-
-public NSImage image() {
-	int result = OS.objc_msgSend(this.id, OS.sel_image);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public int indexOfTickMarkAtPoint(NSPoint point) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfTickMarkAtPoint_1, point);
-}
-
-public int isVertical() {
-	return OS.objc_msgSend(this.id, OS.sel_isVertical);
-}
-
-public float knobThickness() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_knobThickness);
+public NSSlider(id id) {
+	super(id);
 }
 
 public double maxValue() {
@@ -61,90 +32,12 @@ public double minValue() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_minValue);
 }
 
-public int numberOfTickMarks() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfTickMarks);
-}
-
-public NSRect rectOfTickMarkAtIndex(int index) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfTickMarkAtIndex_1, index);
-	return result;
-}
-
-public void setAllowsTickMarkValuesOnly(boolean yorn) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsTickMarkValuesOnly_1, yorn);
-}
-
-public void setAltIncrementValue(double incValue) {
-	OS.objc_msgSend(this.id, OS.sel_setAltIncrementValue_1, incValue);
-}
-
-public void setImage(NSImage backgroundImage) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1, backgroundImage != null ? backgroundImage.id : 0);
-}
-
-public void setKnobThickness(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setKnobThickness_1, aFloat);
-}
-
 public void setMaxValue(double aDouble) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxValue_1, aDouble);
+	OS.objc_msgSend(this.id, OS.sel_setMaxValue_, aDouble);
 }
 
 public void setMinValue(double aDouble) {
-	OS.objc_msgSend(this.id, OS.sel_setMinValue_1, aDouble);
-}
-
-public void setNumberOfTickMarks(int count) {
-	OS.objc_msgSend(this.id, OS.sel_setNumberOfTickMarks_1, count);
-}
-
-public void setTickMarkPosition(int position) {
-	OS.objc_msgSend(this.id, OS.sel_setTickMarkPosition_1, position);
-}
-
-public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, aString != null ? aString.id : 0);
-}
-
-public void setTitleCell(NSCell aCell) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleCell_1, aCell != null ? aCell.id : 0);
-}
-
-public void setTitleColor(NSColor newColor) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleColor_1, newColor != null ? newColor.id : 0);
-}
-
-public void setTitleFont(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleFont_1, fontObj != null ? fontObj.id : 0);
-}
-
-public int tickMarkPosition() {
-	return OS.objc_msgSend(this.id, OS.sel_tickMarkPosition);
-}
-
-public double tickMarkValueAtIndex(int index) {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_tickMarkValueAtIndex_1, index);
-}
-
-public NSString title() {
-	int result = OS.objc_msgSend(this.id, OS.sel_title);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id titleCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_titleCell);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSColor titleColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_titleColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSFont titleFont() {
-	int result = OS.objc_msgSend(this.id, OS.sel_titleFont);
-	return result != 0 ? new NSFont(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setMinValue_, aDouble);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSliderCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSliderCell.java
deleted file mode 100644
index e34569151d..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSliderCell.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSliderCell extends NSActionCell {
-
-public NSSliderCell() {
-	super();
-}
-
-public NSSliderCell(int id) {
-	super(id);
-}
-
-public boolean allowsTickMarkValuesOnly() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsTickMarkValuesOnly) != 0;
-}
-
-public double altIncrementValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_altIncrementValue);
-}
-
-public double closestTickMarkValueToValue(double value) {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_closestTickMarkValueToValue_1, value);
-}
-
-public void drawBarInside(NSRect aRect, boolean flipped) {
-	OS.objc_msgSend(this.id, OS.sel_drawBarInside_1flipped_1, aRect, flipped);
-}
-
-public void drawKnob() {
-	OS.objc_msgSend(this.id, OS.sel_drawKnob);
-}
-
-public void drawKnob_(NSRect knobRect) {
-	OS.objc_msgSend(this.id, OS.sel_drawKnob_1, knobRect);
-}
-
-public int indexOfTickMarkAtPoint(NSPoint point) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfTickMarkAtPoint_1, point);
-}
-
-public int isVertical() {
-	return OS.objc_msgSend(this.id, OS.sel_isVertical);
-}
-
-public NSRect knobRectFlipped(boolean flipped) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_knobRectFlipped_1, flipped);
-	return result;
-}
-
-public float 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);
-}
-
-public double minValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_minValue);
-}
-
-public int numberOfTickMarks() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfTickMarks);
-}
-
-public static boolean prefersTrackingUntilMouseUp() {
-	return OS.objc_msgSend(OS.class_NSSliderCell, OS.sel_prefersTrackingUntilMouseUp) != 0;
-}
-
-public NSRect rectOfTickMarkAtIndex(int index) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfTickMarkAtIndex_1, index);
-	return result;
-}
-
-public void setAllowsTickMarkValuesOnly(boolean yorn) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsTickMarkValuesOnly_1, yorn);
-}
-
-public void setAltIncrementValue(double incValue) {
-	OS.objc_msgSend(this.id, OS.sel_setAltIncrementValue_1, incValue);
-}
-
-public void setKnobThickness(float aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setKnobThickness_1, aFloat);
-}
-
-public void setMaxValue(double aDouble) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxValue_1, aDouble);
-}
-
-public void setMinValue(double aDouble) {
-	OS.objc_msgSend(this.id, OS.sel_setMinValue_1, aDouble);
-}
-
-public void setNumberOfTickMarks(int count) {
-	OS.objc_msgSend(this.id, OS.sel_setNumberOfTickMarks_1, count);
-}
-
-public void setSliderType(int sliderType) {
-	OS.objc_msgSend(this.id, OS.sel_setSliderType_1, sliderType);
-}
-
-public void setTickMarkPosition(int position) {
-	OS.objc_msgSend(this.id, OS.sel_setTickMarkPosition_1, position);
-}
-
-public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, aString != null ? aString.id : 0);
-}
-
-public void setTitleCell(NSCell aCell) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleCell_1, aCell != null ? aCell.id : 0);
-}
-
-public void setTitleColor(NSColor newColor) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleColor_1, newColor != null ? newColor.id : 0);
-}
-
-public void setTitleFont(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleFont_1, fontObj != null ? fontObj.id : 0);
-}
-
-public int sliderType() {
-	return OS.objc_msgSend(this.id, OS.sel_sliderType);
-}
-
-public int tickMarkPosition() {
-	return OS.objc_msgSend(this.id, OS.sel_tickMarkPosition);
-}
-
-public double tickMarkValueAtIndex(int index) {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_tickMarkValueAtIndex_1, index);
-}
-
-public NSString title() {
-	int result = OS.objc_msgSend(this.id, OS.sel_title);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id titleCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_titleCell);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSColor titleColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_titleColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSFont titleFont() {
-	int result = OS.objc_msgSend(this.id, OS.sel_titleFont);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public NSRect trackRect() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_trackRect);
-	return result;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSocketPort.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSocketPort.java
deleted file mode 100644
index 54d78c98e3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSocketPort.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSocketPort extends NSPort {
-
-public NSSocketPort() {
-	super();
-}
-
-public NSSocketPort(int id) {
-	super(id);
-}
-
-public NSData address() {
-	int result = OS.objc_msgSend(this.id, OS.sel_address);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public id initRemoteWithProtocolFamily(int family, int type, int protocol, NSData address) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initRemoteWithProtocolFamily_1socketType_1protocol_1address_1, family, type, protocol, address != null ? address.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initRemoteWithTCPPort(short port, NSString hostName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initRemoteWithTCPPort_1host_1, port, hostName != null ? hostName.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithProtocolFamily_socketType_protocol_address_(int family, int type, int protocol, NSData address) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithProtocolFamily_1socketType_1protocol_1address_1, family, type, protocol, address != null ? address.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithProtocolFamily_socketType_protocol_socket_(int family, int type, int protocol, int sock) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithProtocolFamily_1socketType_1protocol_1socket_1, family, type, protocol, sock);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithTCPPort(short port) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithTCPPort_1, port);
-	return result != 0 ? new id(result) : null;
-}
-
-public int protocol() {
-	return OS.objc_msgSend(this.id, OS.sel_protocol);
-}
-
-public int protocolFamily() {
-	return OS.objc_msgSend(this.id, OS.sel_protocolFamily);
-}
-
-public int socket() {
-	return OS.objc_msgSend(this.id, OS.sel_socket);
-}
-
-public int socketType() {
-	return OS.objc_msgSend(this.id, OS.sel_socketType);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSocketPortNameServer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSocketPortNameServer.java
deleted file mode 100644
index 01b8178ac2..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSocketPortNameServer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSocketPortNameServer extends NSPortNameServer {
-
-public NSSocketPortNameServer() {
-	super();
-}
-
-public NSSocketPortNameServer(int id) {
-	super(id);
-}
-
-public short defaultNameServerPortNumber() {
-	return (short)OS.objc_msgSend(this.id, OS.sel_defaultNameServerPortNumber);
-}
-
-public NSPort portForName_(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_portForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public NSPort portForName_host_(NSString name, NSString host) {
-	int result = OS.objc_msgSend(this.id, OS.sel_portForName_1host_1, name != null ? name.id : 0, host != null ? host.id : 0);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public NSPort portForName_host_nameServerPortNumber_(NSString name, NSString host, short portNumber) {
-	int result = OS.objc_msgSend(this.id, OS.sel_portForName_1host_1nameServerPortNumber_1, name != null ? name.id : 0, host != null ? host.id : 0, portNumber);
-	return result != 0 ? new NSPort(result) : null;
-}
-
-public boolean registerPort_name_(NSPort port, NSString name) {
-	return OS.objc_msgSend(this.id, OS.sel_registerPort_1name_1, port != null ? port.id : 0, name != null ? name.id : 0) != 0;
-}
-
-public boolean registerPort_name_nameServerPortNumber_(NSPort port, NSString name, short portNumber) {
-	return OS.objc_msgSend(this.id, OS.sel_registerPort_1name_1nameServerPortNumber_1, port != null ? port.id : 0, name != null ? name.id : 0, portNumber) != 0;
-}
-
-public boolean removePortForName(NSString name) {
-	return OS.objc_msgSend(this.id, OS.sel_removePortForName_1, name != null ? name.id : 0) != 0;
-}
-
-public void setDefaultNameServerPortNumber(short portNumber) {
-	OS.objc_msgSend(this.id, OS.sel_setDefaultNameServerPortNumber_1, portNumber);
-}
-
-public static id sharedInstance() {
-	int result = OS.objc_msgSend(OS.class_NSSocketPortNameServer, OS.sel_sharedInstance);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSortDescriptor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSortDescriptor.java
deleted file mode 100644
index f292509d2a..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSortDescriptor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSortDescriptor extends NSObject {
-
-public NSSortDescriptor() {
-	super();
-}
-
-public NSSortDescriptor(int id) {
-	super(id);
-}
-
-public boolean ascending() {
-	return OS.objc_msgSend(this.id, OS.sel_ascending) != 0;
-}
-
-public int compareObject(id object1, id object2) {
-	return OS.objc_msgSend(this.id, OS.sel_compareObject_1toObject_1, object1 != null ? object1.id : 0, object2 != null ? object2.id : 0);
-}
-
-public id initWithKey_ascending_(NSString key, boolean ascending) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithKey_1ascending_1, key != null ? key.id : 0, ascending);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithKey_ascending_selector_(NSString key, boolean ascending, int selector) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithKey_1ascending_1selector_1, key != null ? key.id : 0, ascending, selector);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString key() {
-	int result = OS.objc_msgSend(this.id, OS.sel_key);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id reversedSortDescriptor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_reversedSortDescriptor);
-	return result != 0 ? new id(result) : null;
-}
-
-public int selector() {
-	return OS.objc_msgSend(this.id, OS.sel_selector);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSound.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSound.java
deleted file mode 100644
index 798c2d65ed..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSound.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSound extends NSObject {
-
-public NSSound() {
-	super();
-}
-
-public NSSound(int id) {
-	super(id);
-}
-
-public static boolean canInitWithPasteboard(NSPasteboard pasteboard) {
-	return OS.objc_msgSend(OS.class_NSSound, OS.sel_canInitWithPasteboard_1, pasteboard != null ? pasteboard.id : 0) != 0;
-}
-
-public NSArray channelMapping() {
-	int result = OS.objc_msgSend(this.id, OS.sel_channelMapping);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public double currentTime() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_currentTime);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public double duration() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_duration);
-}
-
-public id initWithContentsOfFile(NSString path, boolean byRef) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_1byReference_1, path != null ? path.id : 0, byRef);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithContentsOfURL(NSURL url, boolean byRef) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1byReference_1, url != null ? url.id : 0, byRef);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithData(NSData data) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithPasteboard(NSPasteboard pasteboard) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithPasteboard_1, pasteboard != null ? pasteboard.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isPlaying() {
-	return OS.objc_msgSend(this.id, OS.sel_isPlaying) != 0;
-}
-
-public boolean loops() {
-	return OS.objc_msgSend(this.id, OS.sel_loops) != 0;
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean pause() {
-	return OS.objc_msgSend(this.id, OS.sel_pause) != 0;
-}
-
-public boolean play() {
-	return OS.objc_msgSend(this.id, OS.sel_play) != 0;
-}
-
-public NSString playbackDeviceIdentifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_playbackDeviceIdentifier);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean resume() {
-	return OS.objc_msgSend(this.id, OS.sel_resume) != 0;
-}
-
-public void setChannelMapping(NSArray channelMapping) {
-	OS.objc_msgSend(this.id, OS.sel_setChannelMapping_1, channelMapping != null ? channelMapping.id : 0);
-}
-
-public void setCurrentTime(double seconds) {
-	OS.objc_msgSend(this.id, OS.sel_setCurrentTime_1, seconds);
-}
-
-public void setDelegate(id aDelegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, aDelegate != null ? aDelegate.id : 0);
-}
-
-public void setLoops(boolean val) {
-	OS.objc_msgSend(this.id, OS.sel_setLoops_1, val);
-}
-
-public boolean setName(NSString string) {
-	return OS.objc_msgSend(this.id, OS.sel_setName_1, string != null ? string.id : 0) != 0;
-}
-
-public void setPlaybackDeviceIdentifier(NSString deviceUID) {
-	OS.objc_msgSend(this.id, OS.sel_setPlaybackDeviceIdentifier_1, deviceUID != null ? deviceUID.id : 0);
-}
-
-public void setVolume(float volume) {
-	OS.objc_msgSend(this.id, OS.sel_setVolume_1, volume);
-}
-
-public static id soundNamed(NSString name) {
-	int result = OS.objc_msgSend(OS.class_NSSound, OS.sel_soundNamed_1, name != null ? name.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSArray soundUnfilteredFileTypes() {
-	int result = OS.objc_msgSend(OS.class_NSSound, OS.sel_soundUnfilteredFileTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray soundUnfilteredPasteboardTypes() {
-	int result = OS.objc_msgSend(OS.class_NSSound, OS.sel_soundUnfilteredPasteboardTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSArray soundUnfilteredTypes() {
-	int result = OS.objc_msgSend(OS.class_NSSound, OS.sel_soundUnfilteredTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean stop() {
-	return OS.objc_msgSend(this.id, OS.sel_stop) != 0;
-}
-
-public float volume() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_volume);
-}
-
-public void writeToPasteboard(NSPasteboard pasteboard) {
-	OS.objc_msgSend(this.id, OS.sel_writeToPasteboard_1, pasteboard != null ? pasteboard.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpecifierTest.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpecifierTest.java
deleted file mode 100644
index 30f450f596..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpecifierTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSpecifierTest extends NSScriptWhoseTest {
-
-public NSSpecifierTest() {
-	super();
-}
-
-public NSSpecifierTest(int id) {
-	super(id);
-}
-
-public id initWithObjectSpecifier(NSScriptObjectSpecifier obj1, int compOp, id obj2) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithObjectSpecifier_1comparisonOperator_1testObject_1, obj1 != null ? obj1.id : 0, compOp, obj2 != null ? obj2.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/NSSpeechRecognizer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpeechRecognizer.java
deleted file mode 100644
index aa0697219f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpeechRecognizer.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSpeechRecognizer extends NSObject {
-
-public NSSpeechRecognizer() {
-	super();
-}
-
-public NSSpeechRecognizer(int id) {
-	super(id);
-}
-
-public boolean blocksOtherRecognizers() {
-	return OS.objc_msgSend(this.id, OS.sel_blocksOtherRecognizers) != 0;
-}
-
-public NSArray commands() {
-	int result = OS.objc_msgSend(this.id, OS.sel_commands);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString displayedCommandsTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_displayedCommandsTitle);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean listensInForegroundOnly() {
-	return OS.objc_msgSend(this.id, OS.sel_listensInForegroundOnly) != 0;
-}
-
-public void setBlocksOtherRecognizers(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBlocksOtherRecognizers_1, flag);
-}
-
-public void setCommands(NSArray commands) {
-	OS.objc_msgSend(this.id, OS.sel_setCommands_1, commands != null ? commands.id : 0);
-}
-
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public void setDisplayedCommandsTitle(NSString title) {
-	OS.objc_msgSend(this.id, OS.sel_setDisplayedCommandsTitle_1, title != null ? title.id : 0);
-}
-
-public void setListensInForegroundOnly(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setListensInForegroundOnly_1, flag);
-}
-
-public void startListening() {
-	OS.objc_msgSend(this.id, OS.sel_startListening);
-}
-
-public void stopListening() {
-	OS.objc_msgSend(this.id, OS.sel_stopListening);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpeechSynthesizer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpeechSynthesizer.java
deleted file mode 100644
index 1f34181999..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpeechSynthesizer.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSpeechSynthesizer extends NSObject {
-
-public NSSpeechSynthesizer() {
-	super();
-}
-
-public NSSpeechSynthesizer(int id) {
-	super(id);
-}
-
-public void addSpeechDictionary(NSDictionary speechDictionary) {
-	OS.objc_msgSend(this.id, OS.sel_addSpeechDictionary_1, speechDictionary != null ? speechDictionary.id : 0);
-}
-
-public static NSDictionary attributesForVoice(NSString voice) {
-	int result = OS.objc_msgSend(OS.class_NSSpeechSynthesizer, OS.sel_attributesForVoice_1, voice != null ? voice.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public static NSArray availableVoices() {
-	int result = OS.objc_msgSend(OS.class_NSSpeechSynthesizer, OS.sel_availableVoices);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void continueSpeaking() {
-	OS.objc_msgSend(this.id, OS.sel_continueSpeaking);
-}
-
-public static NSString defaultVoice() {
-	int result = OS.objc_msgSend(OS.class_NSSpeechSynthesizer, OS.sel_defaultVoice);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithVoice(NSString voice) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithVoice_1, voice != null ? voice.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static boolean isAnyApplicationSpeaking() {
-	return OS.objc_msgSend(OS.class_NSSpeechSynthesizer, OS.sel_isAnyApplicationSpeaking) != 0;
-}
-
-public boolean isSpeaking() {
-	return OS.objc_msgSend(this.id, OS.sel_isSpeaking) != 0;
-}
-
-public id objectForProperty(NSString property, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectForProperty_1error_1, property != null ? property.id : 0, outError);
-	return result != 0 ? new id(result) : null;
-}
-
-public void pauseSpeakingAtBoundary(int boundary) {
-	OS.objc_msgSend(this.id, OS.sel_pauseSpeakingAtBoundary_1, boundary);
-}
-
-public NSString phonemesFromText(NSString text) {
-	int result = OS.objc_msgSend(this.id, OS.sel_phonemesFromText_1, text != null ? text.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public float rate() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rate);
-}
-
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public boolean setObject(id object, NSString property, int outError) {
-	return OS.objc_msgSend(this.id, OS.sel_setObject_1forProperty_1error_1, object != null ? object.id : 0, property != null ? property.id : 0, outError) != 0;
-}
-
-public void setRate(float rate) {
-	OS.objc_msgSend(this.id, OS.sel_setRate_1, rate);
-}
-
-public void setUsesFeedbackWindow(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesFeedbackWindow_1, flag);
-}
-
-public boolean setVoice(NSString voice) {
-	return OS.objc_msgSend(this.id, OS.sel_setVoice_1, voice != null ? voice.id : 0) != 0;
-}
-
-public void setVolume(float volume) {
-	OS.objc_msgSend(this.id, OS.sel_setVolume_1, volume);
-}
-
-public boolean startSpeakingString_(NSString string) {
-	return OS.objc_msgSend(this.id, OS.sel_startSpeakingString_1, string != null ? string.id : 0) != 0;
-}
-
-public boolean startSpeakingString_toURL_(NSString string, NSURL url) {
-	return OS.objc_msgSend(this.id, OS.sel_startSpeakingString_1toURL_1, string != null ? string.id : 0, url != null ? url.id : 0) != 0;
-}
-
-public void stopSpeaking() {
-	OS.objc_msgSend(this.id, OS.sel_stopSpeaking);
-}
-
-public void stopSpeakingAtBoundary(int boundary) {
-	OS.objc_msgSend(this.id, OS.sel_stopSpeakingAtBoundary_1, boundary);
-}
-
-public boolean usesFeedbackWindow() {
-	return OS.objc_msgSend(this.id, OS.sel_usesFeedbackWindow) != 0;
-}
-
-public NSString voice() {
-	int result = OS.objc_msgSend(this.id, OS.sel_voice);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public float volume() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_volume);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpellChecker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpellChecker.java
deleted file mode 100644
index 34af427d2f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpellChecker.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSpellChecker extends NSObject {
-
-public NSSpellChecker() {
-	super();
-}
-
-public NSSpellChecker(int id) {
-	super(id);
-}
-
-public NSView accessoryView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_accessoryView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public NSArray availableLanguages() {
-	int result = OS.objc_msgSend(this.id, OS.sel_availableLanguages);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSRange checkGrammarOfString(NSString stringToCheck, int startingOffset, NSString language, boolean wrapFlag, int tag, int details) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_checkGrammarOfString_1startingAt_1language_1wrap_1inSpellDocumentWithTag_1details_1, stringToCheck != null ? stringToCheck.id : 0, startingOffset, language != null ? language.id : 0, wrapFlag, tag, details);
-	return result;
-}
-
-public NSRange checkSpellingOfString_startingAt_(NSString stringToCheck, int startingOffset) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_checkSpellingOfString_1startingAt_1, stringToCheck != null ? stringToCheck.id : 0, startingOffset);
-	return result;
-}
-
-public NSRange checkSpellingOfString_startingAt_language_wrap_inSpellDocumentWithTag_wordCount_(NSString stringToCheck, int startingOffset, NSString language, boolean wrapFlag, int tag, int wordCount) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_checkSpellingOfString_1startingAt_1language_1wrap_1inSpellDocumentWithTag_1wordCount_1, stringToCheck != null ? stringToCheck.id : 0, startingOffset, language != null ? language.id : 0, wrapFlag, tag, wordCount);
-	return result;
-}
-
-public void closeSpellDocumentWithTag(int tag) {
-	OS.objc_msgSend(this.id, OS.sel_closeSpellDocumentWithTag_1, tag);
-}
-
-public NSArray completionsForPartialWordRange(NSRange range, NSString string, NSString language, int tag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_completionsForPartialWordRange_1inString_1language_1inSpellDocumentWithTag_1, range, string != null ? string.id : 0, language != null ? language.id : 0, tag);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public int countWordsInString(NSString stringToCount, NSString language) {
-	return OS.objc_msgSend(this.id, OS.sel_countWordsInString_1language_1, stringToCount != null ? stringToCount.id : 0, language != null ? language.id : 0);
-}
-
-public void forgetWord(NSString word) {
-	OS.objc_msgSend(this.id, OS.sel_forgetWord_1, word != null ? word.id : 0);
-}
-
-public NSArray guessesForWord(NSString word) {
-	int result = OS.objc_msgSend(this.id, OS.sel_guessesForWord_1, word != null ? word.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean hasLearnedWord(NSString word) {
-	return OS.objc_msgSend(this.id, OS.sel_hasLearnedWord_1, word != null ? word.id : 0) != 0;
-}
-
-public void ignoreWord(NSString wordToIgnore, int tag) {
-	OS.objc_msgSend(this.id, OS.sel_ignoreWord_1inSpellDocumentWithTag_1, wordToIgnore != null ? wordToIgnore.id : 0, tag);
-}
-
-public NSArray ignoredWordsInSpellDocumentWithTag(int tag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_ignoredWordsInSpellDocumentWithTag_1, tag);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString language() {
-	int result = OS.objc_msgSend(this.id, OS.sel_language);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void learnWord(NSString word) {
-	OS.objc_msgSend(this.id, OS.sel_learnWord_1, word != null ? word.id : 0);
-}
-
-public void setAccessoryView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_setAccessoryView_1, aView != null ? aView.id : 0);
-}
-
-public void setIgnoredWords(NSArray words, int tag) {
-	OS.objc_msgSend(this.id, OS.sel_setIgnoredWords_1inSpellDocumentWithTag_1, words != null ? words.id : 0, tag);
-}
-
-public boolean setLanguage(NSString language) {
-	return OS.objc_msgSend(this.id, OS.sel_setLanguage_1, language != null ? language.id : 0) != 0;
-}
-
-public void setWordFieldStringValue(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setWordFieldStringValue_1, aString != null ? aString.id : 0);
-}
-
-public static NSSpellChecker sharedSpellChecker() {
-	int result = OS.objc_msgSend(OS.class_NSSpellChecker, OS.sel_sharedSpellChecker);
-	return result != 0 ? new NSSpellChecker(result) : null;
-}
-
-public static boolean sharedSpellCheckerExists() {
-	return OS.objc_msgSend(OS.class_NSSpellChecker, OS.sel_sharedSpellCheckerExists) != 0;
-}
-
-public NSPanel spellingPanel() {
-	int result = OS.objc_msgSend(this.id, OS.sel_spellingPanel);
-	return result != 0 ? new NSPanel(result) : null;
-}
-
-public static int uniqueSpellDocumentTag() {
-	return OS.objc_msgSend(OS.class_NSSpellChecker, OS.sel_uniqueSpellDocumentTag);
-}
-
-public void unlearnWord(NSString word) {
-	OS.objc_msgSend(this.id, OS.sel_unlearnWord_1, word != null ? word.id : 0);
-}
-
-public void updateSpellingPanelWithGrammarString(NSString string, NSDictionary detail) {
-	OS.objc_msgSend(this.id, OS.sel_updateSpellingPanelWithGrammarString_1detail_1, string != null ? string.id : 0, detail != null ? detail.id : 0);
-}
-
-public void updateSpellingPanelWithMisspelledWord(NSString word) {
-	OS.objc_msgSend(this.id, OS.sel_updateSpellingPanelWithMisspelledWord_1, word != null ? word.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpellServer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpellServer.java
deleted file mode 100644
index 5ae6ee8501..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSpellServer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSpellServer extends NSObject {
-
-public NSSpellServer() {
-	super();
-}
-
-public NSSpellServer(int id) {
-	super(id);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isWordInUserDictionaries(NSString word, boolean flag) {
-	return OS.objc_msgSend(this.id, OS.sel_isWordInUserDictionaries_1caseSensitive_1, word != null ? word.id : 0, flag) != 0;
-}
-
-public boolean registerLanguage(NSString language, NSString vendor) {
-	return OS.objc_msgSend(this.id, OS.sel_registerLanguage_1byVendor_1, language != null ? language.id : 0, vendor != null ? vendor.id : 0) != 0;
-}
-
-public void run() {
-	OS.objc_msgSend(this.id, OS.sel_run);
-}
-
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSplitView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSplitView.java
deleted file mode 100644
index 32eedc55d0..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSplitView.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSplitView extends NSView {
-
-public NSSplitView() {
-	super();
-}
-
-public NSSplitView(int id) {
-	super(id);
-}
-
-public void adjustSubviews() {
-	OS.objc_msgSend(this.id, OS.sel_adjustSubviews);
-}
-
-public NSString autosaveName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_autosaveName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSColor dividerColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_dividerColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public int dividerStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_dividerStyle);
-}
-
-public float dividerThickness() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_dividerThickness);
-}
-
-public void drawDividerInRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_drawDividerInRect_1, rect);
-}
-
-public boolean isPaneSplitter() {
-	return OS.objc_msgSend(this.id, OS.sel_isPaneSplitter) != 0;
-}
-
-public boolean isSubviewCollapsed(NSView subview) {
-	return OS.objc_msgSend(this.id, OS.sel_isSubviewCollapsed_1, subview != null ? subview.id : 0) != 0;
-}
-
-public boolean isVertical() {
-	return OS.objc_msgSend(this.id, OS.sel_isVertical) != 0;
-}
-
-public float maxPossiblePositionOfDividerAtIndex(int dividerIndex) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_maxPossiblePositionOfDividerAtIndex_1, dividerIndex);
-}
-
-public float minPossiblePositionOfDividerAtIndex(int dividerIndex) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_minPossiblePositionOfDividerAtIndex_1, dividerIndex);
-}
-
-public void setAutosaveName(NSString autosaveName) {
-	OS.objc_msgSend(this.id, OS.sel_setAutosaveName_1, autosaveName != null ? autosaveName.id : 0);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setDividerStyle(int dividerStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setDividerStyle_1, dividerStyle);
-}
-
-public void setIsPaneSplitter(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setIsPaneSplitter_1, flag);
-}
-
-public void setPosition(float position, int dividerIndex) {
-	OS.objc_msgSend(this.id, OS.sel_setPosition_1ofDividerAtIndex_1, position, dividerIndex);
-}
-
-public void setVertical(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setVertical_1, flag);
-}
-
-}
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 19461b493d..2ab968664f 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,20 +16,20 @@ public NSStatusBar() {
 	super();
 }
 
-public NSStatusBar(int id) {
+public NSStatusBar(int /*long*/ id) {
 	super(id);
 }
 
-public boolean isVertical() {
-	return OS.objc_msgSend(this.id, OS.sel_isVertical) != 0;
+public NSStatusBar(id id) {
+	super(id);
 }
 
 public void removeStatusItem(NSStatusItem item) {
-	OS.objc_msgSend(this.id, OS.sel_removeStatusItem_1, item != null ? item.id : 0);
+	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_1, length);
+	int result = OS.objc_msgSend(this.id, OS.sel_statusItemWithLength_, length);
 	return result != 0 ? new NSStatusItem(result) : null;
 }
 
@@ -38,8 +38,4 @@ public static NSStatusBar systemStatusBar() {
 	return result != 0 ? new NSStatusBar(result) : null;
 }
 
-public float thickness() {
-	return (float)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/NSStatusItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusItem.java
index 792dc92718..8c846adacc 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,137 +16,28 @@ public NSStatusItem() {
 	super();
 }
 
-public NSStatusItem(int id) {
+public NSStatusItem(int /*long*/ id) {
 	super(id);
 }
 
-public int action() {
-	return OS.objc_msgSend(this.id, OS.sel_action);
-}
-
-public NSImage alternateImage() {
-	int result = OS.objc_msgSend(this.id, OS.sel_alternateImage);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSAttributedString attributedTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedTitle);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public int doubleAction() {
-	return OS.objc_msgSend(this.id, OS.sel_doubleAction);
+public NSStatusItem(id id) {
+	super(id);
 }
 
 public void drawStatusBarBackgroundInRect(NSRect rect, boolean highlight) {
-	OS.objc_msgSend(this.id, OS.sel_drawStatusBarBackgroundInRect_1withHighlight_1, rect, highlight);
-}
-
-public boolean highlightMode() {
-	return OS.objc_msgSend(this.id, OS.sel_highlightMode) != 0;
-}
-
-public NSImage image() {
-	int result = OS.objc_msgSend(this.id, OS.sel_image);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public boolean isEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isEnabled) != 0;
-}
-
-public float length() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_length);
-}
-
-public NSMenu menu() {
-	int result = OS.objc_msgSend(this.id, OS.sel_menu);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
-public void popUpStatusItemMenu(NSMenu menu) {
-	OS.objc_msgSend(this.id, OS.sel_popUpStatusItemMenu_1, menu != null ? menu.id : 0);
-}
-
-public int sendActionOn(int mask) {
-	return OS.objc_msgSend(this.id, OS.sel_sendActionOn_1, mask);
-}
-
-public void setAction(int action) {
-	OS.objc_msgSend(this.id, OS.sel_setAction_1, action);
-}
-
-public void setAlternateImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setAlternateImage_1, image != null ? image.id : 0);
-}
-
-public void setAttributedTitle(NSAttributedString title) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedTitle_1, title != null ? title.id : 0);
-}
-
-public void setDoubleAction(int action) {
-	OS.objc_msgSend(this.id, OS.sel_setDoubleAction_1, action);
-}
-
-public void setEnabled(boolean enabled) {
-	OS.objc_msgSend(this.id, OS.sel_setEnabled_1, enabled);
+	OS.objc_msgSend(this.id, OS.sel_drawStatusBarBackgroundInRect_withHighlight_, rect, highlight);
 }
 
 public void setHighlightMode(boolean highlightMode) {
-	OS.objc_msgSend(this.id, OS.sel_setHighlightMode_1, highlightMode);
-}
-
-public void setImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1, image != null ? image.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setHighlightMode_, highlightMode);
 }
 
 public void setLength(float length) {
-	OS.objc_msgSend(this.id, OS.sel_setLength_1, length);
-}
-
-public void setMenu(NSMenu menu) {
-	OS.objc_msgSend(this.id, OS.sel_setMenu_1, menu != null ? menu.id : 0);
-}
-
-public void setTarget(id target) {
-	OS.objc_msgSend(this.id, OS.sel_setTarget_1, target != null ? target.id : 0);
-}
-
-public void setTitle(NSString title) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, title != null ? title.id : 0);
-}
-
-public void setToolTip(NSString toolTip) {
-	OS.objc_msgSend(this.id, OS.sel_setToolTip_1, toolTip != null ? toolTip.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setLength_, length);
 }
 
 public void setView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setView_1, view != null ? view.id : 0);
-}
-
-public NSStatusBar statusBar() {
-	int result = OS.objc_msgSend(this.id, OS.sel_statusBar);
-	return result != 0 ? new NSStatusBar(result) : null;
-}
-
-public id target() {
-	int result = OS.objc_msgSend(this.id, OS.sel_target);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString title() {
-	int result = OS.objc_msgSend(this.id, OS.sel_title);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString toolTip() {
-	int result = OS.objc_msgSend(this.id, OS.sel_toolTip);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSView view() {
-	int result = OS.objc_msgSend(this.id, OS.sel_view);
-	return result != 0 ? new NSView(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setView_, view != null ? view.id : 0);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepper.java
index 5f61eedd17..2e96d1ce04 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepper.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepper.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,12 +16,12 @@ public NSStepper() {
 	super();
 }
 
-public NSStepper(int id) {
+public NSStepper(int /*long*/ id) {
 	super(id);
 }
 
-public boolean autorepeat() {
-	return OS.objc_msgSend(this.id, OS.sel_autorepeat) != 0;
+public NSStepper(id id) {
+	super(id);
 }
 
 public double increment() {
@@ -36,28 +36,20 @@ public double minValue() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_minValue);
 }
 
-public void setAutorepeat(boolean autorepeat) {
-	OS.objc_msgSend(this.id, OS.sel_setAutorepeat_1, autorepeat);
-}
-
 public void setIncrement(double increment) {
-	OS.objc_msgSend(this.id, OS.sel_setIncrement_1, increment);
+	OS.objc_msgSend(this.id, OS.sel_setIncrement_, increment);
 }
 
 public void setMaxValue(double maxValue) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxValue_1, maxValue);
+	OS.objc_msgSend(this.id, OS.sel_setMaxValue_, maxValue);
 }
 
 public void setMinValue(double minValue) {
-	OS.objc_msgSend(this.id, OS.sel_setMinValue_1, minValue);
+	OS.objc_msgSend(this.id, OS.sel_setMinValue_, minValue);
 }
 
 public void setValueWraps(boolean valueWraps) {
-	OS.objc_msgSend(this.id, OS.sel_setValueWraps_1, valueWraps);
-}
-
-public boolean valueWraps() {
-	return OS.objc_msgSend(this.id, OS.sel_valueWraps) != 0;
+	OS.objc_msgSend(this.id, OS.sel_setValueWraps_, valueWraps);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepperCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepperCell.java
deleted file mode 100644
index 8185fdaa55..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepperCell.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSStepperCell extends NSActionCell {
-
-public NSStepperCell() {
-	super();
-}
-
-public NSStepperCell(int id) {
-	super(id);
-}
-
-public boolean autorepeat() {
-	return OS.objc_msgSend(this.id, OS.sel_autorepeat) != 0;
-}
-
-public double increment() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_increment);
-}
-
-public double maxValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_maxValue);
-}
-
-public double minValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_minValue);
-}
-
-public void setAutorepeat(boolean autorepeat) {
-	OS.objc_msgSend(this.id, OS.sel_setAutorepeat_1, autorepeat);
-}
-
-public void setIncrement(double increment) {
-	OS.objc_msgSend(this.id, OS.sel_setIncrement_1, increment);
-}
-
-public void setMaxValue(double maxValue) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxValue_1, maxValue);
-}
-
-public void setMinValue(double minValue) {
-	OS.objc_msgSend(this.id, OS.sel_setMinValue_1, minValue);
-}
-
-public void setValueWraps(boolean valueWraps) {
-	OS.objc_msgSend(this.id, OS.sel_setValueWraps_1, valueWraps);
-}
-
-public boolean valueWraps() {
-	return OS.objc_msgSend(this.id, OS.sel_valueWraps) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStream.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStream.java
deleted file mode 100644
index d94ed532ac..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStream.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSStream extends NSObject {
-
-public NSStream() {
-	super();
-}
-
-public NSStream(int id) {
-	super(id);
-}
-
-public void close() {
-	OS.objc_msgSend(this.id, OS.sel_close);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public static void getStreamsToHost(NSHost host, int port, int inputStream, int outputStream) {
-	OS.objc_msgSend(OS.class_NSStream, OS.sel_getStreamsToHost_1port_1inputStream_1outputStream_1, host != null ? host.id : 0, port, inputStream, outputStream);
-}
-
-public void open() {
-	OS.objc_msgSend(this.id, OS.sel_open);
-}
-
-public id propertyForKey(NSString key) {
-	int result = OS.objc_msgSend(this.id, OS.sel_propertyForKey_1, key != null ? key.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void removeFromRunLoop(NSRunLoop aRunLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_removeFromRunLoop_1forMode_1, aRunLoop != null ? aRunLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-public void scheduleInRunLoop(NSRunLoop aRunLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_scheduleInRunLoop_1forMode_1, aRunLoop != null ? aRunLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public boolean setProperty(id property, NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_setProperty_1forKey_1, property != null ? property.id : 0, key != null ? key.id : 0) != 0;
-}
-
-public NSError streamError() {
-	int result = OS.objc_msgSend(this.id, OS.sel_streamError);
-	return result != 0 ? new NSError(result) : null;
-}
-
-public int streamStatus() {
-	return OS.objc_msgSend(this.id, OS.sel_streamStatus);
-}
-
-}
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 7f90256cbd..d7bf229c38 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,308 +16,36 @@ public NSString() {
 	super();
 }
 
-public NSString(int id) {
+public NSString(int /*long*/ id) {
 	super(id);
 }
 
-public int UTF8String() {
-	return OS.objc_msgSend(this.id, OS.sel_UTF8String);
-}
-
-public static int availableStringEncodings() {
-	return OS.objc_msgSend(OS.class_NSString, OS.sel_availableStringEncodings);
-}
-
-public boolean boolValue() {
-	return OS.objc_msgSend(this.id, OS.sel_boolValue) != 0;
-}
-
-public int cString() {
-	return OS.objc_msgSend(this.id, OS.sel_cString);
-}
-
-public int cStringLength() {
-	return OS.objc_msgSend(this.id, OS.sel_cStringLength);
-}
-
-public int cStringUsingEncoding(int encoding) {
-	return OS.objc_msgSend(this.id, OS.sel_cStringUsingEncoding_1, encoding);
-}
-
-public boolean canBeConvertedToEncoding(int encoding) {
-	return OS.objc_msgSend(this.id, OS.sel_canBeConvertedToEncoding_1, encoding) != 0;
-}
-
-public NSString capitalizedString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_capitalizedString);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public int caseInsensitiveCompare(NSString string) {
-	return OS.objc_msgSend(this.id, OS.sel_caseInsensitiveCompare_1, string != null ? string.id : 0);
-}
-
-public short characterAtIndex(int index) {
-	return (short)OS.objc_msgSend(this.id, OS.sel_characterAtIndex_1, index);
-}
-
-public NSString commonPrefixWithString(NSString aString, int mask) {
-	int result = OS.objc_msgSend(this.id, OS.sel_commonPrefixWithString_1options_1, aString != null ? aString.id : 0, mask);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public int compare_(NSString string) {
-	return OS.objc_msgSend(this.id, OS.sel_compare_1, string != null ? string.id : 0);
-}
-
-public int compare_options_(NSString string, int mask) {
-	return OS.objc_msgSend(this.id, OS.sel_compare_1options_1, string != null ? string.id : 0, mask);
-}
-
-public int compare_options_range_(NSString string, int mask, NSRange compareRange) {
-	return OS.objc_msgSend(this.id, OS.sel_compare_1options_1range_1, string != null ? string.id : 0, mask, compareRange);
-}
-
-public int compare_options_range_locale_(NSString string, int mask, NSRange compareRange, id locale) {
-	return OS.objc_msgSend(this.id, OS.sel_compare_1options_1range_1locale_1, string != null ? string.id : 0, mask, compareRange, locale != null ? locale.id : 0);
-}
-
-public int completePathIntoString(int outputName, boolean flag, int outputArray, NSArray filterTypes) {
-	return OS.objc_msgSend(this.id, OS.sel_completePathIntoString_1caseSensitive_1matchesIntoArray_1filterTypes_1, outputName, flag, outputArray, filterTypes != null ? filterTypes.id : 0);
-}
-
-public NSArray componentsSeparatedByCharactersInSet(NSCharacterSet separator) {
-	int result = OS.objc_msgSend(this.id, OS.sel_componentsSeparatedByCharactersInSet_1, separator != null ? separator.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray componentsSeparatedByString(NSString separator) {
-	int result = OS.objc_msgSend(this.id, OS.sel_componentsSeparatedByString_1, separator != null ? separator.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSData dataUsingEncoding_(int encoding) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataUsingEncoding_1, encoding);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSData dataUsingEncoding_allowLossyConversion_(int encoding, boolean lossy) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataUsingEncoding_1allowLossyConversion_1, encoding, lossy);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSString decomposedStringWithCanonicalMapping() {
-	int result = OS.objc_msgSend(this.id, OS.sel_decomposedStringWithCanonicalMapping);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString decomposedStringWithCompatibilityMapping() {
-	int result = OS.objc_msgSend(this.id, OS.sel_decomposedStringWithCompatibilityMapping);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public static int defaultCStringEncoding() {
-	return OS.objc_msgSend(OS.class_NSString, OS.sel_defaultCStringEncoding);
-}
-
-public NSString description() {
-	int result = OS.objc_msgSend(this.id, OS.sel_description);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public double doubleValue() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_doubleValue);
-}
-
-public int fastestEncoding() {
-	return OS.objc_msgSend(this.id, OS.sel_fastestEncoding);
-}
-
-public int fileSystemRepresentation() {
-	return OS.objc_msgSend(this.id, OS.sel_fileSystemRepresentation);
-}
-
-public float floatValue() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_floatValue);
-}
-
-public boolean getBytes(int buffer, int maxBufferCount, int usedBufferCount, int encoding, int options, NSRange range, int leftover) {
-	return OS.objc_msgSend(this.id, OS.sel_getBytes_1maxLength_1usedLength_1encoding_1options_1range_1remainingRange_1, buffer, maxBufferCount, usedBufferCount, encoding, options, range, leftover) != 0;
-}
-
-public void getCString_(int bytes) {
-	OS.objc_msgSend(this.id, OS.sel_getCString_1, bytes);
-}
-
-public void getCString_maxLength_(int bytes, int maxLength) {
-	OS.objc_msgSend(this.id, OS.sel_getCString_1maxLength_1, bytes, maxLength);
-}
-
-public boolean getCString_maxLength_encoding_(int buffer, int maxBufferCount, int encoding) {
-	return OS.objc_msgSend(this.id, OS.sel_getCString_1maxLength_1encoding_1, buffer, maxBufferCount, encoding) != 0;
-}
-
-public void getCString_maxLength_range_remainingRange_(int bytes, int maxLength, NSRange aRange, int leftoverRange) {
-	OS.objc_msgSend(this.id, OS.sel_getCString_1maxLength_1range_1remainingRange_1, bytes, maxLength, aRange, leftoverRange);
-}
-
-public void getCharacters_(char[] buffer) {
-	OS.objc_msgSend(this.id, OS.sel_getCharacters_1, buffer);
-}
-
-public void getCharacters_range_(char[] buffer, NSRange aRange) {
-	OS.objc_msgSend(this.id, OS.sel_getCharacters_1range_1, buffer, aRange);
-}
-
-public boolean getFileSystemRepresentation(int cname, int max) {
-	return OS.objc_msgSend(this.id, OS.sel_getFileSystemRepresentation_1maxLength_1, cname, max) != 0;
-}
-
-public void getLineStart(int startPtr, int lineEndPtr, int contentsEndPtr, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_getLineStart_1end_1contentsEnd_1forRange_1, startPtr, lineEndPtr, contentsEndPtr, range);
-}
-
-public void getParagraphStart(int startPtr, int parEndPtr, int contentsEndPtr, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_getParagraphStart_1end_1contentsEnd_1forRange_1, startPtr, parEndPtr, contentsEndPtr, range);
+public NSString(id id) {
+	super(id);
 }
 
 public String getString() {
 	char[] buffer = new char[length()];
-	getCharacters_(buffer);
+	getCharacters(buffer);
 	return new String(buffer);
 }
 
-public boolean hasPrefix(NSString aString) {
-	return OS.objc_msgSend(this.id, OS.sel_hasPrefix_1, aString != null ? aString.id : 0) != 0;
-}
-
-public boolean hasSuffix(NSString aString) {
-	return OS.objc_msgSend(this.id, OS.sel_hasSuffix_1, aString != null ? aString.id : 0) != 0;
-}
-
-public int hash() {
-	return OS.objc_msgSend(this.id, OS.sel_hash);
-}
-
-public NSString initWithBytes(int bytes, int len, int encoding) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithBytes_1length_1encoding_1, bytes, len, encoding);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithBytesNoCopy(int bytes, int len, int encoding, boolean freeBuffer) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithBytesNoCopy_1length_1encoding_1freeWhenDone_1, bytes, len, encoding, freeBuffer);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithCString_(int bytes) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCString_1, bytes);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithCString_encoding_(int nullTerminatedCString, int encoding) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCString_1encoding_1, nullTerminatedCString, encoding);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithCString_length_(int bytes, int length) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCString_1length_1, bytes, length);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithCStringNoCopy(int bytes, int length, boolean freeBuffer) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCStringNoCopy_1length_1freeWhenDone_1, bytes, length, freeBuffer);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithCharacters(int characters, int length) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCharacters_1length_1, characters, length);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithCharactersNoCopy(int characters, int length, boolean freeBuffer) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithCharactersNoCopy_1length_1freeWhenDone_1, characters, length, freeBuffer);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithContentsOfFile_(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_1, path != null ? path.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithContentsOfFile_encoding_error_(NSString path, int enc, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_1encoding_1error_1, path != null ? path.id : 0, enc, error);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithContentsOfFile_usedEncoding_error_(NSString path, int enc, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_1usedEncoding_1error_1, path != null ? path.id : 0, enc, error);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithContentsOfURL_(NSURL url) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1, url != null ? url.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithContentsOfURL_encoding_error_(NSURL url, int enc, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1encoding_1error_1, url != null ? url.id : 0, enc, error);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithContentsOfURL_usedEncoding_error_(NSURL url, int enc, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1usedEncoding_1error_1, url != null ? url.id : 0, enc, error);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithData(NSData data, int encoding) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_1encoding_1, data != null ? data.id : 0, encoding);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithFormat_(NSString initWithFormat) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFormat_1, initWithFormat != null ? initWithFormat.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithFormat_arguments_(NSString format, int argList) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFormat_1arguments_1, format != null ? format.id : 0, argList);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithFormat_locale_(NSString format, id locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFormat_1locale_1, format != null ? format.id : 0, locale != null ? locale.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithFormat_locale_arguments_(NSString format, id locale, int argList) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFormat_1locale_1arguments_1, format != null ? format.id : 0, locale != null ? locale.id : 0, argList);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithString(NSString aString) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithString_1, aString != null ? aString.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSString initWithUTF8String(int nullTerminatedCString) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithUTF8String_1, nullTerminatedCString);
-	return result != 0 ? this : null;
-}
-
-public int intValue() {
-	return OS.objc_msgSend(this.id, OS.sel_intValue);
+public static NSString stringWith(String str) {
+	char[] buffer = new char[str.length()];
+	str.getChars(0, buffer.length, buffer, 0);
+	return stringWithCharacters(buffer, buffer.length);
 }
 
-public int integerValue() {
-	return OS.objc_msgSend(this.id, OS.sel_integerValue);
+public short characterAtIndex(int index) {
+	return (short)OS.objc_msgSend(this.id, OS.sel_characterAtIndex_, index);
 }
 
-public boolean isAbsolutePath() {
-	return OS.objc_msgSend(this.id, OS.sel_isAbsolutePath) != 0;
+public void getCharacters(char[] buffer) {
+	OS.objc_msgSend(this.id, OS.sel_getCharacters_, buffer);
 }
 
-public boolean isEqualToString(NSString aString) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualToString_1, aString != null ? aString.id : 0) != 0;
+public void getCharacters(char[] buffer, NSRange aRange) {
+	OS.objc_msgSend(this.id, OS.sel_getCharacters_range_, buffer, aRange);
 }
 
 public NSString lastPathComponent() {
@@ -329,187 +57,18 @@ public int length() {
 	return OS.objc_msgSend(this.id, OS.sel_length);
 }
 
-public int lengthOfBytesUsingEncoding(int enc) {
-	return OS.objc_msgSend(this.id, OS.sel_lengthOfBytesUsingEncoding_1, enc);
-}
-
-public NSRange lineRangeForRange(NSRange range) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_lineRangeForRange_1, range);
-	return result;
-}
-
-public int localizedCaseInsensitiveCompare(NSString string) {
-	return OS.objc_msgSend(this.id, OS.sel_localizedCaseInsensitiveCompare_1, string != null ? string.id : 0);
-}
-
-public int localizedCompare(NSString string) {
-	return OS.objc_msgSend(this.id, OS.sel_localizedCompare_1, string != null ? string.id : 0);
-}
-
-public static NSString localizedNameOfStringEncoding(int encoding) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_localizedNameOfStringEncoding_1, encoding);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static id localizedStringWithFormat(NSString localizedStringWithFormat) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_localizedStringWithFormat_1, localizedStringWithFormat != null ? localizedStringWithFormat.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public long longLongValue() {
-	return (long)OS.objc_msgSend(this.id, OS.sel_longLongValue);
-}
-
-public int lossyCString() {
-	return OS.objc_msgSend(this.id, OS.sel_lossyCString);
-}
-
 public NSString lowercaseString() {
 	int result = OS.objc_msgSend(this.id, OS.sel_lowercaseString);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
-public int maximumLengthOfBytesUsingEncoding(int enc) {
-	return OS.objc_msgSend(this.id, OS.sel_maximumLengthOfBytesUsingEncoding_1, enc);
-}
-
-public NSRange paragraphRangeForRange(NSRange range) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_paragraphRangeForRange_1, range);
-	return result;
-}
-
-public NSArray pathComponents() {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathComponents);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString pathExtension() {
-	int result = OS.objc_msgSend(this.id, OS.sel_pathExtension);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public static NSString pathWithComponents(NSArray components) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_pathWithComponents_1, components != null ? components.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString precomposedStringWithCanonicalMapping() {
-	int result = OS.objc_msgSend(this.id, OS.sel_precomposedStringWithCanonicalMapping);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString precomposedStringWithCompatibilityMapping() {
-	int result = OS.objc_msgSend(this.id, OS.sel_precomposedStringWithCompatibilityMapping);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public id propertyList() {
-	int result = OS.objc_msgSend(this.id, OS.sel_propertyList);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSDictionary propertyListFromStringsFileFormat() {
-	int result = OS.objc_msgSend(this.id, OS.sel_propertyListFromStringsFileFormat);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSRange rangeOfCharacterFromSet_(NSCharacterSet aSet) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeOfCharacterFromSet_1, aSet != null ? aSet.id : 0);
-	return result;
-}
-
-public NSRange rangeOfCharacterFromSet_options_(NSCharacterSet aSet, int mask) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeOfCharacterFromSet_1options_1, aSet != null ? aSet.id : 0, mask);
-	return result;
-}
-
-public NSRange rangeOfCharacterFromSet_options_range_(NSCharacterSet aSet, int mask, NSRange searchRange) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeOfCharacterFromSet_1options_1range_1, aSet != null ? aSet.id : 0, mask, searchRange);
-	return result;
-}
-
-public NSRange rangeOfComposedCharacterSequenceAtIndex(int index) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeOfComposedCharacterSequenceAtIndex_1, index);
-	return result;
-}
-
-public NSRange rangeOfComposedCharacterSequencesForRange(NSRange range) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeOfComposedCharacterSequencesForRange_1, range);
-	return result;
-}
-
-public NSRange rangeOfString_(NSString aString) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeOfString_1, aString != null ? aString.id : 0);
-	return result;
-}
-
-public NSRange rangeOfString_options_(NSString aString, int mask) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeOfString_1options_1, aString != null ? aString.id : 0, mask);
-	return result;
-}
-
-public NSRange rangeOfString_options_range_(NSString aString, int mask, NSRange searchRange) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeOfString_1options_1range_1, aString != null ? aString.id : 0, mask, searchRange);
-	return result;
-}
-
-public NSRange rangeOfString_options_range_locale_(NSString aString, int mask, NSRange searchRange, NSLocale locale) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeOfString_1options_1range_1locale_1, aString != null ? aString.id : 0, mask, searchRange, locale != null ? locale.id : 0);
-	return result;
-}
-
-public int smallestEncoding() {
-	return OS.objc_msgSend(this.id, OS.sel_smallestEncoding);
-}
-
-public static NSString string() {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_string);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString stringByAbbreviatingWithTildeInPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByAbbreviatingWithTildeInPath);
-	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_1, enc);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString stringByAppendingFormat(NSString stringByAppendingFormat) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingFormat_1, stringByAppendingFormat != null ? stringByAppendingFormat.id : 0);
+	int 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_1, str != null ? str.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString stringByAppendingPathExtension(NSString str) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingPathExtension_1, str != null ? str.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString stringByAppendingString(NSString aString) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingString_1, aString != null ? aString.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString stringByDeletingLastPathComponent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByDeletingLastPathComponent);
+	int 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);
 }
 
@@ -518,167 +77,14 @@ public NSString stringByDeletingPathExtension() {
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
-public NSString stringByExpandingTildeInPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByExpandingTildeInPath);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString stringByFoldingWithOptions(int options, NSLocale locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByFoldingWithOptions_1locale_1, options, locale != null ? locale.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString stringByPaddingToLength(int newLength, NSString padString, int padIndex) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByPaddingToLength_1withString_1startingAtIndex_1, newLength, padString != null ? padString.id : 0, padIndex);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString stringByReplacingCharactersInRange(NSRange range, NSString replacement) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingCharactersInRange_1withString_1, range, replacement != null ? replacement.id : 0);
+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);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
-public NSString stringByReplacingOccurrencesOfString_withString_(NSString target, NSString replacement) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingOccurrencesOfString_1withString_1, target != null ? target.id : 0, replacement != null ? replacement.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString stringByReplacingOccurrencesOfString_withString_options_range_(NSString target, NSString replacement, int options, NSRange searchRange) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingOccurrencesOfString_1withString_1options_1range_1, target != null ? target.id : 0, replacement != null ? replacement.id : 0, options, searchRange);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString stringByReplacingPercentEscapesUsingEncoding(int enc) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingPercentEscapesUsingEncoding_1, enc);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString stringByResolvingSymlinksInPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByResolvingSymlinksInPath);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString stringByStandardizingPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByStandardizingPath);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString stringByTrimmingCharactersInSet(NSCharacterSet set) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByTrimmingCharactersInSet_1, set != null ? set.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public static id static_stringWithCString_(int bytes) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithCString_1, bytes);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static id static_stringWithCString_encoding_(int cString, int enc) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithCString_1encoding_1, cString, enc);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSString static_stringWithCString_length_(int bytes, int length) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithCString_1length_1, bytes, length);
-	return 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_1length_1, characters, length);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSString stringWith(String str) {
-	char[] chars = new char[str.length()];
-	str.getChars(0, chars.length, chars, 0);
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithCharacters_1length_1, chars, chars.length);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static id static_stringWithContentsOfFile_(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithContentsOfFile_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_stringWithContentsOfFile_encoding_error_(NSString path, int enc, int error) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithContentsOfFile_1encoding_1error_1, path != null ? path.id : 0, enc, error);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_stringWithContentsOfFile_usedEncoding_error_(NSString path, int enc, int error) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithContentsOfFile_1usedEncoding_1error_1, path != null ? path.id : 0, enc, error);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_stringWithContentsOfURL_(NSURL url) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithContentsOfURL_1, url != null ? url.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_stringWithContentsOfURL_encoding_error_(NSURL url, int enc, int error) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithContentsOfURL_1encoding_1error_1, url != null ? url.id : 0, enc, error);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_stringWithContentsOfURL_usedEncoding_error_(NSURL url, int enc, int error) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithContentsOfURL_1usedEncoding_1error_1, url != null ? url.id : 0, enc, error);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id stringWithFormat(NSString stringWithFormat) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithFormat_1, stringWithFormat != null ? stringWithFormat.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id stringWithString(NSString string) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithString_1, string != null ? string.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSString stringWithUTF8String(int nullTerminatedCString) {
-	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithUTF8String_1, nullTerminatedCString);
+	int result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithCharacters_length_, characters, length);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public NSArray stringsByAppendingPaths(NSArray paths) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringsByAppendingPaths_1, paths != null ? paths.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString substringFromIndex(int from) {
-	int result = OS.objc_msgSend(this.id, OS.sel_substringFromIndex_1, from);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString substringToIndex(int to) {
-	int result = OS.objc_msgSend(this.id, OS.sel_substringToIndex_1, to);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString substringWithRange(NSRange range) {
-	int result = OS.objc_msgSend(this.id, OS.sel_substringWithRange_1, range);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public NSString uppercaseString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_uppercaseString);
-	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
-}
-
-public boolean writeToFile_atomically_(NSString path, boolean useAuxiliaryFile) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToFile_1atomically_1, path != null ? path.id : 0, useAuxiliaryFile) != 0;
-}
-
-public boolean writeToFile_atomically_encoding_error_(NSString path, boolean useAuxiliaryFile, int enc, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToFile_1atomically_1encoding_1error_1, path != null ? path.id : 0, useAuxiliaryFile, enc, error) != 0;
-}
-
-public boolean writeToURL_atomically_(NSURL url, boolean atomically) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToURL_1atomically_1, url != null ? url.id : 0, atomically) != 0;
-}
-
-public boolean writeToURL_atomically_encoding_error_(NSURL url, boolean useAuxiliaryFile, int enc, int error) {
-	return OS.objc_msgSend(this.id, OS.sel_writeToURL_1atomically_1encoding_1error_1, url != null ? url.id : 0, useAuxiliaryFile, enc, error) != 0;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSwappedDouble.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSwappedDouble.java
deleted file mode 100644
index 9acb9484ee..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSwappedDouble.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSwappedDouble {
-public long v;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSwappedFloat.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSwappedFloat.java
deleted file mode 100644
index ddded7f0a0..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSwappedFloat.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSSwappedFloat {
-public int v;
-}
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 b75f390ce2..d09aea2b23 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,16 +16,16 @@ public NSTabView() {
 	super();
 }
 
-public NSTabView(int id) {
+public NSTabView(int /*long*/ id) {
 	super(id);
 }
 
-public void addTabViewItem(NSTabViewItem tabViewItem) {
-	OS.objc_msgSend(this.id, OS.sel_addTabViewItem_1, tabViewItem != null ? tabViewItem.id : 0);
+public NSTabView(id id) {
+	super(id);
 }
 
-public boolean allowsTruncatedLabels() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsTruncatedLabels) != 0;
+public void addTabViewItem(NSTabViewItem tabViewItem) {
+	OS.objc_msgSend(this.id, OS.sel_addTabViewItem_, tabViewItem != null ? tabViewItem.id : 0);
 }
 
 public NSRect contentRect() {
@@ -34,38 +34,8 @@ public NSRect contentRect() {
 	return result;
 }
 
-public int controlSize() {
-	return OS.objc_msgSend(this.id, OS.sel_controlSize);
-}
-
-public int controlTint() {
-	return OS.objc_msgSend(this.id, OS.sel_controlTint);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean drawsBackground() {
-	return OS.objc_msgSend(this.id, OS.sel_drawsBackground) != 0;
-}
-
-public NSFont font() {
-	int result = OS.objc_msgSend(this.id, OS.sel_font);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public int indexOfTabViewItem(NSTabViewItem tabViewItem) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfTabViewItem_1, tabViewItem != null ? tabViewItem.id : 0);
-}
-
-public int indexOfTabViewItemWithIdentifier(id identifier) {
-	return OS.objc_msgSend(this.id, OS.sel_indexOfTabViewItemWithIdentifier_1, identifier != null ? identifier.id : 0);
-}
-
 public void insertTabViewItem(NSTabViewItem tabViewItem, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertTabViewItem_1atIndex_1, tabViewItem != null ? tabViewItem.id : 0, index);
+	OS.objc_msgSend(this.id, OS.sel_insertTabViewItem_atIndex_, tabViewItem != null ? tabViewItem.id : 0, index);
 }
 
 public NSSize minimumSize() {
@@ -74,40 +44,12 @@ public NSSize minimumSize() {
 	return result;
 }
 
-public int numberOfTabViewItems() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfTabViewItems);
-}
-
 public void removeTabViewItem(NSTabViewItem tabViewItem) {
-	OS.objc_msgSend(this.id, OS.sel_removeTabViewItem_1, tabViewItem != null ? tabViewItem.id : 0);
-}
-
-public void selectFirstTabViewItem(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectFirstTabViewItem_1, sender != null ? sender.id : 0);
-}
-
-public void selectLastTabViewItem(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectLastTabViewItem_1, sender != null ? sender.id : 0);
-}
-
-public void selectNextTabViewItem(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectNextTabViewItem_1, sender != null ? sender.id : 0);
-}
-
-public void selectPreviousTabViewItem(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectPreviousTabViewItem_1, sender != null ? sender.id : 0);
-}
-
-public void selectTabViewItem(NSTabViewItem tabViewItem) {
-	OS.objc_msgSend(this.id, OS.sel_selectTabViewItem_1, tabViewItem != null ? tabViewItem.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_removeTabViewItem_, tabViewItem != null ? tabViewItem.id : 0);
 }
 
 public void selectTabViewItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_selectTabViewItemAtIndex_1, index);
-}
-
-public void selectTabViewItemWithIdentifier(id identifier) {
-	OS.objc_msgSend(this.id, OS.sel_selectTabViewItemWithIdentifier_1, identifier != null ? identifier.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_selectTabViewItemAtIndex_, index);
 }
 
 public NSTabViewItem selectedTabViewItem() {
@@ -115,55 +57,21 @@ public NSTabViewItem selectedTabViewItem() {
 	return result != 0 ? new NSTabViewItem(result) : null;
 }
 
-public void setAllowsTruncatedLabels(boolean allowTruncatedLabels) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsTruncatedLabels_1, allowTruncatedLabels);
-}
-
-public void setControlSize(int controlSize) {
-	OS.objc_msgSend(this.id, OS.sel_setControlSize_1, controlSize);
-}
-
-public void setControlTint(int controlTint) {
-	OS.objc_msgSend(this.id, OS.sel_setControlTint_1, controlTint);
-}
-
 public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0);
 }
 
 public void setFont(NSFont font) {
-	OS.objc_msgSend(this.id, OS.sel_setFont_1, font != null ? font.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setFont_, font != null ? font.id : 0);
 }
 
 public void setTabViewType(int tabViewType) {
-	OS.objc_msgSend(this.id, OS.sel_setTabViewType_1, tabViewType);
-}
-
-public NSTabViewItem tabViewItemAtIndex(int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_tabViewItemAtIndex_1, index);
-	return result != 0 ? new NSTabViewItem(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setTabViewType_, tabViewType);
 }
 
 public NSTabViewItem tabViewItemAtPoint(NSPoint point) {
-	int result = OS.objc_msgSend(this.id, OS.sel_tabViewItemAtPoint_1, point);
+	int result = OS.objc_msgSend(this.id, OS.sel_tabViewItemAtPoint_, point);
 	return result != 0 ? new NSTabViewItem(result) : null;
 }
 
-public NSArray tabViewItems() {
-	int result = OS.objc_msgSend(this.id, OS.sel_tabViewItems);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public int tabViewType() {
-	return OS.objc_msgSend(this.id, OS.sel_tabViewType);
-}
-
-public void takeSelectedTabViewItemFromSender(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeSelectedTabViewItemFromSender_1, sender != null ? sender.id : 0);
-}
-
 }
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 1e188f7296..34d6439799 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,77 +16,25 @@ public NSTabViewItem() {
 	super();
 }
 
-public NSTabViewItem(int id) {
+public NSTabViewItem(int /*long*/ id) {
 	super(id);
 }
 
-public NSColor color() {
-	int result = OS.objc_msgSend(this.id, OS.sel_color);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public void drawLabel(boolean shouldTruncateLabel, NSRect labelRect) {
-	OS.objc_msgSend(this.id, OS.sel_drawLabel_1inRect_1, shouldTruncateLabel, labelRect);
+public NSTabViewItem(id id) {
+	super(id);
 }
 
-public id identifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_identifier);
+public id initWithIdentifier(id identifier) {
+	int result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
-public NSTabViewItem initWithIdentifier(id identifier) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_1, identifier != null ? identifier.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSTabViewItem initialFirstResponder() {
-	int result = OS.objc_msgSend(this.id, OS.sel_initialFirstResponder);
-	return result != 0 ? this : null;
-}
-
-public NSString label() {
-	int result = OS.objc_msgSend(this.id, OS.sel_label);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setColor_1, color != null ? color.id : 0);
-}
-
-public void setIdentifier(id identifier) {
-	OS.objc_msgSend(this.id, OS.sel_setIdentifier_1, identifier != null ? identifier.id : 0);
-}
-
-public void setInitialFirstResponder(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setInitialFirstResponder_1, view != null ? view.id : 0);
-}
-
 public void setLabel(NSString label) {
-	OS.objc_msgSend(this.id, OS.sel_setLabel_1, label != null ? label.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setLabel_, label != null ? label.id : 0);
 }
 
 public void setView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setView_1, view != null ? view.id : 0);
-}
-
-public NSSize sizeOfLabel(boolean computeMin) {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_sizeOfLabel_1, computeMin);
-	return result;
-}
-
-public int tabState() {
-	return OS.objc_msgSend(this.id, OS.sel_tabState);
-}
-
-public NSTabView tabView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_tabView);
-	return result != 0 ? new NSTabView(result) : null;
-}
-
-public id view() {
-	int result = OS.objc_msgSend(this.id, OS.sel_view);
-	return result != 0 ? new id(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setView_, view != null ? view.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 8d987df507..88afc8de6e 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,18 +16,12 @@ public NSTableColumn() {
 	super();
 }
 
-public NSTableColumn(int id) {
+public NSTableColumn(int /*long*/ id) {
 	super(id);
 }
 
-public id dataCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataCell);
-	return result != 0 ? new id(result) : null;
-}
-
-public id dataCellForRow(int row) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataCellForRow_1, row);
-	return result != 0 ? new id(result) : null;
+public NSTableColumn(id id) {
+	super(id);
 }
 
 public NSTableHeaderCell headerCell() {
@@ -35,109 +29,37 @@ public NSTableHeaderCell headerCell() {
 	return result != 0 ? new NSTableHeaderCell(result) : null;
 }
 
-public NSString headerToolTip() {
-	int result = OS.objc_msgSend(this.id, OS.sel_headerToolTip);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id identifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_identifier);
+public id initWithIdentifier(id identifier) {
+	int result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
-public NSTableColumn initWithIdentifier(id identifier) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_1, identifier != null ? identifier.id : 0);
-	return result != 0 ? this : null;
-}
-
-public boolean isEditable() {
-	return OS.objc_msgSend(this.id, OS.sel_isEditable) != 0;
-}
-
-public boolean isHidden() {
-	return OS.objc_msgSend(this.id, OS.sel_isHidden) != 0;
-}
-
-public boolean isResizable() {
-	return OS.objc_msgSend(this.id, OS.sel_isResizable) != 0;
-}
-
-public float maxWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_maxWidth);
-}
-
-public float minWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_minWidth);
-}
-
 public int resizingMask() {
 	return OS.objc_msgSend(this.id, OS.sel_resizingMask);
 }
 
 public void setDataCell(NSCell cell) {
-	OS.objc_msgSend(this.id, OS.sel_setDataCell_1, cell != null ? cell.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setDataCell_, cell != null ? cell.id : 0);
 }
 
 public void setEditable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEditable_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setEditable_, flag);
 }
 
 public void setHeaderCell(NSCell cell) {
-	OS.objc_msgSend(this.id, OS.sel_setHeaderCell_1, cell != null ? cell.id : 0);
-}
-
-public void setHeaderToolTip(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setHeaderToolTip_1, string != null ? string.id : 0);
-}
-
-public void setHidden(boolean hidden) {
-	OS.objc_msgSend(this.id, OS.sel_setHidden_1, hidden);
-}
-
-public void setIdentifier(id identifier) {
-	OS.objc_msgSend(this.id, OS.sel_setIdentifier_1, identifier != null ? identifier.id : 0);
-}
-
-public void setMaxWidth(float maxWidth) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxWidth_1, maxWidth);
+	OS.objc_msgSend(this.id, OS.sel_setHeaderCell_, cell != null ? cell.id : 0);
 }
 
 public void setMinWidth(float minWidth) {
-	OS.objc_msgSend(this.id, OS.sel_setMinWidth_1, minWidth);
-}
-
-public void setResizable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setResizable_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setMinWidth_, minWidth);
 }
 
 public void setResizingMask(int resizingMask) {
-	OS.objc_msgSend(this.id, OS.sel_setResizingMask_1, resizingMask);
-}
-
-public void setSortDescriptorPrototype(NSSortDescriptor sortDescriptor) {
-	OS.objc_msgSend(this.id, OS.sel_setSortDescriptorPrototype_1, sortDescriptor != null ? sortDescriptor.id : 0);
-}
-
-public void setTableView(NSTableView tableView) {
-	OS.objc_msgSend(this.id, OS.sel_setTableView_1, tableView != null ? tableView.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setResizingMask_, resizingMask);
 }
 
 public void setWidth(float width) {
-	OS.objc_msgSend(this.id, OS.sel_setWidth_1, width);
-}
-
-public void sizeToFit() {
-	OS.objc_msgSend(this.id, OS.sel_sizeToFit);
-}
-
-public NSSortDescriptor sortDescriptorPrototype() {
-	int result = OS.objc_msgSend(this.id, OS.sel_sortDescriptorPrototype);
-	return result != 0 ? new NSSortDescriptor(result) : null;
-}
-
-public NSTableView tableView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_tableView);
-	return result != 0 ? new NSTableView(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setWidth_, width);
 }
 
 public float 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 dc283f9879..d74891b571 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,17 +16,21 @@ public NSTableHeaderCell() {
 	super();
 }
 
-public NSTableHeaderCell(int id) {
+public NSTableHeaderCell(int /*long*/ id) {
+	super(id);
+}
+
+public NSTableHeaderCell(id id) {
 	super(id);
 }
 
 public void drawSortIndicatorWithFrame(NSRect cellFrame, NSView controlView, boolean ascending, int priority) {
-	OS.objc_msgSend(this.id, OS.sel_drawSortIndicatorWithFrame_1inView_1ascending_1priority_1, cellFrame, controlView != null ? controlView.id : 0, ascending, priority);
+	OS.objc_msgSend(this.id, OS.sel_drawSortIndicatorWithFrame_inView_ascending_priority_, cellFrame, controlView != null ? controlView.id : 0, ascending, priority);
 }
 
 public NSRect sortIndicatorRectForBounds(NSRect theRect) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_sortIndicatorRectForBounds_1, theRect);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_sortIndicatorRectForBounds_, theRect);
 	return result;
 }
 
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 cbd4e7492b..0756a7e4e3 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,39 +16,22 @@ public NSTableHeaderView() {
 	super();
 }
 
-public NSTableHeaderView(int id) {
+public NSTableHeaderView(int /*long*/ id) {
 	super(id);
 }
 
-public int columnAtPoint(NSPoint point) {
-	return OS.objc_msgSend(this.id, OS.sel_columnAtPoint_1, point);
-}
-
-public int draggedColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_draggedColumn);
+public NSTableHeaderView(id id) {
+	super(id);
 }
 
-public float draggedDistance() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_draggedDistance);
+public int columnAtPoint(NSPoint point) {
+	return OS.objc_msgSend(this.id, OS.sel_columnAtPoint_, point);
 }
 
 public NSRect headerRectOfColumn(int column) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_headerRectOfColumn_1, column);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_headerRectOfColumn_, column);
 	return result;
 }
 
-public int resizedColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_resizedColumn);
-}
-
-public void setTableView(NSTableView tableView) {
-	OS.objc_msgSend(this.id, OS.sel_setTableView_1, tableView != null ? tableView.id : 0);
-}
-
-public NSTableView tableView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_tableView);
-	return result != 0 ? new NSTableView(result) : null;
-}
-
 }
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 85d42c8fcd..edaa0fae8f 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,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,214 +16,43 @@ public NSTableView() {
 	super();
 }
 
-public NSTableView(int id) {
+public NSTableView(int /*long*/ id) {
 	super(id);
 }
 
-public void addTableColumn(NSTableColumn column) {
-	OS.objc_msgSend(this.id, OS.sel_addTableColumn_1, column != null ? column.id : 0);
-}
-
-public boolean allowsColumnReordering() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsColumnReordering) != 0;
-}
-
-public boolean allowsColumnResizing() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsColumnResizing) != 0;
-}
-
-public boolean allowsColumnSelection() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsColumnSelection) != 0;
-}
-
-public boolean allowsEmptySelection() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsEmptySelection) != 0;
-}
-
-public boolean allowsMultipleSelection() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsMultipleSelection) != 0;
-}
-
-public boolean allowsTypeSelect() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsTypeSelect) != 0;
-}
-
-public boolean autoresizesAllColumnsToFit() {
-	return OS.objc_msgSend(this.id, OS.sel_autoresizesAllColumnsToFit) != 0;
-}
-
-public NSString autosaveName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_autosaveName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean autosaveTableColumns() {
-	return OS.objc_msgSend(this.id, OS.sel_autosaveTableColumns) != 0;
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public boolean canDragRowsWithIndexes(NSIndexSet rowIndexes, NSPoint mouseDownPoint) {
-	return OS.objc_msgSend(this.id, OS.sel_canDragRowsWithIndexes_1atPoint_1, rowIndexes != null ? rowIndexes.id : 0, mouseDownPoint) != 0;
-}
-
-public int clickedColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_clickedColumn);
-}
-
-public int clickedRow() {
-	return OS.objc_msgSend(this.id, OS.sel_clickedRow);
-}
-
-public int columnAtPoint(NSPoint point) {
-	return OS.objc_msgSend(this.id, OS.sel_columnAtPoint_1, point);
-}
-
-public int columnAutoresizingStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_columnAutoresizingStyle);
-}
-
-public NSIndexSet columnIndexesInRect(NSRect rect) {
-	int result = OS.objc_msgSend(this.id, OS.sel_columnIndexesInRect_1, rect);
-	return result != 0 ? new NSIndexSet(result) : null;
-}
-
-public int columnWithIdentifier(id identifier) {
-	return OS.objc_msgSend(this.id, OS.sel_columnWithIdentifier_1, identifier != null ? identifier.id : 0);
-}
-
-public NSRange columnsInRect(NSRect rect) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_columnsInRect_1, rect);
-	return result;
-}
-
-public NSView cornerView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_cornerView);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public id dataSource() {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataSource);
-	return result != 0 ? new id(result) : null;
+public NSTableView(id id) {
+	super(id);
 }
 
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
+public void addTableColumn(NSTableColumn column) {
+	OS.objc_msgSend(this.id, OS.sel_addTableColumn_, column != null ? column.id : 0);
 }
 
 public void deselectAll(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_deselectAll_1, sender != null ? sender.id : 0);
-}
-
-public void deselectColumn(int column) {
-	OS.objc_msgSend(this.id, OS.sel_deselectColumn_1, column);
+	OS.objc_msgSend(this.id, OS.sel_deselectAll_, sender != null ? sender.id : 0);
 }
 
 public void deselectRow(int row) {
-	OS.objc_msgSend(this.id, OS.sel_deselectRow_1, row);
-}
-
-public int doubleAction() {
-	return OS.objc_msgSend(this.id, OS.sel_doubleAction);
-}
-
-public NSImage dragImageForRows(NSArray dragRows, NSEvent dragEvent, int dragImageOffset) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dragImageForRows_1event_1dragImageOffset_1, dragRows != null ? dragRows.id : 0, dragEvent != null ? dragEvent.id : 0, dragImageOffset);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSImage dragImageForRowsWithIndexes(NSIndexSet dragRows, NSArray tableColumns, NSEvent dragEvent, int dragImageOffset) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dragImageForRowsWithIndexes_1tableColumns_1event_1offset_1, dragRows != null ? dragRows.id : 0, tableColumns != null ? tableColumns.id : 0, dragEvent != null ? dragEvent.id : 0, dragImageOffset);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public void drawBackgroundInClipRect(NSRect clipRect) {
-	OS.objc_msgSend(this.id, OS.sel_drawBackgroundInClipRect_1, clipRect);
-}
-
-public void drawGridInClipRect(NSRect clipRect) {
-	OS.objc_msgSend(this.id, OS.sel_drawGridInClipRect_1, clipRect);
-}
-
-public void drawRow(int row, NSRect clipRect) {
-	OS.objc_msgSend(this.id, OS.sel_drawRow_1clipRect_1, row, clipRect);
-}
-
-public boolean drawsGrid() {
-	return OS.objc_msgSend(this.id, OS.sel_drawsGrid) != 0;
-}
-
-public void editColumn(int column, int row, NSEvent theEvent, boolean select) {
-	OS.objc_msgSend(this.id, OS.sel_editColumn_1row_1withEvent_1select_1, column, row, theEvent != null ? theEvent.id : 0, select);
-}
-
-public int editedColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_editedColumn);
-}
-
-public int editedRow() {
-	return OS.objc_msgSend(this.id, OS.sel_editedRow);
+	OS.objc_msgSend(this.id, OS.sel_deselectRow_, row);
 }
 
 public NSRect frameOfCellAtColumn(int column, int row) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_frameOfCellAtColumn_1row_1, column, row);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_frameOfCellAtColumn_row_, column, row);
 	return result;
 }
 
-public NSColor gridColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_gridColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public int gridStyleMask() {
-	return OS.objc_msgSend(this.id, OS.sel_gridStyleMask);
-}
-
 public NSTableHeaderView headerView() {
 	int result = OS.objc_msgSend(this.id, OS.sel_headerView);
 	return result != 0 ? new NSTableHeaderView(result) : null;
 }
 
-public void highlightSelectionInClipRect(NSRect clipRect) {
-	OS.objc_msgSend(this.id, OS.sel_highlightSelectionInClipRect_1, clipRect);
-}
-
-public NSTableColumn highlightedTableColumn() {
-	int result = OS.objc_msgSend(this.id, OS.sel_highlightedTableColumn);
-	return result != 0 ? new NSTableColumn(result) : null;
-}
-
-public NSImage indicatorImageInTableColumn(NSTableColumn tc) {
-	int result = OS.objc_msgSend(this.id, OS.sel_indicatorImageInTableColumn_1, tc != null ? tc.id : 0);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSSize intercellSpacing() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_intercellSpacing);
-	return result;
-}
-
-public boolean isColumnSelected(int column) {
-	return OS.objc_msgSend(this.id, OS.sel_isColumnSelected_1, column) != 0;
-}
-
 public boolean isRowSelected(int row) {
-	return OS.objc_msgSend(this.id, OS.sel_isRowSelected_1, row) != 0;
+	return OS.objc_msgSend(this.id, OS.sel_isRowSelected_, row) != 0;
 }
 
 public void moveColumn(int column, int newIndex) {
-	OS.objc_msgSend(this.id, OS.sel_moveColumn_1toColumn_1, column, newIndex);
-}
-
-public void noteHeightOfRowsWithIndexesChanged(NSIndexSet indexSet) {
-	OS.objc_msgSend(this.id, OS.sel_noteHeightOfRowsWithIndexesChanged_1, indexSet != null ? indexSet.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_moveColumn_toColumn_, column, newIndex);
 }
 
 public void noteNumberOfRowsChanged() {
@@ -238,28 +67,13 @@ public int numberOfRows() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfRows);
 }
 
-public int numberOfSelectedColumns() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfSelectedColumns);
-}
-
 public int numberOfSelectedRows() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfSelectedRows);
 }
 
-public NSCell preparedCellAtColumn(int column, int row) {
-	int result = OS.objc_msgSend(this.id, OS.sel_preparedCellAtColumn_1row_1, column, row);
-	return result != 0 ? new NSCell(result) : null;
-}
-
-public NSRect rectOfColumn(int column) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfColumn_1, column);
-	return result;
-}
-
 public NSRect rectOfRow(int row) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfRow_1, row);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfRow_, row);
 	return result;
 }
 
@@ -268,240 +82,72 @@ public void reloadData() {
 }
 
 public void removeTableColumn(NSTableColumn column) {
-	OS.objc_msgSend(this.id, OS.sel_removeTableColumn_1, column != null ? column.id : 0);
+	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_1, point);
+	return OS.objc_msgSend(this.id, OS.sel_rowAtPoint_, point);
 }
 
 public float rowHeight() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rowHeight);
 }
 
-public NSRange rowsInRect(NSRect rect) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rowsInRect_1, rect);
-	return result;
-}
-
 public void scrollColumnToVisible(int column) {
-	OS.objc_msgSend(this.id, OS.sel_scrollColumnToVisible_1, column);
+	OS.objc_msgSend(this.id, OS.sel_scrollColumnToVisible_, column);
 }
 
 public void scrollRowToVisible(int row) {
-	OS.objc_msgSend(this.id, OS.sel_scrollRowToVisible_1, row);
+	OS.objc_msgSend(this.id, OS.sel_scrollRowToVisible_, row);
 }
 
 public void selectAll(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectAll_1, sender != null ? sender.id : 0);
-}
-
-public void selectColumn(int column, boolean extend) {
-	OS.objc_msgSend(this.id, OS.sel_selectColumn_1byExtendingSelection_1, column, extend);
-}
-
-public void selectColumnIndexes(NSIndexSet indexes, boolean extend) {
-	OS.objc_msgSend(this.id, OS.sel_selectColumnIndexes_1byExtendingSelection_1, indexes != null ? indexes.id : 0, extend);
+	OS.objc_msgSend(this.id, OS.sel_selectAll_, sender != null ? sender.id : 0);
 }
 
 public void selectRow(int row, boolean extend) {
-	OS.objc_msgSend(this.id, OS.sel_selectRow_1byExtendingSelection_1, row, extend);
+	OS.objc_msgSend(this.id, OS.sel_selectRow_byExtendingSelection_, row, extend);
 }
 
 public void selectRowIndexes(NSIndexSet indexes, boolean extend) {
-	OS.objc_msgSend(this.id, OS.sel_selectRowIndexes_1byExtendingSelection_1, indexes != null ? indexes.id : 0, extend);
-}
-
-public int selectedColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_selectedColumn);
-}
-
-public NSEnumerator selectedColumnEnumerator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedColumnEnumerator);
-	return result != 0 ? new NSEnumerator(result) : null;
-}
-
-public NSIndexSet selectedColumnIndexes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedColumnIndexes);
-	return result != 0 ? new NSIndexSet(result) : null;
+	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 NSEnumerator selectedRowEnumerator() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedRowEnumerator);
-	return result != 0 ? new NSEnumerator(result) : null;
-}
-
 public NSIndexSet selectedRowIndexes() {
 	int result = OS.objc_msgSend(this.id, OS.sel_selectedRowIndexes);
 	return result != 0 ? new NSIndexSet(result) : null;
 }
 
-public int selectionHighlightStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_selectionHighlightStyle);
-}
-
-public void setAllowsColumnReordering(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsColumnReordering_1, flag);
-}
-
-public void setAllowsColumnResizing(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsColumnResizing_1, flag);
-}
-
-public void setAllowsColumnSelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsColumnSelection_1, flag);
-}
-
-public void setAllowsEmptySelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsEmptySelection_1, flag);
-}
-
 public void setAllowsMultipleSelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsMultipleSelection_1, flag);
-}
-
-public void setAllowsTypeSelect(boolean value) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsTypeSelect_1, value);
-}
-
-public void setAutoresizesAllColumnsToFit(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutoresizesAllColumnsToFit_1, flag);
-}
-
-public void setAutosaveName(NSString name) {
-	OS.objc_msgSend(this.id, OS.sel_setAutosaveName_1, name != null ? name.id : 0);
-}
-
-public void setAutosaveTableColumns(boolean save) {
-	OS.objc_msgSend(this.id, OS.sel_setAutosaveTableColumns_1, save);
+	OS.objc_msgSend(this.id, OS.sel_setAllowsMultipleSelection_, flag);
 }
 
 public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setColumnAutoresizingStyle(int style) {
-	OS.objc_msgSend(this.id, OS.sel_setColumnAutoresizingStyle_1, style);
-}
-
-public void setCornerView(NSView cornerView) {
-	OS.objc_msgSend(this.id, OS.sel_setCornerView_1, cornerView != null ? cornerView.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
 }
 
 public void setDataSource(id aSource) {
-	OS.objc_msgSend(this.id, OS.sel_setDataSource_1, aSource != null ? aSource.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setDataSource_, aSource != null ? aSource.id : 0);
 }
 
 public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setDelegate_, delegate != null ? delegate.id : 0);
 }
 
 public void setDoubleAction(int aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_setDoubleAction_1, aSelector);
-}
-
-public void setDraggingSourceOperationMask(int mask, boolean isLocal) {
-	OS.objc_msgSend(this.id, OS.sel_setDraggingSourceOperationMask_1forLocal_1, mask, isLocal);
-}
-
-public void setDrawsGrid(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsGrid_1, flag);
-}
-
-public void setDropRow(int row, int op) {
-	OS.objc_msgSend(this.id, OS.sel_setDropRow_1dropOperation_1, row, op);
-}
-
-public void setGridColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setGridColor_1, color != null ? color.id : 0);
-}
-
-public void setGridStyleMask(int gridType) {
-	OS.objc_msgSend(this.id, OS.sel_setGridStyleMask_1, gridType);
+	OS.objc_msgSend(this.id, OS.sel_setDoubleAction_, aSelector);
 }
 
 public void setHeaderView(NSTableHeaderView headerView) {
-	OS.objc_msgSend(this.id, OS.sel_setHeaderView_1, headerView != null ? headerView.id : 0);
-}
-
-public void setHighlightedTableColumn(NSTableColumn tc) {
-	OS.objc_msgSend(this.id, OS.sel_setHighlightedTableColumn_1, tc != null ? tc.id : 0);
-}
-
-public void setIndicatorImage(NSImage anImage, NSTableColumn tc) {
-	OS.objc_msgSend(this.id, OS.sel_setIndicatorImage_1inTableColumn_1, anImage != null ? anImage.id : 0, tc != null ? tc.id : 0);
-}
-
-public void setIntercellSpacing(NSSize aSize) {
-	OS.objc_msgSend(this.id, OS.sel_setIntercellSpacing_1, aSize);
-}
-
-public void setRowHeight(float rowHeight) {
-	OS.objc_msgSend(this.id, OS.sel_setRowHeight_1, rowHeight);
-}
-
-public void setSelectionHighlightStyle(int selectionHighlightStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectionHighlightStyle_1, selectionHighlightStyle);
-}
-
-public void setSortDescriptors(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setSortDescriptors_1, array != null ? array.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setHeaderView_, headerView != null ? headerView.id : 0);
 }
 
 public void setUsesAlternatingRowBackgroundColors(boolean useAlternatingRowColors) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesAlternatingRowBackgroundColors_1, useAlternatingRowColors);
-}
-
-public void setVerticalMotionCanBeginDrag(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setVerticalMotionCanBeginDrag_1, flag);
-}
-
-public void sizeLastColumnToFit() {
-	OS.objc_msgSend(this.id, OS.sel_sizeLastColumnToFit);
-}
-
-public void sizeToFit() {
-	OS.objc_msgSend(this.id, OS.sel_sizeToFit);
-}
-
-public NSArray sortDescriptors() {
-	int result = OS.objc_msgSend(this.id, OS.sel_sortDescriptors);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSTableColumn tableColumnWithIdentifier(id identifier) {
-	int result = OS.objc_msgSend(this.id, OS.sel_tableColumnWithIdentifier_1, identifier != null ? identifier.id : 0);
-	return result != 0 ? new NSTableColumn(result) : null;
-}
-
-public NSArray tableColumns() {
-	int result = OS.objc_msgSend(this.id, OS.sel_tableColumns);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void textDidBeginEditing(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_textDidBeginEditing_1, notification != null ? notification.id : 0);
-}
-
-public void textDidChange(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_textDidChange_1, notification != null ? notification.id : 0);
-}
-
-public void textDidEndEditing(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_textDidEndEditing_1, notification != null ? notification.id : 0);
-}
-
-public boolean textShouldBeginEditing(NSText textObject) {
-	return OS.objc_msgSend(this.id, OS.sel_textShouldBeginEditing_1, textObject != null ? textObject.id : 0) != 0;
-}
-
-public boolean textShouldEndEditing(NSText textObject) {
-	return OS.objc_msgSend(this.id, OS.sel_textShouldEndEditing_1, textObject != null ? textObject.id : 0) != 0;
+	OS.objc_msgSend(this.id, OS.sel_setUsesAlternatingRowBackgroundColors_, useAlternatingRowColors);
 }
 
 public void tile() {
@@ -512,8 +158,4 @@ public boolean usesAlternatingRowBackgroundColors() {
 	return OS.objc_msgSend(this.id, OS.sel_usesAlternatingRowBackgroundColors) != 0;
 }
 
-public boolean verticalMotionCanBeginDrag() {
-	return OS.objc_msgSend(this.id, OS.sel_verticalMotionCanBeginDrag) != 0;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTask.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTask.java
deleted file mode 100644
index fa581d669c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTask.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSTask extends NSObject {
-
-public NSTask() {
-	super();
-}
-
-public NSTask(int id) {
-	super(id);
-}
-
-public NSArray arguments() {
-	int result = OS.objc_msgSend(this.id, OS.sel_arguments);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString currentDirectoryPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currentDirectoryPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSDictionary environment() {
-	int result = OS.objc_msgSend(this.id, OS.sel_environment);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public void interrupt() {
-	OS.objc_msgSend(this.id, OS.sel_interrupt);
-}
-
-public boolean isRunning() {
-	return OS.objc_msgSend(this.id, OS.sel_isRunning) != 0;
-}
-
-public void launch() {
-	OS.objc_msgSend(this.id, OS.sel_launch);
-}
-
-public NSString launchPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_launchPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSTask launchedTaskWithLaunchPath(NSString path, NSArray arguments) {
-	int result = OS.objc_msgSend(OS.class_NSTask, OS.sel_launchedTaskWithLaunchPath_1arguments_1, path != null ? path.id : 0, arguments != null ? arguments.id : 0);
-	return result != 0 ? new NSTask(result) : null;
-}
-
-public int processIdentifier() {
-	return OS.objc_msgSend(this.id, OS.sel_processIdentifier);
-}
-
-public boolean resume() {
-	return OS.objc_msgSend(this.id, OS.sel_resume) != 0;
-}
-
-public void setArguments(NSArray arguments) {
-	OS.objc_msgSend(this.id, OS.sel_setArguments_1, arguments != null ? arguments.id : 0);
-}
-
-public void setCurrentDirectoryPath(NSString path) {
-	OS.objc_msgSend(this.id, OS.sel_setCurrentDirectoryPath_1, path != null ? path.id : 0);
-}
-
-public void setEnvironment(NSDictionary dict) {
-	OS.objc_msgSend(this.id, OS.sel_setEnvironment_1, dict != null ? dict.id : 0);
-}
-
-public void setLaunchPath(NSString path) {
-	OS.objc_msgSend(this.id, OS.sel_setLaunchPath_1, path != null ? path.id : 0);
-}
-
-public void setStandardError(id error) {
-	OS.objc_msgSend(this.id, OS.sel_setStandardError_1, error != null ? error.id : 0);
-}
-
-public void setStandardInput(id input) {
-	OS.objc_msgSend(this.id, OS.sel_setStandardInput_1, input != null ? input.id : 0);
-}
-
-public void setStandardOutput(id output) {
-	OS.objc_msgSend(this.id, OS.sel_setStandardOutput_1, output != null ? output.id : 0);
-}
-
-public id standardError() {
-	int result = OS.objc_msgSend(this.id, OS.sel_standardError);
-	return result != 0 ? new id(result) : null;
-}
-
-public id standardInput() {
-	int result = OS.objc_msgSend(this.id, OS.sel_standardInput);
-	return result != 0 ? new id(result) : null;
-}
-
-public id standardOutput() {
-	int result = OS.objc_msgSend(this.id, OS.sel_standardOutput);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean suspend() {
-	return OS.objc_msgSend(this.id, OS.sel_suspend) != 0;
-}
-
-public void terminate() {
-	OS.objc_msgSend(this.id, OS.sel_terminate);
-}
-
-public int terminationStatus() {
-	return OS.objc_msgSend(this.id, OS.sel_terminationStatus);
-}
-
-public void waitUntilExit() {
-	OS.objc_msgSend(this.id, OS.sel_waitUntilExit);
-}
-
-}
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 b796ebd3ba..fd1ca54760 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,169 +16,36 @@ public NSText() {
 	super();
 }
 
-public NSText(int id) {
+public NSText(int /*long*/ id) {
 	super(id);
 }
 
-public static int static_class() {
-	return OS.objc_msgSend(OS.class_NSText, OS.sel_class);
-}
-
-public NSData RTFDFromRange(NSRange range) {
-	int result = OS.objc_msgSend(this.id, OS.sel_RTFDFromRange_1, range);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSData RTFFromRange(NSRange range) {
-	int result = OS.objc_msgSend(this.id, OS.sel_RTFFromRange_1, range);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public void alignCenter(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_alignCenter_1, sender != null ? sender.id : 0);
-}
-
-public void alignLeft(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_alignLeft_1, sender != null ? sender.id : 0);
-}
-
-public void alignRight(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_alignRight_1, sender != null ? sender.id : 0);
-}
-
-public int alignment() {
-	return OS.objc_msgSend(this.id, OS.sel_alignment);
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public int baseWritingDirection() {
-	return OS.objc_msgSend(this.id, OS.sel_baseWritingDirection);
-}
-
-public void changeFont(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_changeFont_1, sender != null ? sender.id : 0);
-}
-
-public void checkSpelling(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_checkSpelling_1, sender != null ? sender.id : 0);
+public NSText(id id) {
+	super(id);
 }
 
 public void copy(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_copy_1, sender != null ? sender.id : 0);
-}
-
-public void copyFont(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_copyFont_1, sender != null ? sender.id : 0);
-}
-
-public void copyRuler(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_copyRuler_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_copy_, sender != null ? sender.id : 0);
 }
 
 public void cut(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_cut_1, sender != null ? sender.id : 0);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void delete(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_delete_1, sender != null ? sender.id : 0);
-}
-
-public boolean drawsBackground() {
-	return OS.objc_msgSend(this.id, OS.sel_drawsBackground) != 0;
-}
-
-public NSFont font() {
-	int result = OS.objc_msgSend(this.id, OS.sel_font);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public boolean importsGraphics() {
-	return OS.objc_msgSend(this.id, OS.sel_importsGraphics) != 0;
-}
-
-public boolean isEditable() {
-	return OS.objc_msgSend(this.id, OS.sel_isEditable) != 0;
-}
-
-public boolean isFieldEditor() {
-	return OS.objc_msgSend(this.id, OS.sel_isFieldEditor) != 0;
-}
-
-public boolean isHorizontallyResizable() {
-	return OS.objc_msgSend(this.id, OS.sel_isHorizontallyResizable) != 0;
-}
-
-public boolean isRichText() {
-	return OS.objc_msgSend(this.id, OS.sel_isRichText) != 0;
-}
-
-public boolean isRulerVisible() {
-	return OS.objc_msgSend(this.id, OS.sel_isRulerVisible) != 0;
-}
-
-public boolean isSelectable() {
-	return OS.objc_msgSend(this.id, OS.sel_isSelectable) != 0;
-}
-
-public boolean isVerticallyResizable() {
-	return OS.objc_msgSend(this.id, OS.sel_isVerticallyResizable) != 0;
-}
-
-public NSSize maxSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_maxSize);
-	return result;
-}
-
-public NSSize minSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_minSize);
-	return result;
+	OS.objc_msgSend(this.id, OS.sel_cut_, sender != null ? sender.id : 0);
 }
 
 public void paste(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_paste_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_paste_, sender != null ? sender.id : 0);
 }
 
-public void pasteFont(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_pasteFont_1, sender != null ? sender.id : 0);
-}
-
-public void pasteRuler(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_pasteRuler_1, sender != null ? sender.id : 0);
-}
-
-public boolean readRTFDFromFile(NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_readRTFDFromFile_1, path != null ? path.id : 0) != 0;
-}
-
-public void replaceCharactersInRange_withRTF_(NSRange range, NSData rtfData) {
-	OS.objc_msgSend(this.id, OS.sel_replaceCharactersInRange_1withRTF_1, range, rtfData != null ? rtfData.id : 0);
-}
-
-public void replaceCharactersInRange_withRTFD_(NSRange range, NSData rtfdData) {
-	OS.objc_msgSend(this.id, OS.sel_replaceCharactersInRange_1withRTFD_1, range, rtfdData != null ? rtfdData.id : 0);
-}
-
-public void replaceCharactersInRange_withString_(NSRange range, NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_replaceCharactersInRange_1withString_1, range, aString != null ? aString.id : 0);
+public void replaceCharactersInRange(NSRange range, NSString aString) {
+	OS.objc_msgSend(this.id, OS.sel_replaceCharactersInRange_withString_, range, aString != null ? aString.id : 0);
 }
 
 public void scrollRangeToVisible(NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_scrollRangeToVisible_1, range);
+	OS.objc_msgSend(this.id, OS.sel_scrollRangeToVisible_, range);
 }
 
 public void selectAll(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectAll_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_selectAll_, sender != null ? sender.id : 0);
 }
 
 public NSRange selectedRange() {
@@ -188,133 +55,59 @@ public NSRange selectedRange() {
 }
 
 public void setAlignment(int mode) {
-	OS.objc_msgSend(this.id, OS.sel_setAlignment_1, mode);
+	OS.objc_msgSend(this.id, OS.sel_setAlignment_, mode);
 }
 
 public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setBaseWritingDirection(int writingDirection) {
-	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_1, writingDirection);
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
 }
 
 public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0);
 }
 
 public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, flag);
 }
 
 public void setEditable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEditable_1, flag);
-}
-
-public void setFieldEditor(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setFieldEditor_1, flag);
-}
-
-public void setFont_(NSFont obj) {
-	OS.objc_msgSend(this.id, OS.sel_setFont_1, obj != null ? obj.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setEditable_, flag);
 }
 
-public void setFont_range_(NSFont font, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_setFont_1range_1, font != null ? font.id : 0, range);
+public void setFont(NSFont obj) {
+	OS.objc_msgSend(this.id, OS.sel_setFont_, obj != null ? obj.id : 0);
 }
 
 public void setHorizontallyResizable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHorizontallyResizable_1, flag);
-}
-
-public void setImportsGraphics(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setImportsGraphics_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setHorizontallyResizable_, flag);
 }
 
 public void setMaxSize(NSSize newMaxSize) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxSize_1, newMaxSize);
+	OS.objc_msgSend(this.id, OS.sel_setMaxSize_, newMaxSize);
 }
 
 public void setMinSize(NSSize newMinSize) {
-	OS.objc_msgSend(this.id, OS.sel_setMinSize_1, newMinSize);
-}
-
-public void setRichText(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setRichText_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setMinSize_, newMinSize);
 }
 
 public void setSelectable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectable_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setSelectable_, flag);
 }
 
 public void setSelectedRange(NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedRange_1, range);
+	OS.objc_msgSend(this.id, OS.sel_setSelectedRange_, range);
 }
 
 public void setString(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setString_1, string != null ? string.id : 0);
-}
-
-public void setTextColor_(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setTextColor_1, color != null ? color.id : 0);
-}
-
-public void setTextColor_range_(NSColor color, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_setTextColor_1range_1, color != null ? color.id : 0, range);
-}
-
-public void setUsesFontPanel(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesFontPanel_1, flag);
-}
-
-public void setVerticallyResizable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setVerticallyResizable_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setString_, string != null ? string.id : 0);
 }
 
-public void showGuessPanel(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_showGuessPanel_1, sender != null ? sender.id : 0);
+public void setTextColor(NSColor color) {
+	OS.objc_msgSend(this.id, OS.sel_setTextColor_, color != null ? color.id : 0);
 }
 
 public void sizeToFit() {
 	OS.objc_msgSend(this.id, OS.sel_sizeToFit);
 }
 
-public NSString string() {
-	int result = OS.objc_msgSend(this.id, OS.sel_string);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void subscript(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_subscript_1, sender != null ? sender.id : 0);
-}
-
-public void superscript(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_superscript_1, sender != null ? sender.id : 0);
-}
-
-public NSColor textColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public void toggleRuler(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_toggleRuler_1, sender != null ? sender.id : 0);
-}
-
-public void underline(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_underline_1, sender != null ? sender.id : 0);
-}
-
-public void unscript(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_unscript_1, sender != null ? sender.id : 0);
-}
-
-public boolean usesFontPanel() {
-	return OS.objc_msgSend(this.id, OS.sel_usesFontPanel) != 0;
-}
-
-public boolean writeRTFDToFile(NSString path, boolean flag) {
-	return OS.objc_msgSend(this.id, OS.sel_writeRTFDToFile_1atomically_1, path != null ? path.id : 0, flag) != 0;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java
deleted file mode 100644
index 767bd72751..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSTextAttachment extends NSObject {
-
-public NSTextAttachment() {
-	super();
-}
-
-public NSTextAttachment(int id) {
-	super(id);
-}
-
-public id  attachmentCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attachmentCell);
-	return result != 0 ? new id (result) : null;
-}
-
-public NSFileWrapper fileWrapper() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fileWrapper);
-	return result != 0 ? new NSFileWrapper(result) : null;
-}
-
-public id initWithFileWrapper(NSFileWrapper fileWrapper) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFileWrapper_1, fileWrapper != null ? fileWrapper.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setAttachmentCell(id  cell) {
-	OS.objc_msgSend(this.id, OS.sel_setAttachmentCell_1, cell != null ? cell.id : 0);
-}
-
-public void setFileWrapper(NSFileWrapper fileWrapper) {
-	OS.objc_msgSend(this.id, OS.sel_setFileWrapper_1, fileWrapper != null ? fileWrapper.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextBlock.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextBlock.java
deleted file mode 100644
index 44d2a57f6e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextBlock.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSTextBlock extends NSObject {
-
-public NSTextBlock() {
-	super();
-}
-
-public NSTextBlock(int id) {
-	super(id);
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSColor borderColorForEdge(int edge) {
-	int result = OS.objc_msgSend(this.id, OS.sel_borderColorForEdge_1, edge);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public NSRect boundsRectForContentRect(NSRect contentRect, NSRect rect, NSTextContainer textContainer, NSRange charRange) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_boundsRectForContentRect_1inRect_1textContainer_1characterRange_1, contentRect, rect, textContainer != null ? textContainer.id : 0, charRange);
-	return result;
-}
-
-public float contentWidth() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_contentWidth);
-}
-
-public int contentWidthValueType() {
-	return OS.objc_msgSend(this.id, OS.sel_contentWidthValueType);
-}
-
-public void drawBackgroundWithFrame(NSRect frameRect, NSView controlView, NSRange charRange, NSLayoutManager layoutManager) {
-	OS.objc_msgSend(this.id, OS.sel_drawBackgroundWithFrame_1inView_1characterRange_1layoutManager_1, frameRect, controlView != null ? controlView.id : 0, charRange, layoutManager != null ? layoutManager.id : 0);
-}
-
-public NSRect rectForLayoutAtPoint(NSPoint startingPoint, NSRect rect, NSTextContainer textContainer, NSRange charRange) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectForLayoutAtPoint_1inRect_1textContainer_1characterRange_1, startingPoint, rect, textContainer != null ? textContainer.id : 0, charRange);
-	return result;
-}
-
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setBorderColor_(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBorderColor_1, color != null ? color.id : 0);
-}
-
-public void setBorderColor_forEdge_(NSColor color, int edge) {
-	OS.objc_msgSend(this.id, OS.sel_setBorderColor_1forEdge_1, color != null ? color.id : 0, edge);
-}
-
-public void setContentWidth(float val, int type) {
-	OS.objc_msgSend(this.id, OS.sel_setContentWidth_1type_1, val, type);
-}
-
-public void setValue(float val, int type, int dimension) {
-	OS.objc_msgSend(this.id, OS.sel_setValue_1type_1forDimension_1, val, type, dimension);
-}
-
-public void setVerticalAlignment(int alignment) {
-	OS.objc_msgSend(this.id, OS.sel_setVerticalAlignment_1, alignment);
-}
-
-public void setWidth_type_forLayer_(float val, int type, int layer) {
-	OS.objc_msgSend(this.id, OS.sel_setWidth_1type_1forLayer_1, val, type, layer);
-}
-
-public void setWidth_type_forLayer_edge_(float val, int type, int layer, int edge) {
-	OS.objc_msgSend(this.id, OS.sel_setWidth_1type_1forLayer_1edge_1, val, type, layer, edge);
-}
-
-public float valueForDimension(int dimension) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_valueForDimension_1, dimension);
-}
-
-public int valueTypeForDimension(int dimension) {
-	return OS.objc_msgSend(this.id, OS.sel_valueTypeForDimension_1, dimension);
-}
-
-public int verticalAlignment() {
-	return OS.objc_msgSend(this.id, OS.sel_verticalAlignment);
-}
-
-public float widthForLayer(int layer, int edge) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_widthForLayer_1edge_1, layer, edge);
-}
-
-public int widthValueTypeForLayer(int layer, int edge) {
-	return OS.objc_msgSend(this.id, OS.sel_widthValueTypeForLayer_1edge_1, layer, edge);
-}
-
-}
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 910f1ce5e3..727e4e7f96 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,7 +16,11 @@ public NSTextContainer() {
 	super();
 }
 
-public NSTextContainer(int id) {
+public NSTextContainer(int /*long*/ id) {
+	super(id);
+}
+
+public NSTextContainer(id id) {
 	super(id);
 }
 
@@ -26,73 +30,21 @@ public NSSize containerSize() {
 	return result;
 }
 
-public boolean containsPoint(NSPoint point) {
-	return OS.objc_msgSend(this.id, OS.sel_containsPoint_1, point) != 0;
-}
-
-public boolean heightTracksTextView() {
-	return OS.objc_msgSend(this.id, OS.sel_heightTracksTextView) != 0;
-}
-
-public id initWithContainerSize(NSSize size) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContainerSize_1, size);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isSimpleRectangularTextContainer() {
-	return OS.objc_msgSend(this.id, OS.sel_isSimpleRectangularTextContainer) != 0;
-}
-
-public NSLayoutManager layoutManager() {
-	int result = OS.objc_msgSend(this.id, OS.sel_layoutManager);
-	return result != 0 ? new NSLayoutManager(result) : null;
-}
-
-public float lineFragmentPadding() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_lineFragmentPadding);
-}
-
-public NSRect lineFragmentRectForProposedRect(NSRect proposedRect, int sweepDirection, int movementDirection, int remainingRect) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentRectForProposedRect_1sweepDirection_1movementDirection_1remainingRect_1, proposedRect, sweepDirection, movementDirection, remainingRect);
-	return result;
-}
-
-public void replaceLayoutManager(NSLayoutManager newLayoutManager) {
-	OS.objc_msgSend(this.id, OS.sel_replaceLayoutManager_1, newLayoutManager != null ? newLayoutManager.id : 0);
+public NSTextContainer initWithContainerSize(NSSize size) {
+	int result = OS.objc_msgSend(this.id, OS.sel_initWithContainerSize_, size);
+	return result == this.id ? this : (result != 0 ? new NSTextContainer(result) : null);
 }
 
 public void setContainerSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setContainerSize_1, size);
-}
-
-public void setHeightTracksTextView(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHeightTracksTextView_1, flag);
-}
-
-public void setLayoutManager(NSLayoutManager layoutManager) {
-	OS.objc_msgSend(this.id, OS.sel_setLayoutManager_1, layoutManager != null ? layoutManager.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setContainerSize_, size);
 }
 
 public void setLineFragmentPadding(float pad) {
-	OS.objc_msgSend(this.id, OS.sel_setLineFragmentPadding_1, pad);
-}
-
-public void setTextView(NSTextView textView) {
-	OS.objc_msgSend(this.id, OS.sel_setTextView_1, textView != null ? textView.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setLineFragmentPadding_, pad);
 }
 
 public void setWidthTracksTextView(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setWidthTracksTextView_1, flag);
-}
-
-public NSTextView textView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textView);
-	return result != 0 ? new NSTextView(result) : null;
-}
-
-public boolean widthTracksTextView() {
-	return OS.objc_msgSend(this.id, OS.sel_widthTracksTextView) != 0;
+	OS.objc_msgSend(this.id, OS.sel_setWidthTracksTextView_, flag);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java
index 8ca2f1f21e..c6954d0f26 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,131 +16,40 @@ public NSTextField() {
 	super();
 }
 
-public NSTextField(int id) {
+public NSTextField(int /*long*/ id) {
 	super(id);
 }
 
-public boolean acceptsFirstResponder() {
-	return OS.objc_msgSend(this.id, OS.sel_acceptsFirstResponder) != 0;
-}
-
-public boolean allowsEditingTextAttributes() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsEditingTextAttributes) != 0;
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public int bezelStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_bezelStyle);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean drawsBackground() {
-	return OS.objc_msgSend(this.id, OS.sel_drawsBackground) != 0;
-}
-
-public boolean importsGraphics() {
-	return OS.objc_msgSend(this.id, OS.sel_importsGraphics) != 0;
-}
-
-public boolean isBezeled() {
-	return OS.objc_msgSend(this.id, OS.sel_isBezeled) != 0;
-}
-
-public boolean isBordered() {
-	return OS.objc_msgSend(this.id, OS.sel_isBordered) != 0;
-}
-
-public boolean isEditable() {
-	return OS.objc_msgSend(this.id, OS.sel_isEditable) != 0;
-}
-
-public boolean isSelectable() {
-	return OS.objc_msgSend(this.id, OS.sel_isSelectable) != 0;
-}
-
-public void selectText(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectText_1, sender != null ? sender.id : 0);
-}
-
-public void setAllowsEditingTextAttributes(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsEditingTextAttributes_1, flag);
+public NSTextField(id id) {
+	super(id);
 }
 
 public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setBezelStyle(int style) {
-	OS.objc_msgSend(this.id, OS.sel_setBezelStyle_1, style);
-}
-
-public void setBezeled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBezeled_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
 }
 
 public void setBordered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBordered_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setBordered_, flag);
 }
 
 public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0);
 }
 
 public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, flag);
 }
 
 public void setEditable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEditable_1, flag);
-}
-
-public void setImportsGraphics(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setImportsGraphics_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setEditable_, flag);
 }
 
 public void setSelectable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectable_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setSelectable_, flag);
 }
 
 public void setTextColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setTextColor_1, color != null ? color.id : 0);
-}
-
-public void setTitleWithMnemonic(NSString stringWithAmpersand) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleWithMnemonic_1, stringWithAmpersand != null ? stringWithAmpersand.id : 0);
-}
-
-public NSColor textColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public void textDidBeginEditing(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_textDidBeginEditing_1, notification != null ? notification.id : 0);
-}
-
-public void textDidChange(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_textDidChange_1, notification != null ? notification.id : 0);
-}
-
-public void textDidEndEditing(NSNotification notification) {
-	OS.objc_msgSend(this.id, OS.sel_textDidEndEditing_1, notification != null ? notification.id : 0);
-}
-
-public boolean textShouldBeginEditing(NSText textObject) {
-	return OS.objc_msgSend(this.id, OS.sel_textShouldBeginEditing_1, textObject != null ? textObject.id : 0) != 0;
-}
-
-public boolean textShouldEndEditing(NSText textObject) {
-	return OS.objc_msgSend(this.id, OS.sel_textShouldEndEditing_1, textObject != null ? textObject.id : 0) != 0;
+	OS.objc_msgSend(this.id, OS.sel_setTextColor_, color != null ? color.id : 0);
 }
 
 }
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 c81252d586..96ac2586df 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,73 +16,16 @@ public NSTextFieldCell() {
 	super();
 }
 
-public NSTextFieldCell(int id) {
+public NSTextFieldCell(int /*long*/ id) {
 	super(id);
 }
 
-public NSArray allowedInputSourceLocales() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allowedInputSourceLocales);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public int bezelStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_bezelStyle);
-}
-
-public boolean drawsBackground() {
-	return OS.objc_msgSend(this.id, OS.sel_drawsBackground) != 0;
-}
-
-public NSAttributedString placeholderAttributedString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_placeholderAttributedString);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public NSString placeholderString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_placeholderString);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setAllowedInputSourceLocales(NSArray localeIdentifiers) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowedInputSourceLocales_1, localeIdentifiers != null ? localeIdentifiers.id : 0);
-}
-
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setBezelStyle(int style) {
-	OS.objc_msgSend(this.id, OS.sel_setBezelStyle_1, style);
-}
-
-public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_1, flag);
-}
-
-public void setPlaceholderAttributedString(NSAttributedString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPlaceholderAttributedString_1, string != null ? string.id : 0);
-}
-
-public void setPlaceholderString(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPlaceholderString_1, string != null ? string.id : 0);
+public NSTextFieldCell(id id) {
+	super(id);
 }
 
 public void setTextColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setTextColor_1, color != null ? color.id : 0);
-}
-
-public NSText setUpFieldEditorAttributes(NSText textObj) {
-	int result = OS.objc_msgSend(this.id, OS.sel_setUpFieldEditorAttributes_1, textObj != null ? textObj.id : 0);
-	return result != 0 ? new NSText(result) : null;
-}
-
-public void setWantsNotificationForMarkedText(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setWantsNotificationForMarkedText_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setTextColor_, color != null ? color.id : 0);
 }
 
 public NSColor textColor() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextList.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextList.java
deleted file mode 100644
index e267953af3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextList.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSTextList extends NSObject {
-
-public NSTextList() {
-	super();
-}
-
-public NSTextList(int id) {
-	super(id);
-}
-
-public NSTextList initWithMarkerFormat(NSString format, int mask) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithMarkerFormat_1options_1, format != null ? format.id : 0, mask);
-	return result != 0 ? this : null;
-}
-
-public int listOptions() {
-	return OS.objc_msgSend(this.id, OS.sel_listOptions);
-}
-
-public NSString markerForItemNumber(int itemNum) {
-	int result = OS.objc_msgSend(this.id, OS.sel_markerForItemNumber_1, itemNum);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString markerFormat() {
-	int result = OS.objc_msgSend(this.id, OS.sel_markerFormat);
-	return result != 0 ? new NSString(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 5f541fd785..633bdf2a63 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,72 +16,16 @@ public NSTextStorage() {
 	super();
 }
 
-public NSTextStorage(int id) {
+public NSTextStorage(int /*long*/ id) {
 	super(id);
 }
 
-public void addLayoutManager(NSLayoutManager obj) {
-	OS.objc_msgSend(this.id, OS.sel_addLayoutManager_1, obj != null ? obj.id : 0);
-}
-
-public NSArray attributeRuns() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributeRuns);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public int changeInLength() {
-	return OS.objc_msgSend(this.id, OS.sel_changeInLength);
-}
-
-public NSArray characters() {
-	int result = OS.objc_msgSend(this.id, OS.sel_characters);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void edited(int editedMask, NSRange range, int delta) {
-	OS.objc_msgSend(this.id, OS.sel_edited_1range_1changeInLength_1, editedMask, range, delta);
-}
-
-public int editedMask() {
-	return OS.objc_msgSend(this.id, OS.sel_editedMask);
-}
-
-public NSRange editedRange() {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_editedRange);
-	return result;
-}
-
-public void ensureAttributesAreFixedInRange(NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_ensureAttributesAreFixedInRange_1, range);
-}
-
-public boolean fixesAttributesLazily() {
-	return OS.objc_msgSend(this.id, OS.sel_fixesAttributesLazily) != 0;
-}
-
-public NSFont font() {
-	int result = OS.objc_msgSend(this.id, OS.sel_font);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public NSColor foregroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_foregroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public void invalidateAttributesInRange(NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_invalidateAttributesInRange_1, range);
+public NSTextStorage(id id) {
+	super(id);
 }
 
-public NSArray layoutManagers() {
-	int result = OS.objc_msgSend(this.id, OS.sel_layoutManagers);
-	return result != 0 ? new NSArray(result) : null;
+public void addLayoutManager(NSLayoutManager obj) {
+	OS.objc_msgSend(this.id, OS.sel_addLayoutManager_, obj != null ? obj.id : 0);
 }
 
 public NSArray paragraphs() {
@@ -89,45 +33,4 @@ public NSArray paragraphs() {
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public void processEditing() {
-	OS.objc_msgSend(this.id, OS.sel_processEditing);
-}
-
-public void removeLayoutManager(NSLayoutManager obj) {
-	OS.objc_msgSend(this.id, OS.sel_removeLayoutManager_1, obj != null ? obj.id : 0);
-}
-
-public void setAttributeRuns(NSArray attributeRuns) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributeRuns_1, attributeRuns != null ? attributeRuns.id : 0);
-}
-
-public void setCharacters(NSArray characters) {
-	OS.objc_msgSend(this.id, OS.sel_setCharacters_1, characters != null ? characters.id : 0);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setFont(NSFont font) {
-	OS.objc_msgSend(this.id, OS.sel_setFont_1, font != null ? font.id : 0);
-}
-
-public void setForegroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setForegroundColor_1, color != null ? color.id : 0);
-}
-
-public void setParagraphs(NSArray paragraphs) {
-	OS.objc_msgSend(this.id, OS.sel_setParagraphs_1, paragraphs != null ? paragraphs.id : 0);
-}
-
-public void setWords(NSArray words) {
-	OS.objc_msgSend(this.id, OS.sel_setWords_1, words != null ? words.id : 0);
-}
-
-public NSArray words() {
-	int result = OS.objc_msgSend(this.id, OS.sel_words);
-	return result != 0 ? new NSArray(result) : null;
-}
-
 }
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
deleted file mode 100644
index 705fbfc01f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTab.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSTextTab extends NSObject {
-
-public NSTextTab() {
-	super();
-}
-
-public NSTextTab(int id) {
-	super(id);
-}
-
-public int alignment() {
-	return OS.objc_msgSend(this.id, OS.sel_alignment);
-}
-
-public NSTextTab initWithTextAlignment(int alignment, float loc, NSDictionary options) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithTextAlignment_1location_1options_1, alignment, loc, options != null ? options.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSTextTab initWithType(int type, float loc) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithType_1location_1, type, loc);
-	return result != 0 ? this : null;
-}
-
-public float location() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_location);
-}
-
-public NSDictionary options() {
-	int result = OS.objc_msgSend(this.id, OS.sel_options);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public int tabStopType() {
-	return OS.objc_msgSend(this.id, OS.sel_tabStopType);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTable.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTable.java
deleted file mode 100644
index 1251f47f0a..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTable.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSTextTable extends NSTextBlock {
-
-public NSTextTable() {
-	super();
-}
-
-public NSTextTable(int id) {
-	super(id);
-}
-
-public NSRect boundsRectForBlock(NSTextTableBlock block, NSRect contentRect, NSRect rect, NSTextContainer textContainer, NSRange charRange) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_boundsRectForBlock_1contentRect_1inRect_1textContainer_1characterRange_1, block != null ? block.id : 0, contentRect, rect, textContainer != null ? textContainer.id : 0, charRange);
-	return result;
-}
-
-public boolean collapsesBorders() {
-	return OS.objc_msgSend(this.id, OS.sel_collapsesBorders) != 0;
-}
-
-public void drawBackgroundForBlock(NSTextTableBlock block, NSRect frameRect, NSView controlView, NSRange charRange, NSLayoutManager layoutManager) {
-	OS.objc_msgSend(this.id, OS.sel_drawBackgroundForBlock_1withFrame_1inView_1characterRange_1layoutManager_1, block != null ? block.id : 0, frameRect, controlView != null ? controlView.id : 0, charRange, layoutManager != null ? layoutManager.id : 0);
-}
-
-public boolean hidesEmptyCells() {
-	return OS.objc_msgSend(this.id, OS.sel_hidesEmptyCells) != 0;
-}
-
-public int layoutAlgorithm() {
-	return OS.objc_msgSend(this.id, OS.sel_layoutAlgorithm);
-}
-
-public int numberOfColumns() {
-	return OS.objc_msgSend(this.id, OS.sel_numberOfColumns);
-}
-
-public NSRect rectForBlock(NSTextTableBlock block, NSPoint startingPoint, NSRect rect, NSTextContainer textContainer, NSRange charRange) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectForBlock_1layoutAtPoint_1inRect_1textContainer_1characterRange_1, block != null ? block.id : 0, startingPoint, rect, textContainer != null ? textContainer.id : 0, charRange);
-	return result;
-}
-
-public void setCollapsesBorders(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCollapsesBorders_1, flag);
-}
-
-public void setHidesEmptyCells(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHidesEmptyCells_1, flag);
-}
-
-public void setLayoutAlgorithm(int algorithm) {
-	OS.objc_msgSend(this.id, OS.sel_setLayoutAlgorithm_1, algorithm);
-}
-
-public void setNumberOfColumns(int numCols) {
-	OS.objc_msgSend(this.id, OS.sel_setNumberOfColumns_1, numCols);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTableBlock.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTableBlock.java
deleted file mode 100644
index e5a2bf9736..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTableBlock.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSTextTableBlock extends NSTextBlock {
-
-public NSTextTableBlock() {
-	super();
-}
-
-public NSTextTableBlock(int id) {
-	super(id);
-}
-
-public int columnSpan() {
-	return OS.objc_msgSend(this.id, OS.sel_columnSpan);
-}
-
-public id initWithTable(NSTextTable table, int row, int rowSpan, int col, int colSpan) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithTable_1startingRow_1rowSpan_1startingColumn_1columnSpan_1, table != null ? table.id : 0, row, rowSpan, col, colSpan);
-	return result != 0 ? new id(result) : null;
-}
-
-public int rowSpan() {
-	return OS.objc_msgSend(this.id, OS.sel_rowSpan);
-}
-
-public int startingColumn() {
-	return OS.objc_msgSend(this.id, OS.sel_startingColumn);
-}
-
-public int startingRow() {
-	return OS.objc_msgSend(this.id, OS.sel_startingRow);
-}
-
-public NSTextTable table() {
-	int result = OS.objc_msgSend(this.id, OS.sel_table);
-	return result != 0 ? new NSTextTable(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 6ae480d085..ed2eddb6fe 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,214 +16,12 @@ public NSTextView() {
 	super();
 }
 
-public NSTextView(int id) {
+public NSTextView(int /*long*/ id) {
 	super(id);
 }
 
-public NSArray acceptableDragTypes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_acceptableDragTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean acceptsGlyphInfo() {
-	return OS.objc_msgSend(this.id, OS.sel_acceptsGlyphInfo) != 0;
-}
-
-public void alignJustified(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_alignJustified_1, sender != null ? sender.id : 0);
-}
-
-public NSArray allowedInputSourceLocales() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allowedInputSourceLocales);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean allowsDocumentBackgroundColorChange() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsDocumentBackgroundColorChange) != 0;
-}
-
-public boolean allowsImageEditing() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsImageEditing) != 0;
-}
-
-public boolean allowsUndo() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsUndo) != 0;
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public void breakUndoCoalescing() {
-	OS.objc_msgSend(this.id, OS.sel_breakUndoCoalescing);
-}
-
-public void changeAttributes(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_changeAttributes_1, sender != null ? sender.id : 0);
-}
-
-public void changeColor(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_changeColor_1, sender != null ? sender.id : 0);
-}
-
-public void changeDocumentBackgroundColor(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_changeDocumentBackgroundColor_1, sender != null ? sender.id : 0);
-}
-
-public int characterIndexForInsertionAtPoint(NSPoint point) {
-	return OS.objc_msgSend(this.id, OS.sel_characterIndexForInsertionAtPoint_1, point);
-}
-
-public void cleanUpAfterDragOperation() {
-	OS.objc_msgSend(this.id, OS.sel_cleanUpAfterDragOperation);
-}
-
-public void clickedOnLink(id link, int charIndex) {
-	OS.objc_msgSend(this.id, OS.sel_clickedOnLink_1atIndex_1, link != null ? link.id : 0, charIndex);
-}
-
-public void complete(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_complete_1, sender != null ? sender.id : 0);
-}
-
-public NSArray completionsForPartialWordRange(NSRange charRange, int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_completionsForPartialWordRange_1indexOfSelectedItem_1, charRange, index);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSParagraphStyle defaultParagraphStyle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_defaultParagraphStyle);
-	return result != 0 ? new NSParagraphStyle(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void didChangeText() {
-	OS.objc_msgSend(this.id, OS.sel_didChangeText);
-}
-
-public boolean displaysLinkToolTips() {
-	return OS.objc_msgSend(this.id, OS.sel_displaysLinkToolTips) != 0;
-}
-
-public NSImage dragImageForSelectionWithEvent(NSEvent event, int origin) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dragImageForSelectionWithEvent_1origin_1, event != null ? event.id : 0, origin);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public int dragOperationForDraggingInfo(id  dragInfo, NSString type) {
-	return OS.objc_msgSend(this.id, OS.sel_dragOperationForDraggingInfo_1type_1, dragInfo != null ? dragInfo.id : 0, type != null ? type.id : 0);
-}
-
-public boolean dragSelectionWithEvent(NSEvent event, NSSize mouseOffset, boolean slideBack) {
-	return OS.objc_msgSend(this.id, OS.sel_dragSelectionWithEvent_1offset_1slideBack_1, event != null ? event.id : 0, mouseOffset, slideBack) != 0;
-}
-
-public void drawInsertionPointInRect(NSRect rect, NSColor color, boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_drawInsertionPointInRect_1color_1turnedOn_1, rect, color != null ? color.id : 0, flag);
-}
-
-public void drawViewBackgroundInRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_drawViewBackgroundInRect_1, rect);
-}
-
-public boolean drawsBackground() {
-	return OS.objc_msgSend(this.id, OS.sel_drawsBackground) != 0;
-}
-
-public NSRect firstRectForCharacterRange(NSRange range) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, id, OS.sel_firstRectForCharacterRange_1, range);
-	return result;
-}
-
-public boolean importsGraphics() {
-	return OS.objc_msgSend(this.id, OS.sel_importsGraphics) != 0;
-}
-
-public id initWithFrame_(NSRect frameRect) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_1, frameRect);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithFrame_textContainer_(NSRect frameRect, NSTextContainer container) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_1textContainer_1, frameRect, container != null ? container.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void insertCompletion(NSString word, NSRange charRange, int movement, boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_insertCompletion_1forPartialWordRange_1movement_1isFinal_1, word != null ? word.id : 0, charRange, movement, flag);
-}
-
-public void insertText(id insertString) {
-	OS.objc_msgSend(this.id, OS.sel_insertText_1, insertString != null ? insertString.id : 0);
-}
-
-public NSColor insertionPointColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_insertionPointColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public void invalidateTextContainerOrigin() {
-	OS.objc_msgSend(this.id, OS.sel_invalidateTextContainerOrigin);
-}
-
-public boolean isAutomaticLinkDetectionEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isAutomaticLinkDetectionEnabled) != 0;
-}
-
-public boolean isAutomaticQuoteSubstitutionEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isAutomaticQuoteSubstitutionEnabled) != 0;
-}
-
-public boolean isContinuousSpellCheckingEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isContinuousSpellCheckingEnabled) != 0;
-}
-
-public boolean isEditable() {
-	return OS.objc_msgSend(this.id, OS.sel_isEditable) != 0;
-}
-
-public boolean isFieldEditor() {
-	return OS.objc_msgSend(this.id, OS.sel_isFieldEditor) != 0;
-}
-
-public boolean isGrammarCheckingEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isGrammarCheckingEnabled) != 0;
-}
-
-public boolean isRichText() {
-	return OS.objc_msgSend(this.id, OS.sel_isRichText) != 0;
-}
-
-public boolean isRulerVisible() {
-	return OS.objc_msgSend(this.id, OS.sel_isRulerVisible) != 0;
-}
-
-public boolean isSelectable() {
-	return OS.objc_msgSend(this.id, OS.sel_isSelectable) != 0;
-}
-
-public NSLayoutManager layoutManager() {
-	int result = OS.objc_msgSend(this.id, OS.sel_layoutManager);
-	return result != 0 ? new NSLayoutManager(result) : null;
-}
-
-public NSDictionary linkTextAttributes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_linkTextAttributes);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public void loosenKerning(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_loosenKerning_1, sender != null ? sender.id : 0);
-}
-
-public void lowerBaseline(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_lowerBaseline_1, sender != null ? sender.id : 0);
+public NSTextView(id id) {
+	super(id);
 }
 
 public NSDictionary markedTextAttributes() {
@@ -231,381 +29,8 @@ public NSDictionary markedTextAttributes() {
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
-public void orderFrontLinkPanel(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_orderFrontLinkPanel_1, sender != null ? sender.id : 0);
-}
-
-public void orderFrontListPanel(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_orderFrontListPanel_1, sender != null ? sender.id : 0);
-}
-
-public void orderFrontSpacingPanel(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_orderFrontSpacingPanel_1, sender != null ? sender.id : 0);
-}
-
-public void orderFrontTablePanel(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_orderFrontTablePanel_1, sender != null ? sender.id : 0);
-}
-
-public void outline(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_outline_1, sender != null ? sender.id : 0);
-}
-
-public void pasteAsPlainText(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_pasteAsPlainText_1, sender != null ? sender.id : 0);
-}
-
-public void pasteAsRichText(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_pasteAsRichText_1, sender != null ? sender.id : 0);
-}
-
-public void performFindPanelAction(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_performFindPanelAction_1, sender != null ? sender.id : 0);
-}
-
-public NSString preferredPasteboardTypeFromArray(NSArray availableTypes, NSArray allowedTypes) {
-	int result = OS.objc_msgSend(this.id, OS.sel_preferredPasteboardTypeFromArray_1restrictedToTypesFromArray_1, availableTypes != null ? availableTypes.id : 0, allowedTypes != null ? allowedTypes.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void raiseBaseline(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_raiseBaseline_1, sender != null ? sender.id : 0);
-}
-
-public NSRange rangeForUserCharacterAttributeChange() {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeForUserCharacterAttributeChange);
-	return result;
-}
-
-public NSRange rangeForUserCompletion() {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeForUserCompletion);
-	return result;
-}
-
-public NSRange rangeForUserParagraphAttributeChange() {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeForUserParagraphAttributeChange);
-	return result;
-}
-
-public NSRange rangeForUserTextChange() {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeForUserTextChange);
-	return result;
-}
-
-public NSArray rangesForUserCharacterAttributeChange() {
-	int result = OS.objc_msgSend(this.id, OS.sel_rangesForUserCharacterAttributeChange);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray rangesForUserParagraphAttributeChange() {
-	int result = OS.objc_msgSend(this.id, OS.sel_rangesForUserParagraphAttributeChange);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray rangesForUserTextChange() {
-	int result = OS.objc_msgSend(this.id, OS.sel_rangesForUserTextChange);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean readSelectionFromPasteboard_(NSPasteboard pboard) {
-	return OS.objc_msgSend(this.id, OS.sel_readSelectionFromPasteboard_1, pboard != null ? pboard.id : 0) != 0;
-}
-
-public boolean readSelectionFromPasteboard_type_(NSPasteboard pboard, NSString type) {
-	return OS.objc_msgSend(this.id, OS.sel_readSelectionFromPasteboard_1type_1, pboard != null ? pboard.id : 0, type != null ? type.id : 0) != 0;
-}
-
-public NSArray readablePasteboardTypes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_readablePasteboardTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static void registerForServices() {
-	OS.objc_msgSend(OS.class_NSTextView, OS.sel_registerForServices);
-}
-
-public void replaceTextContainer(NSTextContainer newContainer) {
-	OS.objc_msgSend(this.id, OS.sel_replaceTextContainer_1, newContainer != null ? newContainer.id : 0);
-}
-
-public void rulerView_didAddMarker_(NSRulerView ruler, NSRulerMarker marker) {
-	OS.objc_msgSend(this.id, OS.sel_rulerView_1didAddMarker_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0);
-}
-
-public void rulerView_didMoveMarker_(NSRulerView ruler, NSRulerMarker marker) {
-	OS.objc_msgSend(this.id, OS.sel_rulerView_1didMoveMarker_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0);
-}
-
-public void rulerView_didRemoveMarker_(NSRulerView ruler, NSRulerMarker marker) {
-	OS.objc_msgSend(this.id, OS.sel_rulerView_1didRemoveMarker_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0);
-}
-
-public void rulerView_handleMouseDown_(NSRulerView ruler, NSEvent event) {
-	OS.objc_msgSend(this.id, OS.sel_rulerView_1handleMouseDown_1, ruler != null ? ruler.id : 0, event != null ? event.id : 0);
-}
-
-public boolean rulerView_shouldAddMarker_(NSRulerView ruler, NSRulerMarker marker) {
-	return OS.objc_msgSend(this.id, OS.sel_rulerView_1shouldAddMarker_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0) != 0;
-}
-
-public boolean rulerView_shouldMoveMarker_(NSRulerView ruler, NSRulerMarker marker) {
-	return OS.objc_msgSend(this.id, OS.sel_rulerView_1shouldMoveMarker_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0) != 0;
-}
-
-public boolean rulerView_shouldRemoveMarker_(NSRulerView ruler, NSRulerMarker marker) {
-	return OS.objc_msgSend(this.id, OS.sel_rulerView_1shouldRemoveMarker_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0) != 0;
-}
-
-public float rulerView_willAddMarker_atLocation_(NSRulerView ruler, NSRulerMarker marker, float location) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rulerView_1willAddMarker_1atLocation_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0, location);
-}
-
-public float rulerView_willMoveMarker_toLocation_(NSRulerView ruler, NSRulerMarker marker, float location) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rulerView_1willMoveMarker_1toLocation_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0, location);
-}
-
-public NSArray selectedRanges() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedRanges);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSDictionary selectedTextAttributes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedTextAttributes);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public int selectionAffinity() {
-	return OS.objc_msgSend(this.id, OS.sel_selectionAffinity);
-}
-
-public int selectionGranularity() {
-	return OS.objc_msgSend(this.id, OS.sel_selectionGranularity);
-}
-
-public NSRange selectionRangeForProposedRange(NSRange proposedCharRange, int granularity) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_selectionRangeForProposedRange_1granularity_1, proposedCharRange, granularity);
-	return result;
-}
-
-public void setAcceptsGlyphInfo(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAcceptsGlyphInfo_1, flag);
-}
-
-public void setAlignment(int alignment, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_setAlignment_1range_1, alignment, range);
-}
-
-public void setAllowedInputSourceLocales(NSArray localeIdentifiers) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowedInputSourceLocales_1, localeIdentifiers != null ? localeIdentifiers.id : 0);
-}
-
-public void setAllowsDocumentBackgroundColorChange(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsDocumentBackgroundColorChange_1, flag);
-}
-
-public void setAllowsImageEditing(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsImageEditing_1, flag);
-}
-
-public void setAllowsUndo(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsUndo_1, flag);
-}
-
-public void setAutomaticLinkDetectionEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutomaticLinkDetectionEnabled_1, flag);
-}
-
-public void setAutomaticQuoteSubstitutionEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutomaticQuoteSubstitutionEnabled_1, flag);
-}
-
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setBaseWritingDirection(int writingDirection, NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_1range_1, writingDirection, range);
-}
-
-public void setConstrainedFrameSize(NSSize desiredSize) {
-	OS.objc_msgSend(this.id, OS.sel_setConstrainedFrameSize_1, desiredSize);
-}
-
-public void setContinuousSpellCheckingEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setContinuousSpellCheckingEnabled_1, flag);
-}
-
-public void setDefaultParagraphStyle(NSParagraphStyle paragraphStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setDefaultParagraphStyle_1, paragraphStyle != null ? paragraphStyle.id : 0);
-}
-
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public void setDisplaysLinkToolTips(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDisplaysLinkToolTips_1, flag);
-}
-
-public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_1, flag);
-}
-
-public void setEditable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEditable_1, flag);
-}
-
-public void setFieldEditor(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setFieldEditor_1, flag);
-}
-
-public void setGrammarCheckingEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setGrammarCheckingEnabled_1, flag);
-}
-
-public void setImportsGraphics(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setImportsGraphics_1, flag);
-}
-
-public void setInsertionPointColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setInsertionPointColor_1, color != null ? color.id : 0);
-}
-
-public void setLinkTextAttributes(NSDictionary attributeDictionary) {
-	OS.objc_msgSend(this.id, OS.sel_setLinkTextAttributes_1, attributeDictionary != null ? attributeDictionary.id : 0);
-}
-
-public void setMarkedTextAttributes(NSDictionary attributeDictionary) {
-	OS.objc_msgSend(this.id, OS.sel_setMarkedTextAttributes_1, attributeDictionary != null ? attributeDictionary.id : 0);
-}
-
-public void setNeedsDisplayInRect(NSRect rect, boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setNeedsDisplayInRect_1avoidAdditionalLayout_1, rect, flag);
-}
-
 public void setRichText(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setRichText_1, flag);
-}
-
-public void setRulerVisible(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setRulerVisible_1, flag);
-}
-
-public void setSelectable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectable_1, flag);
-}
-
-public void setSelectedRange_(NSRange charRange) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedRange_1, charRange);
-}
-
-public void setSelectedRange_affinity_stillSelecting_(NSRange charRange, int affinity, boolean stillSelectingFlag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedRange_1affinity_1stillSelecting_1, charRange, affinity, stillSelectingFlag);
-}
-
-public void setSelectedRanges_(NSArray ranges) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedRanges_1, ranges != null ? ranges.id : 0);
-}
-
-public void setSelectedRanges_affinity_stillSelecting_(NSArray ranges, int affinity, boolean stillSelectingFlag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedRanges_1affinity_1stillSelecting_1, ranges != null ? ranges.id : 0, affinity, stillSelectingFlag);
-}
-
-public void setSelectedTextAttributes(NSDictionary attributeDictionary) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedTextAttributes_1, attributeDictionary != null ? attributeDictionary.id : 0);
-}
-
-public void setSelectionGranularity(int granularity) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectionGranularity_1, granularity);
-}
-
-public void setSmartInsertDeleteEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSmartInsertDeleteEnabled_1, flag);
-}
-
-public void setSpellingState(int value, NSRange charRange) {
-	OS.objc_msgSend(this.id, OS.sel_setSpellingState_1range_1, value, charRange);
-}
-
-public void setTextContainer(NSTextContainer container) {
-	OS.objc_msgSend(this.id, OS.sel_setTextContainer_1, container != null ? container.id : 0);
-}
-
-public void setTextContainerInset(NSSize inset) {
-	OS.objc_msgSend(this.id, OS.sel_setTextContainerInset_1, inset);
-}
-
-public void setTypingAttributes(NSDictionary attrs) {
-	OS.objc_msgSend(this.id, OS.sel_setTypingAttributes_1, attrs != null ? attrs.id : 0);
-}
-
-public void setUsesFindPanel(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesFindPanel_1, flag);
-}
-
-public void setUsesFontPanel(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesFontPanel_1, flag);
-}
-
-public void setUsesRuler(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesRuler_1, flag);
-}
-
-public boolean shouldChangeTextInRange(NSRange affectedCharRange, NSString replacementString) {
-	return OS.objc_msgSend(this.id, OS.sel_shouldChangeTextInRange_1replacementString_1, affectedCharRange, replacementString != null ? replacementString.id : 0) != 0;
-}
-
-public boolean shouldChangeTextInRanges(NSArray affectedRanges, NSArray replacementStrings) {
-	return OS.objc_msgSend(this.id, OS.sel_shouldChangeTextInRanges_1replacementStrings_1, affectedRanges != null ? affectedRanges.id : 0, replacementStrings != null ? replacementStrings.id : 0) != 0;
-}
-
-public boolean shouldDrawInsertionPoint() {
-	return OS.objc_msgSend(this.id, OS.sel_shouldDrawInsertionPoint) != 0;
-}
-
-public void showFindIndicatorForRange(NSRange charRange) {
-	OS.objc_msgSend(this.id, OS.sel_showFindIndicatorForRange_1, charRange);
-}
-
-public NSRange smartDeleteRangeForProposedRange(NSRange proposedCharRange) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_smartDeleteRangeForProposedRange_1, proposedCharRange);
-	return result;
-}
-
-public NSString smartInsertAfterStringForString(NSString pasteString, NSRange charRangeToReplace) {
-	int result = OS.objc_msgSend(this.id, OS.sel_smartInsertAfterStringForString_1replacingRange_1, pasteString != null ? pasteString.id : 0, charRangeToReplace);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString smartInsertBeforeStringForString(NSString pasteString, NSRange charRangeToReplace) {
-	int result = OS.objc_msgSend(this.id, OS.sel_smartInsertBeforeStringForString_1replacingRange_1, pasteString != null ? pasteString.id : 0, charRangeToReplace);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean smartInsertDeleteEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_smartInsertDeleteEnabled) != 0;
-}
-
-public void smartInsertForString(NSString pasteString, NSRange charRangeToReplace, int beforeString, int afterString) {
-	OS.objc_msgSend(this.id, OS.sel_smartInsertForString_1replacingRange_1beforeString_1afterString_1, pasteString != null ? pasteString.id : 0, charRangeToReplace, beforeString, afterString);
-}
-
-public int spellCheckerDocumentTag() {
-	return OS.objc_msgSend(this.id, OS.sel_spellCheckerDocumentTag);
-}
-
-public void startSpeaking(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_startSpeaking_1, sender != null ? sender.id : 0);
-}
-
-public void stopSpeaking(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_stopSpeaking_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setRichText_, flag);
 }
 
 public NSTextContainer textContainer() {
@@ -613,124 +38,9 @@ public NSTextContainer textContainer() {
 	return result != 0 ? new NSTextContainer(result) : null;
 }
 
-public NSSize textContainerInset() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_textContainerInset);
-	return result;
-}
-
-public NSPoint textContainerOrigin() {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_textContainerOrigin);
-	return result;
-}
-
 public NSTextStorage textStorage() {
 	int result = OS.objc_msgSend(this.id, OS.sel_textStorage);
 	return result != 0 ? new NSTextStorage(result) : null;
 }
 
-public void tightenKerning(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_tightenKerning_1, sender != null ? sender.id : 0);
-}
-
-public void toggleAutomaticLinkDetection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_toggleAutomaticLinkDetection_1, sender != null ? sender.id : 0);
-}
-
-public void toggleAutomaticQuoteSubstitution(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_toggleAutomaticQuoteSubstitution_1, sender != null ? sender.id : 0);
-}
-
-public void toggleBaseWritingDirection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_toggleBaseWritingDirection_1, sender != null ? sender.id : 0);
-}
-
-public void toggleContinuousSpellChecking(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_toggleContinuousSpellChecking_1, sender != null ? sender.id : 0);
-}
-
-public void toggleGrammarChecking(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_toggleGrammarChecking_1, sender != null ? sender.id : 0);
-}
-
-public void toggleSmartInsertDelete(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_toggleSmartInsertDelete_1, sender != null ? sender.id : 0);
-}
-
-public void toggleTraditionalCharacterShape(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_toggleTraditionalCharacterShape_1, sender != null ? sender.id : 0);
-}
-
-public void turnOffKerning(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_turnOffKerning_1, sender != null ? sender.id : 0);
-}
-
-public void turnOffLigatures(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_turnOffLigatures_1, sender != null ? sender.id : 0);
-}
-
-public NSDictionary typingAttributes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_typingAttributes);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public void updateDragTypeRegistration() {
-	OS.objc_msgSend(this.id, OS.sel_updateDragTypeRegistration);
-}
-
-public void updateFontPanel() {
-	OS.objc_msgSend(this.id, OS.sel_updateFontPanel);
-}
-
-public void updateInsertionPointStateAndRestartTimer(boolean restartFlag) {
-	OS.objc_msgSend(this.id, OS.sel_updateInsertionPointStateAndRestartTimer_1, restartFlag);
-}
-
-public void updateRuler() {
-	OS.objc_msgSend(this.id, OS.sel_updateRuler);
-}
-
-public void useAllLigatures(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_useAllLigatures_1, sender != null ? sender.id : 0);
-}
-
-public void useStandardKerning(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_useStandardKerning_1, sender != null ? sender.id : 0);
-}
-
-public void useStandardLigatures(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_useStandardLigatures_1, sender != null ? sender.id : 0);
-}
-
-public boolean usesFindPanel() {
-	return OS.objc_msgSend(this.id, OS.sel_usesFindPanel) != 0;
-}
-
-public boolean usesFontPanel() {
-	return OS.objc_msgSend(this.id, OS.sel_usesFontPanel) != 0;
-}
-
-public boolean usesRuler() {
-	return OS.objc_msgSend(this.id, OS.sel_usesRuler) != 0;
-}
-
-public id validRequestorForSendType(NSString sendType, NSString returnType) {
-	int result = OS.objc_msgSend(this.id, OS.sel_validRequestorForSendType_1returnType_1, sendType != null ? sendType.id : 0, returnType != null ? returnType.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSArray writablePasteboardTypes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_writablePasteboardTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean writeSelectionToPasteboard_type_(NSPasteboard pboard, NSString type) {
-	return OS.objc_msgSend(this.id, OS.sel_writeSelectionToPasteboard_1type_1, pboard != null ? pboard.id : 0, type != null ? type.id : 0) != 0;
-}
-
-public boolean writeSelectionToPasteboard_types_(NSPasteboard pboard, NSArray types) {
-	return OS.objc_msgSend(this.id, OS.sel_writeSelectionToPasteboard_1types_1, pboard != null ? pboard.id : 0, types != null ? types.id : 0) != 0;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSThread.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSThread.java
deleted file mode 100644
index c5d10a96d9..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSThread.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSThread extends NSObject {
-
-public NSThread() {
-	super();
-}
-
-public NSThread(int id) {
-	super(id);
-}
-
-public static NSArray callStackReturnAddresses() {
-	int result = OS.objc_msgSend(OS.class_NSThread, OS.sel_callStackReturnAddresses);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void cancel() {
-	OS.objc_msgSend(this.id, OS.sel_cancel);
-}
-
-public static NSThread currentThread() {
-	int result = OS.objc_msgSend(OS.class_NSThread, OS.sel_currentThread);
-	return result != 0 ? new NSThread(result) : null;
-}
-
-public static void detachNewThreadSelector(int selector, id target, id argument) {
-	OS.objc_msgSend(OS.class_NSThread, OS.sel_detachNewThreadSelector_1toTarget_1withObject_1, selector, target != null ? target.id : 0, argument != null ? argument.id : 0);
-}
-
-public static void exit() {
-	OS.objc_msgSend(OS.class_NSThread, OS.sel_exit);
-}
-
-public id initWithTarget(id target, int selector, id argument) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithTarget_1selector_1object_1, target != null ? target.id : 0, selector, argument != null ? argument.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isCancelled() {
-	return OS.objc_msgSend(this.id, OS.sel_isCancelled) != 0;
-}
-
-public boolean isExecuting() {
-	return OS.objc_msgSend(this.id, OS.sel_isExecuting) != 0;
-}
-
-public boolean isFinished() {
-	return OS.objc_msgSend(this.id, OS.sel_isFinished) != 0;
-}
-
-public static boolean static_isMainThread() {
-	return OS.objc_msgSend(OS.class_NSThread, OS.sel_isMainThread) != 0;
-}
-
-public boolean isMainThread() {
-	return OS.objc_msgSend(this.id, OS.sel_isMainThread) != 0;
-}
-
-public static boolean isMultiThreaded() {
-	return OS.objc_msgSend(OS.class_NSThread, OS.sel_isMultiThreaded) != 0;
-}
-
-public void main() {
-	OS.objc_msgSend(this.id, OS.sel_main);
-}
-
-public static NSThread mainThread() {
-	int result = OS.objc_msgSend(OS.class_NSThread, OS.sel_mainThread);
-	return result != 0 ? new NSThread(result) : null;
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setName(NSString n) {
-	OS.objc_msgSend(this.id, OS.sel_setName_1, n != null ? n.id : 0);
-}
-
-public void setStackSize(int s) {
-	OS.objc_msgSend(this.id, OS.sel_setStackSize_1, s);
-}
-
-public static boolean setThreadPriority(double p) {
-	return OS.objc_msgSend(OS.class_NSThread, OS.sel_setThreadPriority_1, p) != 0;
-}
-
-public static void sleepForTimeInterval(double ti) {
-	OS.objc_msgSend(OS.class_NSThread, OS.sel_sleepForTimeInterval_1, ti);
-}
-
-public static void sleepUntilDate(NSDate date) {
-	OS.objc_msgSend(OS.class_NSThread, OS.sel_sleepUntilDate_1, date != null ? date.id : 0);
-}
-
-public int stackSize() {
-	return OS.objc_msgSend(this.id, OS.sel_stackSize);
-}
-
-public void start() {
-	OS.objc_msgSend(this.id, OS.sel_start);
-}
-
-public NSMutableDictionary threadDictionary() {
-	int result = OS.objc_msgSend(this.id, OS.sel_threadDictionary);
-	return result != 0 ? new NSMutableDictionary(result) : null;
-}
-
-public static double threadPriority() {
-	return OS.objc_msgSend_fpret(OS.class_NSThread, OS.sel_threadPriority);
-}
-
-}
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 491bb355e5..0a7599c652 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
@@ -16,36 +16,12 @@ public NSTimeZone() {
 	super();
 }
 
-public NSTimeZone(int id) {
+public NSTimeZone(int /*long*/ id) {
 	super(id);
 }
 
-public NSString abbreviation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_abbreviation);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSDictionary abbreviationDictionary() {
-	int result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_abbreviationDictionary);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSString abbreviationForDate(NSDate aDate) {
-	int result = OS.objc_msgSend(this.id, OS.sel_abbreviationForDate_1, aDate != null ? aDate.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSData data() {
-	int result = OS.objc_msgSend(this.id, OS.sel_data);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public double daylightSavingTimeOffset() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_daylightSavingTimeOffset);
-}
-
-public double daylightSavingTimeOffsetForDate(NSDate aDate) {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_daylightSavingTimeOffsetForDate_1, aDate != null ? aDate.id : 0);
+public NSTimeZone(id id) {
+	super(id);
 }
 
 public static NSTimeZone defaultTimeZone() {
@@ -53,102 +29,4 @@ public static NSTimeZone defaultTimeZone() {
 	return result != 0 ? new NSTimeZone(result) : null;
 }
 
-public NSString description() {
-	int result = OS.objc_msgSend(this.id, OS.sel_description);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id initWithName_(NSString tzName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithName_1, tzName != null ? tzName.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithName_data_(NSString tzName, NSData aData) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithName_1data_1, tzName != null ? tzName.id : 0, aData != null ? aData.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isDaylightSavingTime() {
-	return OS.objc_msgSend(this.id, OS.sel_isDaylightSavingTime) != 0;
-}
-
-public boolean isDaylightSavingTimeForDate(NSDate aDate) {
-	return OS.objc_msgSend(this.id, OS.sel_isDaylightSavingTimeForDate_1, aDate != null ? aDate.id : 0) != 0;
-}
-
-public boolean isEqualToTimeZone(NSTimeZone aTimeZone) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualToTimeZone_1, aTimeZone != null ? aTimeZone.id : 0) != 0;
-}
-
-public static NSArray knownTimeZoneNames() {
-	int result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_knownTimeZoneNames);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static NSTimeZone localTimeZone() {
-	int result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_localTimeZone);
-	return result != 0 ? new NSTimeZone(result) : null;
-}
-
-public NSString localizedName(int style, NSLocale locale) {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedName_1locale_1, style, locale != null ? locale.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSDate nextDaylightSavingTimeTransition() {
-	int result = OS.objc_msgSend(this.id, OS.sel_nextDaylightSavingTimeTransition);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public NSDate nextDaylightSavingTimeTransitionAfterDate(NSDate aDate) {
-	int result = OS.objc_msgSend(this.id, OS.sel_nextDaylightSavingTimeTransitionAfterDate_1, aDate != null ? aDate.id : 0);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public static void resetSystemTimeZone() {
-	OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_resetSystemTimeZone);
-}
-
-public int secondsFromGMT() {
-	return OS.objc_msgSend(this.id, OS.sel_secondsFromGMT);
-}
-
-public int secondsFromGMTForDate(NSDate aDate) {
-	return OS.objc_msgSend(this.id, OS.sel_secondsFromGMTForDate_1, aDate != null ? aDate.id : 0);
-}
-
-public static void setDefaultTimeZone(NSTimeZone aTimeZone) {
-	OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_setDefaultTimeZone_1, aTimeZone != null ? aTimeZone.id : 0);
-}
-
-public static NSTimeZone systemTimeZone() {
-	int result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_systemTimeZone);
-	return result != 0 ? new NSTimeZone(result) : null;
-}
-
-public static id timeZoneForSecondsFromGMT(int seconds) {
-	int result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_timeZoneForSecondsFromGMT_1, seconds);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id timeZoneWithAbbreviation(NSString abbreviation) {
-	int result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_timeZoneWithAbbreviation_1, abbreviation != null ? abbreviation.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_timeZoneWithName_(NSString tzName) {
-	int result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_timeZoneWithName_1, tzName != null ? tzName.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_timeZoneWithName_data_(NSString tzName, NSData aData) {
-	int result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_timeZoneWithName_1data_1, tzName != null ? tzName.id : 0, aData != null ? aData.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/NSTimer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java
index e706ecd1f5..27f960f7b7 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,62 +16,30 @@ public NSTimer() {
 	super();
 }
 
-public NSTimer(int id) {
+public NSTimer(int /*long*/ id) {
 	super(id);
 }
 
-public void fire() {
-	OS.objc_msgSend(this.id, OS.sel_fire);
-}
-
-public NSDate fireDate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fireDate);
-	return result != 0 ? new NSDate(result) : null;
-}
-
-public id initWithFireDate(NSDate date, double ti, id t, int s, id ui, boolean rep) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFireDate_1interval_1target_1selector_1userInfo_1repeats_1, date != null ? date.id : 0, ti, t != null ? t.id : 0, s, ui != null ? ui.id : 0, rep);
-	return result != 0 ? new id(result) : null;
+public NSTimer(id id) {
+	super(id);
 }
 
 public void invalidate() {
 	OS.objc_msgSend(this.id, OS.sel_invalidate);
 }
 
-public boolean isValid() {
-	return OS.objc_msgSend(this.id, OS.sel_isValid) != 0;
-}
-
-public static NSTimer static_scheduledTimerWithTimeInterval_invocation_repeats_(double ti, NSInvocation invocation, boolean yesOrNo) {
-	int result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_scheduledTimerWithTimeInterval_1invocation_1repeats_1, ti, invocation != null ? invocation.id : 0, yesOrNo);
-	return result != 0 ? new NSTimer(result) : null;
-}
-
-public static NSTimer static_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_(double ti, id aTarget, int aSelector, int userInfo, boolean yesOrNo) {
-	int result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_scheduledTimerWithTimeInterval_1target_1selector_1userInfo_1repeats_1, ti, aTarget != null ? aTarget.id : 0, aSelector, userInfo, yesOrNo);
+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);
 	return result != 0 ? new NSTimer(result) : null;
 }
 
 public void setFireDate(NSDate date) {
-	OS.objc_msgSend(this.id, OS.sel_setFireDate_1, date != null ? date.id : 0);
-}
-
-public double timeInterval() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_timeInterval);
-}
-
-public static NSTimer static_timerWithTimeInterval_invocation_repeats_(double ti, NSInvocation invocation, boolean yesOrNo) {
-	int result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_timerWithTimeInterval_1invocation_1repeats_1, ti, invocation != null ? invocation.id : 0, yesOrNo);
-	return result != 0 ? new NSTimer(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_setFireDate_, date != null ? date.id : 0);
 }
 
-public static NSTimer static_timerWithTimeInterval_target_selector_userInfo_repeats_(double ti, id aTarget, int aSelector, id userInfo, boolean yesOrNo) {
-	int result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_timerWithTimeInterval_1target_1selector_1userInfo_1repeats_1, ti, aTarget != null ? aTarget.id : 0, aSelector, userInfo != null ? userInfo.id : 0, yesOrNo);
-	return result != 0 ? new NSTimer(result) : null;
-}
-
-public int userInfo() {
-	return OS.objc_msgSend(this.id, OS.sel_userInfo);
+public id userInfo() {
+	int 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/NSTokenField.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTokenField.java
deleted file mode 100644
index 51461d47fd..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTokenField.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSTokenField extends NSTextField {
-
-public NSTokenField() {
-	super();
-}
-
-public NSTokenField(int id) {
-	super(id);
-}
-
-public double completionDelay() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_completionDelay);
-}
-
-public static double defaultCompletionDelay() {
-	return OS.objc_msgSend_fpret(OS.class_NSTokenField, OS.sel_defaultCompletionDelay);
-}
-
-public static NSCharacterSet defaultTokenizingCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSTokenField, OS.sel_defaultTokenizingCharacterSet);
-	return result != 0 ? new NSCharacterSet(result) : null;
-}
-
-public void setCompletionDelay(double delay) {
-	OS.objc_msgSend(this.id, OS.sel_setCompletionDelay_1, delay);
-}
-
-public void setTokenStyle(int style) {
-	OS.objc_msgSend(this.id, OS.sel_setTokenStyle_1, style);
-}
-
-public void setTokenizingCharacterSet(NSCharacterSet characterSet) {
-	OS.objc_msgSend(this.id, OS.sel_setTokenizingCharacterSet_1, characterSet != null ? characterSet.id : 0);
-}
-
-public int tokenStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_tokenStyle);
-}
-
-public NSCharacterSet tokenizingCharacterSet() {
-	int result = OS.objc_msgSend(this.id, OS.sel_tokenizingCharacterSet);
-	return result != 0 ? new NSCharacterSet(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTokenFieldCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTokenFieldCell.java
deleted file mode 100644
index 34d05df1aa..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTokenFieldCell.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSTokenFieldCell extends NSTextFieldCell {
-
-public NSTokenFieldCell() {
-	super();
-}
-
-public NSTokenFieldCell(int id) {
-	super(id);
-}
-
-public double completionDelay() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_completionDelay);
-}
-
-public static double defaultCompletionDelay() {
-	return OS.objc_msgSend_fpret(OS.class_NSTokenFieldCell, OS.sel_defaultCompletionDelay);
-}
-
-public static NSCharacterSet defaultTokenizingCharacterSet() {
-	int result = OS.objc_msgSend(OS.class_NSTokenFieldCell, OS.sel_defaultTokenizingCharacterSet);
-	return result != 0 ? new NSCharacterSet(result) : null;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setCompletionDelay(double delay) {
-	OS.objc_msgSend(this.id, OS.sel_setCompletionDelay_1, delay);
-}
-
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
-}
-
-public void setTokenStyle(int style) {
-	OS.objc_msgSend(this.id, OS.sel_setTokenStyle_1, style);
-}
-
-public void setTokenizingCharacterSet(NSCharacterSet characterSet) {
-	OS.objc_msgSend(this.id, OS.sel_setTokenizingCharacterSet_1, characterSet != null ? characterSet.id : 0);
-}
-
-public int tokenStyle() {
-	return OS.objc_msgSend(this.id, OS.sel_tokenStyle);
-}
-
-public NSCharacterSet tokenizingCharacterSet() {
-	int result = OS.objc_msgSend(this.id, OS.sel_tokenizingCharacterSet);
-	return result != 0 ? new NSCharacterSet(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java
deleted file mode 100644
index fc139b36b1..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSToolbar extends NSObject {
-
-public NSToolbar() {
-	super();
-}
-
-public NSToolbar(int id) {
-	super(id);
-}
-
-public boolean allowsUserCustomization() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsUserCustomization) != 0;
-}
-
-public boolean autosavesConfiguration() {
-	return OS.objc_msgSend(this.id, OS.sel_autosavesConfiguration) != 0;
-}
-
-public NSDictionary configurationDictionary() {
-	int result = OS.objc_msgSend(this.id, OS.sel_configurationDictionary);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public boolean customizationPaletteIsRunning() {
-	return OS.objc_msgSend(this.id, OS.sel_customizationPaletteIsRunning) != 0;
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public int displayMode() {
-	return OS.objc_msgSend(this.id, OS.sel_displayMode);
-}
-
-public NSString identifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_identifier);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id initWithIdentifier(NSString identifier) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_1, identifier != null ? identifier.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void insertItemWithItemIdentifier(NSString itemIdentifier, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertItemWithItemIdentifier_1atIndex_1, itemIdentifier != null ? itemIdentifier.id : 0, index);
-}
-
-public boolean isVisible() {
-	return OS.objc_msgSend(this.id, OS.sel_isVisible) != 0;
-}
-
-public NSArray items() {
-	int result = OS.objc_msgSend(this.id, OS.sel_items);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void removeItemAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_1, index);
-}
-
-public void runCustomizationPalette(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_runCustomizationPalette_1, sender != null ? sender.id : 0);
-}
-
-public NSString selectedItemIdentifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedItemIdentifier);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setAllowsUserCustomization(boolean allowCustomization) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsUserCustomization_1, allowCustomization);
-}
-
-public void setAutosavesConfiguration(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutosavesConfiguration_1, flag);
-}
-
-public void setConfigurationFromDictionary(NSDictionary configDict) {
-	OS.objc_msgSend(this.id, OS.sel_setConfigurationFromDictionary_1, configDict != null ? configDict.id : 0);
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setDisplayMode(int displayMode) {
-	OS.objc_msgSend(this.id, OS.sel_setDisplayMode_1, displayMode);
-}
-
-public void setSelectedItemIdentifier(NSString itemIdentifier) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedItemIdentifier_1, itemIdentifier != null ? itemIdentifier.id : 0);
-}
-
-public void setShowsBaselineSeparator(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsBaselineSeparator_1, flag);
-}
-
-public void setSizeMode(int sizeMode) {
-	OS.objc_msgSend(this.id, OS.sel_setSizeMode_1, sizeMode);
-}
-
-public void setVisible(boolean shown) {
-	OS.objc_msgSend(this.id, OS.sel_setVisible_1, shown);
-}
-
-public boolean showsBaselineSeparator() {
-	return OS.objc_msgSend(this.id, OS.sel_showsBaselineSeparator) != 0;
-}
-
-public int sizeMode() {
-	return OS.objc_msgSend(this.id, OS.sel_sizeMode);
-}
-
-public void validateVisibleItems() {
-	OS.objc_msgSend(this.id, OS.sel_validateVisibleItems);
-}
-
-public NSArray visibleItems() {
-	int result = OS.objc_msgSend(this.id, OS.sel_visibleItems);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java
deleted file mode 100644
index b8fdee453e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSToolbarItem extends NSObject {
-
-public NSToolbarItem() {
-	super();
-}
-
-public NSToolbarItem(int id) {
-	super(id);
-}
-
-public int action() {
-	return OS.objc_msgSend(this.id, OS.sel_action);
-}
-
-public boolean allowsDuplicatesInToolbar() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsDuplicatesInToolbar) != 0;
-}
-
-public boolean autovalidates() {
-	return OS.objc_msgSend(this.id, OS.sel_autovalidates) != 0;
-}
-
-public NSImage image() {
-	int result = OS.objc_msgSend(this.id, OS.sel_image);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public id initWithItemIdentifier(NSString itemIdentifier) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithItemIdentifier_1, itemIdentifier != null ? itemIdentifier.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isEnabled) != 0;
-}
-
-public NSString itemIdentifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_itemIdentifier);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString label() {
-	int result = OS.objc_msgSend(this.id, OS.sel_label);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSSize maxSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_maxSize);
-	return result;
-}
-
-public NSMenuItem menuFormRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_menuFormRepresentation);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
-public NSSize minSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_minSize);
-	return result;
-}
-
-public NSString paletteLabel() {
-	int result = OS.objc_msgSend(this.id, OS.sel_paletteLabel);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setAction(int action) {
-	OS.objc_msgSend(this.id, OS.sel_setAction_1, action);
-}
-
-public void setAutovalidates(boolean resistance) {
-	OS.objc_msgSend(this.id, OS.sel_setAutovalidates_1, resistance);
-}
-
-public void setEnabled(boolean enabled) {
-	OS.objc_msgSend(this.id, OS.sel_setEnabled_1, enabled);
-}
-
-public void setImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_1, image != null ? image.id : 0);
-}
-
-public void setLabel(NSString label) {
-	OS.objc_msgSend(this.id, OS.sel_setLabel_1, label != null ? label.id : 0);
-}
-
-public void setMaxSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxSize_1, size);
-}
-
-public void setMenuFormRepresentation(NSMenuItem menuItem) {
-	OS.objc_msgSend(this.id, OS.sel_setMenuFormRepresentation_1, menuItem != null ? menuItem.id : 0);
-}
-
-public void setMinSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setMinSize_1, size);
-}
-
-public void setPaletteLabel(NSString paletteLabel) {
-	OS.objc_msgSend(this.id, OS.sel_setPaletteLabel_1, paletteLabel != null ? paletteLabel.id : 0);
-}
-
-public void setTag(int tag) {
-	OS.objc_msgSend(this.id, OS.sel_setTag_1, tag);
-}
-
-public void setTarget(id target) {
-	OS.objc_msgSend(this.id, OS.sel_setTarget_1, target != null ? target.id : 0);
-}
-
-public void setToolTip(NSString toolTip) {
-	OS.objc_msgSend(this.id, OS.sel_setToolTip_1, toolTip != null ? toolTip.id : 0);
-}
-
-public void setView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setView_1, view != null ? view.id : 0);
-}
-
-public void setVisibilityPriority(int visibilityPriority) {
-	OS.objc_msgSend(this.id, OS.sel_setVisibilityPriority_1, visibilityPriority);
-}
-
-public int tag() {
-	return OS.objc_msgSend(this.id, OS.sel_tag);
-}
-
-public id target() {
-	int result = OS.objc_msgSend(this.id, OS.sel_target);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString toolTip() {
-	int result = OS.objc_msgSend(this.id, OS.sel_toolTip);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSToolbar toolbar() {
-	int result = OS.objc_msgSend(this.id, OS.sel_toolbar);
-	return result != 0 ? new NSToolbar(result) : null;
-}
-
-public void validate() {
-	OS.objc_msgSend(this.id, OS.sel_validate);
-}
-
-public NSView view() {
-	int result = OS.objc_msgSend(this.id, OS.sel_view);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public int visibilityPriority() {
-	return OS.objc_msgSend(this.id, OS.sel_visibilityPriority);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItemGroup.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItemGroup.java
deleted file mode 100644
index 6a0b63fa8e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItemGroup.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSToolbarItemGroup extends NSToolbarItem {
-
-public NSToolbarItemGroup() {
-	super();
-}
-
-public NSToolbarItemGroup(int id) {
-	super(id);
-}
-
-public void setSubitems(NSArray subitems) {
-	OS.objc_msgSend(this.id, OS.sel_setSubitems_1, subitems != null ? subitems.id : 0);
-}
-
-public NSArray subitems() {
-	int result = OS.objc_msgSend(this.id, OS.sel_subitems);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTrackingArea.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTrackingArea.java
deleted file mode 100644
index d388aea272..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTrackingArea.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSTrackingArea extends NSObject {
-
-public NSTrackingArea() {
-	super();
-}
-
-public NSTrackingArea(int id) {
-	super(id);
-}
-
-public NSTrackingArea initWithRect(NSRect rect, int options, id owner, NSDictionary userInfo) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithRect_1options_1owner_1userInfo_1, rect, options, owner != null ? owner.id : 0, userInfo != null ? userInfo.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSTrackingArea(result) : null);
-}
-
-public int options() {
-	return OS.objc_msgSend(this.id, OS.sel_options);
-}
-
-public id owner() {
-	int result = OS.objc_msgSend(this.id, OS.sel_owner);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSRect rect() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rect);
-	return result;
-}
-
-public NSDictionary userInfo() {
-	int 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/NSTreeController.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTreeController.java
deleted file mode 100644
index d0c21cd99e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTreeController.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSTreeController extends NSObjectController {
-
-public NSTreeController() {
-	super();
-}
-
-public NSTreeController(int id) {
-	super(id);
-}
-
-public void add(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_add_1, sender != null ? sender.id : 0);
-}
-
-public void addChild(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_addChild_1, sender != null ? sender.id : 0);
-}
-
-public boolean addSelectionIndexPaths(NSArray indexPaths) {
-	return OS.objc_msgSend(this.id, OS.sel_addSelectionIndexPaths_1, indexPaths != null ? indexPaths.id : 0) != 0;
-}
-
-public boolean alwaysUsesMultipleValuesMarker() {
-	return OS.objc_msgSend(this.id, OS.sel_alwaysUsesMultipleValuesMarker) != 0;
-}
-
-public id arrangedObjects() {
-	int result = OS.objc_msgSend(this.id, OS.sel_arrangedObjects);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean avoidsEmptySelection() {
-	return OS.objc_msgSend(this.id, OS.sel_avoidsEmptySelection) != 0;
-}
-
-public boolean canAddChild() {
-	return OS.objc_msgSend(this.id, OS.sel_canAddChild) != 0;
-}
-
-public boolean canInsert() {
-	return OS.objc_msgSend(this.id, OS.sel_canInsert) != 0;
-}
-
-public boolean canInsertChild() {
-	return OS.objc_msgSend(this.id, OS.sel_canInsertChild) != 0;
-}
-
-public NSString childrenKeyPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_childrenKeyPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString childrenKeyPathForNode(NSTreeNode node) {
-	int result = OS.objc_msgSend(this.id, OS.sel_childrenKeyPathForNode_1, node != null ? node.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id content() {
-	int result = OS.objc_msgSend(this.id, OS.sel_content);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString countKeyPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_countKeyPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString countKeyPathForNode(NSTreeNode node) {
-	int result = OS.objc_msgSend(this.id, OS.sel_countKeyPathForNode_1, node != null ? node.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void insert(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_insert_1, sender != null ? sender.id : 0);
-}
-
-public void insertChild(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_insertChild_1, sender != null ? sender.id : 0);
-}
-
-public void insertObject(id object, NSIndexPath indexPath) {
-	OS.objc_msgSend(this.id, OS.sel_insertObject_1atArrangedObjectIndexPath_1, object != null ? object.id : 0, indexPath != null ? indexPath.id : 0);
-}
-
-public void insertObjects(NSArray objects, NSArray indexPaths) {
-	OS.objc_msgSend(this.id, OS.sel_insertObjects_1atArrangedObjectIndexPaths_1, objects != null ? objects.id : 0, indexPaths != null ? indexPaths.id : 0);
-}
-
-public NSString leafKeyPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_leafKeyPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString leafKeyPathForNode(NSTreeNode node) {
-	int result = OS.objc_msgSend(this.id, OS.sel_leafKeyPathForNode_1, node != null ? node.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void moveNode(NSTreeNode node, NSIndexPath indexPath) {
-	OS.objc_msgSend(this.id, OS.sel_moveNode_1toIndexPath_1, node != null ? node.id : 0, indexPath != null ? indexPath.id : 0);
-}
-
-public void moveNodes(NSArray nodes, NSIndexPath startingIndexPath) {
-	OS.objc_msgSend(this.id, OS.sel_moveNodes_1toIndexPath_1, nodes != null ? nodes.id : 0, startingIndexPath != null ? startingIndexPath.id : 0);
-}
-
-public boolean preservesSelection() {
-	return OS.objc_msgSend(this.id, OS.sel_preservesSelection) != 0;
-}
-
-public void rearrangeObjects() {
-	OS.objc_msgSend(this.id, OS.sel_rearrangeObjects);
-}
-
-public void remove(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_remove_1, sender != null ? sender.id : 0);
-}
-
-public void removeObjectAtArrangedObjectIndexPath(NSIndexPath indexPath) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectAtArrangedObjectIndexPath_1, indexPath != null ? indexPath.id : 0);
-}
-
-public void removeObjectsAtArrangedObjectIndexPaths(NSArray indexPaths) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectsAtArrangedObjectIndexPaths_1, indexPaths != null ? indexPaths.id : 0);
-}
-
-public boolean removeSelectionIndexPaths(NSArray indexPaths) {
-	return OS.objc_msgSend(this.id, OS.sel_removeSelectionIndexPaths_1, indexPaths != null ? indexPaths.id : 0) != 0;
-}
-
-public NSArray selectedNodes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedNodes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray selectedObjects() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectedObjects);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSIndexPath selectionIndexPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectionIndexPath);
-	return result != 0 ? new NSIndexPath(result) : null;
-}
-
-public NSArray selectionIndexPaths() {
-	int result = OS.objc_msgSend(this.id, OS.sel_selectionIndexPaths);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean selectsInsertedObjects() {
-	return OS.objc_msgSend(this.id, OS.sel_selectsInsertedObjects) != 0;
-}
-
-public void setAlwaysUsesMultipleValuesMarker(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAlwaysUsesMultipleValuesMarker_1, flag);
-}
-
-public void setAvoidsEmptySelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAvoidsEmptySelection_1, flag);
-}
-
-public void setChildrenKeyPath(NSString keyPath) {
-	OS.objc_msgSend(this.id, OS.sel_setChildrenKeyPath_1, keyPath != null ? keyPath.id : 0);
-}
-
-public void setContent(id content) {
-	OS.objc_msgSend(this.id, OS.sel_setContent_1, content != null ? content.id : 0);
-}
-
-public void setCountKeyPath(NSString keyPath) {
-	OS.objc_msgSend(this.id, OS.sel_setCountKeyPath_1, keyPath != null ? keyPath.id : 0);
-}
-
-public void setLeafKeyPath(NSString keyPath) {
-	OS.objc_msgSend(this.id, OS.sel_setLeafKeyPath_1, keyPath != null ? keyPath.id : 0);
-}
-
-public void setPreservesSelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setPreservesSelection_1, flag);
-}
-
-public boolean setSelectionIndexPath(NSIndexPath indexPath) {
-	return OS.objc_msgSend(this.id, OS.sel_setSelectionIndexPath_1, indexPath != null ? indexPath.id : 0) != 0;
-}
-
-public boolean setSelectionIndexPaths(NSArray indexPaths) {
-	return OS.objc_msgSend(this.id, OS.sel_setSelectionIndexPaths_1, indexPaths != null ? indexPaths.id : 0) != 0;
-}
-
-public void setSelectsInsertedObjects(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectsInsertedObjects_1, flag);
-}
-
-public void setSortDescriptors(NSArray sortDescriptors) {
-	OS.objc_msgSend(this.id, OS.sel_setSortDescriptors_1, sortDescriptors != null ? sortDescriptors.id : 0);
-}
-
-public NSArray sortDescriptors() {
-	int result = OS.objc_msgSend(this.id, OS.sel_sortDescriptors);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTreeNode.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTreeNode.java
deleted file mode 100644
index 0e8d8df915..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTreeNode.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSTreeNode extends NSObject {
-
-public NSTreeNode() {
-	super();
-}
-
-public NSTreeNode(int id) {
-	super(id);
-}
-
-public NSArray childNodes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_childNodes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSTreeNode descendantNodeAtIndexPath(NSIndexPath indexPath) {
-	int result = OS.objc_msgSend(this.id, OS.sel_descendantNodeAtIndexPath_1, indexPath != null ? indexPath.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSTreeNode(result) : null);
-}
-
-public NSIndexPath indexPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_indexPath);
-	return result != 0 ? new NSIndexPath(result) : null;
-}
-
-public id initWithRepresentedObject(id modelObject) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithRepresentedObject_1, modelObject != null ? modelObject.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isLeaf() {
-	return OS.objc_msgSend(this.id, OS.sel_isLeaf) != 0;
-}
-
-public NSMutableArray mutableChildNodes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mutableChildNodes);
-	return result != 0 ? new NSMutableArray(result) : null;
-}
-
-public NSTreeNode parentNode() {
-	int result = OS.objc_msgSend(this.id, OS.sel_parentNode);
-	return result == this.id ? this : (result != 0 ? new NSTreeNode(result) : null);
-}
-
-public id representedObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_representedObject);
-	return result != 0 ? new id(result) : null;
-}
-
-public void sortWithSortDescriptors(NSArray sortDescriptors, boolean recursively) {
-	OS.objc_msgSend(this.id, OS.sel_sortWithSortDescriptors_1recursively_1, sortDescriptors != null ? sortDescriptors.id : 0, recursively);
-}
-
-public static id treeNodeWithRepresentedObject(id modelObject) {
-	int result = OS.objc_msgSend(OS.class_NSTreeNode, OS.sel_treeNodeWithRepresentedObject_1, modelObject != null ? modelObject.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/NSTypesetter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTypesetter.java
index 54f5c31855..aa66daa42d 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
@@ -16,280 +16,16 @@ public NSTypesetter() {
 	super();
 }
 
-public NSTypesetter(int id) {
+public NSTypesetter(int /*long*/ id) {
 	super(id);
 }
 
-public int actionForControlCharacterAtIndex(int charIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_actionForControlCharacterAtIndex_1, charIndex);
-}
-
-public NSAttributedString attributedString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributedString);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public NSDictionary attributesForExtraLineFragment() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributesForExtraLineFragment);
-	return result != 0 ? new NSDictionary(result) : null;
+public NSTypesetter(id id) {
+	super(id);
 }
 
 public float baselineOffsetInLayoutManager(NSLayoutManager layoutMgr, int glyphIndex) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_baselineOffsetInLayoutManager_1glyphIndex_1, layoutMgr != null ? layoutMgr.id : 0, glyphIndex);
-}
-
-public void beginLineWithGlyphAtIndex(int glyphIndex) {
-	OS.objc_msgSend(this.id, OS.sel_beginLineWithGlyphAtIndex_1, glyphIndex);
-}
-
-public void beginParagraph() {
-	OS.objc_msgSend(this.id, OS.sel_beginParagraph);
-}
-
-public boolean bidiProcessingEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_bidiProcessingEnabled) != 0;
-}
-
-public NSRect boundingBoxForControlGlyphAtIndex(int glyphIndex, NSTextContainer textContainer, NSRect proposedRect, NSPoint glyphPosition, int charIndex) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_boundingBoxForControlGlyphAtIndex_1forTextContainer_1proposedLineFragment_1glyphPosition_1characterIndex_1, glyphIndex, textContainer != null ? textContainer.id : 0, proposedRect, glyphPosition, charIndex);
-	return result;
-}
-
-public NSRange characterRangeForGlyphRange(NSRange glyphRange, int actualGlyphRange) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_characterRangeForGlyphRange_1actualGlyphRange_1, glyphRange, actualGlyphRange);
-	return result;
-}
-
-public NSParagraphStyle currentParagraphStyle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currentParagraphStyle);
-	return result != 0 ? new NSParagraphStyle(result) : null;
-}
-
-public NSTextContainer currentTextContainer() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currentTextContainer);
-	return result != 0 ? new NSTextContainer(result) : null;
-}
-
-public static int defaultTypesetterBehavior() {
-	return OS.objc_msgSend(OS.class_NSTypesetter, OS.sel_defaultTypesetterBehavior);
-}
-
-public void deleteGlyphsInRange(NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_deleteGlyphsInRange_1, glyphRange);
-}
-
-public void endLineWithGlyphRange(NSRange lineGlyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_endLineWithGlyphRange_1, lineGlyphRange);
-}
-
-public void endParagraph() {
-	OS.objc_msgSend(this.id, OS.sel_endParagraph);
-}
-
-public int getGlyphsInRange(NSRange glyphsRange, int glyphBuffer, int charIndexBuffer, int inscribeBuffer, int elasticBuffer, int bidiLevelBuffer) {
-	return OS.objc_msgSend(this.id, OS.sel_getGlyphsInRange_1glyphs_1characterIndexes_1glyphInscriptions_1elasticBits_1bidiLevels_1, glyphsRange, glyphBuffer, charIndexBuffer, inscribeBuffer, elasticBuffer, bidiLevelBuffer);
-}
-
-public void getLineFragmentRect_usedRect_forParagraphSeparatorGlyphRange_atProposedOrigin_(int lineFragmentRect, int lineFragmentUsedRect, NSRange paragraphSeparatorGlyphRange, NSPoint lineOrigin) {
-	OS.objc_msgSend(this.id, OS.sel_getLineFragmentRect_1usedRect_1forParagraphSeparatorGlyphRange_1atProposedOrigin_1, lineFragmentRect, lineFragmentUsedRect, paragraphSeparatorGlyphRange, lineOrigin);
-}
-
-public void getLineFragmentRect_usedRect_remainingRect_forStartingGlyphAtIndex_proposedRect_lineSpacing_paragraphSpacingBefore_paragraphSpacingAfter_(int lineFragmentRect, int lineFragmentUsedRect, int remainingRect, int startingGlyphIndex, NSRect proposedRect, float lineSpacing, float paragraphSpacingBefore, float paragraphSpacingAfter) {
-	OS.objc_msgSend(this.id, OS.sel_getLineFragmentRect_1usedRect_1remainingRect_1forStartingGlyphAtIndex_1proposedRect_1lineSpacing_1paragraphSpacingBefore_1paragraphSpacingAfter_1, lineFragmentRect, lineFragmentUsedRect, remainingRect, startingGlyphIndex, proposedRect, lineSpacing, paragraphSpacingBefore, paragraphSpacingAfter);
-}
-
-public NSRange glyphRangeForCharacterRange(NSRange charRange, int actualCharRange) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_glyphRangeForCharacterRange_1actualCharacterRange_1, charRange, actualCharRange);
-	return result;
-}
-
-public int hyphenCharacterForGlyphAtIndex(int glyphIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_hyphenCharacterForGlyphAtIndex_1, glyphIndex);
-}
-
-public float hyphenationFactor() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_hyphenationFactor);
-}
-
-public float hyphenationFactorForGlyphAtIndex(int glyphIndex) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_hyphenationFactorForGlyphAtIndex_1, glyphIndex);
-}
-
-public void insertGlyph(int glyph, int glyphIndex, int characterIndex) {
-	OS.objc_msgSend(this.id, OS.sel_insertGlyph_1atGlyphIndex_1characterIndex_1, glyph, glyphIndex, characterIndex);
-}
-
-public NSRange layoutCharactersInRange(NSRange characterRange, NSLayoutManager layoutManager, int maxNumLines) {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_layoutCharactersInRange_1forLayoutManager_1maximumNumberOfLineFragments_1, characterRange, layoutManager != null ? layoutManager.id : 0, maxNumLines);
-	return result;
-}
-
-public void layoutGlyphsInLayoutManager(NSLayoutManager layoutManager, int startGlyphIndex, int maxNumLines, int nextGlyph) {
-	OS.objc_msgSend(this.id, OS.sel_layoutGlyphsInLayoutManager_1startingAtGlyphIndex_1maxNumberOfLineFragments_1nextGlyphIndex_1, layoutManager != null ? layoutManager.id : 0, startGlyphIndex, maxNumLines, nextGlyph);
-}
-
-public NSLayoutManager layoutManager() {
-	int result = OS.objc_msgSend(this.id, OS.sel_layoutManager);
-	return result != 0 ? new NSLayoutManager(result) : null;
-}
-
-public int layoutParagraphAtPoint(int lineFragmentOrigin) {
-	return OS.objc_msgSend(this.id, OS.sel_layoutParagraphAtPoint_1, lineFragmentOrigin);
-}
-
-public float lineFragmentPadding() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_lineFragmentPadding);
-}
-
-public float lineSpacingAfterGlyphAtIndex(int glyphIndex, NSRect rect) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_lineSpacingAfterGlyphAtIndex_1withProposedLineFragmentRect_1, glyphIndex, rect);
-}
-
-public NSRange paragraphCharacterRange() {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_paragraphCharacterRange);
-	return result;
-}
-
-public NSRange paragraphGlyphRange() {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_paragraphGlyphRange);
-	return result;
-}
-
-public NSRange paragraphSeparatorCharacterRange() {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_paragraphSeparatorCharacterRange);
-	return result;
-}
-
-public NSRange paragraphSeparatorGlyphRange() {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_paragraphSeparatorGlyphRange);
-	return result;
-}
-
-public float paragraphSpacingAfterGlyphAtIndex(int glyphIndex, NSRect rect) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_paragraphSpacingAfterGlyphAtIndex_1withProposedLineFragmentRect_1, glyphIndex, rect);
-}
-
-public float paragraphSpacingBeforeGlyphAtIndex(int glyphIndex, NSRect rect) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_paragraphSpacingBeforeGlyphAtIndex_1withProposedLineFragmentRect_1, glyphIndex, rect);
-}
-
-public static NSSize printingAdjustmentInLayoutManager(NSLayoutManager layoutMgr, NSRange nominallySpacedGlyphsRange, int packedGlyphs, int packedGlyphsCount) {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, OS.class_NSTypesetter, OS.sel_printingAdjustmentInLayoutManager_1forNominallySpacedGlyphRange_1packedGlyphs_1count_1, layoutMgr != null ? layoutMgr.id : 0, nominallySpacedGlyphsRange, packedGlyphs, packedGlyphsCount);
-	return result;
-}
-
-public void setAttachmentSize(NSSize attachmentSize, NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_setAttachmentSize_1forGlyphRange_1, attachmentSize, glyphRange);
-}
-
-public void setAttributedString(NSAttributedString attrString) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedString_1, attrString != null ? attrString.id : 0);
-}
-
-public void setBidiLevels(int levels, NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_setBidiLevels_1forGlyphRange_1, levels, glyphRange);
-}
-
-public void setBidiProcessingEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBidiProcessingEnabled_1, flag);
-}
-
-public void setDrawsOutsideLineFragment(boolean flag, NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsOutsideLineFragment_1forGlyphRange_1, flag, glyphRange);
-}
-
-public void setHardInvalidation(boolean flag, NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_setHardInvalidation_1forGlyphRange_1, flag, glyphRange);
-}
-
-public void setHyphenationFactor(float factor) {
-	OS.objc_msgSend(this.id, OS.sel_setHyphenationFactor_1, factor);
-}
-
-public void setLineFragmentPadding(float padding) {
-	OS.objc_msgSend(this.id, OS.sel_setLineFragmentPadding_1, padding);
-}
-
-public void setLineFragmentRect(NSRect fragmentRect, NSRange glyphRange, NSRect usedRect, float baselineOffset) {
-	OS.objc_msgSend(this.id, OS.sel_setLineFragmentRect_1forGlyphRange_1usedRect_1baselineOffset_1, fragmentRect, glyphRange, usedRect, baselineOffset);
-}
-
-public void setLocation(NSPoint location, int advancements, NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_setLocation_1withAdvancements_1forStartOfGlyphRange_1, location, advancements, glyphRange);
-}
-
-public void setNotShownAttribute(boolean flag, NSRange glyphRange) {
-	OS.objc_msgSend(this.id, OS.sel_setNotShownAttribute_1forGlyphRange_1, flag, glyphRange);
-}
-
-public void setParagraphGlyphRange(NSRange paragraphRange, NSRange paragraphSeparatorRange) {
-	OS.objc_msgSend(this.id, OS.sel_setParagraphGlyphRange_1separatorGlyphRange_1, paragraphRange, paragraphSeparatorRange);
-}
-
-public void setTypesetterBehavior(int behavior) {
-	OS.objc_msgSend(this.id, OS.sel_setTypesetterBehavior_1, behavior);
-}
-
-public void setUsesFontLeading(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesFontLeading_1, flag);
-}
-
-public static id sharedSystemTypesetter() {
-	int result = OS.objc_msgSend(OS.class_NSTypesetter, OS.sel_sharedSystemTypesetter);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id sharedSystemTypesetterForBehavior(int theBehavior) {
-	int result = OS.objc_msgSend(OS.class_NSTypesetter, OS.sel_sharedSystemTypesetterForBehavior_1, theBehavior);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean shouldBreakLineByHyphenatingBeforeCharacterAtIndex(int charIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_shouldBreakLineByHyphenatingBeforeCharacterAtIndex_1, charIndex) != 0;
-}
-
-public boolean shouldBreakLineByWordBeforeCharacterAtIndex(int charIndex) {
-	return OS.objc_msgSend(this.id, OS.sel_shouldBreakLineByWordBeforeCharacterAtIndex_1, charIndex) != 0;
-}
-
-public NSFont substituteFontForFont(NSFont originalFont) {
-	int result = OS.objc_msgSend(this.id, OS.sel_substituteFontForFont_1, originalFont != null ? originalFont.id : 0);
-	return result != 0 ? new NSFont(result) : null;
-}
-
-public void substituteGlyphsInRange(NSRange glyphRange, int glyphs) {
-	OS.objc_msgSend(this.id, OS.sel_substituteGlyphsInRange_1withGlyphs_1, glyphRange, glyphs);
-}
-
-public NSArray textContainers() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textContainers);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSTextTab textTabForGlyphLocation(float glyphLocation, int direction, float maxLocation) {
-	int result = OS.objc_msgSend(this.id, OS.sel_textTabForGlyphLocation_1writingDirection_1maxLocation_1, glyphLocation, direction, maxLocation);
-	return result != 0 ? new NSTextTab(result) : null;
-}
-
-public int typesetterBehavior() {
-	return OS.objc_msgSend(this.id, OS.sel_typesetterBehavior);
-}
-
-public boolean usesFontLeading() {
-	return OS.objc_msgSend(this.id, OS.sel_usesFontLeading) != 0;
-}
-
-public void willSetLineFragmentRect(int lineRect, NSRange glyphRange, int usedRect, int baselineOffset) {
-	OS.objc_msgSend(this.id, OS.sel_willSetLineFragmentRect_1forGlyphRange_1usedRect_1baselineOffset_1, lineRect, glyphRange, usedRect, baselineOffset);
+	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 6324e4381e..63407e6842 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
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
@@ -16,164 +16,27 @@ public NSURL() {
 	super();
 }
 
-public NSURL(int id) {
+public NSURL(int /*long*/ id) {
 	super(id);
 }
 
-public NSURLHandle URLHandleUsingCache(boolean shouldUseCache) {
-	int result = OS.objc_msgSend(this.id, OS.sel_URLHandleUsingCache_1, shouldUseCache);
-	return result != 0 ? new NSURLHandle(result) : null;
+public NSURL(id id) {
+	super(id);
 }
 
-public static NSURL static_URLWithString_(NSString URLString) {
-	int result = OS.objc_msgSend(OS.class_NSURL, OS.sel_URLWithString_1, URLString != null ? URLString.id : 0);
+public static NSURL URLWithString(NSString URLString) {
+	int result = OS.objc_msgSend(OS.class_NSURL, OS.sel_URLWithString_, URLString != null ? URLString.id : 0);
 	return result != 0 ? new NSURL(result) : null;
 }
 
-public static id static_URLWithString_relativeToURL_(NSString URLString, NSURL baseURL) {
-	int result = OS.objc_msgSend(OS.class_NSURL, OS.sel_URLWithString_1relativeToURL_1, URLString != null ? URLString.id : 0, baseURL != null ? baseURL.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
 public NSString absoluteString() {
 	int result = OS.objc_msgSend(this.id, OS.sel_absoluteString);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public NSURL absoluteURL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_absoluteURL);
-	return result == this.id ? this : (result != 0 ? new NSURL(result) : null);
-}
-
-public NSURL baseURL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_baseURL);
-	return result == this.id ? this : (result != 0 ? new NSURL(result) : null);
-}
-
-public static NSURL static_fileURLWithPath_(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSURL, OS.sel_fileURLWithPath_1, path != null ? path.id : 0);
+public static NSURL fileURLWithPath(NSString path) {
+	int result = OS.objc_msgSend(OS.class_NSURL, OS.sel_fileURLWithPath_, path != null ? path.id : 0);
 	return result != 0 ? new NSURL(result) : null;
 }
 
-public static id static_fileURLWithPath_isDirectory_(NSString path, boolean isDir) {
-	int result = OS.objc_msgSend(OS.class_NSURL, OS.sel_fileURLWithPath_1isDirectory_1, path != null ? path.id : 0, isDir);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString fragment() {
-	int result = OS.objc_msgSend(this.id, OS.sel_fragment);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString host() {
-	int result = OS.objc_msgSend(this.id, OS.sel_host);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id initFileURLWithPath_(NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initFileURLWithPath_1, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initFileURLWithPath_isDirectory_(NSString path, boolean isDir) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initFileURLWithPath_1isDirectory_1, path != null ? path.id : 0, isDir);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithScheme(NSString scheme, NSString host, NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithScheme_1host_1path_1, scheme != null ? scheme.id : 0, host != null ? host.id : 0, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithString_(NSString URLString) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithString_1, URLString != null ? URLString.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithString_relativeToURL_(NSString URLString, NSURL baseURL) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithString_1relativeToURL_1, URLString != null ? URLString.id : 0, baseURL != null ? baseURL.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isFileURL() {
-	return OS.objc_msgSend(this.id, OS.sel_isFileURL) != 0;
-}
-
-public void loadResourceDataNotifyingClient(id client, boolean shouldUseCache) {
-	OS.objc_msgSend(this.id, OS.sel_loadResourceDataNotifyingClient_1usingCache_1, client != null ? client.id : 0, shouldUseCache);
-}
-
-public NSString parameterString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_parameterString);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString password() {
-	int result = OS.objc_msgSend(this.id, OS.sel_password);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString path() {
-	int result = OS.objc_msgSend(this.id, OS.sel_path);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSNumber port() {
-	int result = OS.objc_msgSend(this.id, OS.sel_port);
-	return result != 0 ? new NSNumber(result) : null;
-}
-
-public id propertyForKey(NSString propertyKey) {
-	int result = OS.objc_msgSend(this.id, OS.sel_propertyForKey_1, propertyKey != null ? propertyKey.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString query() {
-	int result = OS.objc_msgSend(this.id, OS.sel_query);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString relativePath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_relativePath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString relativeString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_relativeString);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSData resourceDataUsingCache(boolean shouldUseCache) {
-	int result = OS.objc_msgSend(this.id, OS.sel_resourceDataUsingCache_1, shouldUseCache);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSString resourceSpecifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_resourceSpecifier);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString scheme() {
-	int result = OS.objc_msgSend(this.id, OS.sel_scheme);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean setProperty(id property, NSString propertyKey) {
-	return OS.objc_msgSend(this.id, OS.sel_setProperty_1forKey_1, property != null ? property.id : 0, propertyKey != null ? propertyKey.id : 0) != 0;
-}
-
-public boolean setResourceData(NSData data) {
-	return OS.objc_msgSend(this.id, OS.sel_setResourceData_1, data != null ? data.id : 0) != 0;
-}
-
-public NSURL standardizedURL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_standardizedURL);
-	return result == this.id ? this : (result != 0 ? new NSURL(result) : null);
-}
-
-public NSString user() {
-	int result = OS.objc_msgSend(this.id, OS.sel_user);
-	return result != 0 ? new NSString(result) : null;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLAuthenticationChallenge.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLAuthenticationChallenge.java
deleted file mode 100644
index 7861cce03c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLAuthenticationChallenge.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSURLAuthenticationChallenge extends NSObject {
-
-public NSURLAuthenticationChallenge() {
-	super();
-}
-
-public NSURLAuthenticationChallenge(int id) {
-	super(id);
-}
-
-public NSError error() {
-	int result = OS.objc_msgSend(this.id, OS.sel_error);
-	return result != 0 ? new NSError(result) : null;
-}
-
-public NSURLResponse failureResponse() {
-	int result = OS.objc_msgSend(this.id, OS.sel_failureResponse);
-	return result != 0 ? new NSURLResponse(result) : null;
-}
-
-public id initWithAuthenticationChallenge(NSURLAuthenticationChallenge challenge, id sender) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithAuthenticationChallenge_1sender_1, challenge != null ? challenge.id : 0, sender != null ? sender.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithProtectionSpace(NSURLProtectionSpace space, NSURLCredential credential, int previousFailureCount, NSURLResponse response, NSError error, id sender) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithProtectionSpace_1proposedCredential_1previousFailureCount_1failureResponse_1error_1sender_1, space != null ? space.id : 0, credential != null ? credential.id : 0, previousFailureCount, response != null ? response.id : 0, error != null ? error.id : 0, sender != null ? sender.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public int previousFailureCount() {
-	return OS.objc_msgSend(this.id, OS.sel_previousFailureCount);
-}
-
-public NSURLCredential proposedCredential() {
-	int result = OS.objc_msgSend(this.id, OS.sel_proposedCredential);
-	return result != 0 ? new NSURLCredential(result) : null;
-}
-
-public NSURLProtectionSpace protectionSpace() {
-	int result = OS.objc_msgSend(this.id, OS.sel_protectionSpace);
-	return result != 0 ? new NSURLProtectionSpace(result) : null;
-}
-
-public id sender() {
-	int result = OS.objc_msgSend(this.id, OS.sel_sender);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCache.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCache.java
deleted file mode 100644
index 251d099a0c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCache.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSURLCache extends NSObject {
-
-public NSURLCache() {
-	super();
-}
-
-public NSURLCache(int id) {
-	super(id);
-}
-
-public NSCachedURLResponse cachedResponseForRequest(NSURLRequest request) {
-	int result = OS.objc_msgSend(this.id, OS.sel_cachedResponseForRequest_1, request != null ? request.id : 0);
-	return result != 0 ? new NSCachedURLResponse(result) : null;
-}
-
-public int currentDiskUsage() {
-	return OS.objc_msgSend(this.id, OS.sel_currentDiskUsage);
-}
-
-public int currentMemoryUsage() {
-	return OS.objc_msgSend(this.id, OS.sel_currentMemoryUsage);
-}
-
-public int diskCapacity() {
-	return OS.objc_msgSend(this.id, OS.sel_diskCapacity);
-}
-
-public id initWithMemoryCapacity(int memoryCapacity, int diskCapacity, NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithMemoryCapacity_1diskCapacity_1diskPath_1, memoryCapacity, diskCapacity, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public int memoryCapacity() {
-	return OS.objc_msgSend(this.id, OS.sel_memoryCapacity);
-}
-
-public void removeAllCachedResponses() {
-	OS.objc_msgSend(this.id, OS.sel_removeAllCachedResponses);
-}
-
-public void removeCachedResponseForRequest(NSURLRequest request) {
-	OS.objc_msgSend(this.id, OS.sel_removeCachedResponseForRequest_1, request != null ? request.id : 0);
-}
-
-public void setDiskCapacity(int diskCapacity) {
-	OS.objc_msgSend(this.id, OS.sel_setDiskCapacity_1, diskCapacity);
-}
-
-public void setMemoryCapacity(int memoryCapacity) {
-	OS.objc_msgSend(this.id, OS.sel_setMemoryCapacity_1, memoryCapacity);
-}
-
-public static void setSharedURLCache(NSURLCache cache) {
-	OS.objc_msgSend(OS.class_NSURLCache, OS.sel_setSharedURLCache_1, cache != null ? cache.id : 0);
-}
-
-public static NSURLCache sharedURLCache() {
-	int result = OS.objc_msgSend(OS.class_NSURLCache, OS.sel_sharedURLCache);
-	return result != 0 ? new NSURLCache(result) : null;
-}
-
-public void storeCachedResponse(NSCachedURLResponse cachedResponse, NSURLRequest request) {
-	OS.objc_msgSend(this.id, OS.sel_storeCachedResponse_1forRequest_1, cachedResponse != null ? cachedResponse.id : 0, request != null ? request.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLConnection.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLConnection.java
deleted file mode 100644
index 8f62a04bb9..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLConnection.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSURLConnection extends NSObject {
-
-public NSURLConnection() {
-	super();
-}
-
-public NSURLConnection(int id) {
-	super(id);
-}
-
-public static boolean canHandleRequest(NSURLRequest request) {
-	return OS.objc_msgSend(OS.class_NSURLConnection, OS.sel_canHandleRequest_1, request != null ? request.id : 0) != 0;
-}
-
-public void cancel() {
-	OS.objc_msgSend(this.id, OS.sel_cancel);
-}
-
-public static NSURLConnection connectionWithRequest(NSURLRequest request, id delegate) {
-	int result = OS.objc_msgSend(OS.class_NSURLConnection, OS.sel_connectionWithRequest_1delegate_1, request != null ? request.id : 0, delegate != null ? delegate.id : 0);
-	return result != 0 ? new NSURLConnection(result) : null;
-}
-
-public id initWithRequest_delegate_(NSURLRequest request, id delegate) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithRequest_1delegate_1, request != null ? request.id : 0, delegate != null ? delegate.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithRequest_delegate_startImmediately_(NSURLRequest request, id delegate, boolean startImmediately) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithRequest_1delegate_1startImmediately_1, request != null ? request.id : 0, delegate != null ? delegate.id : 0, startImmediately);
-	return result != 0 ? new id(result) : null;
-}
-
-public void scheduleInRunLoop(NSRunLoop aRunLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_scheduleInRunLoop_1forMode_1, aRunLoop != null ? aRunLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-public static NSData sendSynchronousRequest(NSURLRequest request, int response, int error) {
-	int result = OS.objc_msgSend(OS.class_NSURLConnection, OS.sel_sendSynchronousRequest_1returningResponse_1error_1, request != null ? request.id : 0, response, error);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public void start() {
-	OS.objc_msgSend(this.id, OS.sel_start);
-}
-
-public void unscheduleFromRunLoop(NSRunLoop aRunLoop, NSString mode) {
-	OS.objc_msgSend(this.id, OS.sel_unscheduleFromRunLoop_1forMode_1, aRunLoop != null ? aRunLoop.id : 0, mode != null ? mode.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredential.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredential.java
deleted file mode 100644
index 8e0ab76867..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredential.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSURLCredential extends NSObject {
-
-public NSURLCredential() {
-	super();
-}
-
-public NSURLCredential(int id) {
-	super(id);
-}
-
-public static NSURLCredential credentialWithUser(NSString user, NSString password, int persistence) {
-	int result = OS.objc_msgSend(OS.class_NSURLCredential, OS.sel_credentialWithUser_1password_1persistence_1, user != null ? user.id : 0, password != null ? password.id : 0, persistence);
-	return result != 0 ? new NSURLCredential(result) : null;
-}
-
-public boolean hasPassword() {
-	return OS.objc_msgSend(this.id, OS.sel_hasPassword) != 0;
-}
-
-public id initWithUser(NSString user, NSString password, int persistence) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithUser_1password_1persistence_1, user != null ? user.id : 0, password != null ? password.id : 0, persistence);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString password() {
-	int result = OS.objc_msgSend(this.id, OS.sel_password);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int persistence() {
-	return OS.objc_msgSend(this.id, OS.sel_persistence);
-}
-
-public NSString user() {
-	int result = OS.objc_msgSend(this.id, OS.sel_user);
-	return result != 0 ? new NSString(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredentialStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredentialStorage.java
deleted file mode 100644
index f42225531b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredentialStorage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSURLCredentialStorage extends NSObject {
-
-public NSURLCredentialStorage() {
-	super();
-}
-
-public NSURLCredentialStorage(int id) {
-	super(id);
-}
-
-public NSDictionary allCredentials() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allCredentials);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDictionary credentialsForProtectionSpace(NSURLProtectionSpace space) {
-	int result = OS.objc_msgSend(this.id, OS.sel_credentialsForProtectionSpace_1, space != null ? space.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSURLCredential defaultCredentialForProtectionSpace(NSURLProtectionSpace space) {
-	int result = OS.objc_msgSend(this.id, OS.sel_defaultCredentialForProtectionSpace_1, space != null ? space.id : 0);
-	return result != 0 ? new NSURLCredential(result) : null;
-}
-
-public void removeCredential(NSURLCredential credential, NSURLProtectionSpace space) {
-	OS.objc_msgSend(this.id, OS.sel_removeCredential_1forProtectionSpace_1, credential != null ? credential.id : 0, space != null ? space.id : 0);
-}
-
-public void setCredential(NSURLCredential credential, NSURLProtectionSpace space) {
-	OS.objc_msgSend(this.id, OS.sel_setCredential_1forProtectionSpace_1, credential != null ? credential.id : 0, space != null ? space.id : 0);
-}
-
-public void setDefaultCredential(NSURLCredential credential, NSURLProtectionSpace space) {
-	OS.objc_msgSend(this.id, OS.sel_setDefaultCredential_1forProtectionSpace_1, credential != null ? credential.id : 0, space != null ? space.id : 0);
-}
-
-public static NSURLCredentialStorage sharedCredentialStorage() {
-	int result = OS.objc_msgSend(OS.class_NSURLCredentialStorage, OS.sel_sharedCredentialStorage);
-	return result != 0 ? new NSURLCredentialStorage(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLDownload.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLDownload.java
index 8e781d7517..fed3395908 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLDownload.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLDownload.java
@@ -16,48 +16,20 @@ public NSURLDownload() {
 	super();
 }
 
-public NSURLDownload(int id) {
+public NSURLDownload(int /*long*/ id) {
 	super(id);
 }
 
-public static boolean canResumeDownloadDecodedWithEncodingMIMEType(NSString MIMEType) {
-	return OS.objc_msgSend(OS.class_NSURLDownload, OS.sel_canResumeDownloadDecodedWithEncodingMIMEType_1, MIMEType != null ? MIMEType.id : 0) != 0;
+public NSURLDownload(id id) {
+	super(id);
 }
 
 public void cancel() {
 	OS.objc_msgSend(this.id, OS.sel_cancel);
 }
 
-public boolean deletesFileUponFailure() {
-	return OS.objc_msgSend(this.id, OS.sel_deletesFileUponFailure) != 0;
-}
-
-public id initWithRequest(NSURLRequest request, id delegate) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithRequest_1delegate_1, request != null ? request.id : 0, delegate != null ? delegate.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithResumeData(NSData resumeData, id delegate, NSString path) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithResumeData_1delegate_1path_1, resumeData != null ? resumeData.id : 0, delegate != null ? delegate.id : 0, path != null ? path.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSURLRequest request() {
-	int result = OS.objc_msgSend(this.id, OS.sel_request);
-	return result != 0 ? new NSURLRequest(result) : null;
-}
-
-public NSData resumeData() {
-	int result = OS.objc_msgSend(this.id, OS.sel_resumeData);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public void setDeletesFileUponFailure(boolean deletesFileUponFailure) {
-	OS.objc_msgSend(this.id, OS.sel_setDeletesFileUponFailure_1, deletesFileUponFailure);
-}
-
 public void setDestination(NSString path, boolean allowOverwrite) {
-	OS.objc_msgSend(this.id, OS.sel_setDestination_1allowOverwrite_1, path != null ? path.id : 0, allowOverwrite);
+	OS.objc_msgSend(this.id, OS.sel_setDestination_allowOverwrite_, path != null ? path.id : 0, allowOverwrite);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLHandle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLHandle.java
deleted file mode 100644
index 645cc0a680..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLHandle.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSURLHandle extends NSObject {
-
-public NSURLHandle() {
-	super();
-}
-
-public NSURLHandle(int id) {
-	super(id);
-}
-
-public static int URLHandleClassForURL(NSURL anURL) {
-	return OS.objc_msgSend(OS.class_NSURLHandle, OS.sel_URLHandleClassForURL_1, anURL != null ? anURL.id : 0);
-}
-
-public void addClient(id  client) {
-	OS.objc_msgSend(this.id, OS.sel_addClient_1, client != null ? client.id : 0);
-}
-
-public NSData availableResourceData() {
-	int result = OS.objc_msgSend(this.id, OS.sel_availableResourceData);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public void backgroundLoadDidFailWithReason(NSString reason) {
-	OS.objc_msgSend(this.id, OS.sel_backgroundLoadDidFailWithReason_1, reason != null ? reason.id : 0);
-}
-
-public void beginLoadInBackground() {
-	OS.objc_msgSend(this.id, OS.sel_beginLoadInBackground);
-}
-
-public static NSURLHandle cachedHandleForURL(NSURL anURL) {
-	int result = OS.objc_msgSend(OS.class_NSURLHandle, OS.sel_cachedHandleForURL_1, anURL != null ? anURL.id : 0);
-	return result != 0 ? new NSURLHandle(result) : null;
-}
-
-public static boolean canInitWithURL(NSURL anURL) {
-	return OS.objc_msgSend(OS.class_NSURLHandle, OS.sel_canInitWithURL_1, anURL != null ? anURL.id : 0) != 0;
-}
-
-public void cancelLoadInBackground() {
-	OS.objc_msgSend(this.id, OS.sel_cancelLoadInBackground);
-}
-
-public void didLoadBytes(NSData newBytes, boolean yorn) {
-	OS.objc_msgSend(this.id, OS.sel_didLoadBytes_1loadComplete_1, newBytes != null ? newBytes.id : 0, yorn);
-}
-
-public void endLoadInBackground() {
-	OS.objc_msgSend(this.id, OS.sel_endLoadInBackground);
-}
-
-public long expectedResourceDataSize() {
-	return (long)OS.objc_msgSend(this.id, OS.sel_expectedResourceDataSize);
-}
-
-public NSString failureReason() {
-	int result = OS.objc_msgSend(this.id, OS.sel_failureReason);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void flushCachedData() {
-	OS.objc_msgSend(this.id, OS.sel_flushCachedData);
-}
-
-public id initWithURL(NSURL anURL, boolean willCache) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithURL_1cached_1, anURL != null ? anURL.id : 0, willCache);
-	return result != 0 ? new id(result) : null;
-}
-
-public void loadInBackground() {
-	OS.objc_msgSend(this.id, OS.sel_loadInBackground);
-}
-
-public NSData loadInForeground() {
-	int result = OS.objc_msgSend(this.id, OS.sel_loadInForeground);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public id propertyForKey(NSString propertyKey) {
-	int result = OS.objc_msgSend(this.id, OS.sel_propertyForKey_1, propertyKey != null ? propertyKey.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id propertyForKeyIfAvailable(NSString propertyKey) {
-	int result = OS.objc_msgSend(this.id, OS.sel_propertyForKeyIfAvailable_1, propertyKey != null ? propertyKey.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static void registerURLHandleClass(int anURLHandleSubclass) {
-	OS.objc_msgSend(OS.class_NSURLHandle, OS.sel_registerURLHandleClass_1, anURLHandleSubclass);
-}
-
-public void removeClient(id  client) {
-	OS.objc_msgSend(this.id, OS.sel_removeClient_1, client != null ? client.id : 0);
-}
-
-public NSData resourceData() {
-	int result = OS.objc_msgSend(this.id, OS.sel_resourceData);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public int status() {
-	return OS.objc_msgSend(this.id, OS.sel_status);
-}
-
-public boolean writeData(NSData data) {
-	return OS.objc_msgSend(this.id, OS.sel_writeData_1, data != null ? data.id : 0) != 0;
-}
-
-public boolean writeProperty(id propertyValue, NSString propertyKey) {
-	return OS.objc_msgSend(this.id, OS.sel_writeProperty_1forKey_1, propertyValue != null ? propertyValue.id : 0, propertyKey != null ? propertyKey.id : 0) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtectionSpace.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtectionSpace.java
deleted file mode 100644
index 3034e6a19b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtectionSpace.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSURLProtectionSpace extends NSObject {
-
-public NSURLProtectionSpace() {
-	super();
-}
-
-public NSURLProtectionSpace(int id) {
-	super(id);
-}
-
-public NSString authenticationMethod() {
-	int result = OS.objc_msgSend(this.id, OS.sel_authenticationMethod);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString host() {
-	int result = OS.objc_msgSend(this.id, OS.sel_host);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id initWithHost(NSString host, int port, NSString protocol, NSString realm, NSString authenticationMethod) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithHost_1port_1protocol_1realm_1authenticationMethod_1, host != null ? host.id : 0, port, protocol != null ? protocol.id : 0, realm != null ? realm.id : 0, authenticationMethod != null ? authenticationMethod.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithProxyHost(NSString host, int port, NSString type, NSString realm, NSString authenticationMethod) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithProxyHost_1port_1type_1realm_1authenticationMethod_1, host != null ? host.id : 0, port, type != null ? type.id : 0, realm != null ? realm.id : 0, authenticationMethod != null ? authenticationMethod.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isProxy() {
-	return OS.objc_msgSend(this.id, OS.sel_isProxy) != 0;
-}
-
-public int port() {
-	return OS.objc_msgSend(this.id, OS.sel_port);
-}
-
-public NSString protocol() {
-	int result = OS.objc_msgSend(this.id, OS.sel_protocol);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString proxyType() {
-	int result = OS.objc_msgSend(this.id, OS.sel_proxyType);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString realm() {
-	int result = OS.objc_msgSend(this.id, OS.sel_realm);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean receivesCredentialSecurely() {
-	return OS.objc_msgSend(this.id, OS.sel_receivesCredentialSecurely) != 0;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtocol.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtocol.java
deleted file mode 100644
index 28da8a92dd..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtocol.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSURLProtocol extends NSObject {
-
-public NSURLProtocol() {
-	super();
-}
-
-public NSURLProtocol(int id) {
-	super(id);
-}
-
-public NSCachedURLResponse cachedResponse() {
-	int result = OS.objc_msgSend(this.id, OS.sel_cachedResponse);
-	return result != 0 ? new NSCachedURLResponse(result) : null;
-}
-
-public static boolean canInitWithRequest(NSURLRequest request) {
-	return OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_canInitWithRequest_1, request != null ? request.id : 0) != 0;
-}
-
-public static NSURLRequest canonicalRequestForRequest(NSURLRequest request) {
-	int result = OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_canonicalRequestForRequest_1, request != null ? request.id : 0);
-	return result != 0 ? new NSURLRequest(result) : null;
-}
-
-public id  client() {
-	int result = OS.objc_msgSend(this.id, OS.sel_client);
-	return result != 0 ? new id (result) : null;
-}
-
-public id initWithRequest(NSURLRequest request, NSCachedURLResponse cachedResponse, id  client) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithRequest_1cachedResponse_1client_1, request != null ? request.id : 0, cachedResponse != null ? cachedResponse.id : 0, client != null ? client.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id propertyForKey(NSString key, NSURLRequest request) {
-	int result = OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_propertyForKey_1inRequest_1, key != null ? key.id : 0, request != null ? request.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static boolean registerClass(int protocolClass) {
-	return OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_registerClass_1, protocolClass) != 0;
-}
-
-public static void removePropertyForKey(NSString key, NSMutableURLRequest request) {
-	OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_removePropertyForKey_1inRequest_1, key != null ? key.id : 0, request != null ? request.id : 0);
-}
-
-public NSURLRequest request() {
-	int result = OS.objc_msgSend(this.id, OS.sel_request);
-	return result != 0 ? new NSURLRequest(result) : null;
-}
-
-public static boolean requestIsCacheEquivalent(NSURLRequest a, NSURLRequest b) {
-	return OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_requestIsCacheEquivalent_1toRequest_1, a != null ? a.id : 0, b != null ? b.id : 0) != 0;
-}
-
-public static void setProperty(id value, NSString key, NSMutableURLRequest request) {
-	OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_setProperty_1forKey_1inRequest_1, value != null ? value.id : 0, key != null ? key.id : 0, request != null ? request.id : 0);
-}
-
-public void startLoading() {
-	OS.objc_msgSend(this.id, OS.sel_startLoading);
-}
-
-public void stopLoading() {
-	OS.objc_msgSend(this.id, OS.sel_stopLoading);
-}
-
-public static void unregisterClass(int protocolClass) {
-	OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_unregisterClass_1, protocolClass);
-}
-
-}
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 b4ac5dcb8c..ae59eeeada 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
@@ -16,27 +16,12 @@ public NSURLRequest() {
 	super();
 }
 
-public NSURLRequest(int id) {
+public NSURLRequest(int /*long*/ id) {
 	super(id);
 }
 
-public NSData HTTPBody() {
-	int result = OS.objc_msgSend(this.id, OS.sel_HTTPBody);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSInputStream HTTPBodyStream() {
-	int result = OS.objc_msgSend(this.id, OS.sel_HTTPBodyStream);
-	return result != 0 ? new NSInputStream(result) : null;
-}
-
-public NSString HTTPMethod() {
-	int result = OS.objc_msgSend(this.id, OS.sel_HTTPMethod);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean HTTPShouldHandleCookies() {
-	return OS.objc_msgSend(this.id, OS.sel_HTTPShouldHandleCookies) != 0;
+public NSURLRequest(id id) {
+	super(id);
 }
 
 public NSURL URL() {
@@ -44,47 +29,14 @@ public NSURL URL() {
 	return result != 0 ? new NSURL(result) : null;
 }
 
-public NSDictionary allHTTPHeaderFields() {
-	int result = OS.objc_msgSend(this.id, OS.sel_allHTTPHeaderFields);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public int cachePolicy() {
-	return OS.objc_msgSend(this.id, OS.sel_cachePolicy);
-}
-
-public id initWithURL_(NSURL URL) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithURL_1, URL != null ? URL.id : 0);
-	return result != 0 ? new id(result) : null;
+public NSURLRequest initWithURL(NSURL URL) {
+	int 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 id initWithURL_cachePolicy_timeoutInterval_(NSURL URL, int cachePolicy, double timeoutInterval) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithURL_1cachePolicy_1timeoutInterval_1, URL != null ? URL.id : 0, cachePolicy, timeoutInterval);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSURL mainDocumentURL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mainDocumentURL);
-	return result != 0 ? new NSURL(result) : null;
-}
-
-public static NSURLRequest static_requestWithURL_(NSURL URL) {
-	int result = OS.objc_msgSend(OS.class_NSURLRequest, OS.sel_requestWithURL_1, URL != null ? URL.id : 0);
+public static NSURLRequest requestWithURL(NSURL URL) {
+	int result = OS.objc_msgSend(OS.class_NSURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0);
 	return result != 0 ? new NSURLRequest(result) : null;
 }
 
-public static id static_requestWithURL_cachePolicy_timeoutInterval_(NSURL URL, int cachePolicy, double timeoutInterval) {
-	int result = OS.objc_msgSend(OS.class_NSURLRequest, OS.sel_requestWithURL_1cachePolicy_1timeoutInterval_1, URL != null ? URL.id : 0, cachePolicy, timeoutInterval);
-	return result != 0 ? new id(result) : null;
-}
-
-public double timeoutInterval() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_timeoutInterval);
-}
-
-public NSString valueForHTTPHeaderField(NSString field) {
-	int result = OS.objc_msgSend(this.id, OS.sel_valueForHTTPHeaderField_1, field != null ? field.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLResponse.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLResponse.java
deleted file mode 100644
index 025fed9c06..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLResponse.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSURLResponse extends NSObject {
-
-public NSURLResponse() {
-	super();
-}
-
-public NSURLResponse(int id) {
-	super(id);
-}
-
-public NSString MIMEType() {
-	int result = OS.objc_msgSend(this.id, OS.sel_MIMEType);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSURL URL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_URL);
-	return result != 0 ? new NSURL(result) : null;
-}
-
-public long expectedContentLength() {
-	return (long)OS.objc_msgSend(this.id, OS.sel_expectedContentLength);
-}
-
-public id initWithURL(NSURL URL, NSString MIMEType, int length, NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithURL_1MIMEType_1expectedContentLength_1textEncodingName_1, URL != null ? URL.id : 0, MIMEType != null ? MIMEType.id : 0, length, name != null ? name.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString suggestedFilename() {
-	int result = OS.objc_msgSend(this.id, OS.sel_suggestedFilename);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString textEncodingName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textEncodingName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUnarchiver.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUnarchiver.java
deleted file mode 100644
index b483808d15..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUnarchiver.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSUnarchiver extends NSCoder {
-
-public NSUnarchiver() {
-	super();
-}
-
-public NSUnarchiver(int id) {
-	super(id);
-}
-
-public static NSString static_classNameDecodedForArchiveClassName_(NSString inArchiveName) {
-	int result = OS.objc_msgSend(OS.class_NSUnarchiver, OS.sel_classNameDecodedForArchiveClassName_1, inArchiveName != null ? inArchiveName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString classNameDecodedForArchiveClassName_(NSString inArchiveName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_classNameDecodedForArchiveClassName_1, inArchiveName != null ? inArchiveName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void decodeClassName_asClassName_(NSString inArchiveName, NSString trueName) {
-	OS.objc_msgSend(this.id, OS.sel_decodeClassName_1asClassName_1, inArchiveName != null ? inArchiveName.id : 0, trueName != null ? trueName.id : 0);
-}
-
-public static void static_decodeClassName_asClassName_(NSString inArchiveName, NSString trueName) {
-	OS.objc_msgSend(OS.class_NSUnarchiver, OS.sel_decodeClassName_1asClassName_1, inArchiveName != null ? inArchiveName.id : 0, trueName != null ? trueName.id : 0);
-}
-
-public id initForReadingWithData(NSData data) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initForReadingWithData_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isAtEnd() {
-	return OS.objc_msgSend(this.id, OS.sel_isAtEnd) != 0;
-}
-
-public int objectZone() {
-	return OS.objc_msgSend(this.id, OS.sel_objectZone);
-}
-
-public void replaceObject(id object, id newObject) {
-	OS.objc_msgSend(this.id, OS.sel_replaceObject_1withObject_1, object != null ? object.id : 0, newObject != null ? newObject.id : 0);
-}
-
-public void setObjectZone(int zone) {
-	OS.objc_msgSend(this.id, OS.sel_setObjectZone_1, zone);
-}
-
-public int systemVersion() {
-	return OS.objc_msgSend(this.id, OS.sel_systemVersion);
-}
-
-public static id unarchiveObjectWithData(NSData data) {
-	int result = OS.objc_msgSend(OS.class_NSUnarchiver, OS.sel_unarchiveObjectWithData_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id unarchiveObjectWithFile(NSString path) {
-	int result = OS.objc_msgSend(OS.class_NSUnarchiver, OS.sel_unarchiveObjectWithFile_1, path != null ? path.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/NSUndoManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUndoManager.java
deleted file mode 100644
index 4b0865309e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUndoManager.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSUndoManager extends NSObject {
-
-public NSUndoManager() {
-	super();
-}
-
-public NSUndoManager(int id) {
-	super(id);
-}
-
-public void beginUndoGrouping() {
-	OS.objc_msgSend(this.id, OS.sel_beginUndoGrouping);
-}
-
-public boolean canRedo() {
-	return OS.objc_msgSend(this.id, OS.sel_canRedo) != 0;
-}
-
-public boolean canUndo() {
-	return OS.objc_msgSend(this.id, OS.sel_canUndo) != 0;
-}
-
-public void disableUndoRegistration() {
-	OS.objc_msgSend(this.id, OS.sel_disableUndoRegistration);
-}
-
-public void enableUndoRegistration() {
-	OS.objc_msgSend(this.id, OS.sel_enableUndoRegistration);
-}
-
-public void endUndoGrouping() {
-	OS.objc_msgSend(this.id, OS.sel_endUndoGrouping);
-}
-
-public int groupingLevel() {
-	return OS.objc_msgSend(this.id, OS.sel_groupingLevel);
-}
-
-public boolean groupsByEvent() {
-	return OS.objc_msgSend(this.id, OS.sel_groupsByEvent) != 0;
-}
-
-public boolean isRedoing() {
-	return OS.objc_msgSend(this.id, OS.sel_isRedoing) != 0;
-}
-
-public boolean isUndoRegistrationEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isUndoRegistrationEnabled) != 0;
-}
-
-public boolean isUndoing() {
-	return OS.objc_msgSend(this.id, OS.sel_isUndoing) != 0;
-}
-
-public int levelsOfUndo() {
-	return OS.objc_msgSend(this.id, OS.sel_levelsOfUndo);
-}
-
-public id prepareWithInvocationTarget(id target) {
-	int result = OS.objc_msgSend(this.id, OS.sel_prepareWithInvocationTarget_1, target != null ? target.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void redo() {
-	OS.objc_msgSend(this.id, OS.sel_redo);
-}
-
-public NSString redoActionName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_redoActionName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString redoMenuItemTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_redoMenuItemTitle);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString redoMenuTitleForUndoActionName(NSString actionName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_redoMenuTitleForUndoActionName_1, actionName != null ? actionName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void registerUndoWithTarget(id target, int selector, id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_registerUndoWithTarget_1selector_1object_1, target != null ? target.id : 0, selector, anObject != null ? anObject.id : 0);
-}
-
-public void removeAllActions() {
-	OS.objc_msgSend(this.id, OS.sel_removeAllActions);
-}
-
-public void removeAllActionsWithTarget(id target) {
-	OS.objc_msgSend(this.id, OS.sel_removeAllActionsWithTarget_1, target != null ? target.id : 0);
-}
-
-public NSArray runLoopModes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_runLoopModes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void setActionName(NSString actionName) {
-	OS.objc_msgSend(this.id, OS.sel_setActionName_1, actionName != null ? actionName.id : 0);
-}
-
-public void setGroupsByEvent(boolean groupsByEvent) {
-	OS.objc_msgSend(this.id, OS.sel_setGroupsByEvent_1, groupsByEvent);
-}
-
-public void setLevelsOfUndo(int levels) {
-	OS.objc_msgSend(this.id, OS.sel_setLevelsOfUndo_1, levels);
-}
-
-public void setRunLoopModes(NSArray runLoopModes) {
-	OS.objc_msgSend(this.id, OS.sel_setRunLoopModes_1, runLoopModes != null ? runLoopModes.id : 0);
-}
-
-public void undo() {
-	OS.objc_msgSend(this.id, OS.sel_undo);
-}
-
-public NSString undoActionName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_undoActionName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString undoMenuItemTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_undoMenuItemTitle);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString undoMenuTitleForUndoActionName(NSString actionName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_undoMenuTitleForUndoActionName_1, actionName != null ? actionName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void undoNestedGroup() {
-	OS.objc_msgSend(this.id, OS.sel_undoNestedGroup);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUniqueIDSpecifier.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUniqueIDSpecifier.java
deleted file mode 100644
index c833607689..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUniqueIDSpecifier.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSUniqueIDSpecifier extends NSScriptObjectSpecifier {
-
-public NSUniqueIDSpecifier() {
-	super();
-}
-
-public NSUniqueIDSpecifier(int id) {
-	super(id);
-}
-
-public id initWithContainerClassDescription(NSScriptClassDescription classDesc, NSScriptObjectSpecifier container, NSString property, id uniqueID) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContainerClassDescription_1containerSpecifier_1key_1uniqueID_1, classDesc != null ? classDesc.id : 0, container != null ? container.id : 0, property != null ? property.id : 0, uniqueID != null ? uniqueID.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setUniqueID(id uniqueID) {
-	OS.objc_msgSend(this.id, OS.sel_setUniqueID_1, uniqueID != null ? uniqueID.id : 0);
-}
-
-public id uniqueID() {
-	int result = OS.objc_msgSend(this.id, OS.sel_uniqueID);
-	return result != 0 ? new id(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaults.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaults.java
deleted file mode 100644
index 572573a8f7..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaults.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSUserDefaults extends NSObject {
-
-public NSUserDefaults() {
-	super();
-}
-
-public NSUserDefaults(int id) {
-	super(id);
-}
-
-public void addSuiteNamed(NSString suiteName) {
-	OS.objc_msgSend(this.id, OS.sel_addSuiteNamed_1, suiteName != null ? suiteName.id : 0);
-}
-
-public NSArray arrayForKey(NSString defaultName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_arrayForKey_1, defaultName != null ? defaultName.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public boolean boolForKey(NSString defaultName) {
-	return OS.objc_msgSend(this.id, OS.sel_boolForKey_1, defaultName != null ? defaultName.id : 0) != 0;
-}
-
-public NSData dataForKey(NSString defaultName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataForKey_1, defaultName != null ? defaultName.id : 0);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSDictionary dictionaryForKey(NSString defaultName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dictionaryForKey_1, defaultName != null ? defaultName.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSDictionary dictionaryRepresentation() {
-	int result = OS.objc_msgSend(this.id, OS.sel_dictionaryRepresentation);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public double doubleForKey(NSString defaultName) {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_doubleForKey_1, defaultName != null ? defaultName.id : 0);
-}
-
-public float floatForKey(NSString defaultName) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_floatForKey_1, defaultName != null ? defaultName.id : 0);
-}
-
-public id initWithUser(NSString username) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithUser_1, username != null ? username.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public int integerForKey(NSString defaultName) {
-	return OS.objc_msgSend(this.id, OS.sel_integerForKey_1, defaultName != null ? defaultName.id : 0);
-}
-
-public id objectForKey(NSString defaultName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectForKey_1, defaultName != null ? defaultName.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean objectIsForcedForKey_(NSString key) {
-	return OS.objc_msgSend(this.id, OS.sel_objectIsForcedForKey_1, key != null ? key.id : 0) != 0;
-}
-
-public boolean objectIsForcedForKey_inDomain_(NSString key, NSString domain) {
-	return OS.objc_msgSend(this.id, OS.sel_objectIsForcedForKey_1inDomain_1, key != null ? key.id : 0, domain != null ? domain.id : 0) != 0;
-}
-
-public NSDictionary persistentDomainForName(NSString domainName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_persistentDomainForName_1, domainName != null ? domainName.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSArray persistentDomainNames() {
-	int result = OS.objc_msgSend(this.id, OS.sel_persistentDomainNames);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void registerDefaults(NSDictionary registrationDictionary) {
-	OS.objc_msgSend(this.id, OS.sel_registerDefaults_1, registrationDictionary != null ? registrationDictionary.id : 0);
-}
-
-public void removeObjectForKey(NSString defaultName) {
-	OS.objc_msgSend(this.id, OS.sel_removeObjectForKey_1, defaultName != null ? defaultName.id : 0);
-}
-
-public void removePersistentDomainForName(NSString domainName) {
-	OS.objc_msgSend(this.id, OS.sel_removePersistentDomainForName_1, domainName != null ? domainName.id : 0);
-}
-
-public void removeSuiteNamed(NSString suiteName) {
-	OS.objc_msgSend(this.id, OS.sel_removeSuiteNamed_1, suiteName != null ? suiteName.id : 0);
-}
-
-public void removeVolatileDomainForName(NSString domainName) {
-	OS.objc_msgSend(this.id, OS.sel_removeVolatileDomainForName_1, domainName != null ? domainName.id : 0);
-}
-
-public static void resetStandardUserDefaults() {
-	OS.objc_msgSend(OS.class_NSUserDefaults, OS.sel_resetStandardUserDefaults);
-}
-
-public void setBool(boolean value, NSString defaultName) {
-	OS.objc_msgSend(this.id, OS.sel_setBool_1forKey_1, value, defaultName != null ? defaultName.id : 0);
-}
-
-public void setDouble(double value, NSString defaultName) {
-	OS.objc_msgSend(this.id, OS.sel_setDouble_1forKey_1, value, defaultName != null ? defaultName.id : 0);
-}
-
-public void setFloat(float value, NSString defaultName) {
-	OS.objc_msgSend(this.id, OS.sel_setFloat_1forKey_1, value, defaultName != null ? defaultName.id : 0);
-}
-
-public void setInteger(int value, NSString defaultName) {
-	OS.objc_msgSend(this.id, OS.sel_setInteger_1forKey_1, value, defaultName != null ? defaultName.id : 0);
-}
-
-public void setObject(id value, NSString defaultName) {
-	OS.objc_msgSend(this.id, OS.sel_setObject_1forKey_1, value != null ? value.id : 0, defaultName != null ? defaultName.id : 0);
-}
-
-public void setPersistentDomain(NSDictionary domain, NSString domainName) {
-	OS.objc_msgSend(this.id, OS.sel_setPersistentDomain_1forName_1, domain != null ? domain.id : 0, domainName != null ? domainName.id : 0);
-}
-
-public void setVolatileDomain(NSDictionary domain, NSString domainName) {
-	OS.objc_msgSend(this.id, OS.sel_setVolatileDomain_1forName_1, domain != null ? domain.id : 0, domainName != null ? domainName.id : 0);
-}
-
-public static NSUserDefaults standardUserDefaults() {
-	int result = OS.objc_msgSend(OS.class_NSUserDefaults, OS.sel_standardUserDefaults);
-	return result != 0 ? new NSUserDefaults(result) : null;
-}
-
-public NSArray stringArrayForKey(NSString defaultName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringArrayForKey_1, defaultName != null ? defaultName.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString stringForKey(NSString defaultName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringForKey_1, defaultName != null ? defaultName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean synchronize() {
-	return OS.objc_msgSend(this.id, OS.sel_synchronize) != 0;
-}
-
-public NSDictionary volatileDomainForName(NSString domainName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_volatileDomainForName_1, domainName != null ? domainName.id : 0);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public NSArray volatileDomainNames() {
-	int result = OS.objc_msgSend(this.id, OS.sel_volatileDomainNames);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaultsController.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaultsController.java
deleted file mode 100644
index 690907f41b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaultsController.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSUserDefaultsController extends NSController {
-
-public NSUserDefaultsController() {
-	super();
-}
-
-public NSUserDefaultsController(int id) {
-	super(id);
-}
-
-public boolean appliesImmediately() {
-	return OS.objc_msgSend(this.id, OS.sel_appliesImmediately) != 0;
-}
-
-public NSUserDefaults defaults() {
-	int result = OS.objc_msgSend(this.id, OS.sel_defaults);
-	return result != 0 ? new NSUserDefaults(result) : null;
-}
-
-public boolean hasUnappliedChanges() {
-	return OS.objc_msgSend(this.id, OS.sel_hasUnappliedChanges) != 0;
-}
-
-public id initWithDefaults(NSUserDefaults defaults, NSDictionary initialValues) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithDefaults_1initialValues_1, defaults != null ? defaults.id : 0, initialValues != null ? initialValues.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSDictionary initialValues() {
-	int result = OS.objc_msgSend(this.id, OS.sel_initialValues);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public void revert(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_revert_1, sender != null ? sender.id : 0);
-}
-
-public void revertToInitialValues(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_revertToInitialValues_1, sender != null ? sender.id : 0);
-}
-
-public void save(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_save_1, sender != null ? sender.id : 0);
-}
-
-public void setAppliesImmediately(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAppliesImmediately_1, flag);
-}
-
-public void setInitialValues(NSDictionary initialValues) {
-	OS.objc_msgSend(this.id, OS.sel_setInitialValues_1, initialValues != null ? initialValues.id : 0);
-}
-
-public static id sharedUserDefaultsController() {
-	int result = OS.objc_msgSend(OS.class_NSUserDefaultsController, OS.sel_sharedUserDefaultsController);
-	return result != 0 ? new id(result) : null;
-}
-
-public id values() {
-	int result = OS.objc_msgSend(this.id, OS.sel_values);
-	return result != 0 ? new id(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 5d87196bac..9ab6b0a302 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
@@ -16,30 +16,12 @@ public NSValue() {
 	super();
 }
 
-public NSValue(int id) {
+public NSValue(int /*long*/ id) {
 	super(id);
 }
 
-public void getValue(int value) {
-	OS.objc_msgSend(this.id, OS.sel_getValue_1, value);
-}
-
-public id initWithBytes(int value, int type) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithBytes_1objCType_1, value, type);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isEqualToValue(NSValue value) {
-	return OS.objc_msgSend(this.id, OS.sel_isEqualToValue_1, value != null ? value.id : 0) != 0;
-}
-
-public id nonretainedObjectValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_nonretainedObjectValue);
-	return result != 0 ? new id(result) : null;
-}
-
-public int objCType() {
-	return OS.objc_msgSend(this.id, OS.sel_objCType);
+public NSValue(id id) {
+	super(id);
 }
 
 public NSPoint pointValue() {
@@ -48,65 +30,29 @@ public NSPoint pointValue() {
 	return result;
 }
 
-public int pointerValue() {
-	return OS.objc_msgSend(this.id, OS.sel_pointerValue);
-}
-
-public NSRange rangeValue() {
-	NSRange result = new NSRange();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rangeValue);
-	return result;
-}
-
-public NSRect rectValue() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectValue);
-	return result;
-}
-
 public NSSize sizeValue() {
 	NSSize result = new NSSize();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_sizeValue);
 	return result;
 }
 
-public static NSValue value(int value, int type) {
-	int result = OS.objc_msgSend(OS.class_NSValue, OS.sel_value_1withObjCType_1, value, type);
-	return result != 0 ? new NSValue(result) : null;
-}
-
-public static NSValue valueWithBytes(int value, int type) {
-	int result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithBytes_1objCType_1, value, type);
-	return result != 0 ? new NSValue(result) : null;
-}
-
-public static NSValue valueWithNonretainedObject(id anObject) {
-	int result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithNonretainedObject_1, anObject != null ? anObject.id : 0);
-	return result != 0 ? new NSValue(result) : null;
-}
-
 public static NSValue valueWithPoint(NSPoint point) {
-	int result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithPoint_1, point);
-	return result != 0 ? new NSValue(result) : null;
-}
-
-public static NSValue valueWithPointer(int pointer) {
-	int result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithPointer_1, pointer);
+	int 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_1, range);
+	int 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_1, rect);
+	int 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_1, size);
+	int 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/NSValueTransformer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValueTransformer.java
deleted file mode 100644
index a6e1aae579..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValueTransformer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSValueTransformer extends NSObject {
-
-public NSValueTransformer() {
-	super();
-}
-
-public NSValueTransformer(int id) {
-	super(id);
-}
-
-public static boolean allowsReverseTransformation() {
-	return OS.objc_msgSend(OS.class_NSValueTransformer, OS.sel_allowsReverseTransformation) != 0;
-}
-
-public id reverseTransformedValue(id value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_reverseTransformedValue_1, value != null ? value.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static void setValueTransformer(NSValueTransformer transformer, NSString name) {
-	OS.objc_msgSend(OS.class_NSValueTransformer, OS.sel_setValueTransformer_1forName_1, transformer != null ? transformer.id : 0, name != null ? name.id : 0);
-}
-
-public id transformedValue(id value) {
-	int result = OS.objc_msgSend(this.id, OS.sel_transformedValue_1, value != null ? value.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static int transformedValueClass() {
-	return OS.objc_msgSend(OS.class_NSValueTransformer, OS.sel_transformedValueClass);
-}
-
-public static NSValueTransformer valueTransformerForName(NSString name) {
-	int result = OS.objc_msgSend(OS.class_NSValueTransformer, OS.sel_valueTransformerForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSValueTransformer(result) : null;
-}
-
-public static NSArray valueTransformerNames() {
-	int result = OS.objc_msgSend(OS.class_NSValueTransformer, OS.sel_valueTransformerNames);
-	return result != 0 ? new NSArray(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 906417bbcd..d58b247908 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
@@ -16,80 +16,20 @@ public NSView() {
 	super();
 }
 
-public NSView(int id) {
+public NSView(int /*long*/ id) {
 	super(id);
 }
 
-public boolean acceptsFirstMouse(NSEvent theEvent) {
-	return OS.objc_msgSend(this.id, OS.sel_acceptsFirstMouse_1, theEvent != null ? theEvent.id : 0) != 0;
-}
-
-public void addCursorRect(NSRect aRect, NSCursor anObj) {
-	OS.objc_msgSend(this.id, OS.sel_addCursorRect_1cursor_1, aRect, anObj != null ? anObj.id : 0);
-}
-
-public void addSubview_(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_addSubview_1, aView != null ? aView.id : 0);
-}
-
-public void addSubview_positioned_relativeTo_(NSView aView, int place, NSView otherView) {
-	OS.objc_msgSend(this.id, OS.sel_addSubview_1positioned_1relativeTo_1, aView != null ? aView.id : 0, place, otherView != null ? otherView.id : 0);
-}
-
-public int addToolTipRect(NSRect aRect, id anObject, int data) {
-	return OS.objc_msgSend(this.id, OS.sel_addToolTipRect_1owner_1userData_1, aRect, anObject != null ? anObject.id : 0, data);
-}
-
-public void addTrackingArea(NSTrackingArea trackingArea) {
-	OS.objc_msgSend(this.id, OS.sel_addTrackingArea_1, trackingArea != null ? trackingArea.id : 0);
-}
-
-public int addTrackingRect(NSRect aRect, id anObject, int data, boolean flag) {
-	return OS.objc_msgSend(this.id, OS.sel_addTrackingRect_1owner_1userData_1assumeInside_1, aRect, anObject != null ? anObject.id : 0, data, flag);
-}
-
-public void adjustPageHeightNew(int newBottom, float oldTop, float oldBottom, float bottomLimit) {
-	OS.objc_msgSend(this.id, OS.sel_adjustPageHeightNew_1top_1bottom_1limit_1, newBottom, oldTop, oldBottom, bottomLimit);
-}
-
-public void adjustPageWidthNew(int newRight, float oldLeft, float oldRight, float rightLimit) {
-	OS.objc_msgSend(this.id, OS.sel_adjustPageWidthNew_1left_1right_1limit_1, newRight, oldLeft, oldRight, rightLimit);
-}
-
-public NSRect adjustScroll(NSRect newVisible) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_adjustScroll_1, newVisible);
-	return result;
-}
-
-public void allocateGState() {
-	OS.objc_msgSend(this.id, OS.sel_allocateGState);
-}
-
-public float alphaValue() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_alphaValue);
-}
-
-public NSView ancestorSharedWithView(NSView aView) {
-	int result = OS.objc_msgSend(this.id, OS.sel_ancestorSharedWithView_1, aView != null ? aView.id : 0);
-	return result == this.id ? this : (result != 0 ? new NSView(result) : null);
-}
-
-public boolean autoresizesSubviews() {
-	return OS.objc_msgSend(this.id, OS.sel_autoresizesSubviews) != 0;
-}
-
-public int autoresizingMask() {
-	return OS.objc_msgSend(this.id, OS.sel_autoresizingMask);
+public NSView(id id) {
+	super(id);
 }
 
-public boolean autoscroll(NSEvent theEvent) {
-	return OS.objc_msgSend(this.id, OS.sel_autoscroll_1, theEvent != null ? theEvent.id : 0) != 0;
+public void addSubview(NSView aView) {
+	OS.objc_msgSend(this.id, OS.sel_addSubview_, aView != null ? aView.id : 0);
 }
 
-public NSArray backgroundFilters() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundFilters);
-	return result != 0 ? new NSArray(result) : null;
+public void addSubview(NSView aView, int place, NSView otherView) {
+	OS.objc_msgSend(this.id, OS.sel_addSubview_positioned_relativeTo_, aView != null ? aView.id : 0, place, otherView != null ? otherView.id : 0);
 }
 
 public void beginDocument() {
@@ -97,12 +37,7 @@ public void beginDocument() {
 }
 
 public void beginPageInRect(NSRect aRect, NSPoint location) {
-	OS.objc_msgSend(this.id, OS.sel_beginPageInRect_1atPlacement_1, aRect, location);
-}
-
-public NSBitmapImageRep bitmapImageRepForCachingDisplayInRect(NSRect rect) {
-	int result = OS.objc_msgSend(this.id, OS.sel_bitmapImageRepForCachingDisplayInRect_1, rect);
-	return result != 0 ? new NSBitmapImageRep(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_beginPageInRect_atPlacement_, aRect, location);
 }
 
 public NSRect bounds() {
@@ -111,196 +46,84 @@ public NSRect bounds() {
 	return result;
 }
 
-public float boundsRotation() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_boundsRotation);
-}
-
-public void cacheDisplayInRect(NSRect rect, NSBitmapImageRep bitmapImageRep) {
-	OS.objc_msgSend(this.id, OS.sel_cacheDisplayInRect_1toBitmapImageRep_1, rect, bitmapImageRep != null ? bitmapImageRep.id : 0);
-}
-
-public boolean canBecomeKeyView() {
-	return OS.objc_msgSend(this.id, OS.sel_canBecomeKeyView) != 0;
-}
-
-public boolean canDraw() {
-	return OS.objc_msgSend(this.id, OS.sel_canDraw) != 0;
-}
-
-public NSRect centerScanRect(NSRect aRect) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_centerScanRect_1, aRect);
-	return result;
-}
-
-public NSArray contentFilters() {
-	int result = OS.objc_msgSend(this.id, OS.sel_contentFilters);
-	return result != 0 ? new NSArray(result) : null;
-}
-
 public NSPoint convertPoint_fromView_(NSPoint aPoint, NSView aView) {
 	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertPoint_1fromView_1, aPoint, aView != null ? aView.id : 0);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertPoint_fromView_, aPoint, aView != null ? aView.id : 0);
 	return result;
 }
 
 public NSPoint convertPoint_toView_(NSPoint aPoint, NSView aView) {
 	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertPoint_1toView_1, aPoint, aView != null ? aView.id : 0);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertPoint_toView_, aPoint, aView != null ? aView.id : 0);
 	return result;
 }
 
 public NSPoint convertPointFromBase(NSPoint aPoint) {
 	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertPointFromBase_1, aPoint);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertPointFromBase_, aPoint);
 	return result;
 }
 
 public NSPoint convertPointToBase(NSPoint aPoint) {
 	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertPointToBase_1, aPoint);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertPointToBase_, aPoint);
 	return result;
 }
 
 public NSRect convertRect_fromView_(NSRect aRect, NSView aView) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertRect_1fromView_1, aRect, aView != null ? aView.id : 0);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertRect_fromView_, aRect, aView != null ? aView.id : 0);
 	return result;
 }
 
 public NSRect convertRect_toView_(NSRect aRect, NSView aView) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertRect_1toView_1, aRect, aView != null ? aView.id : 0);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertRect_toView_, aRect, aView != null ? aView.id : 0);
 	return result;
 }
 
 public NSRect convertRectFromBase(NSRect aRect) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertRectFromBase_1, aRect);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertRectFromBase_, aRect);
 	return result;
 }
 
 public NSRect convertRectToBase(NSRect aRect) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertRectToBase_1, aRect);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertRectToBase_, aRect);
 	return result;
 }
 
 public NSSize convertSize_fromView_(NSSize aSize, NSView aView) {
 	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertSize_1fromView_1, aSize, aView != null ? aView.id : 0);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertSize_fromView_, aSize, aView != null ? aView.id : 0);
 	return result;
 }
 
 public NSSize convertSize_toView_(NSSize aSize, NSView aView) {
 	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertSize_1toView_1, aSize, aView != null ? aView.id : 0);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertSize_toView_, aSize, aView != null ? aView.id : 0);
 	return result;
 }
 
 public NSSize convertSizeFromBase(NSSize aSize) {
 	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertSizeFromBase_1, aSize);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertSizeFromBase_, aSize);
 	return result;
 }
 
 public NSSize convertSizeToBase(NSSize aSize) {
 	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertSizeToBase_1, aSize);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertSizeToBase_, aSize);
 	return result;
 }
 
-public NSData dataWithEPSInsideRect(NSRect rect) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataWithEPSInsideRect_1, rect);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSData dataWithPDFInsideRect(NSRect rect) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataWithPDFInsideRect_1, rect);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public static int defaultFocusRingType() {
-	return OS.objc_msgSend(OS.class_NSView, OS.sel_defaultFocusRingType);
-}
-
-public static NSMenu defaultMenu() {
-	int result = OS.objc_msgSend(OS.class_NSView, OS.sel_defaultMenu);
-	return result != 0 ? new NSMenu(result) : null;
-}
-
-public void didAddSubview(NSView subview) {
-	OS.objc_msgSend(this.id, OS.sel_didAddSubview_1, subview != null ? subview.id : 0);
-}
-
-public void discardCursorRects() {
-	OS.objc_msgSend(this.id, OS.sel_discardCursorRects);
-}
-
-public void display() {
-	OS.objc_msgSend(this.id, OS.sel_display);
-}
-
 public void displayIfNeeded() {
 	OS.objc_msgSend(this.id, OS.sel_displayIfNeeded);
 }
 
-public void displayIfNeededIgnoringOpacity() {
-	OS.objc_msgSend(this.id, OS.sel_displayIfNeededIgnoringOpacity);
-}
-
-public void displayIfNeededInRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_displayIfNeededInRect_1, rect);
-}
-
-public void displayIfNeededInRectIgnoringOpacity(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_displayIfNeededInRectIgnoringOpacity_1, rect);
-}
-
-public void displayRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_displayRect_1, rect);
-}
-
-public void displayRectIgnoringOpacity_(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_displayRectIgnoringOpacity_1, rect);
-}
-
-public void displayRectIgnoringOpacity_inContext_(NSRect aRect, NSGraphicsContext context) {
-	OS.objc_msgSend(this.id, OS.sel_displayRectIgnoringOpacity_1inContext_1, aRect, context != null ? context.id : 0);
-}
-
-public boolean dragFile(NSString filename, NSRect rect, boolean aFlag, NSEvent event) {
-	return OS.objc_msgSend(this.id, OS.sel_dragFile_1fromRect_1slideBack_1event_1, filename != null ? filename.id : 0, rect, aFlag, event != null ? event.id : 0) != 0;
-}
-
-public void dragImage(NSImage anImage, NSPoint viewLocation, NSSize initialOffset, NSEvent event, NSPasteboard pboard, id sourceObj, boolean slideFlag) {
-	OS.objc_msgSend(this.id, OS.sel_dragImage_1at_1offset_1event_1pasteboard_1source_1slideBack_1, anImage != null ? anImage.id : 0, viewLocation, initialOffset, event != null ? event.id : 0, pboard != null ? pboard.id : 0, sourceObj != null ? sourceObj.id : 0, slideFlag);
-}
-
-public boolean dragPromisedFilesOfTypes(NSArray typeArray, NSRect rect, id sourceObject, boolean aFlag, NSEvent event) {
-	return OS.objc_msgSend(this.id, OS.sel_dragPromisedFilesOfTypes_1fromRect_1source_1slideBack_1event_1, typeArray != null ? typeArray.id : 0, rect, sourceObject != null ? sourceObject.id : 0, aFlag, event != null ? event.id : 0) != 0;
-}
-
-public void drawPageBorderWithSize(NSSize borderSize) {
-	OS.objc_msgSend(this.id, OS.sel_drawPageBorderWithSize_1, borderSize);
-}
-
 public void drawRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_drawRect_1, rect);
-}
-
-public void drawSheetBorderWithSize(NSSize borderSize) {
-	OS.objc_msgSend(this.id, OS.sel_drawSheetBorderWithSize_1, borderSize);
-}
-
-public NSMenuItem enclosingMenuItem() {
-	int result = OS.objc_msgSend(this.id, OS.sel_enclosingMenuItem);
-	return result != 0 ? new NSMenuItem(result) : null;
-}
-
-public NSScrollView enclosingScrollView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_enclosingScrollView);
-	return result != 0 ? new NSScrollView(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_drawRect_, rect);
 }
 
 public void endDocument() {
@@ -311,474 +134,81 @@ public void endPage() {
 	OS.objc_msgSend(this.id, OS.sel_endPage);
 }
 
-public boolean enterFullScreenMode(NSScreen screen, NSDictionary options) {
-	return OS.objc_msgSend(this.id, OS.sel_enterFullScreenMode_1withOptions_1, screen != null ? screen.id : 0, options != null ? options.id : 0) != 0;
-}
-
-public void exitFullScreenModeWithOptions(NSDictionary options) {
-	OS.objc_msgSend(this.id, OS.sel_exitFullScreenModeWithOptions_1, options != null ? options.id : 0);
-}
-
-public int focusRingType() {
-	return OS.objc_msgSend(this.id, OS.sel_focusRingType);
-}
-
-public static NSView focusView() {
-	int result = OS.objc_msgSend(OS.class_NSView, OS.sel_focusView);
-	return result != 0 ? new NSView(result) : null;
-}
-
 public NSRect frame() {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_frame);
 	return result;
 }
 
-public float frameCenterRotation() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_frameCenterRotation);
-}
-
-public float frameRotation() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_frameRotation);
-}
-
-public int gState() {
-	return OS.objc_msgSend(this.id, OS.sel_gState);
-}
-
-public void getRectsBeingDrawn(int rects, int count) {
-	OS.objc_msgSend(this.id, OS.sel_getRectsBeingDrawn_1count_1, rects, count);
-}
-
-public void getRectsExposedDuringLiveResize(int exposedRects, int count) {
-	OS.objc_msgSend(this.id, OS.sel_getRectsExposedDuringLiveResize_1count_1, exposedRects, count);
-}
-
-public float heightAdjustLimit() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_heightAdjustLimit);
-}
-
 public NSView hitTest(NSPoint aPoint) {
-	int result = OS.objc_msgSend(this.id, OS.sel_hitTest_1, aPoint);
+	int result = OS.objc_msgSend(this.id, OS.sel_hitTest_, aPoint);
 	return result == this.id ? this : (result != 0 ? new NSView(result) : null);
 }
 
-public boolean inLiveResize() {
-	return OS.objc_msgSend(this.id, OS.sel_inLiveResize) != 0;
-}
-
 public NSView initWithFrame(NSRect frameRect) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_1, frameRect);
+	int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_, frameRect);
 	return result == this.id ? this : (result != 0 ? new NSView(result) : null);
 }
 
-public boolean isDescendantOf(NSView aView) {
-	return OS.objc_msgSend(this.id, OS.sel_isDescendantOf_1, aView != null ? aView.id : 0) != 0;
-}
-
 public boolean isFlipped() {
 	return OS.objc_msgSend(this.id, OS.sel_isFlipped) != 0;
 }
 
-public boolean isHidden() {
-	return OS.objc_msgSend(this.id, OS.sel_isHidden) != 0;
-}
-
-public boolean isHiddenOrHasHiddenAncestor() {
-	return OS.objc_msgSend(this.id, OS.sel_isHiddenOrHasHiddenAncestor) != 0;
-}
-
-public boolean isInFullScreenMode() {
-	return OS.objc_msgSend(this.id, OS.sel_isInFullScreenMode) != 0;
-}
-
 public boolean isOpaque() {
 	return OS.objc_msgSend(this.id, OS.sel_isOpaque) != 0;
 }
 
-public boolean isRotatedFromBase() {
-	return OS.objc_msgSend(this.id, OS.sel_isRotatedFromBase) != 0;
-}
-
-public boolean isRotatedOrScaledFromBase() {
-	return OS.objc_msgSend(this.id, OS.sel_isRotatedOrScaledFromBase) != 0;
-}
-
-public boolean knowsPageRange(int range) {
-	return OS.objc_msgSend(this.id, OS.sel_knowsPageRange_1, range) != 0;
-}
-
-public NSPoint locationOfPrintRect(NSRect aRect) {
-	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_locationOfPrintRect_1, aRect);
-	return result;
-}
-
-public void lockFocus() {
-	OS.objc_msgSend(this.id, OS.sel_lockFocus);
-}
-
-public boolean lockFocusIfCanDraw() {
-	return OS.objc_msgSend(this.id, OS.sel_lockFocusIfCanDraw) != 0;
-}
-
-public boolean lockFocusIfCanDrawInContext(NSGraphicsContext context) {
-	return OS.objc_msgSend(this.id, OS.sel_lockFocusIfCanDrawInContext_1, context != null ? context.id : 0) != 0;
-}
-
 public NSMenu menuForEvent(NSEvent event) {
-	int result = OS.objc_msgSend(this.id, OS.sel_menuForEvent_1, event != null ? event.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_menuForEvent_, event != null ? event.id : 0);
 	return result != 0 ? new NSMenu(result) : null;
 }
 
-public boolean mouse(NSPoint aPoint, NSRect aRect) {
-	return OS.objc_msgSend(this.id, OS.sel_mouse_1inRect_1, aPoint, aRect) != 0;
-}
-
-public boolean mouseDownCanMoveWindow() {
-	return OS.objc_msgSend(this.id, OS.sel_mouseDownCanMoveWindow) != 0;
-}
-
-public boolean needsDisplay() {
-	return OS.objc_msgSend(this.id, OS.sel_needsDisplay) != 0;
-}
-
-public boolean needsPanelToBecomeKey() {
-	return OS.objc_msgSend(this.id, OS.sel_needsPanelToBecomeKey) != 0;
-}
-
-public boolean needsToDrawRect(NSRect aRect) {
-	return OS.objc_msgSend(this.id, OS.sel_needsToDrawRect_1, aRect) != 0;
-}
-
-public NSView nextKeyView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_nextKeyView);
-	return result == this.id ? this : (result != 0 ? new NSView(result) : null);
-}
-
-public NSView nextValidKeyView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_nextValidKeyView);
-	return result == this.id ? this : (result != 0 ? new NSView(result) : null);
-}
-
-public NSView opaqueAncestor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_opaqueAncestor);
-	return result == this.id ? this : (result != 0 ? new NSView(result) : null);
-}
-
-public NSAttributedString pageFooter() {
-	int result = OS.objc_msgSend(this.id, OS.sel_pageFooter);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public NSAttributedString pageHeader() {
-	int result = OS.objc_msgSend(this.id, OS.sel_pageHeader);
-	return result != 0 ? new NSAttributedString(result) : null;
-}
-
-public boolean performKeyEquivalent(NSEvent theEvent) {
-	return OS.objc_msgSend(this.id, OS.sel_performKeyEquivalent_1, theEvent != null ? theEvent.id : 0) != 0;
-}
-
-public boolean performMnemonic(NSString theString) {
-	return OS.objc_msgSend(this.id, OS.sel_performMnemonic_1, theString != null ? theString.id : 0) != 0;
-}
-
-public boolean postsBoundsChangedNotifications() {
-	return OS.objc_msgSend(this.id, OS.sel_postsBoundsChangedNotifications) != 0;
-}
-
-public boolean postsFrameChangedNotifications() {
-	return OS.objc_msgSend(this.id, OS.sel_postsFrameChangedNotifications) != 0;
-}
-
-public boolean preservesContentDuringLiveResize() {
-	return OS.objc_msgSend(this.id, OS.sel_preservesContentDuringLiveResize) != 0;
-}
-
-public NSView previousKeyView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_previousKeyView);
-	return result == this.id ? this : (result != 0 ? new NSView(result) : null);
-}
-
-public NSView previousValidKeyView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_previousValidKeyView);
-	return result == this.id ? this : (result != 0 ? new NSView(result) : null);
-}
-
-public void print(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_print_1, sender != null ? sender.id : 0);
-}
-
-public NSString printJobTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_printJobTitle);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSRect rectForPage(int page) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectForPage_1, page);
-	return result;
-}
-
-public NSRect rectPreservedDuringLiveResize() {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_rectPreservedDuringLiveResize);
-	return result;
-}
-
-public void reflectScrolledClipView(NSClipView aClipView) {
-	OS.objc_msgSend(this.id, OS.sel_reflectScrolledClipView_1, aClipView != null ? aClipView.id : 0);
-}
-
-public void registerForDraggedTypes(NSArray newTypes) {
-	OS.objc_msgSend(this.id, OS.sel_registerForDraggedTypes_1, newTypes != null ? newTypes.id : 0);
-}
-
-public NSArray registeredDraggedTypes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_registeredDraggedTypes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void releaseGState() {
-	OS.objc_msgSend(this.id, OS.sel_releaseGState);
-}
-
-public void removeAllToolTips() {
-	OS.objc_msgSend(this.id, OS.sel_removeAllToolTips);
-}
-
-public void removeCursorRect(NSRect aRect, NSCursor anObj) {
-	OS.objc_msgSend(this.id, OS.sel_removeCursorRect_1cursor_1, aRect, anObj != null ? anObj.id : 0);
-}
-
 public void removeFromSuperview() {
 	OS.objc_msgSend(this.id, OS.sel_removeFromSuperview);
 }
 
-public void removeFromSuperviewWithoutNeedingDisplay() {
-	OS.objc_msgSend(this.id, OS.sel_removeFromSuperviewWithoutNeedingDisplay);
-}
-
-public void removeToolTip(int tag) {
-	OS.objc_msgSend(this.id, OS.sel_removeToolTip_1, tag);
-}
-
-public void removeTrackingArea(NSTrackingArea trackingArea) {
-	OS.objc_msgSend(this.id, OS.sel_removeTrackingArea_1, trackingArea != null ? trackingArea.id : 0);
-}
-
-public void removeTrackingRect(int tag) {
-	OS.objc_msgSend(this.id, OS.sel_removeTrackingRect_1, tag);
-}
-
-public void renewGState() {
-	OS.objc_msgSend(this.id, OS.sel_renewGState);
-}
-
-public void replaceSubview(NSView oldView, NSView newView) {
-	OS.objc_msgSend(this.id, OS.sel_replaceSubview_1with_1, oldView != null ? oldView.id : 0, newView != null ? newView.id : 0);
-}
-
-public void resetCursorRects() {
-	OS.objc_msgSend(this.id, OS.sel_resetCursorRects);
-}
-
-public void resizeSubviewsWithOldSize(NSSize oldSize) {
-	OS.objc_msgSend(this.id, OS.sel_resizeSubviewsWithOldSize_1, oldSize);
-}
-
-public void resizeWithOldSuperviewSize(NSSize oldSize) {
-	OS.objc_msgSend(this.id, OS.sel_resizeWithOldSuperviewSize_1, oldSize);
-}
-
-public void rotateByAngle(float angle) {
-	OS.objc_msgSend(this.id, OS.sel_rotateByAngle_1, angle);
-}
-
-public void rulerView_didAddMarker_(NSRulerView ruler, NSRulerMarker marker) {
-	OS.objc_msgSend(this.id, OS.sel_rulerView_1didAddMarker_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0);
-}
-
-public void rulerView_didMoveMarker_(NSRulerView ruler, NSRulerMarker marker) {
-	OS.objc_msgSend(this.id, OS.sel_rulerView_1didMoveMarker_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0);
-}
-
-public void rulerView_didRemoveMarker_(NSRulerView ruler, NSRulerMarker marker) {
-	OS.objc_msgSend(this.id, OS.sel_rulerView_1didRemoveMarker_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0);
-}
-
-public void rulerView_handleMouseDown_(NSRulerView ruler, NSEvent event) {
-	OS.objc_msgSend(this.id, OS.sel_rulerView_1handleMouseDown_1, ruler != null ? ruler.id : 0, event != null ? event.id : 0);
-}
-
-public boolean rulerView_shouldAddMarker_(NSRulerView ruler, NSRulerMarker marker) {
-	return OS.objc_msgSend(this.id, OS.sel_rulerView_1shouldAddMarker_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0) != 0;
-}
-
-public boolean rulerView_shouldMoveMarker_(NSRulerView ruler, NSRulerMarker marker) {
-	return OS.objc_msgSend(this.id, OS.sel_rulerView_1shouldMoveMarker_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0) != 0;
-}
-
-public boolean rulerView_shouldRemoveMarker_(NSRulerView ruler, NSRulerMarker marker) {
-	return OS.objc_msgSend(this.id, OS.sel_rulerView_1shouldRemoveMarker_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0) != 0;
-}
-
-public float rulerView_willAddMarker_atLocation_(NSRulerView ruler, NSRulerMarker marker, float location) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rulerView_1willAddMarker_1atLocation_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0, location);
-}
-
-public float rulerView_willMoveMarker_toLocation_(NSRulerView ruler, NSRulerMarker marker, float location) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rulerView_1willMoveMarker_1toLocation_1, ruler != null ? ruler.id : 0, marker != null ? marker.id : 0, location);
-}
-
-public void rulerView_willSetClientView_(NSRulerView ruler, NSView newClient) {
-	OS.objc_msgSend(this.id, OS.sel_rulerView_1willSetClientView_1, ruler != null ? ruler.id : 0, newClient != null ? newClient.id : 0);
-}
-
-public void scaleUnitSquareToSize(NSSize newUnitSize) {
-	OS.objc_msgSend(this.id, OS.sel_scaleUnitSquareToSize_1, newUnitSize);
-}
-
-public void scrollClipView(NSClipView aClipView, NSPoint aPoint) {
-	OS.objc_msgSend(this.id, OS.sel_scrollClipView_1toPoint_1, aClipView != null ? aClipView.id : 0, aPoint);
-}
-
-public void scrollPoint(NSPoint aPoint) {
-	OS.objc_msgSend(this.id, OS.sel_scrollPoint_1, aPoint);
-}
-
-public void scrollRect(NSRect aRect, NSSize delta) {
-	OS.objc_msgSend(this.id, OS.sel_scrollRect_1by_1, aRect, delta);
-}
-
 public boolean scrollRectToVisible(NSRect aRect) {
-	return OS.objc_msgSend(this.id, OS.sel_scrollRectToVisible_1, aRect) != 0;
-}
-
-public void setAlphaValue(float viewAlpha) {
-	OS.objc_msgSend(this.id, OS.sel_setAlphaValue_1, viewAlpha);
+	return OS.objc_msgSend(this.id, OS.sel_scrollRectToVisible_, aRect) != 0;
 }
 
 public void setAutoresizesSubviews(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutoresizesSubviews_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setAutoresizesSubviews_, flag);
 }
 
 public void setAutoresizingMask(int mask) {
-	OS.objc_msgSend(this.id, OS.sel_setAutoresizingMask_1, mask);
-}
-
-public void setBackgroundFilters(NSArray filters) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundFilters_1, filters != null ? filters.id : 0);
-}
-
-public void setBounds(NSRect aRect) {
-	OS.objc_msgSend(this.id, OS.sel_setBounds_1, aRect);
-}
-
-public void setBoundsOrigin(NSPoint newOrigin) {
-	OS.objc_msgSend(this.id, OS.sel_setBoundsOrigin_1, newOrigin);
-}
-
-public void setBoundsRotation(float angle) {
-	OS.objc_msgSend(this.id, OS.sel_setBoundsRotation_1, angle);
-}
-
-public void setBoundsSize(NSSize newSize) {
-	OS.objc_msgSend(this.id, OS.sel_setBoundsSize_1, newSize);
-}
-
-public void setContentFilters(NSArray filters) {
-	OS.objc_msgSend(this.id, OS.sel_setContentFilters_1, filters != null ? filters.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setAutoresizingMask_, mask);
 }
 
 public void setFocusRingType(int focusRingType) {
-	OS.objc_msgSend(this.id, OS.sel_setFocusRingType_1, focusRingType);
+	OS.objc_msgSend(this.id, OS.sel_setFocusRingType_, focusRingType);
 }
 
 public void setFrame(NSRect frameRect) {
-	OS.objc_msgSend(this.id, OS.sel_setFrame_1, frameRect);
-}
-
-public void setFrameCenterRotation(float angle) {
-	OS.objc_msgSend(this.id, OS.sel_setFrameCenterRotation_1, angle);
+	OS.objc_msgSend(this.id, OS.sel_setFrame_, frameRect);
 }
 
 public void setFrameOrigin(NSPoint newOrigin) {
-	OS.objc_msgSend(this.id, OS.sel_setFrameOrigin_1, newOrigin);
-}
-
-public void setFrameRotation(float angle) {
-	OS.objc_msgSend(this.id, OS.sel_setFrameRotation_1, angle);
+	OS.objc_msgSend(this.id, OS.sel_setFrameOrigin_, newOrigin);
 }
 
 public void setFrameSize(NSSize newSize) {
-	OS.objc_msgSend(this.id, OS.sel_setFrameSize_1, newSize);
+	OS.objc_msgSend(this.id, OS.sel_setFrameSize_, newSize);
 }
 
 public void setHidden(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHidden_1, flag);
-}
-
-public void setKeyboardFocusRingNeedsDisplayInRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_setKeyboardFocusRingNeedsDisplayInRect_1, rect);
+	OS.objc_msgSend(this.id, OS.sel_setHidden_, flag);
 }
 
 public void setNeedsDisplay(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setNeedsDisplay_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setNeedsDisplay_, flag);
 }
 
 public void setNeedsDisplayInRect(NSRect invalidRect) {
-	OS.objc_msgSend(this.id, OS.sel_setNeedsDisplayInRect_1, invalidRect);
-}
-
-public void setNextKeyView(NSView next) {
-	OS.objc_msgSend(this.id, OS.sel_setNextKeyView_1, next != null ? next.id : 0);
-}
-
-public void setPostsBoundsChangedNotifications(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setPostsBoundsChangedNotifications_1, flag);
-}
-
-public void setPostsFrameChangedNotifications(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setPostsFrameChangedNotifications_1, flag);
-}
-
-public void setShadow(NSShadow shadow) {
-	OS.objc_msgSend(this.id, OS.sel_setShadow_1, shadow != null ? shadow.id : 0);
-}
-
-public void setSubviews(NSArray newSubviews) {
-	OS.objc_msgSend(this.id, OS.sel_setSubviews_1, newSubviews != null ? newSubviews.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setNeedsDisplayInRect_, invalidRect);
 }
 
 public void setToolTip(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setToolTip_1, string != null ? string.id : 0);
-}
-
-public void setUpGState() {
-	OS.objc_msgSend(this.id, OS.sel_setUpGState);
-}
-
-public void setWantsLayer(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setWantsLayer_1, flag);
-}
-
-public NSShadow shadow() {
-	int result = OS.objc_msgSend(this.id, OS.sel_shadow);
-	return result != 0 ? new NSShadow(result) : null;
-}
-
-public boolean shouldDelayWindowOrderingForEvent(NSEvent theEvent) {
-	return OS.objc_msgSend(this.id, OS.sel_shouldDelayWindowOrderingForEvent_1, theEvent != null ? theEvent.id : 0) != 0;
-}
-
-public boolean shouldDrawColor() {
-	return OS.objc_msgSend(this.id, OS.sel_shouldDrawColor) != 0;
-}
-
-public void sortSubviewsUsingFunction(int compare, int context) {
-	OS.objc_msgSend(this.id, OS.sel_sortSubviewsUsingFunction_1context_1, compare, context);
+	OS.objc_msgSend(this.id, OS.sel_setToolTip_, string != null ? string.id : 0);
 }
 
 public NSArray subviews() {
@@ -791,114 +221,15 @@ public NSView superview() {
 	return result == this.id ? this : (result != 0 ? new NSView(result) : null);
 }
 
-public int tag() {
-	return OS.objc_msgSend(this.id, OS.sel_tag);
-}
-
-public NSString toolTip() {
-	int result = OS.objc_msgSend(this.id, OS.sel_toolTip);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSArray trackingAreas() {
-	int result = OS.objc_msgSend(this.id, OS.sel_trackingAreas);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void translateOriginToPoint(NSPoint translation) {
-	OS.objc_msgSend(this.id, OS.sel_translateOriginToPoint_1, translation);
-}
-
-public void translateRectsNeedingDisplayInRect(NSRect clipRect, NSSize delta) {
-	OS.objc_msgSend(this.id, OS.sel_translateRectsNeedingDisplayInRect_1by_1, clipRect, delta);
-}
-
-public void unlockFocus() {
-	OS.objc_msgSend(this.id, OS.sel_unlockFocus);
-}
-
-public void unregisterDraggedTypes() {
-	OS.objc_msgSend(this.id, OS.sel_unregisterDraggedTypes);
-}
-
-public void updateTrackingAreas() {
-	OS.objc_msgSend(this.id, OS.sel_updateTrackingAreas);
-}
-
-public void viewDidEndLiveResize() {
-	OS.objc_msgSend(this.id, OS.sel_viewDidEndLiveResize);
-}
-
-public void viewDidHide() {
-	OS.objc_msgSend(this.id, OS.sel_viewDidHide);
-}
-
-public void viewDidMoveToSuperview() {
-	OS.objc_msgSend(this.id, OS.sel_viewDidMoveToSuperview);
-}
-
-public void viewDidMoveToWindow() {
-	OS.objc_msgSend(this.id, OS.sel_viewDidMoveToWindow);
-}
-
-public void viewDidUnhide() {
-	OS.objc_msgSend(this.id, OS.sel_viewDidUnhide);
-}
-
-public void viewWillDraw() {
-	OS.objc_msgSend(this.id, OS.sel_viewWillDraw);
-}
-
-public void viewWillMoveToSuperview(NSView newSuperview) {
-	OS.objc_msgSend(this.id, OS.sel_viewWillMoveToSuperview_1, newSuperview != null ? newSuperview.id : 0);
-}
-
-public void viewWillMoveToWindow(NSWindow newWindow) {
-	OS.objc_msgSend(this.id, OS.sel_viewWillMoveToWindow_1, newWindow != null ? newWindow.id : 0);
-}
-
-public void viewWillStartLiveResize() {
-	OS.objc_msgSend(this.id, OS.sel_viewWillStartLiveResize);
-}
-
-public id viewWithTag(int aTag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_viewWithTag_1, aTag);
-	return result != 0 ? new id(result) : null;
-}
-
 public NSRect visibleRect() {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_visibleRect);
 	return result;
 }
 
-public boolean wantsDefaultClipping() {
-	return OS.objc_msgSend(this.id, OS.sel_wantsDefaultClipping) != 0;
-}
-
-public boolean wantsLayer() {
-	return OS.objc_msgSend(this.id, OS.sel_wantsLayer) != 0;
-}
-
-public float widthAdjustLimit() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_widthAdjustLimit);
-}
-
-public void willRemoveSubview(NSView subview) {
-	OS.objc_msgSend(this.id, OS.sel_willRemoveSubview_1, subview != null ? subview.id : 0);
-}
-
 public NSWindow window() {
 	int result = OS.objc_msgSend(this.id, OS.sel_window);
 	return result != 0 ? new NSWindow(result) : null;
 }
 
-public void writeEPSInsideRect(NSRect rect, NSPasteboard pasteboard) {
-	OS.objc_msgSend(this.id, OS.sel_writeEPSInsideRect_1toPasteboard_1, rect, pasteboard != null ? pasteboard.id : 0);
-}
-
-public void writePDFInsideRect(NSRect rect, NSPasteboard pasteboard) {
-	OS.objc_msgSend(this.id, OS.sel_writePDFInsideRect_1toPasteboard_1, rect, pasteboard != null ? pasteboard.id : 0);
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSViewAnimation.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSViewAnimation.java
deleted file mode 100644
index 3c49333764..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSViewAnimation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSViewAnimation extends NSAnimation {
-
-public NSViewAnimation() {
-	super();
-}
-
-public NSViewAnimation(int id) {
-	super(id);
-}
-
-public id initWithViewAnimations(NSArray viewAnimations) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithViewAnimations_1, viewAnimations != null ? viewAnimations.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setViewAnimations(NSArray viewAnimations) {
-	OS.objc_msgSend(this.id, OS.sel_setViewAnimations_1, viewAnimations != null ? viewAnimations.id : 0);
-}
-
-public NSArray viewAnimations() {
-	int result = OS.objc_msgSend(this.id, OS.sel_viewAnimations);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSViewController.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSViewController.java
deleted file mode 100644
index 666102aab0..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSViewController.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSViewController extends NSResponder {
-
-public NSViewController() {
-	super();
-}
-
-public NSViewController(int id) {
-	super(id);
-}
-
-public boolean commitEditing() {
-	return OS.objc_msgSend(this.id, OS.sel_commitEditing) != 0;
-}
-
-public void commitEditingWithDelegate(id delegate, int didCommitSelector, int contextInfo) {
-	OS.objc_msgSend(this.id, OS.sel_commitEditingWithDelegate_1didCommitSelector_1contextInfo_1, delegate != null ? delegate.id : 0, didCommitSelector, contextInfo);
-}
-
-public void discardEditing() {
-	OS.objc_msgSend(this.id, OS.sel_discardEditing);
-}
-
-public id initWithNibName(NSString nibNameOrNil, NSBundle nibBundleOrNil) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithNibName_1bundle_1, nibNameOrNil != null ? nibNameOrNil.id : 0, nibBundleOrNil != null ? nibBundleOrNil.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void loadView() {
-	OS.objc_msgSend(this.id, OS.sel_loadView);
-}
-
-public NSBundle nibBundle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_nibBundle);
-	return result != 0 ? new NSBundle(result) : null;
-}
-
-public NSString nibName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_nibName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id representedObject() {
-	int result = OS.objc_msgSend(this.id, OS.sel_representedObject);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setRepresentedObject(id representedObject) {
-	OS.objc_msgSend(this.id, OS.sel_setRepresentedObject_1, representedObject != null ? representedObject.id : 0);
-}
-
-public void setTitle(NSString title) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, title != null ? title.id : 0);
-}
-
-public void setView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setView_1, view != null ? view.id : 0);
-}
-
-public NSString title() {
-	int result = OS.objc_msgSend(this.id, OS.sel_title);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSView view() {
-	int result = OS.objc_msgSend(this.id, OS.sel_view);
-	return result != 0 ? new NSView(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWhoseSpecifier.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWhoseSpecifier.java
deleted file mode 100644
index 70a573c659..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWhoseSpecifier.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSWhoseSpecifier extends NSScriptObjectSpecifier {
-
-public NSWhoseSpecifier() {
-	super();
-}
-
-public NSWhoseSpecifier(int id) {
-	super(id);
-}
-
-public int endSubelementIdentifier() {
-	return OS.objc_msgSend(this.id, OS.sel_endSubelementIdentifier);
-}
-
-public int endSubelementIndex() {
-	return OS.objc_msgSend(this.id, OS.sel_endSubelementIndex);
-}
-
-public id initWithContainerClassDescription(NSScriptClassDescription classDesc, NSScriptObjectSpecifier container, NSString property, NSScriptWhoseTest test) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContainerClassDescription_1containerSpecifier_1key_1test_1, classDesc != null ? classDesc.id : 0, container != null ? container.id : 0, property != null ? property.id : 0, test != null ? test.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setEndSubelementIdentifier(int subelement) {
-	OS.objc_msgSend(this.id, OS.sel_setEndSubelementIdentifier_1, subelement);
-}
-
-public void setEndSubelementIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_setEndSubelementIndex_1, index);
-}
-
-public void setStartSubelementIdentifier(int subelement) {
-	OS.objc_msgSend(this.id, OS.sel_setStartSubelementIdentifier_1, subelement);
-}
-
-public void setStartSubelementIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_setStartSubelementIndex_1, index);
-}
-
-public void setTest(NSScriptWhoseTest test) {
-	OS.objc_msgSend(this.id, OS.sel_setTest_1, test != null ? test.id : 0);
-}
-
-public int startSubelementIdentifier() {
-	return OS.objc_msgSend(this.id, OS.sel_startSubelementIdentifier);
-}
-
-public int startSubelementIndex() {
-	return OS.objc_msgSend(this.id, OS.sel_startSubelementIndex);
-}
-
-public NSScriptWhoseTest test() {
-	int result = OS.objc_msgSend(this.id, OS.sel_test);
-	return result != 0 ? new NSScriptWhoseTest(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 c4a1fcbae3..26c314fc9f 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
@@ -16,168 +16,31 @@ public NSWindow() {
 	super();
 }
 
-public NSWindow(int id) {
+public NSWindow(int /*long*/ id) {
 	super(id);
 }
 
-public boolean acceptsMouseMovedEvents() {
-	return OS.objc_msgSend(this.id, OS.sel_acceptsMouseMovedEvents) != 0;
-}
-
-public void addChildWindow(NSWindow childWin, int place) {
-	OS.objc_msgSend(this.id, OS.sel_addChildWindow_1ordered_1, childWin != null ? childWin.id : 0, place);
-}
-
-public boolean allowsToolTipsWhenApplicationIsInactive() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsToolTipsWhenApplicationIsInactive) != 0;
+public NSWindow(id id) {
+	super(id);
 }
 
 public float alphaValue() {
 	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_alphaValue);
 }
 
-public double animationResizeTime(NSRect newFrame) {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_animationResizeTime_1, newFrame);
-}
-
-public boolean areCursorRectsEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_areCursorRectsEnabled) != 0;
-}
-
-public NSSize aspectRatio() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_aspectRatio);
-	return result;
-}
-
-public NSWindow attachedSheet() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attachedSheet);
-	return result == this.id ? this : (result != 0 ? new NSWindow(result) : null);
-}
-
-public boolean autorecalculatesContentBorderThicknessForEdge(int edge) {
-	return OS.objc_msgSend(this.id, OS.sel_autorecalculatesContentBorderThicknessForEdge_1, edge) != 0;
-}
-
-public boolean autorecalculatesKeyViewLoop() {
-	return OS.objc_msgSend(this.id, OS.sel_autorecalculatesKeyViewLoop) != 0;
-}
-
-public NSColor backgroundColor() {
-	int result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
-	return result != 0 ? new NSColor(result) : null;
-}
-
-public int backingLocation() {
-	return OS.objc_msgSend(this.id, OS.sel_backingLocation);
-}
-
-public int backingType() {
-	return OS.objc_msgSend(this.id, OS.sel_backingType);
-}
-
-public void becomeKeyWindow() {
-	OS.objc_msgSend(this.id, OS.sel_becomeKeyWindow);
-}
-
-public void becomeMainWindow() {
-	OS.objc_msgSend(this.id, OS.sel_becomeMainWindow);
-}
-
-public void cacheImageInRect(NSRect aRect) {
-	OS.objc_msgSend(this.id, OS.sel_cacheImageInRect_1, aRect);
-}
-
-public boolean canBeVisibleOnAllSpaces() {
-	return OS.objc_msgSend(this.id, OS.sel_canBeVisibleOnAllSpaces) != 0;
-}
-
-public boolean canBecomeKeyWindow() {
-	return OS.objc_msgSend(this.id, OS.sel_canBecomeKeyWindow) != 0;
-}
-
-public boolean canBecomeMainWindow() {
-	return OS.objc_msgSend(this.id, OS.sel_canBecomeMainWindow) != 0;
-}
-
-public boolean canBecomeVisibleWithoutLogin() {
-	return OS.objc_msgSend(this.id, OS.sel_canBecomeVisibleWithoutLogin) != 0;
-}
-
-public boolean canHide() {
-	return OS.objc_msgSend(this.id, OS.sel_canHide) != 0;
-}
-
-public boolean canStoreColor() {
-	return OS.objc_msgSend(this.id, OS.sel_canStoreColor) != 0;
-}
-
 public NSPoint cascadeTopLeftFromPoint(NSPoint topLeftPoint) {
 	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_cascadeTopLeftFromPoint_1, topLeftPoint);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_cascadeTopLeftFromPoint_, topLeftPoint);
 	return result;
 }
 
-public void center() {
-	OS.objc_msgSend(this.id, OS.sel_center);
-}
-
-public NSArray childWindows() {
-	int result = OS.objc_msgSend(this.id, OS.sel_childWindows);
-	return result != 0 ? new NSArray(result) : null;
-}
-
 public void close() {
 	OS.objc_msgSend(this.id, OS.sel_close);
 }
 
-public int collectionBehavior() {
-	return OS.objc_msgSend(this.id, OS.sel_collectionBehavior);
-}
-
-public NSRect constrainFrameRect(NSRect frameRect, NSScreen screen) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_constrainFrameRect_1toScreen_1, frameRect, screen != null ? screen.id : 0);
-	return result;
-}
-
-public NSSize contentAspectRatio() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_contentAspectRatio);
-	return result;
-}
-
-public float contentBorderThicknessForEdge(int edge) {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_contentBorderThicknessForEdge_1, edge);
-}
-
-public NSSize contentMaxSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_contentMaxSize);
-	return result;
-}
-
-public NSSize contentMinSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_contentMinSize);
-	return result;
-}
-
-public NSRect contentRectForFrameRect_(NSRect frameRect) {
+public NSRect contentRectForFrameRect(NSRect frameRect) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_contentRectForFrameRect_1, frameRect);
-	return result;
-}
-
-public static NSRect static_contentRectForFrameRect_styleMask_(NSRect fRect, int aStyle) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, OS.class_NSWindow, OS.sel_contentRectForFrameRect_1styleMask_1, fRect, aStyle);
-	return result;
-}
-
-public NSSize contentResizeIncrements() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_contentResizeIncrements);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_contentRectForFrameRect_, frameRect);
 	return result;
 }
 
@@ -188,135 +51,18 @@ public NSView contentView() {
 
 public NSPoint convertBaseToScreen(NSPoint aPoint) {
 	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertBaseToScreen_1, aPoint);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertBaseToScreen_, aPoint);
 	return result;
 }
 
 public NSPoint convertScreenToBase(NSPoint aPoint) {
 	NSPoint result = new NSPoint();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_convertScreenToBase_1, aPoint);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_convertScreenToBase_, aPoint);
 	return result;
 }
 
-public NSEvent currentEvent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_currentEvent);
-	return result != 0 ? new NSEvent(result) : null;
-}
-
-public NSData dataWithEPSInsideRect(NSRect rect) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataWithEPSInsideRect_1, rect);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSData dataWithPDFInsideRect(NSRect rect) {
-	int result = OS.objc_msgSend(this.id, OS.sel_dataWithPDFInsideRect_1, rect);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSScreen deepestScreen() {
-	int result = OS.objc_msgSend(this.id, OS.sel_deepestScreen);
-	return result != 0 ? new NSScreen(result) : null;
-}
-
-public NSButtonCell defaultButtonCell() {
-	int result = OS.objc_msgSend(this.id, OS.sel_defaultButtonCell);
-	return result != 0 ? new NSButtonCell(result) : null;
-}
-
-public static int defaultDepthLimit() {
-	return OS.objc_msgSend(OS.class_NSWindow, OS.sel_defaultDepthLimit);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void deminiaturize(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_deminiaturize_1, sender != null ? sender.id : 0);
-}
-
-public int depthLimit() {
-	return OS.objc_msgSend(this.id, OS.sel_depthLimit);
-}
-
-public NSDictionary deviceDescription() {
-	int result = OS.objc_msgSend(this.id, OS.sel_deviceDescription);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public void disableCursorRects() {
-	OS.objc_msgSend(this.id, OS.sel_disableCursorRects);
-}
-
-public void disableFlushWindow() {
-	OS.objc_msgSend(this.id, OS.sel_disableFlushWindow);
-}
-
-public void disableKeyEquivalentForDefaultButtonCell() {
-	OS.objc_msgSend(this.id, OS.sel_disableKeyEquivalentForDefaultButtonCell);
-}
-
-public void disableScreenUpdatesUntilFlush() {
-	OS.objc_msgSend(this.id, OS.sel_disableScreenUpdatesUntilFlush);
-}
-
-public void discardCachedImage() {
-	OS.objc_msgSend(this.id, OS.sel_discardCachedImage);
-}
-
-public void discardCursorRects() {
-	OS.objc_msgSend(this.id, OS.sel_discardCursorRects);
-}
-
-public void discardEventsMatchingMask(int mask, NSEvent lastEvent) {
-	OS.objc_msgSend(this.id, OS.sel_discardEventsMatchingMask_1beforeEvent_1, mask, lastEvent != null ? lastEvent.id : 0);
-}
-
-public void display() {
-	OS.objc_msgSend(this.id, OS.sel_display);
-}
-
-public void displayIfNeeded() {
-	OS.objc_msgSend(this.id, OS.sel_displayIfNeeded);
-}
-
-public boolean displaysWhenScreenProfileChanges() {
-	return OS.objc_msgSend(this.id, OS.sel_displaysWhenScreenProfileChanges) != 0;
-}
-
-public NSDockTile dockTile() {
-	int result = OS.objc_msgSend(this.id, OS.sel_dockTile);
-	return result != 0 ? new NSDockTile(result) : null;
-}
-
-public void dragImage(NSImage anImage, NSPoint baseLocation, NSSize initialOffset, NSEvent event, NSPasteboard pboard, id sourceObj, boolean slideFlag) {
-	OS.objc_msgSend(this.id, OS.sel_dragImage_1at_1offset_1event_1pasteboard_1source_1slideBack_1, anImage != null ? anImage.id : 0, baseLocation, initialOffset, event != null ? event.id : 0, pboard != null ? pboard.id : 0, sourceObj != null ? sourceObj.id : 0, slideFlag);
-}
-
-public NSArray drawers() {
-	int result = OS.objc_msgSend(this.id, OS.sel_drawers);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void enableCursorRects() {
-	OS.objc_msgSend(this.id, OS.sel_enableCursorRects);
-}
-
-public void enableFlushWindow() {
-	OS.objc_msgSend(this.id, OS.sel_enableFlushWindow);
-}
-
-public void enableKeyEquivalentForDefaultButtonCell() {
-	OS.objc_msgSend(this.id, OS.sel_enableKeyEquivalentForDefaultButtonCell);
-}
-
-public void endEditingFor(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_endEditingFor_1, anObject != null ? anObject.id : 0);
-}
-
 public NSText fieldEditor(boolean createFlag, id anObject) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fieldEditor_1forObject_1, createFlag, anObject != null ? anObject.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_fieldEditor_forObject_, createFlag, anObject != null ? anObject.id : 0);
 	return result != 0 ? new NSText(result) : null;
 }
 
@@ -325,249 +71,43 @@ public NSResponder firstResponder() {
 	return result != 0 ? new NSResponder(result) : null;
 }
 
-public void flushWindow() {
-	OS.objc_msgSend(this.id, OS.sel_flushWindow);
-}
-
-public void flushWindowIfNeeded() {
-	OS.objc_msgSend(this.id, OS.sel_flushWindowIfNeeded);
-}
-
 public NSRect frame() {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_frame);
 	return result;
 }
 
-public NSString frameAutosaveName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_frameAutosaveName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSRect frameRectForContentRect_(NSRect contentRect) {
-	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_frameRectForContentRect_1, contentRect);
-	return result;
-}
-
-public static NSRect static_frameRectForContentRect_styleMask_(NSRect cRect, int aStyle) {
+public NSRect frameRectForContentRect(NSRect contentRect) {
 	NSRect result = new NSRect();
-	OS.objc_msgSend_stret(result, OS.class_NSWindow, OS.sel_frameRectForContentRect_1styleMask_1, cRect, aStyle);
+	OS.objc_msgSend_stret(result, this.id, OS.sel_frameRectForContentRect_, contentRect);
 	return result;
 }
 
-public int gState() {
-	return OS.objc_msgSend(this.id, OS.sel_gState);
-}
-
 public NSGraphicsContext graphicsContext() {
 	int result = OS.objc_msgSend(this.id, OS.sel_graphicsContext);
 	return result != 0 ? new NSGraphicsContext(result) : null;
 }
 
-public id handleCloseScriptCommand(NSCloseCommand command) {
-	int result = OS.objc_msgSend(this.id, OS.sel_handleCloseScriptCommand_1, command != null ? command.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id handlePrintScriptCommand(NSScriptCommand command) {
-	int result = OS.objc_msgSend(this.id, OS.sel_handlePrintScriptCommand_1, command != null ? command.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id handleSaveScriptCommand(NSScriptCommand command) {
-	int result = OS.objc_msgSend(this.id, OS.sel_handleSaveScriptCommand_1, command != null ? command.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean hasCloseBox() {
-	return OS.objc_msgSend(this.id, OS.sel_hasCloseBox) != 0;
-}
-
-public boolean hasDynamicDepthLimit() {
-	return OS.objc_msgSend(this.id, OS.sel_hasDynamicDepthLimit) != 0;
-}
-
-public boolean hasShadow() {
-	return OS.objc_msgSend(this.id, OS.sel_hasShadow) != 0;
-}
-
-public boolean hasTitleBar() {
-	return OS.objc_msgSend(this.id, OS.sel_hasTitleBar) != 0;
-}
-
-public boolean hidesOnDeactivate() {
-	return OS.objc_msgSend(this.id, OS.sel_hidesOnDeactivate) != 0;
-}
-
-public boolean ignoresMouseEvents() {
-	return OS.objc_msgSend(this.id, OS.sel_ignoresMouseEvents) != 0;
-}
-
-public NSWindow initWithContentRect_styleMask_backing_defer_(NSRect contentRect, int aStyle, int bufferingType, boolean flag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_1styleMask_1backing_1defer_1, contentRect, aStyle, bufferingType, flag);
-	return result != 0 ? this : null;
-}
-
-public NSWindow initWithContentRect_styleMask_backing_defer_screen_(NSRect contentRect, int aStyle, int bufferingType, boolean flag, NSScreen screen) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_1styleMask_1backing_1defer_1screen_1, contentRect, aStyle, bufferingType, flag, screen != null ? screen.id : 0);
-	return result != 0 ? this : null;
-}
-
-public NSWindow initWithWindowRef(int windowRef) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithWindowRef_1, windowRef);
+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);
 	return result == this.id ? this : (result != 0 ? new NSWindow(result) : null);
 }
 
-public NSView initialFirstResponder() {
-	int result = OS.objc_msgSend(this.id, OS.sel_initialFirstResponder);
-	return result != 0 ? new NSView(result) : null;
-}
-
-public void invalidateCursorRectsForView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_invalidateCursorRectsForView_1, aView != null ? aView.id : 0);
-}
-
-public void invalidateShadow() {
-	OS.objc_msgSend(this.id, OS.sel_invalidateShadow);
-}
-
-public boolean isAutodisplay() {
-	return OS.objc_msgSend(this.id, OS.sel_isAutodisplay) != 0;
-}
-
-public boolean isDocumentEdited() {
-	return OS.objc_msgSend(this.id, OS.sel_isDocumentEdited) != 0;
-}
-
-public boolean isExcludedFromWindowsMenu() {
-	return OS.objc_msgSend(this.id, OS.sel_isExcludedFromWindowsMenu) != 0;
-}
-
-public boolean isFloatingPanel() {
-	return OS.objc_msgSend(this.id, OS.sel_isFloatingPanel) != 0;
-}
-
-public boolean isFlushWindowDisabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isFlushWindowDisabled) != 0;
-}
-
-public boolean isKeyWindow() {
-	return OS.objc_msgSend(this.id, OS.sel_isKeyWindow) != 0;
-}
-
-public boolean isMainWindow() {
-	return OS.objc_msgSend(this.id, OS.sel_isMainWindow) != 0;
-}
-
-public boolean isMiniaturizable() {
-	return OS.objc_msgSend(this.id, OS.sel_isMiniaturizable) != 0;
-}
-
-public boolean isMiniaturized() {
-	return OS.objc_msgSend(this.id, OS.sel_isMiniaturized) != 0;
-}
-
-public boolean isModalPanel() {
-	return OS.objc_msgSend(this.id, OS.sel_isModalPanel) != 0;
-}
-
-public boolean isMovableByWindowBackground() {
-	return OS.objc_msgSend(this.id, OS.sel_isMovableByWindowBackground) != 0;
-}
-
-public boolean isOneShot() {
-	return OS.objc_msgSend(this.id, OS.sel_isOneShot) != 0;
-}
-
-public boolean isOpaque() {
-	return OS.objc_msgSend(this.id, OS.sel_isOpaque) != 0;
-}
-
-public boolean isReleasedWhenClosed() {
-	return OS.objc_msgSend(this.id, OS.sel_isReleasedWhenClosed) != 0;
-}
-
-public boolean isResizable() {
-	return OS.objc_msgSend(this.id, OS.sel_isResizable) != 0;
-}
-
-public boolean isSheet() {
-	return OS.objc_msgSend(this.id, OS.sel_isSheet) != 0;
+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);
+	return result == this.id ? this : (result != 0 ? new NSWindow(result) : null);
 }
 
 public boolean isVisible() {
 	return OS.objc_msgSend(this.id, OS.sel_isVisible) != 0;
 }
 
-public boolean isZoomable() {
-	return OS.objc_msgSend(this.id, OS.sel_isZoomable) != 0;
-}
-
-public boolean isZoomed() {
-	return OS.objc_msgSend(this.id, OS.sel_isZoomed) != 0;
-}
-
-public void keyDown(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_keyDown_1, theEvent != null ? theEvent.id : 0);
-}
-
-public int keyViewSelectionDirection() {
-	return OS.objc_msgSend(this.id, OS.sel_keyViewSelectionDirection);
-}
-
-public int level() {
-	return OS.objc_msgSend(this.id, OS.sel_level);
-}
-
 public boolean makeFirstResponder(NSResponder aResponder) {
-	return OS.objc_msgSend(this.id, OS.sel_makeFirstResponder_1, aResponder != null ? aResponder.id : 0) != 0;
+	return OS.objc_msgSend(this.id, OS.sel_makeFirstResponder_, aResponder != null ? aResponder.id : 0) != 0;
 }
 
 public void makeKeyAndOrderFront(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_makeKeyAndOrderFront_1, sender != null ? sender.id : 0);
-}
-
-public void makeKeyWindow() {
-	OS.objc_msgSend(this.id, OS.sel_makeKeyWindow);
-}
-
-public void makeMainWindow() {
-	OS.objc_msgSend(this.id, OS.sel_makeMainWindow);
-}
-
-public NSSize maxSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_maxSize);
-	return result;
-}
-
-public static void menuChanged(NSMenu menu) {
-	OS.objc_msgSend(OS.class_NSWindow, OS.sel_menuChanged_1, menu != null ? menu.id : 0);
-}
-
-public static float minFrameWidthWithTitle(NSString aTitle, int aStyle) {
-	return (float)OS.objc_msgSend_fpret(OS.class_NSWindow, OS.sel_minFrameWidthWithTitle_1styleMask_1, aTitle != null ? aTitle.id : 0, aStyle);
-}
-
-public NSSize minSize() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_minSize);
-	return result;
-}
-
-public void miniaturize(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_miniaturize_1, sender != null ? sender.id : 0);
-}
-
-public NSImage miniwindowImage() {
-	int result = OS.objc_msgSend(this.id, OS.sel_miniwindowImage);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSString miniwindowTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_miniwindowTitle);
-	return result != 0 ? new NSString(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_makeKeyAndOrderFront_, sender != null ? sender.id : 0);
 }
 
 public NSPoint mouseLocationOutsideOfEventStream() {
@@ -576,22 +116,8 @@ public NSPoint mouseLocationOutsideOfEventStream() {
 	return result;
 }
 
-public NSEvent nextEventMatchingMask_(int mask) {
-	int result = OS.objc_msgSend(this.id, OS.sel_nextEventMatchingMask_1, mask);
-	return result != 0 ? new NSEvent(result) : null;
-}
-
-public NSEvent nextEventMatchingMask_untilDate_inMode_dequeue_(int mask, NSDate expiration, NSString mode, boolean deqFlag) {
-	int result = OS.objc_msgSend(this.id, OS.sel_nextEventMatchingMask_1untilDate_1inMode_1dequeue_1, mask, expiration != null ? expiration.id : 0, mode != null ? mode.id : 0, deqFlag);
-	return result != 0 ? new NSEvent(result) : null;
-}
-
-public void orderBack(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_orderBack_1, sender != null ? sender.id : 0);
-}
-
 public void orderFront(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_orderFront_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_orderFront_, sender != null ? sender.id : 0);
 }
 
 public void orderFrontRegardless() {
@@ -599,108 +125,7 @@ public void orderFrontRegardless() {
 }
 
 public void orderOut(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_orderOut_1, sender != null ? sender.id : 0);
-}
-
-public void orderWindow(int place, int otherWin) {
-	OS.objc_msgSend(this.id, OS.sel_orderWindow_1relativeTo_1, place, otherWin);
-}
-
-public int orderedIndex() {
-	return OS.objc_msgSend(this.id, OS.sel_orderedIndex);
-}
-
-public NSWindow parentWindow() {
-	int result = OS.objc_msgSend(this.id, OS.sel_parentWindow);
-	return result == this.id ? this : (result != 0 ? new NSWindow(result) : null);
-}
-
-public void performClose(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_performClose_1, sender != null ? sender.id : 0);
-}
-
-public void performMiniaturize(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_performMiniaturize_1, sender != null ? sender.id : 0);
-}
-
-public void performZoom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_performZoom_1, sender != null ? sender.id : 0);
-}
-
-public void postEvent(NSEvent event, boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_postEvent_1atStart_1, event != null ? event.id : 0, flag);
-}
-
-public int preferredBackingLocation() {
-	return OS.objc_msgSend(this.id, OS.sel_preferredBackingLocation);
-}
-
-public boolean preservesContentDuringLiveResize() {
-	return OS.objc_msgSend(this.id, OS.sel_preservesContentDuringLiveResize) != 0;
-}
-
-public void print(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_print_1, sender != null ? sender.id : 0);
-}
-
-public void recalculateKeyViewLoop() {
-	OS.objc_msgSend(this.id, OS.sel_recalculateKeyViewLoop);
-}
-
-public void registerForDraggedTypes(NSArray newTypes) {
-	OS.objc_msgSend(this.id, OS.sel_registerForDraggedTypes_1, newTypes != null ? newTypes.id : 0);
-}
-
-public void removeChildWindow(NSWindow childWin) {
-	OS.objc_msgSend(this.id, OS.sel_removeChildWindow_1, childWin != null ? childWin.id : 0);
-}
-
-public static void removeFrameUsingName(NSString name) {
-	OS.objc_msgSend(OS.class_NSWindow, OS.sel_removeFrameUsingName_1, name != null ? name.id : 0);
-}
-
-public NSString representedFilename() {
-	int result = OS.objc_msgSend(this.id, OS.sel_representedFilename);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSURL representedURL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_representedURL);
-	return result != 0 ? new NSURL(result) : null;
-}
-
-public void resetCursorRects() {
-	OS.objc_msgSend(this.id, OS.sel_resetCursorRects);
-}
-
-public void resignKeyWindow() {
-	OS.objc_msgSend(this.id, OS.sel_resignKeyWindow);
-}
-
-public void resignMainWindow() {
-	OS.objc_msgSend(this.id, OS.sel_resignMainWindow);
-}
-
-public int resizeFlags() {
-	return OS.objc_msgSend(this.id, OS.sel_resizeFlags);
-}
-
-public NSSize resizeIncrements() {
-	NSSize result = new NSSize();
-	OS.objc_msgSend_stret(result, this.id, OS.sel_resizeIncrements);
-	return result;
-}
-
-public void restoreCachedImage() {
-	OS.objc_msgSend(this.id, OS.sel_restoreCachedImage);
-}
-
-public void runToolbarCustomizationPalette(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_runToolbarCustomizationPalette_1, sender != null ? sender.id : 0);
-}
-
-public void saveFrameUsingName(NSString name) {
-	OS.objc_msgSend(this.id, OS.sel_saveFrameUsingName_1, name != null ? name.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_orderOut_, sender != null ? sender.id : 0);
 }
 
 public NSScreen screen() {
@@ -708,383 +133,52 @@ public NSScreen screen() {
 	return result != 0 ? new NSScreen(result) : null;
 }
 
-public void selectKeyViewFollowingView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_selectKeyViewFollowingView_1, aView != null ? aView.id : 0);
-}
-
-public void selectKeyViewPrecedingView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_selectKeyViewPrecedingView_1, aView != null ? aView.id : 0);
-}
-
-public void selectNextKeyView(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectNextKeyView_1, sender != null ? sender.id : 0);
-}
-
-public void selectPreviousKeyView(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectPreviousKeyView_1, sender != null ? sender.id : 0);
-}
-
-public void sendEvent(NSEvent theEvent) {
-	OS.objc_msgSend(this.id, OS.sel_sendEvent_1, theEvent != null ? theEvent.id : 0);
-}
-
 public void setAcceptsMouseMovedEvents(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAcceptsMouseMovedEvents_1, flag);
-}
-
-public void setAllowsToolTipsWhenApplicationIsInactive(boolean allowWhenInactive) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsToolTipsWhenApplicationIsInactive_1, allowWhenInactive);
+	OS.objc_msgSend(this.id, OS.sel_setAcceptsMouseMovedEvents_, flag);
 }
 
 public void setAlphaValue(float windowAlpha) {
-	OS.objc_msgSend(this.id, OS.sel_setAlphaValue_1, windowAlpha);
-}
-
-public void setAspectRatio(NSSize ratio) {
-	OS.objc_msgSend(this.id, OS.sel_setAspectRatio_1, ratio);
-}
-
-public void setAutodisplay(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutodisplay_1, flag);
-}
-
-public void setAutorecalculatesContentBorderThickness(boolean flag, int edge) {
-	OS.objc_msgSend(this.id, OS.sel_setAutorecalculatesContentBorderThickness_1forEdge_1, flag, edge);
-}
-
-public void setAutorecalculatesKeyViewLoop(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutorecalculatesKeyViewLoop_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setAlphaValue_, windowAlpha);
 }
 
 public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color != null ? color.id : 0);
-}
-
-public void setBackingType(int bufferingType) {
-	OS.objc_msgSend(this.id, OS.sel_setBackingType_1, bufferingType);
-}
-
-public void setCanBeVisibleOnAllSpaces(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCanBeVisibleOnAllSpaces_1, flag);
-}
-
-public void setCanBecomeVisibleWithoutLogin(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCanBecomeVisibleWithoutLogin_1, flag);
-}
-
-public void setCanHide(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCanHide_1, flag);
-}
-
-public void setCollectionBehavior(int behavior) {
-	OS.objc_msgSend(this.id, OS.sel_setCollectionBehavior_1, behavior);
-}
-
-public void setContentAspectRatio(NSSize ratio) {
-	OS.objc_msgSend(this.id, OS.sel_setContentAspectRatio_1, ratio);
-}
-
-public void setContentBorderThickness(float thickness, int edge) {
-	OS.objc_msgSend(this.id, OS.sel_setContentBorderThickness_1forEdge_1, thickness, edge);
-}
-
-public void setContentMaxSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setContentMaxSize_1, size);
-}
-
-public void setContentMinSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setContentMinSize_1, size);
-}
-
-public void setContentResizeIncrements(NSSize increments) {
-	OS.objc_msgSend(this.id, OS.sel_setContentResizeIncrements_1, increments);
-}
-
-public void setContentSize(NSSize aSize) {
-	OS.objc_msgSend(this.id, OS.sel_setContentSize_1, aSize);
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
 }
 
 public void setContentView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_setContentView_1, aView != null ? aView.id : 0);
-}
-
-public void setDefaultButtonCell(NSButtonCell defButt) {
-	OS.objc_msgSend(this.id, OS.sel_setDefaultButtonCell_1, defButt != null ? defButt.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setContentView_, aView != null ? aView.id : 0);
 }
 
 public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject != null ? anObject.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0);
 }
 
-public void setDepthLimit(int limit) {
-	OS.objc_msgSend(this.id, OS.sel_setDepthLimit_1, limit);
-}
-
-public void setDisplaysWhenScreenProfileChanges(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDisplaysWhenScreenProfileChanges_1, flag);
-}
-
-public void setDocumentEdited(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDocumentEdited_1, flag);
-}
-
-public void setDynamicDepthLimit(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDynamicDepthLimit_1, flag);
-}
-
-public void setExcludedFromWindowsMenu(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setExcludedFromWindowsMenu_1, flag);
-}
-
-public void setFrame_display_(NSRect frameRect, boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setFrame_1display_1, frameRect, flag);
-}
-
-public void setFrame_display_animate_(NSRect frameRect, boolean displayFlag, boolean animateFlag) {
-	OS.objc_msgSend(this.id, OS.sel_setFrame_1display_1animate_1, frameRect, displayFlag, animateFlag);
-}
-
-public boolean setFrameAutosaveName(NSString name) {
-	return OS.objc_msgSend(this.id, OS.sel_setFrameAutosaveName_1, name != null ? name.id : 0) != 0;
-}
-
-public void setFrameFromString(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setFrameFromString_1, string != null ? string.id : 0);
-}
-
-public void setFrameOrigin(NSPoint aPoint) {
-	OS.objc_msgSend(this.id, OS.sel_setFrameOrigin_1, aPoint);
-}
-
-public void setFrameTopLeftPoint(NSPoint aPoint) {
-	OS.objc_msgSend(this.id, OS.sel_setFrameTopLeftPoint_1, aPoint);
-}
-
-public boolean setFrameUsingName_(NSString name) {
-	return OS.objc_msgSend(this.id, OS.sel_setFrameUsingName_1, name != null ? name.id : 0) != 0;
-}
-
-public boolean setFrameUsingName_force_(NSString name, boolean force) {
-	return OS.objc_msgSend(this.id, OS.sel_setFrameUsingName_1force_1, name != null ? name.id : 0, force) != 0;
+public void setFrame(NSRect frameRect, boolean flag) {
+	OS.objc_msgSend(this.id, OS.sel_setFrame_display_, frameRect, flag);
 }
 
 public void setHasShadow(boolean hasShadow) {
-	OS.objc_msgSend(this.id, OS.sel_setHasShadow_1, hasShadow);
-}
-
-public void setHidesOnDeactivate(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHidesOnDeactivate_1, flag);
-}
-
-public void setIgnoresMouseEvents(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setIgnoresMouseEvents_1, flag);
-}
-
-public void setInitialFirstResponder(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setInitialFirstResponder_1, view != null ? view.id : 0);
-}
-
-public void setIsMiniaturized(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setIsMiniaturized_1, flag);
-}
-
-public void setIsVisible(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setIsVisible_1, flag);
-}
-
-public void setIsZoomed(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setIsZoomed_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setHasShadow_, hasShadow);
 }
 
 public void setLevel(int newLevel) {
-	OS.objc_msgSend(this.id, OS.sel_setLevel_1, newLevel);
-}
-
-public void setMaxSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxSize_1, size);
-}
-
-public void setMinSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setMinSize_1, size);
-}
-
-public void setMiniwindowImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setMiniwindowImage_1, image != null ? image.id : 0);
-}
-
-public void setMiniwindowTitle(NSString title) {
-	OS.objc_msgSend(this.id, OS.sel_setMiniwindowTitle_1, title != null ? title.id : 0);
-}
-
-public void setMovableByWindowBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setMovableByWindowBackground_1, flag);
-}
-
-public void setOneShot(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setOneShot_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setLevel_, newLevel);
 }
 
 public void setOpaque(boolean isOpaque) {
-	OS.objc_msgSend(this.id, OS.sel_setOpaque_1, isOpaque);
-}
-
-public void setOrderedIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_setOrderedIndex_1, index);
-}
-
-public void setParentWindow(NSWindow window) {
-	OS.objc_msgSend(this.id, OS.sel_setParentWindow_1, window != null ? window.id : 0);
-}
-
-public void setPreferredBackingLocation(int backingLocation) {
-	OS.objc_msgSend(this.id, OS.sel_setPreferredBackingLocation_1, backingLocation);
-}
-
-public void setPreservesContentDuringLiveResize(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setPreservesContentDuringLiveResize_1, flag);
-}
-
-public void setReleasedWhenClosed(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setReleasedWhenClosed_1, flag);
-}
-
-public void setRepresentedFilename(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setRepresentedFilename_1, aString != null ? aString.id : 0);
-}
-
-public void setRepresentedURL(NSURL url) {
-	OS.objc_msgSend(this.id, OS.sel_setRepresentedURL_1, url != null ? url.id : 0);
-}
-
-public void setResizeIncrements(NSSize increments) {
-	OS.objc_msgSend(this.id, OS.sel_setResizeIncrements_1, increments);
-}
-
-public void setSharingType(int type) {
-	OS.objc_msgSend(this.id, OS.sel_setSharingType_1, type);
-}
-
-public void setShowsResizeIndicator(boolean show) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsResizeIndicator_1, show);
-}
-
-public void setShowsToolbarButton(boolean show) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsToolbarButton_1, show);
+	OS.objc_msgSend(this.id, OS.sel_setOpaque_, isOpaque);
 }
 
 public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_1, aString != null ? aString.id : 0);
-}
-
-public void setTitleWithRepresentedFilename(NSString filename) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleWithRepresentedFilename_1, filename != null ? filename.id : 0);
-}
-
-public void setToolbar(NSToolbar toolbar) {
-	OS.objc_msgSend(this.id, OS.sel_setToolbar_1, toolbar != null ? toolbar.id : 0);
-}
-
-public void setViewsNeedDisplay(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setViewsNeedDisplay_1, flag);
-}
-
-public void setWindowController(NSWindowController windowController) {
-	OS.objc_msgSend(this.id, OS.sel_setWindowController_1, windowController != null ? windowController.id : 0);
-}
-
-public int sharingType() {
-	return OS.objc_msgSend(this.id, OS.sel_sharingType);
-}
-
-public boolean showsResizeIndicator() {
-	return OS.objc_msgSend(this.id, OS.sel_showsResizeIndicator) != 0;
-}
-
-public boolean showsToolbarButton() {
-	return OS.objc_msgSend(this.id, OS.sel_showsToolbarButton) != 0;
-}
-
-public NSButton standardWindowButton_(int b) {
-	int result = OS.objc_msgSend(this.id, OS.sel_standardWindowButton_1, b);
-	return result != 0 ? new NSButton(result) : null;
-}
-
-public static NSButton static_standardWindowButton_forStyleMask_(int b, int styleMask) {
-	int result = OS.objc_msgSend(OS.class_NSWindow, OS.sel_standardWindowButton_1forStyleMask_1, b, styleMask);
-	return result != 0 ? new NSButton(result) : null;
-}
-
-public NSString stringWithSavedFrame() {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringWithSavedFrame);
-	return result != 0 ? new NSString(result) : null;
+	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 NSString title() {
-	int result = OS.objc_msgSend(this.id, OS.sel_title);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void toggleToolbarShown(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_toggleToolbarShown_1, sender != null ? sender.id : 0);
-}
-
-public NSToolbar toolbar() {
-	int result = OS.objc_msgSend(this.id, OS.sel_toolbar);
-	return result != 0 ? new NSToolbar(result) : null;
-}
-
-public boolean tryToPerform(int anAction, id anObject) {
-	return OS.objc_msgSend(this.id, OS.sel_tryToPerform_1with_1, anAction, anObject != null ? anObject.id : 0) != 0;
-}
-
-public void unregisterDraggedTypes() {
-	OS.objc_msgSend(this.id, OS.sel_unregisterDraggedTypes);
-}
-
-public void update() {
-	OS.objc_msgSend(this.id, OS.sel_update);
-}
-
-public void useOptimizedDrawing(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_useOptimizedDrawing_1, flag);
-}
-
-public float userSpaceScaleFactor() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_userSpaceScaleFactor);
-}
-
-public id validRequestorForSendType(NSString sendType, NSString returnType) {
-	int result = OS.objc_msgSend(this.id, OS.sel_validRequestorForSendType_1returnType_1, sendType != null ? sendType.id : 0, returnType != null ? returnType.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean viewsNeedDisplay() {
-	return OS.objc_msgSend(this.id, OS.sel_viewsNeedDisplay) != 0;
-}
-
-public id windowController() {
-	int result = OS.objc_msgSend(this.id, OS.sel_windowController);
-	return result != 0 ? new id(result) : null;
-}
-
 public int windowNumber() {
 	return OS.objc_msgSend(this.id, OS.sel_windowNumber);
 }
 
-public int windowRef() {
-	return OS.objc_msgSend(this.id, OS.sel_windowRef);
-}
-
-public boolean worksWhenModal() {
-	return OS.objc_msgSend(this.id, OS.sel_worksWhenModal) != 0;
-}
-
-public void zoom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_zoom_1, sender != null ? sender.id : 0);
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindowController.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindowController.java
deleted file mode 100644
index 2409a77410..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindowController.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSWindowController extends NSResponder {
-
-public NSWindowController() {
-	super();
-}
-
-public NSWindowController(int id) {
-	super(id);
-}
-
-public void close() {
-	OS.objc_msgSend(this.id, OS.sel_close);
-}
-
-public id document() {
-	int result = OS.objc_msgSend(this.id, OS.sel_document);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithWindow(NSWindow window) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithWindow_1, window != null ? window.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithWindowNibName_(NSString windowNibName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithWindowNibName_1, windowNibName != null ? windowNibName.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithWindowNibName_owner_(NSString windowNibName, id owner) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithWindowNibName_1owner_1, windowNibName != null ? windowNibName.id : 0, owner != null ? owner.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithWindowNibPath(NSString windowNibPath, id owner) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithWindowNibPath_1owner_1, windowNibPath != null ? windowNibPath.id : 0, owner != null ? owner.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isWindowLoaded() {
-	return OS.objc_msgSend(this.id, OS.sel_isWindowLoaded) != 0;
-}
-
-public void loadWindow() {
-	OS.objc_msgSend(this.id, OS.sel_loadWindow);
-}
-
-public id owner() {
-	int result = OS.objc_msgSend(this.id, OS.sel_owner);
-	return result != 0 ? new id(result) : null;
-}
-
-public void setDocument(NSDocument document) {
-	OS.objc_msgSend(this.id, OS.sel_setDocument_1, document != null ? document.id : 0);
-}
-
-public void setDocumentEdited(boolean dirtyFlag) {
-	OS.objc_msgSend(this.id, OS.sel_setDocumentEdited_1, dirtyFlag);
-}
-
-public void setShouldCascadeWindows(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShouldCascadeWindows_1, flag);
-}
-
-public void setShouldCloseDocument(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShouldCloseDocument_1, flag);
-}
-
-public void setWindow(NSWindow window) {
-	OS.objc_msgSend(this.id, OS.sel_setWindow_1, window != null ? window.id : 0);
-}
-
-public void setWindowFrameAutosaveName(NSString name) {
-	OS.objc_msgSend(this.id, OS.sel_setWindowFrameAutosaveName_1, name != null ? name.id : 0);
-}
-
-public boolean shouldCascadeWindows() {
-	return OS.objc_msgSend(this.id, OS.sel_shouldCascadeWindows) != 0;
-}
-
-public boolean shouldCloseDocument() {
-	return OS.objc_msgSend(this.id, OS.sel_shouldCloseDocument) != 0;
-}
-
-public void showWindow(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_showWindow_1, sender != null ? sender.id : 0);
-}
-
-public void synchronizeWindowTitleWithDocumentName() {
-	OS.objc_msgSend(this.id, OS.sel_synchronizeWindowTitleWithDocumentName);
-}
-
-public NSWindow window() {
-	int result = OS.objc_msgSend(this.id, OS.sel_window);
-	return result != 0 ? new NSWindow(result) : null;
-}
-
-public void windowDidLoad() {
-	OS.objc_msgSend(this.id, OS.sel_windowDidLoad);
-}
-
-public NSString windowFrameAutosaveName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_windowFrameAutosaveName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString windowNibName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_windowNibName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString windowNibPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_windowNibPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString windowTitleForDocumentDisplayName(NSString displayName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_windowTitleForDocumentDisplayName_1, displayName != null ? displayName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void windowWillLoad() {
-	OS.objc_msgSend(this.id, OS.sel_windowWillLoad);
-}
-
-}
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 c1de872872..c6dead1b02 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
@@ -16,173 +16,47 @@ public NSWorkspace() {
 	super();
 }
 
-public NSWorkspace(int id) {
+public NSWorkspace(int /*long*/ id) {
 	super(id);
 }
 
-public NSString absolutePathForAppBundleWithIdentifier(NSString bundleIdentifier) {
-	int result = OS.objc_msgSend(this.id, OS.sel_absolutePathForAppBundleWithIdentifier_1, bundleIdentifier != null ? bundleIdentifier.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSDictionary activeApplication() {
-	int result = OS.objc_msgSend(this.id, OS.sel_activeApplication);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public void checkForRemovableMedia() {
-	OS.objc_msgSend(this.id, OS.sel_checkForRemovableMedia);
-}
-
-public int extendPowerOffBy(int requested) {
-	return OS.objc_msgSend(this.id, OS.sel_extendPowerOffBy_1, requested);
-}
-
-public boolean fileSystemChanged() {
-	return OS.objc_msgSend(this.id, OS.sel_fileSystemChanged) != 0;
-}
-
-public boolean filenameExtension(NSString filenameExtension, NSString typeName) {
-	return OS.objc_msgSend(this.id, OS.sel_filenameExtension_1isValidForType_1, filenameExtension != null ? filenameExtension.id : 0, typeName != null ? typeName.id : 0) != 0;
-}
-
-public void findApplications() {
-	OS.objc_msgSend(this.id, OS.sel_findApplications);
+public NSWorkspace(id id) {
+	super(id);
 }
 
 public NSString fullPathForApplication(NSString appName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_fullPathForApplication_1, appName != null ? appName.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_fullPathForApplication_, appName != null ? appName.id : 0);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public boolean getFileSystemInfoForPath(NSString fullPath, int removableFlag, int writableFlag, int unmountableFlag, int description, int fileSystemType) {
-	return OS.objc_msgSend(this.id, OS.sel_getFileSystemInfoForPath_1isRemovable_1isWritable_1isUnmountable_1description_1type_1, fullPath != null ? fullPath.id : 0, removableFlag, writableFlag, unmountableFlag, description, fileSystemType) != 0;
-}
-
 public boolean getInfoForFile(NSString fullPath, int appName, int type) {
-	return OS.objc_msgSend(this.id, OS.sel_getInfoForFile_1application_1type_1, fullPath != null ? fullPath.id : 0, appName, type) != 0;
-}
-
-public void hideOtherApplications() {
-	OS.objc_msgSend(this.id, OS.sel_hideOtherApplications);
+	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_1, fullPath != null ? fullPath.id : 0);
+	int 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_1, fileType != null ? fileType.id : 0);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSImage iconForFiles(NSArray fullPaths) {
-	int result = OS.objc_msgSend(this.id, OS.sel_iconForFiles_1, fullPaths != null ? fullPaths.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_iconForFileType_, fileType != null ? fileType.id : 0);
 	return result != 0 ? new NSImage(result) : null;
 }
 
 public boolean isFilePackageAtPath(NSString fullPath) {
-	return OS.objc_msgSend(this.id, OS.sel_isFilePackageAtPath_1, fullPath != null ? fullPath.id : 0) != 0;
-}
-
-public boolean launchAppWithBundleIdentifier(NSString bundleIdentifier, int options, NSAppleEventDescriptor descriptor, int identifier) {
-	return OS.objc_msgSend(this.id, OS.sel_launchAppWithBundleIdentifier_1options_1additionalEventParamDescriptor_1launchIdentifier_1, bundleIdentifier != null ? bundleIdentifier.id : 0, options, descriptor != null ? descriptor.id : 0, identifier) != 0;
-}
-
-public boolean launchApplication_(NSString appName) {
-	return OS.objc_msgSend(this.id, OS.sel_launchApplication_1, appName != null ? appName.id : 0) != 0;
-}
-
-public boolean launchApplication_showIcon_autolaunch_(NSString appName, boolean showIcon, boolean autolaunch) {
-	return OS.objc_msgSend(this.id, OS.sel_launchApplication_1showIcon_1autolaunch_1, appName != null ? appName.id : 0, showIcon, autolaunch) != 0;
-}
-
-public NSArray launchedApplications() {
-	int result = OS.objc_msgSend(this.id, OS.sel_launchedApplications);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSString localizedDescriptionForType(NSString typeName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_localizedDescriptionForType_1, typeName != null ? typeName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSArray mountNewRemovableMedia() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mountNewRemovableMedia);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray mountedLocalVolumePaths() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mountedLocalVolumePaths);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray mountedRemovableMedia() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mountedRemovableMedia);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void noteFileSystemChanged() {
-	OS.objc_msgSend(this.id, OS.sel_noteFileSystemChanged);
-}
-
-public void noteFileSystemChanged_(NSString path) {
-	OS.objc_msgSend(this.id, OS.sel_noteFileSystemChanged_1, path != null ? path.id : 0);
+	return OS.objc_msgSend(this.id, OS.sel_isFilePackageAtPath_, fullPath != null ? fullPath.id : 0) != 0;
 }
 
-public void noteUserDefaultsChanged() {
-	OS.objc_msgSend(this.id, OS.sel_noteUserDefaultsChanged);
-}
-
-public NSNotificationCenter notificationCenter() {
-	int result = OS.objc_msgSend(this.id, OS.sel_notificationCenter);
-	return result != 0 ? new NSNotificationCenter(result) : null;
-}
-
-public boolean openFile_(NSString fullPath) {
-	return OS.objc_msgSend(this.id, OS.sel_openFile_1, fullPath != null ? fullPath.id : 0) != 0;
-}
-
-public boolean openFile_fromImage_at_inView_(NSString fullPath, NSImage anImage, NSPoint point, NSView aView) {
-	return OS.objc_msgSend(this.id, OS.sel_openFile_1fromImage_1at_1inView_1, fullPath != null ? fullPath.id : 0, anImage != null ? anImage.id : 0, point, aView != null ? aView.id : 0) != 0;
-}
-
-public boolean openFile_withApplication_(NSString fullPath, NSString appName) {
-	return OS.objc_msgSend(this.id, OS.sel_openFile_1withApplication_1, fullPath != null ? fullPath.id : 0, appName != null ? appName.id : 0) != 0;
-}
-
-public boolean openFile_withApplication_andDeactivate_(NSString fullPath, NSString appName, boolean flag) {
-	return OS.objc_msgSend(this.id, OS.sel_openFile_1withApplication_1andDeactivate_1, fullPath != null ? fullPath.id : 0, appName != null ? appName.id : 0, flag) != 0;
-}
-
-public boolean openTempFile(NSString fullPath) {
-	return OS.objc_msgSend(this.id, OS.sel_openTempFile_1, fullPath != null ? fullPath.id : 0) != 0;
+public boolean openFile(NSString fullPath, NSString appName) {
+	return OS.objc_msgSend(this.id, OS.sel_openFile_withApplication_, fullPath != null ? fullPath.id : 0, appName != null ? appName.id : 0) != 0;
 }
 
 public boolean openURL(NSURL url) {
-	return OS.objc_msgSend(this.id, OS.sel_openURL_1, url != null ? url.id : 0) != 0;
+	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) {
-	return OS.objc_msgSend(this.id, OS.sel_openURLs_1withAppBundleIdentifier_1options_1additionalEventParamDescriptor_1launchIdentifiers_1, urls != null ? urls.id : 0, bundleIdentifier != null ? bundleIdentifier.id : 0, options, descriptor != null ? descriptor.id : 0, identifiers) != 0;
-}
-
-public boolean performFileOperation(NSString operation, NSString source, NSString destination, NSArray files, int tag) {
-	return OS.objc_msgSend(this.id, OS.sel_performFileOperation_1source_1destination_1files_1tag_1, operation != null ? operation.id : 0, source != null ? source.id : 0, destination != null ? destination.id : 0, files != null ? files.id : 0, tag) != 0;
-}
-
-public NSString preferredFilenameExtensionForType(NSString typeName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_preferredFilenameExtensionForType_1, typeName != null ? typeName.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean selectFile(NSString fullPath, NSString rootFullpath) {
-	return OS.objc_msgSend(this.id, OS.sel_selectFile_1inFileViewerRootedAtPath_1, fullPath != null ? fullPath.id : 0, rootFullpath != null ? rootFullpath.id : 0) != 0;
-}
-
-public boolean setIcon(NSImage image, NSString fullPath, int options) {
-	return OS.objc_msgSend(this.id, OS.sel_setIcon_1forFile_1options_1, image != null ? image.id : 0, fullPath != null ? fullPath.id : 0, options) != 0;
+	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() {
@@ -190,25 +64,4 @@ public static NSWorkspace sharedWorkspace() {
 	return result != 0 ? new NSWorkspace(result) : null;
 }
 
-public void slideImage(NSImage image, NSPoint fromPoint, NSPoint toPoint) {
-	OS.objc_msgSend(this.id, OS.sel_slideImage_1from_1to_1, image != null ? image.id : 0, fromPoint, toPoint);
-}
-
-public boolean type(NSString firstTypeName, NSString secondTypeName) {
-	return OS.objc_msgSend(this.id, OS.sel_type_1conformsToType_1, firstTypeName != null ? firstTypeName.id : 0, secondTypeName != null ? secondTypeName.id : 0) != 0;
-}
-
-public NSString typeOfFile(NSString absoluteFilePath, int outError) {
-	int result = OS.objc_msgSend(this.id, OS.sel_typeOfFile_1error_1, absoluteFilePath != null ? absoluteFilePath.id : 0, outError);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean unmountAndEjectDeviceAtPath(NSString path) {
-	return OS.objc_msgSend(this.id, OS.sel_unmountAndEjectDeviceAtPath_1, path != null ? path.id : 0) != 0;
-}
-
-public boolean userDefaultsChanged() {
-	return OS.objc_msgSend(this.id, OS.sel_userDefaultsChanged) != 0;
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLDTD.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLDTD.java
deleted file mode 100644
index c6154fc432..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLDTD.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSXMLDTD extends NSXMLNode {
-
-public NSXMLDTD() {
-	super();
-}
-
-public NSXMLDTD(int id) {
-	super(id);
-}
-
-public void addChild(NSXMLNode child) {
-	OS.objc_msgSend(this.id, OS.sel_addChild_1, child != null ? child.id : 0);
-}
-
-public NSXMLDTDNode attributeDeclarationForName(NSString name, NSString elementName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributeDeclarationForName_1elementName_1, name != null ? name.id : 0, elementName != null ? elementName.id : 0);
-	return result != 0 ? new NSXMLDTDNode(result) : null;
-}
-
-public NSXMLDTDNode elementDeclarationForName(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_elementDeclarationForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSXMLDTDNode(result) : null;
-}
-
-public NSXMLDTDNode entityDeclarationForName(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_entityDeclarationForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSXMLDTDNode(result) : null;
-}
-
-public id initWithContentsOfURL(NSURL url, int mask, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1options_1error_1, url != null ? url.id : 0, mask, error);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithData(NSData data, int mask, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_1options_1error_1, data != null ? data.id : 0, mask, error);
-	return result != 0 ? new id(result) : null;
-}
-
-public void insertChild(NSXMLNode child, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertChild_1atIndex_1, child != null ? child.id : 0, index);
-}
-
-public void insertChildren(NSArray children, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertChildren_1atIndex_1, children != null ? children.id : 0, index);
-}
-
-public NSXMLDTDNode notationDeclarationForName(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_notationDeclarationForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSXMLDTDNode(result) : null;
-}
-
-public static NSXMLDTDNode predefinedEntityDeclarationForName(NSString name) {
-	int result = OS.objc_msgSend(OS.class_NSXMLDTD, OS.sel_predefinedEntityDeclarationForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSXMLDTDNode(result) : null;
-}
-
-public NSString publicID() {
-	int result = OS.objc_msgSend(this.id, OS.sel_publicID);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void removeChildAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeChildAtIndex_1, index);
-}
-
-public void replaceChildAtIndex(int index, NSXMLNode node) {
-	OS.objc_msgSend(this.id, OS.sel_replaceChildAtIndex_1withNode_1, index, node != null ? node.id : 0);
-}
-
-public void setChildren(NSArray children) {
-	OS.objc_msgSend(this.id, OS.sel_setChildren_1, children != null ? children.id : 0);
-}
-
-public void setPublicID(NSString publicID) {
-	OS.objc_msgSend(this.id, OS.sel_setPublicID_1, publicID != null ? publicID.id : 0);
-}
-
-public void setSystemID(NSString systemID) {
-	OS.objc_msgSend(this.id, OS.sel_setSystemID_1, systemID != null ? systemID.id : 0);
-}
-
-public NSString systemID() {
-	int result = OS.objc_msgSend(this.id, OS.sel_systemID);
-	return result != 0 ? new NSString(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLDTDNode.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLDTDNode.java
deleted file mode 100644
index 253518283c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLDTDNode.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSXMLDTDNode extends NSXMLNode {
-
-public NSXMLDTDNode() {
-	super();
-}
-
-public NSXMLDTDNode(int id) {
-	super(id);
-}
-
-public int DTDKind() {
-	return OS.objc_msgSend(this.id, OS.sel_DTDKind);
-}
-
-public id initWithXMLString(NSString string) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithXMLString_1, string != null ? string.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isExternal() {
-	return OS.objc_msgSend(this.id, OS.sel_isExternal) != 0;
-}
-
-public NSString notationName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_notationName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString publicID() {
-	int result = OS.objc_msgSend(this.id, OS.sel_publicID);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setDTDKind(int kind) {
-	OS.objc_msgSend(this.id, OS.sel_setDTDKind_1, kind);
-}
-
-public void setNotationName(NSString notationName) {
-	OS.objc_msgSend(this.id, OS.sel_setNotationName_1, notationName != null ? notationName.id : 0);
-}
-
-public void setPublicID(NSString publicID) {
-	OS.objc_msgSend(this.id, OS.sel_setPublicID_1, publicID != null ? publicID.id : 0);
-}
-
-public void setSystemID(NSString systemID) {
-	OS.objc_msgSend(this.id, OS.sel_setSystemID_1, systemID != null ? systemID.id : 0);
-}
-
-public NSString systemID() {
-	int result = OS.objc_msgSend(this.id, OS.sel_systemID);
-	return result != 0 ? new NSString(result) : null;
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLDocument.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLDocument.java
deleted file mode 100644
index 7db4ee8d29..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLDocument.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSXMLDocument extends NSXMLNode {
-
-public NSXMLDocument() {
-	super();
-}
-
-public NSXMLDocument(int id) {
-	super(id);
-}
-
-public NSXMLDTD DTD() {
-	int result = OS.objc_msgSend(this.id, OS.sel_DTD);
-	return result != 0 ? new NSXMLDTD(result) : null;
-}
-
-public NSString MIMEType() {
-	int result = OS.objc_msgSend(this.id, OS.sel_MIMEType);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSData XMLData() {
-	int result = OS.objc_msgSend(this.id, OS.sel_XMLData);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public NSData XMLDataWithOptions(int options) {
-	int result = OS.objc_msgSend(this.id, OS.sel_XMLDataWithOptions_1, options);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public void addChild(NSXMLNode child) {
-	OS.objc_msgSend(this.id, OS.sel_addChild_1, child != null ? child.id : 0);
-}
-
-public NSString characterEncoding() {
-	int result = OS.objc_msgSend(this.id, OS.sel_characterEncoding);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public int documentContentKind() {
-	return OS.objc_msgSend(this.id, OS.sel_documentContentKind);
-}
-
-public id initWithContentsOfURL(NSURL url, int mask, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1options_1error_1, url != null ? url.id : 0, mask, error);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithData(NSData data, int mask, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_1options_1error_1, data != null ? data.id : 0, mask, error);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithRootElement(NSXMLElement element) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithRootElement_1, element != null ? element.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithXMLString(NSString string, int mask, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithXMLString_1options_1error_1, string != null ? string.id : 0, mask, error);
-	return result != 0 ? new id(result) : null;
-}
-
-public void insertChild(NSXMLNode child, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertChild_1atIndex_1, child != null ? child.id : 0, index);
-}
-
-public void insertChildren(NSArray children, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertChildren_1atIndex_1, children != null ? children.id : 0, index);
-}
-
-public boolean isStandalone() {
-	return OS.objc_msgSend(this.id, OS.sel_isStandalone) != 0;
-}
-
-public id objectByApplyingXSLT(NSData xslt, NSDictionary arguments, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectByApplyingXSLT_1arguments_1error_1, xslt != null ? xslt.id : 0, arguments != null ? arguments.id : 0, error);
-	return result != 0 ? new id(result) : null;
-}
-
-public id objectByApplyingXSLTAtURL(NSURL xsltURL, NSDictionary argument, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectByApplyingXSLTAtURL_1arguments_1error_1, xsltURL != null ? xsltURL.id : 0, argument != null ? argument.id : 0, error);
-	return result != 0 ? new id(result) : null;
-}
-
-public id objectByApplyingXSLTString(NSString xslt, NSDictionary arguments, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectByApplyingXSLTString_1arguments_1error_1, xslt != null ? xslt.id : 0, arguments != null ? arguments.id : 0, error);
-	return result != 0 ? new id(result) : null;
-}
-
-public void removeChildAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeChildAtIndex_1, index);
-}
-
-public void replaceChildAtIndex(int index, NSXMLNode node) {
-	OS.objc_msgSend(this.id, OS.sel_replaceChildAtIndex_1withNode_1, index, node != null ? node.id : 0);
-}
-
-public static int replacementClassForClass(int cls) {
-	return OS.objc_msgSend(OS.class_NSXMLDocument, OS.sel_replacementClassForClass_1, cls);
-}
-
-public NSXMLElement rootElement() {
-	int result = OS.objc_msgSend(this.id, OS.sel_rootElement);
-	return result != 0 ? new NSXMLElement(result) : null;
-}
-
-public void setCharacterEncoding(NSString encoding) {
-	OS.objc_msgSend(this.id, OS.sel_setCharacterEncoding_1, encoding != null ? encoding.id : 0);
-}
-
-public void setChildren(NSArray children) {
-	OS.objc_msgSend(this.id, OS.sel_setChildren_1, children != null ? children.id : 0);
-}
-
-public void setDTD(NSXMLDTD documentTypeDeclaration) {
-	OS.objc_msgSend(this.id, OS.sel_setDTD_1, documentTypeDeclaration != null ? documentTypeDeclaration.id : 0);
-}
-
-public void setDocumentContentKind(int kind) {
-	OS.objc_msgSend(this.id, OS.sel_setDocumentContentKind_1, kind);
-}
-
-public void setMIMEType(NSString MIMEType) {
-	OS.objc_msgSend(this.id, OS.sel_setMIMEType_1, MIMEType != null ? MIMEType.id : 0);
-}
-
-public void setRootElement(NSXMLNode root) {
-	OS.objc_msgSend(this.id, OS.sel_setRootElement_1, root != null ? root.id : 0);
-}
-
-public void setStandalone(boolean standalone) {
-	OS.objc_msgSend(this.id, OS.sel_setStandalone_1, standalone);
-}
-
-public void setVersion(NSString version) {
-	OS.objc_msgSend(this.id, OS.sel_setVersion_1, version != null ? version.id : 0);
-}
-
-public boolean validateAndReturnError(int error) {
-	return OS.objc_msgSend(this.id, OS.sel_validateAndReturnError_1, error) != 0;
-}
-
-//public NSString version() {
-//	int result = OS.objc_msgSend(this.id, OS.sel_version);
-//	return result != 0 ? new NSString(result) : null;
-//}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLElement.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLElement.java
deleted file mode 100644
index ad808a6820..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLElement.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSXMLElement extends NSXMLNode {
-
-public NSXMLElement() {
-	super();
-}
-
-public NSXMLElement(int id) {
-	super(id);
-}
-
-public void addAttribute(NSXMLNode attribute) {
-	OS.objc_msgSend(this.id, OS.sel_addAttribute_1, attribute != null ? attribute.id : 0);
-}
-
-public void addChild(NSXMLNode child) {
-	OS.objc_msgSend(this.id, OS.sel_addChild_1, child != null ? child.id : 0);
-}
-
-public void addNamespace(NSXMLNode aNamespace) {
-	OS.objc_msgSend(this.id, OS.sel_addNamespace_1, aNamespace != null ? aNamespace.id : 0);
-}
-
-public NSXMLNode attributeForLocalName(NSString localName, NSString URI) {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributeForLocalName_1URI_1, localName != null ? localName.id : 0, URI != null ? URI.id : 0);
-	return result != 0 ? new NSXMLNode(result) : null;
-}
-
-public NSXMLNode attributeForName(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributeForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSXMLNode(result) : null;
-}
-
-public NSArray attributes() {
-	int result = OS.objc_msgSend(this.id, OS.sel_attributes);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray elementsForLocalName(NSString localName, NSString URI) {
-	int result = OS.objc_msgSend(this.id, OS.sel_elementsForLocalName_1URI_1, localName != null ? localName.id : 0, URI != null ? URI.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray elementsForName(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_elementsForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id initWithName_(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithName_1, name != null ? name.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithName_URI_(NSString name, NSString URI) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithName_1URI_1, name != null ? name.id : 0, URI != null ? URI.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithName_stringValue_(NSString name, NSString string) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithName_1stringValue_1, name != null ? name.id : 0, string != null ? string.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithXMLString(NSString string, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithXMLString_1error_1, string != null ? string.id : 0, error);
-	return result != 0 ? new id(result) : null;
-}
-
-public void insertChild(NSXMLNode child, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertChild_1atIndex_1, child != null ? child.id : 0, index);
-}
-
-public void insertChildren(NSArray children, int index) {
-	OS.objc_msgSend(this.id, OS.sel_insertChildren_1atIndex_1, children != null ? children.id : 0, index);
-}
-
-public NSXMLNode namespaceForPrefix(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_namespaceForPrefix_1, name != null ? name.id : 0);
-	return result != 0 ? new NSXMLNode(result) : null;
-}
-
-public NSArray namespaces() {
-	int result = OS.objc_msgSend(this.id, OS.sel_namespaces);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void normalizeAdjacentTextNodesPreservingCDATA(boolean preserve) {
-	OS.objc_msgSend(this.id, OS.sel_normalizeAdjacentTextNodesPreservingCDATA_1, preserve);
-}
-
-public void removeAttributeForName(NSString name) {
-	OS.objc_msgSend(this.id, OS.sel_removeAttributeForName_1, name != null ? name.id : 0);
-}
-
-public void removeChildAtIndex(int index) {
-	OS.objc_msgSend(this.id, OS.sel_removeChildAtIndex_1, index);
-}
-
-public void removeNamespaceForPrefix(NSString name) {
-	OS.objc_msgSend(this.id, OS.sel_removeNamespaceForPrefix_1, name != null ? name.id : 0);
-}
-
-public void replaceChildAtIndex(int index, NSXMLNode node) {
-	OS.objc_msgSend(this.id, OS.sel_replaceChildAtIndex_1withNode_1, index, node != null ? node.id : 0);
-}
-
-public NSXMLNode resolveNamespaceForName(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_resolveNamespaceForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSXMLNode(result) : null;
-}
-
-public NSString resolvePrefixForNamespaceURI(NSString namespaceURI) {
-	int result = OS.objc_msgSend(this.id, OS.sel_resolvePrefixForNamespaceURI_1, namespaceURI != null ? namespaceURI.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setAttributes(NSArray attributes) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributes_1, attributes != null ? attributes.id : 0);
-}
-
-public void setAttributesAsDictionary(NSDictionary attributes) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributesAsDictionary_1, attributes != null ? attributes.id : 0);
-}
-
-public void setChildren(NSArray children) {
-	OS.objc_msgSend(this.id, OS.sel_setChildren_1, children != null ? children.id : 0);
-}
-
-public void setNamespaces(NSArray namespaces) {
-	OS.objc_msgSend(this.id, OS.sel_setNamespaces_1, namespaces != null ? namespaces.id : 0);
-}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLNode.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLNode.java
deleted file mode 100644
index 4ef1a70d94..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLNode.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSXMLNode extends NSObject {
-
-public NSXMLNode() {
-	super();
-}
-
-public NSXMLNode(int id) {
-	super(id);
-}
-
-public static id DTDNodeWithXMLString(NSString string) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_DTDNodeWithXMLString_1, string != null ? string.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString URI() {
-	int result = OS.objc_msgSend(this.id, OS.sel_URI);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString XMLString() {
-	int result = OS.objc_msgSend(this.id, OS.sel_XMLString);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString XMLStringWithOptions(int options) {
-	int result = OS.objc_msgSend(this.id, OS.sel_XMLStringWithOptions_1, options);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString XPath() {
-	int result = OS.objc_msgSend(this.id, OS.sel_XPath);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static id static_attributeWithName_URI_stringValue_(NSString name, NSString URI, NSString stringValue) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_attributeWithName_1URI_1stringValue_1, name != null ? name.id : 0, URI != null ? URI.id : 0, stringValue != null ? stringValue.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_attributeWithName_stringValue_(NSString name, NSString stringValue) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_attributeWithName_1stringValue_1, name != null ? name.id : 0, stringValue != null ? stringValue.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString canonicalXMLStringPreservingComments(boolean comments) {
-	int result = OS.objc_msgSend(this.id, OS.sel_canonicalXMLStringPreservingComments_1, comments);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSXMLNode childAtIndex(int index) {
-	int result = OS.objc_msgSend(this.id, OS.sel_childAtIndex_1, index);
-	return result == this.id ? this : (result != 0 ? new NSXMLNode(result) : null);
-}
-
-public int childCount() {
-	return OS.objc_msgSend(this.id, OS.sel_childCount);
-}
-
-public NSArray children() {
-	int result = OS.objc_msgSend(this.id, OS.sel_children);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public static id commentWithStringValue(NSString stringValue) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_commentWithStringValue_1, stringValue != null ? stringValue.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString description() {
-	int result = OS.objc_msgSend(this.id, OS.sel_description);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void detach() {
-	OS.objc_msgSend(this.id, OS.sel_detach);
-}
-
-public static id document() {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_document);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id documentWithRootElement(NSXMLElement element) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_documentWithRootElement_1, element != null ? element.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_elementWithName_(NSString name) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_elementWithName_1, name != null ? name.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_elementWithName_URI_(NSString name, NSString URI) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_elementWithName_1URI_1, name != null ? name.id : 0, URI != null ? URI.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_elementWithName_children_attributes_(NSString name, NSArray children, NSArray attributes) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_elementWithName_1children_1attributes_1, name != null ? name.id : 0, children != null ? children.id : 0, attributes != null ? attributes.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public static id static_elementWithName_stringValue_(NSString name, NSString string) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_elementWithName_1stringValue_1, name != null ? name.id : 0, string != null ? string.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public int index() {
-	return OS.objc_msgSend(this.id, OS.sel_index);
-}
-
-public id initWithKind_(int kind) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithKind_1, kind);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithKind_options_(int kind, int options) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithKind_1options_1, kind, options);
-	return result != 0 ? new id(result) : null;
-}
-
-public int kind() {
-	return OS.objc_msgSend(this.id, OS.sel_kind);
-}
-
-public int level() {
-	return OS.objc_msgSend(this.id, OS.sel_level);
-}
-
-public NSString localName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_localName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSString localNameForName(NSString name) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_localNameForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static id namespaceWithName(NSString name, NSString stringValue) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_namespaceWithName_1stringValue_1, name != null ? name.id : 0, stringValue != null ? stringValue.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSXMLNode nextNode() {
-	int result = OS.objc_msgSend(this.id, OS.sel_nextNode);
-	return result == this.id ? this : (result != 0 ? new NSXMLNode(result) : null);
-}
-
-public NSXMLNode nextSibling() {
-	int result = OS.objc_msgSend(this.id, OS.sel_nextSibling);
-	return result == this.id ? this : (result != 0 ? new NSXMLNode(result) : null);
-}
-
-public NSArray nodesForXPath(NSString xpath, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_nodesForXPath_1error_1, xpath != null ? xpath.id : 0, error);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id objectValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectValue);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSArray objectsForXQuery_constants_error_(NSString xquery, NSDictionary constants, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectsForXQuery_1constants_1error_1, xquery != null ? xquery.id : 0, constants != null ? constants.id : 0, error);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray objectsForXQuery_error_(NSString xquery, int error) {
-	int result = OS.objc_msgSend(this.id, OS.sel_objectsForXQuery_1error_1, xquery != null ? xquery.id : 0, error);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSXMLNode parent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_parent);
-	return result == this.id ? this : (result != 0 ? new NSXMLNode(result) : null);
-}
-
-public static NSXMLNode predefinedNamespaceForPrefix(NSString name) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_predefinedNamespaceForPrefix_1, name != null ? name.id : 0);
-	return result != 0 ? new NSXMLNode(result) : null;
-}
-
-public NSString prefix() {
-	int result = OS.objc_msgSend(this.id, OS.sel_prefix);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static NSString prefixForName(NSString name) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_prefixForName_1, name != null ? name.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSXMLNode previousNode() {
-	int result = OS.objc_msgSend(this.id, OS.sel_previousNode);
-	return result == this.id ? this : (result != 0 ? new NSXMLNode(result) : null);
-}
-
-public NSXMLNode previousSibling() {
-	int result = OS.objc_msgSend(this.id, OS.sel_previousSibling);
-	return result == this.id ? this : (result != 0 ? new NSXMLNode(result) : null);
-}
-
-public static id processingInstructionWithName(NSString name, NSString stringValue) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_processingInstructionWithName_1stringValue_1, name != null ? name.id : 0, stringValue != null ? stringValue.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSXMLDocument rootDocument() {
-	int result = OS.objc_msgSend(this.id, OS.sel_rootDocument);
-	return result != 0 ? new NSXMLDocument(result) : null;
-}
-
-public void setName(NSString name) {
-	OS.objc_msgSend(this.id, OS.sel_setName_1, name != null ? name.id : 0);
-}
-
-public void setObjectValue(id value) {
-	OS.objc_msgSend(this.id, OS.sel_setObjectValue_1, value != null ? value.id : 0);
-}
-
-public void setStringValue_(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setStringValue_1, string != null ? string.id : 0);
-}
-
-public void setStringValue_resolvingEntities_(NSString string, boolean resolve) {
-	OS.objc_msgSend(this.id, OS.sel_setStringValue_1resolvingEntities_1, string != null ? string.id : 0, resolve);
-}
-
-public void setURI(NSString URI) {
-	OS.objc_msgSend(this.id, OS.sel_setURI_1, URI != null ? URI.id : 0);
-}
-
-public NSString stringValue() {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringValue);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static id textWithStringValue(NSString stringValue) {
-	int result = OS.objc_msgSend(OS.class_NSXMLNode, OS.sel_textWithStringValue_1, stringValue != null ? stringValue.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/NSXMLParser.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLParser.java
deleted file mode 100644
index 211dc0c52f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSXMLParser.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.cocoa;
-
-public class NSXMLParser extends NSObject {
-
-public NSXMLParser() {
-	super();
-}
-
-public NSXMLParser(int id) {
-	super(id);
-}
-
-public void abortParsing() {
-	OS.objc_msgSend(this.id, OS.sel_abortParsing);
-}
-
-public int columnNumber() {
-	return OS.objc_msgSend(this.id, OS.sel_columnNumber);
-}
-
-public id delegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_delegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithContentsOfURL(NSURL url) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1, url != null ? url.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public id initWithData(NSData data) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithData_1, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public int lineNumber() {
-	return OS.objc_msgSend(this.id, OS.sel_lineNumber);
-}
-
-public boolean parse() {
-	return OS.objc_msgSend(this.id, OS.sel_parse) != 0;
-}
-
-public NSError parserError() {
-	int result = OS.objc_msgSend(this.id, OS.sel_parserError);
-	return result != 0 ? new NSError(result) : null;
-}
-
-public NSString publicID() {
-	int result = OS.objc_msgSend(this.id, OS.sel_publicID);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void setDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setShouldProcessNamespaces(boolean shouldProcessNamespaces) {
-	OS.objc_msgSend(this.id, OS.sel_setShouldProcessNamespaces_1, shouldProcessNamespaces);
-}
-
-public void setShouldReportNamespacePrefixes(boolean shouldReportNamespacePrefixes) {
-	OS.objc_msgSend(this.id, OS.sel_setShouldReportNamespacePrefixes_1, shouldReportNamespacePrefixes);
-}
-
-public void setShouldResolveExternalEntities(boolean shouldResolveExternalEntities) {
-	OS.objc_msgSend(this.id, OS.sel_setShouldResolveExternalEntities_1, shouldResolveExternalEntities);
-}
-
-public boolean shouldProcessNamespaces() {
-	return OS.objc_msgSend(this.id, OS.sel_shouldProcessNamespaces) != 0;
-}
-
-public boolean shouldReportNamespacePrefixes() {
-	return OS.objc_msgSend(this.id, OS.sel_shouldReportNamespacePrefixes) != 0;
-}
-
-public boolean shouldResolveExternalEntities() {
-	return OS.objc_msgSend(this.id, OS.sel_shouldResolveExternalEntities) != 0;
-}
-
-public NSString systemID() {
-	int result = OS.objc_msgSend(this.id, OS.sel_systemID);
-	return result != 0 ? new NSString(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 ed8eb2fb4b..34fd0957dc 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
@@ -36,8 +36,8 @@ public class OS extends C {
 	public static final int sel_sendArrowSelection = sel_registerName("sendArrowSelection");
 	public static final int sel_sendVerticalSelection = sel_registerName("sendVerticalSelection");
 	public static final int sel_sendHorizontalSelection = sel_registerName("sendHorizontalSelection");
-	public static final int sel_drawAtPoint_ = sel_registerName("drawAtPoint:");
-	public static final int sel_timerProc_1 = sel_registerName("timerProc:");
+	public static final int sel_timerProc_ = sel_registerName("timerProc:");
+	public static final int sel_handleNotification_ = sel_registerName("handleNotification:");
 
 /** JNI natives */
 public static final native int NewGlobalRef(Object object);
@@ -99,12 +99,6 @@ public static final native int objc_msgSendSuper(objc_super superId, int sel, NS
 public static final native int objc_msgSendSuper(objc_super superId, int sel, NSSize arg0);
 public static final native int objc_msgSendSuper(objc_super superId, int sel, int arg0);
 public static final native int objc_msgSendSuper(objc_super superId, int sel, int arg0, int arg1, int arg2, int arg3);
-public static final native void memmove (int /*long*/ dest, NSRect src, int /*long*/ size);
-public static final native void memmove (NSRect dest, int /*long*/ src, int /*long*/ size);
-public static final native void memmove (NSPoint dest, int /*long*/ src, int /*long*/ size);
-public static final native void memmove (NSSize dest, int /*long*/ src, int /*long*/ size);
-public static final native void memmove (NSRange dest, int /*long*/ src, int /*long*/ size);
-public static final native void memmove (int /*long*/ dest, NSRange src, int /*long*/ size);
 
 public static final native boolean class_addIvar(int cls, String name, int size, byte alignment, String types);
 public static final native boolean class_addMethod(int cls, int name, int imp, String types);
@@ -123,7157 +117,989 @@ public static final native void instrumentObjcMessageSends(boolean val);
 
 /** This section is auto generated */
 
-/** Obj-C Sends */
-public static final native int objc_msgSend(int id, int sel, byte[] arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, char[] arg0);
-public static final native int objc_msgSend(int id, int sel, char[] arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, float[] arg0, int arg1, float arg2);
-public static final native int objc_msgSend(int id, int sel, float[] arg0);
-public static final native int objc_msgSend(int id, int sel, char[] arg0, NSRange arg1);
-public static final native int objc_msgSend(int id, int sel, String arg0);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, int arg1, float[] arg2);
-public static final native int objc_msgSend(int id, int sel, int [] arg0);
-public static final native int objc_msgSend(int id, int sel, int [] arg0, int arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, int arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, NSRange arg1, NSRect arg2);
-public static final native int objc_msgSend(int id, int sel, double arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3, int arg4, NSRange arg5, int arg6);
-public static final native void objc_msgSend_stret(NSPoint result, int id, int sel, int arg0, NSRect arg1, int arg2);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSRect arg1, boolean arg2, int arg3);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, NSRange arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, NSSize arg0);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, int arg0, int arg1, int arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, double arg2, int arg3);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, NSRect arg0);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, NSRect arg1, NSRect arg2, int arg3, NSRange arg4);
-public static final native void objc_msgSend_stret(NSDecimal result, int id, int sel);
-public static final native int objc_msgSend(int id, int sel, NSSize arg0, int arg1, boolean arg2, boolean arg3);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3);
-public static final native void objc_msgSend_stret(NSSize result, int id, int sel, NSRect arg0);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, NSRange arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0);
-public static final native int objc_msgSend(int id, int sel, byte[] arg0);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, NSRect arg1, int arg2, float arg3);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0, NSRange arg1);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, NSRect arg1, float arg2);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0);
-public static final native int objc_msgSend(int id, int sel, float arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, long arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, NSPoint arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, float arg1, int arg2, NSPoint arg3);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSPoint arg1);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0, int arg1, NSRect arg2, NSRange arg3, NSPoint arg4);
-public static final native double objc_msgSend_fpret(int id, int sel, int arg0, float arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, NSPoint arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSPoint arg1, int arg2, double arg3, int arg4, int arg5, int arg6, int arg7, float arg8);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, float arg1, float arg2, float arg3);
-public static final native double objc_msgSend_fpret(int id, int sel);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, int arg1);
-public static final native void objc_msgSend_stret(NSAffineTransformStruct result, int id, int sel);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, int arg0, NSRange arg1, NSRange arg2);
-public static final native void objc_msgSend_stret(NSSize result, int id, int sel, int arg0, NSRange arg1, int arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, int arg2, int arg3, int arg4);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, int arg0, int arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, float arg0, int arg1, float arg2);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, int arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, boolean arg0);
-public static final native int objc_msgSend(int id, int sel, NSDecimal arg0);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, NSRect arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0, int arg1, int arg2);
-public static final native void objc_msgSend_stret(NSSize result, int id, int sel);
-public static final native int objc_msgSend(int id, int sel, long arg0, short arg1, boolean arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3, int arg4);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, NSRect arg1, NSPoint arg2, int arg3);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, int arg0);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, NSRect arg1);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, NSRange arg0, int arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, NSRect arg1);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, NSRect arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, NSSize arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, float arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, short arg2);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, int arg2, boolean arg3);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, NSRect arg2, int arg3);
-public static final native double objc_msgSend_fpret(int id, int sel, NSPoint arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, short arg3, int arg4);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, float arg1, float arg2, float arg3, boolean arg4);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3, int arg4, NSPoint arg5);
-public static final native int objc_msgSend(int id, int sel, boolean arg0, NSRect arg1, int arg2);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, NSRange arg0);
-public static final native void objc_msgSend_stret(NSPoint result, int id, int sel, int arg0, int arg1, int arg2, int arg3, int arg4);
-public static final native int objc_msgSend(int id, int sel, double arg0, double arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, double arg1, int arg2, int arg3, int arg4, boolean arg5);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSRect arg1);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, int arg1, NSRect arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, boolean arg1, int arg2, int arg3, int arg4);
-public static final native int objc_msgSend(int id, int sel, float arg0, float arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, float arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0, int arg1, NSRange arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, float arg1, float arg2, float arg3);
-public static final native double objc_msgSend_fpret(int id, int sel, double arg0);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSRange arg1);
-public static final native void objc_msgSend_stret(NSSize result, int id, int sel, boolean arg0);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, NSRange arg2, NSPoint arg3);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, int arg1, NSRange arg2);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, NSPoint arg1, int arg2, boolean arg3);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0, NSRange arg1, int arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, float arg0);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, float arg1);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, NSRect arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0);
-public static final native void objc_msgSend_stret(NSPoint result, int id, int sel);
-public static final native void objc_msgSend_stret(NSPoint result, int id, int sel, NSRect arg0);
-public static final native double objc_msgSend_fpret(int id, int sel, float arg0);
-public static final native double objc_msgSend_fpret(int id, int sel, int arg0);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, NSRange arg2, int arg3, NSRange arg4);
-public static final native int objc_msgSend(int id, int sel, double arg0);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0, int arg1, int arg2, int arg3, int arg4);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, NSRect arg0, int arg1, int arg2, int arg3);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, int arg1, boolean arg2);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, float arg1, float arg2);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, boolean arg0);
-public static final native int objc_msgSend(int id, int sel, boolean arg0, NSRange arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3, int arg4, boolean arg5, boolean arg6, int arg7, int arg8, int arg9, int arg10);
-public static final native void objc_msgSend_stret(NSPoint result, int id, int sel, int arg0);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0, NSPoint arg1);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0, boolean arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSPoint arg1, int arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, float arg1);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, int arg0, int arg1, NSRange arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, NSPoint arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSPoint arg1, NSSize arg2, int arg3, int arg4, int arg5, boolean arg6);
-public static final native int objc_msgSend(int id, int sel, NSSize arg0, NSRange arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, boolean arg3, int arg4);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2);
-public static final native void objc_msgSend_stret(NSPoint result, int id, int sel, NSPoint arg0);
-public static final native int objc_msgSend(int id, int sel, int arg0, boolean arg1, int arg2);
-public static final native double objc_msgSend_fpret(int id, int sel, int arg0, int arg1);
-public static final native void objc_msgSend_stret(NSPoint result, int id, int sel, NSPoint arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, NSSize arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSSize arg1, boolean arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, NSRect arg2, int arg3, int arg4);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, NSRange arg2);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, int arg1);
-public static final native void objc_msgSend_stret(NSSize result, int id, int sel, NSSize arg0, boolean arg1, boolean arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSRange arg1, NSRange arg2);
-public static final native int objc_msgSend(int id, int sel, float arg0, int arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, boolean arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, boolean arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0, int arg1, boolean arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSRect arg1, int arg2, int arg3);
-public static final native double objc_msgSend_fpret(int id, int sel, NSPoint arg0);
-public static final native double objc_msgSend_fpret(int id, int sel, NSRect arg0);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, NSRect arg1, NSRect arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSPoint arg1, int arg2, double arg3, int arg4, int arg5, short arg6, int arg7, int arg8);
-public static final native int objc_msgSend(int id, int sel, byte arg0);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, int arg0, int arg1);
-public static final native double objc_msgSend_fpret(int id, int sel, int arg0, NSRect arg1);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSPoint arg1, int arg2);
-public static final native void objc_msgSend_stret(NSPoint result, int id, int sel, int arg0, short arg1, NSRect arg2);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, NSPoint arg0, NSRect arg1, int arg2, NSRange arg3);
-public static final native void objc_msgSend_stret(NSSize result, int id, int sel, NSSize arg0);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3, int arg4, boolean arg5, boolean arg6, int arg7, int arg8, int arg9);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSRect arg1, int arg2, boolean arg3, int arg4);
-public static final native int objc_msgSend(int id, int sel, long arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, boolean arg0, boolean arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSRect arg1, int arg2, NSRange arg3, int arg4);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0, int arg1);
-public static final native double objc_msgSend_fpret(int id, int sel, int arg0, int arg1, boolean arg2, float arg3);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, NSPoint arg1, NSRect arg2, int arg3, NSRange arg4);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, double arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, NSRange arg2, NSPoint arg3, int arg4, int arg5, NSSize arg6);
-public static final native int objc_msgSend(int id, int sel, int arg0, boolean arg1, int arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, long arg0);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, NSRange arg2);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, int arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, boolean arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, short arg1, boolean arg2, boolean arg3, boolean arg4, boolean arg5);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, int arg2, boolean arg3, int arg4);
-public static final native void objc_msgSend_stret(NSSize result, int id, int sel, NSSize arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, NSPoint arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, NSRange arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, NSRange arg1, NSRect arg2, float arg3);
-public static final native void objc_msgSend_stret(NSSize result, int id, int sel, int arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, float arg0, float arg1, float arg2, float arg3);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, NSRange arg0);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, NSRect arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, boolean arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, float arg2, int arg3, int arg4);
-public static final native int objc_msgSend(int id, int sel, double arg0, int arg1, boolean arg2);
-public static final native int objc_msgSend(int id, int sel);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0, int arg1, float arg2, NSRect arg3, NSRange arg4, NSPoint arg5);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, boolean arg1, boolean arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, NSRange arg3, int arg4);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, NSSize arg0, int arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, float arg1, NSPoint arg2, float arg3, int arg4);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, boolean arg2, int arg3, int arg4);
-public static final native int objc_msgSend(int id, int sel, short arg0);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSRect arg1, int arg2);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, NSRect arg0, NSRect arg1, int arg2, NSRange arg3);
-public static final native int objc_msgSend(int id, int sel, NSRange arg0, int arg1, int arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, int arg0, boolean arg1, boolean arg2, int arg3, int arg4);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, int arg0, int arg1, int arg2, int arg3, boolean arg4);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, NSPoint arg1);
-public static final native void objc_msgSend_stret(NSSize result, int id, int sel, int arg0, NSSize arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, NSPoint arg3);
-public static final native double objc_msgSend_fpret(int id, int sel, int arg0, int arg1, float arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, boolean arg1, boolean arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, boolean arg3);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, int arg1, NSRect arg2, NSPoint arg3, int arg4);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6);
-public static final native void objc_msgSend_stret(NSSize result, int id, int sel, float arg0);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, NSRange arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, NSRange arg2, int arg3);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, NSRange arg0, int arg1);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, int arg0, int arg1, NSRange arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, float arg3);
-public static final native void objc_msgSend_stret(NSSize result, int id, int sel, int arg0);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSPoint arg1, boolean arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSRange arg1, int arg2, int arg3);
-public static final native void objc_msgSend_stret(NSPoint result, int id, int sel, int arg0, int arg1, int arg2);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, NSRect arg0);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, float arg0, int arg1, int arg2, int arg3);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSRect arg1, int arg2, boolean arg3);
-public static final native int objc_msgSend(int id, int sel, int arg0, boolean arg1);
-public static final native int objc_msgSend(int id, int sel, NSAffineTransformStruct arg0);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, NSRect arg2);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, int arg1, float arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, NSRange arg3);
-public static final native int objc_msgSend(int id, int sel, boolean arg0, NSRect arg1);
-public static final native int objc_msgSend(int id, int sel, boolean arg0, int arg1);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, int arg0, int arg1, int arg2, boolean arg3, int arg4, int arg5);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, NSRect arg1, int arg2, float arg3);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSRect arg1, int arg2, int arg3, boolean arg4);
-public static final native double objc_msgSend_fpret(int id, int sel, NSSize arg0);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, NSPoint arg1, float arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSPoint arg1, int arg2, double arg3, int arg4, int arg5, int arg6, int arg7, boolean arg8, short arg9);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3, NSRect arg4, float arg5, float arg6, float arg7);
-public static final native int objc_msgSend(int id, int sel, short arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSRange arg1, int arg2);
-public static final native void objc_msgSend_stret(NSRange result, int id, int sel, NSRect arg0, int arg1);
-public static final native double objc_msgSend_fpret(int id, int sel, int arg0, float arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, float arg0, float arg1, float arg2, float arg3, float arg4);
-public static final native int objc_msgSend(int id, int sel, int arg0, short arg1);
-public static final native int objc_msgSend(int id, int sel, NSPoint arg0, NSPoint arg1, NSPoint arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSPoint arg1, int arg2, double arg3, int arg4, int arg5, int arg6, int arg7, int arg8);
-public static final native int objc_msgSend(int id, int sel, double arg0, int arg1, int arg2, int arg3, boolean arg4);
-public static final native int objc_msgSend(int id, int sel, boolean arg0, int arg1, int arg2);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSRange arg1, int arg2, boolean arg3);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSSize arg1);
-public static final native int objc_msgSend(int id, int sel, NSRect arg0, boolean arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, NSPoint arg1, NSPoint arg2);
-public static final native void objc_msgSend_stret(NSRect result, int id, int sel, NSSize arg0, int arg1);
-public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, float arg2);
-
 /** Classes */
-public static final int class_NSScanner = objc_getClass("NSScanner");
-public static final int class_NSCIImageRep = objc_getClass("NSCIImageRep");
-public static final int class_NSPathControl = objc_getClass("NSPathControl");
-public static final int class_NSTreeController = objc_getClass("NSTreeController");
-public static final int class_NSPDFImageRep = objc_getClass("NSPDFImageRep");
-public static final int class_NSPageLayout = objc_getClass("NSPageLayout");
-public static final int class_NSMetadataQueryAttributeValueTuple = objc_getClass("NSMetadataQueryAttributeValueTuple");
-public static final int class_NSAppleScript = objc_getClass("NSAppleScript");
-public static final int class_NSGradient = objc_getClass("NSGradient");
-public static final int class_NSColorPanel = objc_getClass("NSColorPanel");
-public static final int class_NSPrinter = objc_getClass("NSPrinter");
-public static final int class_NSCachedURLResponse = objc_getClass("NSCachedURLResponse");
-public static final int class_NSLevelIndicatorCell = objc_getClass("NSLevelIndicatorCell");
-public static final int class_NSScriptClassDescription = objc_getClass("NSScriptClassDescription");
-public static final int class_NSDistantObjectRequest = objc_getClass("NSDistantObjectRequest");
-public static final int class_NSOpenPanel = objc_getClass("NSOpenPanel");
-public static final int class_NSOperationQueue = objc_getClass("NSOperationQueue");
-public static final int class_NSOpenGLPixelBuffer = objc_getClass("NSOpenGLPixelBuffer");
-public static final int class_NSRelativeSpecifier = objc_getClass("NSRelativeSpecifier");
-public static final int class_NSTextStorage = objc_getClass("NSTextStorage");
-public static final int class_NSPopUpButtonCell = objc_getClass("NSPopUpButtonCell");
-public static final int class_NSTextContainer = objc_getClass("NSTextContainer");
-public static final int class_NSStepperCell = objc_getClass("NSStepperCell");
-public static final int class_NSTextTable = objc_getClass("NSTextTable");
-public static final int class_NSInvocationOperation = objc_getClass("NSInvocationOperation");
-public static final int class_NSDeleteCommand = objc_getClass("NSDeleteCommand");
-public static final int class_NSImageView = objc_getClass("NSImageView");
-public static final int class_NSMovieView = objc_getClass("NSMovieView");
-public static final int class_NSLock = objc_getClass("NSLock");
-public static final int class_NSCoder = objc_getClass("NSCoder");
-public static final int class_NSXMLElement = objc_getClass("NSXMLElement");
-public static final int class_NSLayoutManager = objc_getClass("NSLayoutManager");
-public static final int class_NSTabView = objc_getClass("NSTabView");
-public static final int class_NSSpeechRecognizer = objc_getClass("NSSpeechRecognizer");
-public static final int class_NSAttributedString = objc_getClass("NSAttributedString");
-public static final int class_NSProcessInfo = objc_getClass("NSProcessInfo");
-public static final int class_NSTextFieldCell = objc_getClass("NSTextFieldCell");
-public static final int class_NSDate = objc_getClass("NSDate");
-public static final int class_NSMachBootstrapServer = objc_getClass("NSMachBootstrapServer");
-public static final int class_NSData = objc_getClass("NSData");
-public static final int class_NSNumberFormatter = objc_getClass("NSNumberFormatter");
-public static final int class_NSPositionalSpecifier = objc_getClass("NSPositionalSpecifier");
-public static final int class_NSSegmentedControl = objc_getClass("NSSegmentedControl");
-public static final int class_NSMatrix = objc_getClass("NSMatrix");
-public static final int class_NSPanel = objc_getClass("NSPanel");
-public static final int class_NSPrintInfo = objc_getClass("NSPrintInfo");
-public static final int class_NSResponder = objc_getClass("NSResponder");
-public static final int class_NSNull = objc_getClass("NSNull");
-public static final int class_NSRunLoop = objc_getClass("NSRunLoop");
-public static final int class_NSMutableAttributedString = objc_getClass("NSMutableAttributedString");
-public static final int class_NSImageCell = objc_getClass("NSImageCell");
-public static final int class_CIColor = objc_getClass("CIColor");
-public static final int class_NSSegmentedCell = objc_getClass("NSSegmentedCell");
-public static final int class_NSDocument = objc_getClass("NSDocument");
-public static final int class_NSTextTab = objc_getClass("NSTextTab");
-public static final int class_NSWhoseSpecifier = objc_getClass("NSWhoseSpecifier");
-public static final int class_NSMenu = objc_getClass("NSMenu");
-public static final int class_NSPopUpButton = objc_getClass("NSPopUpButton");
-public static final int class_NSInvocation = objc_getClass("NSInvocation");
-public static final int class_NSDatePicker = objc_getClass("NSDatePicker");
-public static final int class_NSSliderCell = objc_getClass("NSSliderCell");
-public static final int class_NSURLCache = objc_getClass("NSURLCache");
-public static final int class_NSSpeechSynthesizer = objc_getClass("NSSpeechSynthesizer");
-public static final int class_NSBezierPath = objc_getClass("NSBezierPath");
-public static final int class_NSSavePanel = objc_getClass("NSSavePanel");
-public static final int class_NSMetadataQuery = objc_getClass("NSMetadataQuery");
-public static final int class_NSLogicalTest = objc_getClass("NSLogicalTest");
-public static final int class_NSAffineTransform = objc_getClass("NSAffineTransform");
-public static final int class_NSTreeNode = objc_getClass("NSTreeNode");
-public static final int class_NSControl = objc_getClass("NSControl");
-public static final int class_NSWindowController = objc_getClass("NSWindowController");
-public static final int class_NSURLResponse = objc_getClass("NSURLResponse");
-public static final int class_NSFormatter = objc_getClass("NSFormatter");
-public static final int class_NSAssertionHandler = objc_getClass("NSAssertionHandler");
-public static final int class_NSPort = objc_getClass("NSPort");
-public static final int class_NSURLProtectionSpace = objc_getClass("NSURLProtectionSpace");
-public static final int class_NSPredicate = objc_getClass("NSPredicate");
-public static final int class_NSIndexSpecifier = objc_getClass("NSIndexSpecifier");
-public static final int class_NSPortMessage = objc_getClass("NSPortMessage");
-public static final int class_NSTypesetter = objc_getClass("NSTypesetter");
-public static final int class_NSCompoundPredicate = objc_getClass("NSCompoundPredicate");
-public static final int class_NSBundle = objc_getClass("NSBundle");
-public static final int class_NSSortDescriptor = objc_getClass("NSSortDescriptor");
-public static final int class_NSFontManager = objc_getClass("NSFontManager");
-public static final int class_NSProxy = objc_getClass("NSProxy");
-public static final int class_NSTextView = objc_getClass("NSTextView");
-public static final int class_NSMutableSet = objc_getClass("NSMutableSet");
-public static final int class_NSDatePickerCell = objc_getClass("NSDatePickerCell");
-public static final int class_NSStatusItem = objc_getClass("NSStatusItem");
-public static final int class_NSDirectoryEnumerator = objc_getClass("NSDirectoryEnumerator");
-public static final int class_NSPropertyListSerialization = objc_getClass("NSPropertyListSerialization");
-public static final int class_NSHost = objc_getClass("NSHost");
-public static final int class_NSPipe = objc_getClass("NSPipe");
-public static final int class_NSNibConnector = objc_getClass("NSNibConnector");
-public static final int class_NSDecimalNumber = objc_getClass("NSDecimalNumber");
-public static final int class_NSMenuView = objc_getClass("NSMenuView");
-public static final int class_NSMenuItem = objc_getClass("NSMenuItem");
-public static final int class_NSPICTImageRep = objc_getClass("NSPICTImageRep");
-public static final int class_NSPasteboard = objc_getClass("NSPasteboard");
-public static final int class_NSScriptExecutionContext = objc_getClass("NSScriptExecutionContext");
-public static final int class_NSNotificationQueue = objc_getClass("NSNotificationQueue");
-public static final int class_NSError = objc_getClass("NSError");
-public static final int class_NSNib = objc_getClass("NSNib");
-public static final int class_NSAppleEventManager = objc_getClass("NSAppleEventManager");
-public static final int class_NSCondition = objc_getClass("NSCondition");
-public static final int class_NSBrowser = objc_getClass("NSBrowser");
-public static final int class_NSDocumentController = objc_getClass("NSDocumentController");
-public static final int class_NSMethodSignature = objc_getClass("NSMethodSignature");
-public static final int class_NSTextList = objc_getClass("NSTextList");
-public static final int class_NSURLCredentialStorage = objc_getClass("NSURLCredentialStorage");
-public static final int class_NSEvent = objc_getClass("NSEvent");
-public static final int class_NSScreen = objc_getClass("NSScreen");
-public static final int class_NSMutableCharacterSet = objc_getClass("NSMutableCharacterSet");
-public static final int class_NSSecureTextFieldCell = objc_getClass("NSSecureTextFieldCell");
-public static final int class_NSOpenGLPixelFormat = objc_getClass("NSOpenGLPixelFormat");
-public static final int class_NSInputServer = objc_getClass("NSInputServer");
-public static final int class_NSNotification = objc_getClass("NSNotification");
-public static final int class_NSSpecifierTest = objc_getClass("NSSpecifierTest");
-public static final int class_NSCustomImageRep = objc_getClass("NSCustomImageRep");
-public static final int class_NSParagraphStyle = objc_getClass("NSParagraphStyle");
-public static final int class_NSTableView = objc_getClass("NSTableView");
-public static final int class_NSFileWrapper = objc_getClass("NSFileWrapper");
-public static final int class_NSNotificationCenter = objc_getClass("NSNotificationCenter");
-public static final int class_NSMutableString = objc_getClass("NSMutableString");
-public static final int class_NSFontPanel = objc_getClass("NSFontPanel");
-public static final int class_NSAppleEventDescriptor = objc_getClass("NSAppleEventDescriptor");
-public static final int class_NSConnection = objc_getClass("NSConnection");
-public static final int class_NSURLDownload = objc_getClass("NSURLDownload");
-public static final int class_NSKeyedUnarchiver = objc_getClass("NSKeyedUnarchiver");
-public static final int class_NSCountedSet = objc_getClass("NSCountedSet");
-public static final int class_NSSlider = objc_getClass("NSSlider");
-public static final int class_NSCharacterSet = objc_getClass("NSCharacterSet");
-public static final int class_NSDictionary = objc_getClass("NSDictionary");
-public static final int class_NSOpenGLContext = objc_getClass("NSOpenGLContext");
-public static final int class_NSCachedImageRep = objc_getClass("NSCachedImageRep");
-public static final int class_NSURL = objc_getClass("NSURL");
-public static final int class_NSInputStream = objc_getClass("NSInputStream");
-public static final int class_NSMutableURLRequest = objc_getClass("NSMutableURLRequest");
-public static final int class_NSURLConnection = objc_getClass("NSURLConnection");
-public static final int class_NSPersistentDocument = objc_getClass("NSPersistentDocument");
-public static final int class_NSClipView = objc_getClass("NSClipView");
-public static final int class_NSScriptSuiteRegistry = objc_getClass("NSScriptSuiteRegistry");
-public static final int class_NSStepper = objc_getClass("NSStepper");
-public static final int class_NSXMLNode = objc_getClass("NSXMLNode");
-public static final int class_NSHTTPCookie = objc_getClass("NSHTTPCookie");
-public static final int class_NSMetadataQueryResultGroup = objc_getClass("NSMetadataQueryResultGroup");
-public static final int class_NSURLCredential = objc_getClass("NSURLCredential");
-public static final int class_NSHashTable = objc_getClass("NSHashTable");
-public static final int class_NSColor = objc_getClass("NSColor");
-public static final int class_NSPathComponentCell = objc_getClass("NSPathComponentCell");
-public static final int class_NSToolbar = objc_getClass("NSToolbar");
-public static final int class_NSUndoManager = objc_getClass("NSUndoManager");
-public static final int class_NSNibControlConnector = objc_getClass("NSNibControlConnector");
-public static final int class_NSFontDescriptor = objc_getClass("NSFontDescriptor");
-public static final int class_NSSpellChecker = objc_getClass("NSSpellChecker");
-public static final int class_NSTableColumn = objc_getClass("NSTableColumn");
-public static final int class_NSSpellServer = objc_getClass("NSSpellServer");
-public static final int class_NSAutoreleasePool = objc_getClass("NSAutoreleasePool");
-public static final int class_NSUnarchiver = objc_getClass("NSUnarchiver");
-public static final int class_NSColorSpace = objc_getClass("NSColorSpace");
-public static final int class_NSQuickDrawView = objc_getClass("NSQuickDrawView");
-public static final int class_NSDrawer = objc_getClass("NSDrawer");
-public static final int class_NSFileHandle = objc_getClass("NSFileHandle");
-public static final int class_NSCalendarDate = objc_getClass("NSCalendarDate");
-public static final int class_NSThread = objc_getClass("NSThread");
-public static final int class_NSProtocolChecker = objc_getClass("NSProtocolChecker");
-public static final int class_NSDateComponents = objc_getClass("NSDateComponents");
-public static final int class_NSAnimationContext = objc_getClass("NSAnimationContext");
-public static final int class_NSURLRequest = objc_getClass("NSURLRequest");
-public static final int class_NSViewAnimation = objc_getClass("NSViewAnimation");
-public static final int class_NSScriptObjectSpecifier = objc_getClass("NSScriptObjectSpecifier");
-public static final int class_NSCell = objc_getClass("NSCell");
-public static final int class_NSTableHeaderCell = objc_getClass("NSTableHeaderCell");
-public static final int class_NSATSTypesetter = objc_getClass("NSATSTypesetter");
-public static final int class_NSNetService = objc_getClass("NSNetService");
-public static final int class_NSMutableParagraphStyle = objc_getClass("NSMutableParagraphStyle");
-public static final int class_NSButton = objc_getClass("NSButton");
-public static final int class_NSAnimation = objc_getClass("NSAnimation");
-public static final int class_NSText = objc_getClass("NSText");
-public static final int class_NSMapTable = objc_getClass("NSMapTable");
-public static final int class_NSDictionaryController = objc_getClass("NSDictionaryController");
-public static final int class_NSTrackingArea = objc_getClass("NSTrackingArea");
-public static final int class_NSURLProtocol = objc_getClass("NSURLProtocol");
-public static final int class_NSGlyphInfo = objc_getClass("NSGlyphInfo");
-public static final int class_NSSocketPortNameServer = objc_getClass("NSSocketPortNameServer");
-public static final int class_NSQuitCommand = objc_getClass("NSQuitCommand");
-public static final int class_NSDistributedNotificationCenter = objc_getClass("NSDistributedNotificationCenter");
-public static final int class_NSCloseCommand = objc_getClass("NSCloseCommand");
-public static final int class_NSPrintOperation = objc_getClass("NSPrintOperation");
-public static final int class_NSGraphicsContext = objc_getClass("NSGraphicsContext");
-public static final int class_NSNumber = objc_getClass("NSNumber");
-public static final int class_NSPortCoder = objc_getClass("NSPortCoder");
-public static final int class_NSTextTableBlock = objc_getClass("NSTextTableBlock");
-public static final int class_NSNibOutletConnector = objc_getClass("NSNibOutletConnector");
-public static final int class_NSLocale = objc_getClass("NSLocale");
-public static final int class_NSTableHeaderView = objc_getClass("NSTableHeaderView");
-public static final int class_NSScriptWhoseTest = objc_getClass("NSScriptWhoseTest");
-public static final int class_NSNetServiceBrowser = objc_getClass("NSNetServiceBrowser");
-public static final int class_NSConditionLock = objc_getClass("NSConditionLock");
-public static final int class_NSTimeZone = objc_getClass("NSTimeZone");
-public static final int class_NSComparisonPredicate = objc_getClass("NSComparisonPredicate");
-public static final int class_NSScriptCoercionHandler = objc_getClass("NSScriptCoercionHandler");
-public static final int class_NSFileManager = objc_getClass("NSFileManager");
-public static final int class_NSPredicateEditorRowTemplate = objc_getClass("NSPredicateEditorRowTemplate");
-public static final int class_NSString = objc_getClass("NSString");
-public static final int class_NSToolbarItem = objc_getClass("NSToolbarItem");
-public static final int class_NSPointerArray = objc_getClass("NSPointerArray");
-public static final int class_NSURLAuthenticationChallenge = objc_getClass("NSURLAuthenticationChallenge");
-public static final int class_NSStatusBar = objc_getClass("NSStatusBar");
-public static final int class_NSTextField = objc_getClass("NSTextField");
-public static final int class_NSSecureTextField = objc_getClass("NSSecureTextField");
-public static final int class_NSOutputStream = objc_getClass("NSOutputStream");
-public static final int class_NSComboBoxCell = objc_getClass("NSComboBoxCell");
-public static final int class_NSXMLDTDNode = objc_getClass("NSXMLDTDNode");
-public static final int class_NSMessagePortNameServer = objc_getClass("NSMessagePortNameServer");
-public static final int class_NSHTTPCookieStorage = objc_getClass("NSHTTPCookieStorage");
-public static final int class_NSActionCell = objc_getClass("NSActionCell");
-public static final int class_NSXMLDocument = objc_getClass("NSXMLDocument");
-public static final int class_NSBitmapImageRep = objc_getClass("NSBitmapImageRep");
-public static final int class_NSHTTPURLResponse = objc_getClass("NSHTTPURLResponse");
-public static final int class_NSImage = objc_getClass("NSImage");
-public static final int class_NSIndexSet = objc_getClass("NSIndexSet");
-public static final int class_NSRangeSpecifier = objc_getClass("NSRangeSpecifier");
-public static final int class_NSGlyphGenerator = objc_getClass("NSGlyphGenerator");
-public static final int class_NSFormCell = objc_getClass("NSFormCell");
-public static final int class_NSScroller = objc_getClass("NSScroller");
-public static final int class_NSMetadataItem = objc_getClass("NSMetadataItem");
-public static final int class_NSStream = objc_getClass("NSStream");
-public static final int class_NSClassDescription = objc_getClass("NSClassDescription");
-public static final int class_NSMutableIndexSet = objc_getClass("NSMutableIndexSet");
-public static final int class_NSView = objc_getClass("NSView");
-public static final int class_NSUserDefaults = objc_getClass("NSUserDefaults");
-public static final int class_NSSetCommand = objc_getClass("NSSetCommand");
-public static final int class_NSPathCell = objc_getClass("NSPathCell");
-public static final int class_NSMoveCommand = objc_getClass("NSMoveCommand");
-public static final int class_NSSplitView = objc_getClass("NSSplitView");
-public static final int class_NSTextBlock = objc_getClass("NSTextBlock");
-public static final int class_NSTabViewItem = objc_getClass("NSTabViewItem");
-public static final int class_NSCollectionViewItem = objc_getClass("NSCollectionViewItem");
-public static final int class_NSValue = objc_getClass("NSValue");
-public static final int class_NSHelpManager = objc_getClass("NSHelpManager");
-public static final int class_NSEnumerator = objc_getClass("NSEnumerator");
-public static final int class_NSDistantObject = objc_getClass("NSDistantObject");
-public static final int class_NSGarbageCollector = objc_getClass("NSGarbageCollector");
-public static final int class_NSXMLParser = objc_getClass("NSXMLParser");
-public static final int class_NSFont = objc_getClass("NSFont");
-public static final int class_NSAlert = objc_getClass("NSAlert");
-public static final int class_NSUniqueIDSpecifier = objc_getClass("NSUniqueIDSpecifier");
-public static final int class_NSOutlineView = objc_getClass("NSOutlineView");
-public static final int class_NSProgressIndicator = objc_getClass("NSProgressIndicator");
-public static final int class_NSController = objc_getClass("NSController");
-public static final int class_NSComboBox = objc_getClass("NSComboBox");
-public static final int class_NSArrayController = objc_getClass("NSArrayController");
-public static final int class_NSKeyedArchiver = objc_getClass("NSKeyedArchiver");
-public static final int class_NSDecimalNumberHandler = objc_getClass("NSDecimalNumberHandler");
-public static final int class_NSObject = objc_getClass("NSObject");
-public static final int class_NSNameSpecifier = objc_getClass("NSNameSpecifier");
-public static final int class_NSUserDefaultsController = objc_getClass("NSUserDefaultsController");
-public static final int class_NSLevelIndicator = objc_getClass("NSLevelIndicator");
-public static final int class_NSDistributedLock = objc_getClass("NSDistributedLock");
-public static final int class_NSTokenFieldCell = objc_getClass("NSTokenFieldCell");
-public static final int class_NSSet = objc_getClass("NSSet");
-public static final int class_NSMutableData = objc_getClass("NSMutableData");
-public static final int class_NSArray = objc_getClass("NSArray");
-public static final int class_NSExpression = objc_getClass("NSExpression");
-public static final int class_NSMenuItemCell = objc_getClass("NSMenuItemCell");
-public static final int class_NSColorPicker = objc_getClass("NSColorPicker");
-public static final int class_NSForm = objc_getClass("NSForm");
-public static final int class_NSApplication = objc_getClass("NSApplication");
-public static final int class_NSInputManager = objc_getClass("NSInputManager");
-public static final int class_NSPointerFunctions = objc_getClass("NSPointerFunctions");
-public static final int class_NSRecursiveLock = objc_getClass("NSRecursiveLock");
-public static final int class_NSBox = objc_getClass("NSBox");
-public static final int class_NSDockTile = objc_getClass("NSDockTile");
-public static final int class_NSTextAttachment = objc_getClass("NSTextAttachment");
-public static final int class_NSIndexPath = objc_getClass("NSIndexPath");
-public static final int class_NSEPSImageRep = objc_getClass("NSEPSImageRep");
-public static final int class_NSBrowserCell = objc_getClass("NSBrowserCell");
-public static final int class_NSValueTransformer = objc_getClass("NSValueTransformer");
-public static final int class_CIImage = objc_getClass("CIImage");
-public static final int class_NSMovie = objc_getClass("NSMovie");
-public static final int class_NSTimer = objc_getClass("NSTimer");
-public static final int class_NSMachPort = objc_getClass("NSMachPort");
-public static final int class_NSCreateCommand = objc_getClass("NSCreateCommand");
-public static final int class_NSPortNameServer = objc_getClass("NSPortNameServer");
-public static final int class_NSRulerMarker = objc_getClass("NSRulerMarker");
-public static final int class_NSImageRep = objc_getClass("NSImageRep");
-public static final int class_NSWindow = objc_getClass("NSWindow");
-public static final int class_NSColorWell = objc_getClass("NSColorWell");
-public static final int class_NSSound = objc_getClass("NSSound");
-public static final int class_NSToolbarItemGroup = objc_getClass("NSToolbarItemGroup");
-public static final int class_NSRulerView = objc_getClass("NSRulerView");
-public static final int class_NSWorkspace = objc_getClass("NSWorkspace");
-public static final int class_NSSearchFieldCell = objc_getClass("NSSearchFieldCell");
-public static final int class_NSMutableArray = objc_getClass("NSMutableArray");
-public static final int class_NSRuleEditor = objc_getClass("NSRuleEditor");
-public static final int class_NSScriptCommandDescription = objc_getClass("NSScriptCommandDescription");
-public static final int class_NSViewController = objc_getClass("NSViewController");
-public static final int class_NSPredicateEditor = objc_getClass("NSPredicateEditor");
-public static final int class_NSCloneCommand = objc_getClass("NSCloneCommand");
-public static final int class_NSOpenGLView = objc_getClass("NSOpenGLView");
-public static final int class_NSCursor = objc_getClass("NSCursor");
-public static final int class_NSSearchField = objc_getClass("NSSearchField");
-public static final int class_NSXMLDTD = objc_getClass("NSXMLDTD");
-public static final int class_NSSocketPort = objc_getClass("NSSocketPort");
-public static final int class_NSObjectController = objc_getClass("NSObjectController");
-public static final int class_NSScriptCommand = objc_getClass("NSScriptCommand");
-public static final int class_NSShadow = objc_getClass("NSShadow");
-public static final int class_NSScrollView = objc_getClass("NSScrollView");
-public static final int class_NSPrintPanel = objc_getClass("NSPrintPanel");
-public static final int class_NSURLHandle = objc_getClass("NSURLHandle");
-public static final int class_NSOperation = objc_getClass("NSOperation");
-public static final int class_NSMutableDictionary = objc_getClass("NSMutableDictionary");
-public static final int class_NSException = objc_getClass("NSException");
-public static final int class_NSButtonCell = objc_getClass("NSButtonCell");
-public static final int class_NSTask = objc_getClass("NSTask");
-public static final int class_NSArchiver = objc_getClass("NSArchiver");
-public static final int class_NSDateFormatter = objc_getClass("NSDateFormatter");
-public static final int class_NSCalendar = objc_getClass("NSCalendar");
-public static final int class_NSTokenField = objc_getClass("NSTokenField");
-public static final int class_NSCollectionView = objc_getClass("NSCollectionView");
-public static final int class_NSColorList = objc_getClass("NSColorList");
-public static final int class_DOMEvent = objc_getClass("DOMEvent");
-public static final int class_DOMWheelEvent = objc_getClass("DOMWheelEvent");
-public static final int class_WebView = objc_getClass("WebView");
-public static final int class_WebPreferences = objc_getClass("WebPreferences");
-public static final int class_WebFrameView = objc_getClass("WebFrameView");
+public static final int /*long*/ class_DOMDocument = objc_getClass("DOMDocument");
+public static final int /*long*/ class_DOMEvent = objc_getClass("DOMEvent");
+public static final int /*long*/ class_DOMKeyboardEvent = objc_getClass("DOMKeyboardEvent");
+public static final int /*long*/ class_DOMMouseEvent = objc_getClass("DOMMouseEvent");
+public static final int /*long*/ class_DOMUIEvent = objc_getClass("DOMUIEvent");
+public static final int /*long*/ class_DOMWheelEvent = objc_getClass("DOMWheelEvent");
+public static final int /*long*/ class_NSActionCell = objc_getClass("NSActionCell");
+public static final int /*long*/ class_NSAffineTransform = objc_getClass("NSAffineTransform");
+public static final int /*long*/ class_NSAlert = objc_getClass("NSAlert");
+public static final int /*long*/ class_NSAppleEventDescriptor = objc_getClass("NSAppleEventDescriptor");
+public static final int /*long*/ class_NSApplication = objc_getClass("NSApplication");
+public static final int /*long*/ class_NSArray = objc_getClass("NSArray");
+public static final int /*long*/ class_NSAttributedString = objc_getClass("NSAttributedString");
+public static final int /*long*/ class_NSAutoreleasePool = objc_getClass("NSAutoreleasePool");
+public static final int /*long*/ class_NSBezierPath = objc_getClass("NSBezierPath");
+public static final int /*long*/ class_NSBitmapImageRep = objc_getClass("NSBitmapImageRep");
+public static final int /*long*/ class_NSBox = objc_getClass("NSBox");
+public static final int /*long*/ class_NSBrowserCell = objc_getClass("NSBrowserCell");
+public static final int /*long*/ class_NSBundle = objc_getClass("NSBundle");
+public static final int /*long*/ class_NSButton = objc_getClass("NSButton");
+public static final int /*long*/ class_NSButtonCell = objc_getClass("NSButtonCell");
+public static final int /*long*/ class_NSCalendarDate = objc_getClass("NSCalendarDate");
+public static final int /*long*/ class_NSCell = objc_getClass("NSCell");
+public static final int /*long*/ class_NSClipView = objc_getClass("NSClipView");
+public static final int /*long*/ class_NSCoder = objc_getClass("NSCoder");
+public static final int /*long*/ class_NSColor = objc_getClass("NSColor");
+public static final int /*long*/ class_NSColorPanel = objc_getClass("NSColorPanel");
+public static final int /*long*/ class_NSColorSpace = objc_getClass("NSColorSpace");
+public static final int /*long*/ class_NSComboBox = objc_getClass("NSComboBox");
+public static final int /*long*/ class_NSControl = objc_getClass("NSControl");
+public static final int /*long*/ class_NSCursor = objc_getClass("NSCursor");
+public static final int /*long*/ class_NSData = objc_getClass("NSData");
+public static final int /*long*/ class_NSDate = objc_getClass("NSDate");
+public static final int /*long*/ class_NSDatePicker = objc_getClass("NSDatePicker");
+public static final int /*long*/ class_NSDictionary = objc_getClass("NSDictionary");
+public static final int /*long*/ class_NSDirectoryEnumerator = objc_getClass("NSDirectoryEnumerator");
+public static final int /*long*/ class_NSEnumerator = objc_getClass("NSEnumerator");
+public static final int /*long*/ class_NSError = objc_getClass("NSError");
+public static final int /*long*/ class_NSEvent = objc_getClass("NSEvent");
+public static final int /*long*/ class_NSFileManager = objc_getClass("NSFileManager");
+public static final int /*long*/ class_NSFont = objc_getClass("NSFont");
+public static final int /*long*/ class_NSFontManager = objc_getClass("NSFontManager");
+public static final int /*long*/ class_NSFontPanel = objc_getClass("NSFontPanel");
+public static final int /*long*/ class_NSGradient = objc_getClass("NSGradient");
+public static final int /*long*/ class_NSGraphicsContext = objc_getClass("NSGraphicsContext");
+public static final int /*long*/ class_NSHTTPCookie = objc_getClass("NSHTTPCookie");
+public static final int /*long*/ class_NSHTTPCookieStorage = objc_getClass("NSHTTPCookieStorage");
+public static final int /*long*/ class_NSImage = objc_getClass("NSImage");
+public static final int /*long*/ class_NSImageRep = objc_getClass("NSImageRep");
+public static final int /*long*/ class_NSImageView = objc_getClass("NSImageView");
+public static final int /*long*/ class_NSIndexSet = objc_getClass("NSIndexSet");
+public static final int /*long*/ class_NSInputManager = objc_getClass("NSInputManager");
+public static final int /*long*/ class_NSKeyedArchiver = objc_getClass("NSKeyedArchiver");
+public static final int /*long*/ class_NSKeyedUnarchiver = objc_getClass("NSKeyedUnarchiver");
+public static final int /*long*/ class_NSLayoutManager = objc_getClass("NSLayoutManager");
+public static final int /*long*/ class_NSMenu = objc_getClass("NSMenu");
+public static final int /*long*/ class_NSMenuItem = objc_getClass("NSMenuItem");
+public static final int /*long*/ class_NSMutableArray = objc_getClass("NSMutableArray");
+public static final int /*long*/ class_NSMutableAttributedString = objc_getClass("NSMutableAttributedString");
+public static final int /*long*/ class_NSMutableDictionary = objc_getClass("NSMutableDictionary");
+public static final int /*long*/ class_NSMutableIndexSet = objc_getClass("NSMutableIndexSet");
+public static final int /*long*/ class_NSMutableParagraphStyle = objc_getClass("NSMutableParagraphStyle");
+public static final int /*long*/ class_NSMutableSet = objc_getClass("NSMutableSet");
+public static final int /*long*/ class_NSMutableString = objc_getClass("NSMutableString");
+public static final int /*long*/ class_NSMutableURLRequest = objc_getClass("NSMutableURLRequest");
+public static final int /*long*/ class_NSNotification = objc_getClass("NSNotification");
+public static final int /*long*/ class_NSNotificationCenter = objc_getClass("NSNotificationCenter");
+public static final int /*long*/ class_NSNumber = objc_getClass("NSNumber");
+public static final int /*long*/ class_NSObject = objc_getClass("NSObject");
+public static final int /*long*/ class_NSOpenGLContext = objc_getClass("NSOpenGLContext");
+public static final int /*long*/ class_NSOpenGLPixelFormat = objc_getClass("NSOpenGLPixelFormat");
+public static final int /*long*/ class_NSOpenGLView = objc_getClass("NSOpenGLView");
+public static final int /*long*/ class_NSOpenPanel = objc_getClass("NSOpenPanel");
+public static final int /*long*/ class_NSOutlineView = objc_getClass("NSOutlineView");
+public static final int /*long*/ class_NSPanel = objc_getClass("NSPanel");
+public static final int /*long*/ class_NSParagraphStyle = objc_getClass("NSParagraphStyle");
+public static final int /*long*/ class_NSPasteboard = objc_getClass("NSPasteboard");
+public static final int /*long*/ class_NSPopUpButton = objc_getClass("NSPopUpButton");
+public static final int /*long*/ class_NSPrintInfo = objc_getClass("NSPrintInfo");
+public static final int /*long*/ class_NSPrintOperation = objc_getClass("NSPrintOperation");
+public static final int /*long*/ class_NSPrintPanel = objc_getClass("NSPrintPanel");
+public static final int /*long*/ class_NSPrinter = objc_getClass("NSPrinter");
+public static final int /*long*/ class_NSProgressIndicator = objc_getClass("NSProgressIndicator");
+public static final int /*long*/ class_NSResponder = objc_getClass("NSResponder");
+public static final int /*long*/ class_NSRunLoop = objc_getClass("NSRunLoop");
+public static final int /*long*/ class_NSSavePanel = objc_getClass("NSSavePanel");
+public static final int /*long*/ class_NSScreen = objc_getClass("NSScreen");
+public static final int /*long*/ class_NSScrollView = objc_getClass("NSScrollView");
+public static final int /*long*/ class_NSScroller = objc_getClass("NSScroller");
+public static final int /*long*/ class_NSSearchField = objc_getClass("NSSearchField");
+public static final int /*long*/ class_NSSecureTextField = objc_getClass("NSSecureTextField");
+public static final int /*long*/ class_NSSet = objc_getClass("NSSet");
+public static final int /*long*/ class_NSSlider = objc_getClass("NSSlider");
+public static final int /*long*/ class_NSStatusBar = objc_getClass("NSStatusBar");
+public static final int /*long*/ class_NSStatusItem = objc_getClass("NSStatusItem");
+public static final int /*long*/ class_NSStepper = objc_getClass("NSStepper");
+public static final int /*long*/ class_NSString = objc_getClass("NSString");
+public static final int /*long*/ class_NSTabView = objc_getClass("NSTabView");
+public static final int /*long*/ class_NSTabViewItem = objc_getClass("NSTabViewItem");
+public static final int /*long*/ class_NSTableColumn = objc_getClass("NSTableColumn");
+public static final int /*long*/ class_NSTableHeaderCell = objc_getClass("NSTableHeaderCell");
+public static final int /*long*/ class_NSTableHeaderView = objc_getClass("NSTableHeaderView");
+public static final int /*long*/ class_NSTableView = objc_getClass("NSTableView");
+public static final int /*long*/ class_NSText = objc_getClass("NSText");
+public static final int /*long*/ class_NSTextContainer = objc_getClass("NSTextContainer");
+public static final int /*long*/ class_NSTextField = objc_getClass("NSTextField");
+public static final int /*long*/ class_NSTextFieldCell = objc_getClass("NSTextFieldCell");
+public static final int /*long*/ class_NSTextStorage = objc_getClass("NSTextStorage");
+public static final int /*long*/ class_NSTextView = objc_getClass("NSTextView");
+public static final int /*long*/ class_NSTimeZone = objc_getClass("NSTimeZone");
+public static final int /*long*/ class_NSTimer = objc_getClass("NSTimer");
+public static final int /*long*/ class_NSTypesetter = objc_getClass("NSTypesetter");
+public static final int /*long*/ class_NSURL = objc_getClass("NSURL");
+public static final int /*long*/ class_NSURLDownload = objc_getClass("NSURLDownload");
+public static final int /*long*/ class_NSURLRequest = objc_getClass("NSURLRequest");
+public static final int /*long*/ class_NSValue = objc_getClass("NSValue");
+public static final int /*long*/ class_NSView = objc_getClass("NSView");
+public static final int /*long*/ class_NSWindow = objc_getClass("NSWindow");
+public static final int /*long*/ class_NSWorkspace = objc_getClass("NSWorkspace");
+public static final int /*long*/ class_WebDataSource = objc_getClass("WebDataSource");
+public static final int /*long*/ class_WebFrame = objc_getClass("WebFrame");
+public static final int /*long*/ class_WebFrameView = objc_getClass("WebFrameView");
+public static final int /*long*/ class_WebPreferences = objc_getClass("WebPreferences");
+public static final int /*long*/ class_WebView = objc_getClass("WebView");
+
+/** Protocols */
+public static final int /*long*/ protocol_NSAccessibility = objc_getProtocol("NSAccessibility");
+public static final int /*long*/ protocol_NSApplicationDelegate = objc_getProtocol("NSApplicationDelegate");
+public static final int /*long*/ protocol_NSApplicationNotifications = objc_getProtocol("NSApplicationNotifications");
+public static final int /*long*/ protocol_NSColorPanelResponderMethod = objc_getProtocol("NSColorPanelResponderMethod");
+public static final int /*long*/ protocol_NSComboBoxNotifications = objc_getProtocol("NSComboBoxNotifications");
+public static final int /*long*/ protocol_NSFontManagerResponderMethod = objc_getProtocol("NSFontManagerResponderMethod");
+public static final int /*long*/ protocol_NSMenuDelegate = objc_getProtocol("NSMenuDelegate");
+public static final int /*long*/ protocol_NSOutlineViewDataSource = objc_getProtocol("NSOutlineViewDataSource");
+public static final int /*long*/ protocol_NSOutlineViewDelegate = objc_getProtocol("NSOutlineViewDelegate");
+public static final int /*long*/ protocol_NSOutlineViewNotifications = objc_getProtocol("NSOutlineViewNotifications");
+public static final int /*long*/ protocol_NSTabViewDelegate = objc_getProtocol("NSTabViewDelegate");
+public static final int /*long*/ protocol_NSTableDataSource = objc_getProtocol("NSTableDataSource");
+public static final int /*long*/ protocol_NSTableViewDelegate = objc_getProtocol("NSTableViewDelegate");
+public static final int /*long*/ protocol_NSTableViewNotifications = objc_getProtocol("NSTableViewNotifications");
+public static final int /*long*/ protocol_NSTextDelegate = objc_getProtocol("NSTextDelegate");
+public static final int /*long*/ protocol_NSTextInput = objc_getProtocol("NSTextInput");
+public static final int /*long*/ protocol_NSTextViewDelegate = objc_getProtocol("NSTextViewDelegate");
+public static final int /*long*/ protocol_NSURLDownloadDelegate = objc_getProtocol("NSURLDownloadDelegate");
+public static final int /*long*/ protocol_NSWindowDelegate = objc_getProtocol("NSWindowDelegate");
+public static final int /*long*/ protocol_NSWindowNotifications = objc_getProtocol("NSWindowNotifications");
+public static final int /*long*/ protocol_WebDocumentRepresentation = objc_getProtocol("WebDocumentRepresentation");
+public static final int /*long*/ protocol_WebFrameLoadDelegate = objc_getProtocol("WebFrameLoadDelegate");
+public static final int /*long*/ protocol_WebOpenPanelResultListener = objc_getProtocol("WebOpenPanelResultListener");
+public static final int /*long*/ protocol_WebPolicyDecisionListener = objc_getProtocol("WebPolicyDecisionListener");
+public static final int /*long*/ protocol_WebPolicyDelegate = objc_getProtocol("WebPolicyDelegate");
+public static final int /*long*/ protocol_WebResourceLoadDelegate = objc_getProtocol("WebResourceLoadDelegate");
+public static final int /*long*/ protocol_WebUIDelegate = objc_getProtocol("WebUIDelegate");
 
 /** Selectors */
-public static final int sel_inputClientEnabled_1 = sel_registerName("inputClientEnabled:");
-public static final int sel_setVerticalPagination_1 = sel_registerName("setVerticalPagination:");
-public static final int sel_isEqualToHost_1 = sel_registerName("isEqualToHost:");
-public static final int sel_compare_1 = sel_registerName("compare:");
-public static final int sel_printPanel = sel_registerName("printPanel");
-public static final int sel_unregisterImageRepClass_1 = sel_registerName("unregisterImageRepClass:");
-public static final int sel_dataWithLength_1 = sel_registerName("dataWithLength:");
-public static final int sel_dismissPopUp = sel_registerName("dismissPopUp");
-public static final int sel_substituteFontForFont_1 = sel_registerName("substituteFontForFont:");
-public static final int sel_sendAction_1to_1 = sel_registerName("sendAction:to:");
-public static final int sel_rangeOfCharacterFromSet_1options_1range_1 = sel_registerName("rangeOfCharacterFromSet:options:range:");
-public static final int sel_autoupdatingCurrentCalendar = sel_registerName("autoupdatingCurrentCalendar");
-public static final int sel_nextDaylightSavingTimeTransitionAfterDate_1 = sel_registerName("nextDaylightSavingTimeTransitionAfterDate:");
-public static final int sel_attachmentSizeForGlyphAtIndex_1 = sel_registerName("attachmentSizeForGlyphAtIndex:");
-public static final int sel_shouldCollapseAutoExpandedItemsForDeposited_1 = sel_registerName("shouldCollapseAutoExpandedItemsForDeposited:");
-public static final int sel_decimalNumberByRoundingAccordingToBehavior_1 = sel_registerName("decimalNumberByRoundingAccordingToBehavior:");
-public static final int sel_scanHexFloat_1 = sel_registerName("scanHexFloat:");
-public static final int sel_rangesForUserTextChange = sel_registerName("rangesForUserTextChange");
-public static final int sel_indexOfItemWithObjectValue_1 = sel_registerName("indexOfItemWithObjectValue:");
-public static final int sel_sendsSearchStringImmediately = sel_registerName("sendsSearchStringImmediately");
-public static final int sel_isTransparent = sel_registerName("isTransparent");
-public static final int sel_widthOfColumn_1 = sel_registerName("widthOfColumn:");
-public static final int sel_calendarFormat = sel_registerName("calendarFormat");
-public static final int sel_lineBreakByHyphenatingBeforeIndex_1withinRange_1 = sel_registerName("lineBreakByHyphenatingBeforeIndex:withinRange:");
-public static final int sel_parentNode = sel_registerName("parentNode");
-public static final int sel_setDrawsOutsideLineFragment_1forGlyphRange_1 = sel_registerName("setDrawsOutsideLineFragment:forGlyphRange:");
-public static final int sel_negativeSuffix = sel_registerName("negativeSuffix");
-public static final int sel_setFlatness_1 = sel_registerName("setFlatness:");
-public static final int sel_ignoresAlpha = sel_registerName("ignoresAlpha");
-public static final int sel_setValue_1type_1forDimension_1 = sel_registerName("setValue:type:forDimension:");
-public static final int sel_setLayer_1 = sel_registerName("setLayer:");
-public static final int sel_setActionName_1 = sel_registerName("setActionName:");
-public static final int sel_setIcon_1 = sel_registerName("setIcon:");
-public static final int sel_tokenFieldCell_1readFromPasteboard_1 = sel_registerName("tokenFieldCell:readFromPasteboard:");
-public static final int sel_setPropertyList_1forType_1 = sel_registerName("setPropertyList:forType:");
-public static final int sel_endModalSession_1 = sel_registerName("endModalSession:");
-public static final int sel_sharedColorPanel = sel_registerName("sharedColorPanel");
-public static final int sel_contentSizeForFrameSize_1hasHorizontalScroller_1hasVerticalScroller_1borderType_1 = sel_registerName("contentSizeForFrameSize:hasHorizontalScroller:hasVerticalScroller:borderType:");
-public static final int sel_layoutRectForTextBlock_1glyphRange_1 = sel_registerName("layoutRectForTextBlock:glyphRange:");
-public static final int sel_scrollRowToVisible_1 = sel_registerName("scrollRowToVisible:");
-public static final int sel_attributedStringForZero = sel_registerName("attributedStringForZero");
-public static final int sel_showsInvisibleCharacters = sel_registerName("showsInvisibleCharacters");
-public static final int sel_adjustPageWidthNew_1left_1right_1limit_1 = sel_registerName("adjustPageWidthNew:left:right:limit:");
-public static final int sel_client = sel_registerName("client");
-public static final int sel_initWithKey_1ascending_1selector_1 = sel_registerName("initWithKey:ascending:selector:");
-public static final int sel_completedString_1 = sel_registerName("completedString:");
-public static final int sel_bundleForClass_1 = sel_registerName("bundleForClass:");
-public static final int sel_pathControl_1acceptDrop_1 = sel_registerName("pathControl:acceptDrop:");
-public static final int sel_imageRepsWithPasteboard_1 = sel_registerName("imageRepsWithPasteboard:");
-public static final int sel_toolTipForSegment_1 = sel_registerName("toolTipForSegment:");
-public static final int sel_suspended = sel_registerName("suspended");
-public static final int sel_encodeDouble_1forKey_1 = sel_registerName("encodeDouble:forKey:");
-public static final int sel_setNextState = sel_registerName("setNextState");
-public static final int sel_ignoreWord_1inSpellDocumentWithTag_1 = sel_registerName("ignoreWord:inSpellDocumentWithTag:");
-public static final int sel_stopMonitoring = sel_registerName("stopMonitoring");
-public static final int sel_initWithTitle_1action_1keyEquivalent_1 = sel_registerName("initWithTitle:action:keyEquivalent:");
-public static final int sel_setDropRow_1dropOperation_1 = sel_registerName("setDropRow:dropOperation:");
-public static final int sel_contentView = sel_registerName("contentView");
-public static final int sel_setNilSymbol_1 = sel_registerName("setNilSymbol:");
-public static final int sel_removePropertyForKey_1inRequest_1 = sel_registerName("removePropertyForKey:inRequest:");
-public static final int sel_setMarkerLocation_1 = sel_registerName("setMarkerLocation:");
-public static final int sel_resolvedKeyDictionary = sel_registerName("resolvedKeyDictionary");
-public static final int sel_enumeratorAtPath_1 = sel_registerName("enumeratorAtPath:");
-public static final int sel_decodeObjectForKey_1 = sel_registerName("decodeObjectForKey:");
-public static final int sel_loadInForeground = sel_registerName("loadInForeground");
-public static final int sel_baseSpecifier = sel_registerName("baseSpecifier");
-public static final int sel_isMemberOfClass_1 = sel_registerName("isMemberOfClass:");
-public static final int sel_setMaxVisibleColumns_1 = sel_registerName("setMaxVisibleColumns:");
-public static final int sel_unmountAndEjectDeviceAtPath_1 = sel_registerName("unmountAndEjectDeviceAtPath:");
-public static final int sel_openTempFile_1 = sel_registerName("openTempFile:");
-public static final int sel_isRowSelected_1 = sel_registerName("isRowSelected:");
-public static final int sel_insertItemWithItemIdentifier_1atIndex_1 = sel_registerName("insertItemWithItemIdentifier:atIndex:");
-public static final int sel_parserDidEndDocument_1 = sel_registerName("parserDidEndDocument:");
-public static final int sel_reverseTransformedValue_1 = sel_registerName("reverseTransformedValue:");
-public static final int sel_setTimeStyle_1 = sel_registerName("setTimeStyle:");
-public static final int sel_initWithContentsOfFile_1usedEncoding_1error_1 = sel_registerName("initWithContentsOfFile:usedEncoding:error:");
-public static final int sel_endGrouping = sel_registerName("endGrouping");
-public static final int sel_initWithProxyHost_1port_1type_1realm_1authenticationMethod_1 = sel_registerName("initWithProxyHost:port:type:realm:authenticationMethod:");
-public static final int sel_tableView_1dataCellForTableColumn_1row_1 = sel_registerName("tableView:dataCellForTableColumn:row:");
-public static final int sel_convertPoint_1toView_1 = sel_registerName("convertPoint:toView:");
-public static final int sel_setFrame_1display_1animate_1 = sel_registerName("setFrame:display:animate:");
-public static final int sel_exceptionDuringOperation_1error_1leftOperand_1rightOperand_1 = sel_registerName("exceptionDuringOperation:error:leftOperand:rightOperand:");
-public static final int sel_applicationOpenUntitledFile_1 = sel_registerName("applicationOpenUntitledFile:");
-public static final int sel_initWithRootElement_1 = sel_registerName("initWithRootElement:");
-public static final int sel_setHorizontalScroller_1 = sel_registerName("setHorizontalScroller:");
-public static final int sel_finalWritePrintInfo = sel_registerName("finalWritePrintInfo");
-public static final int sel_addItemWithTitle_1 = sel_registerName("addItemWithTitle:");
-public static final int sel_setColor_1 = sel_registerName("setColor:");
-public static final int sel_isHostCacheEnabled = sel_registerName("isHostCacheEnabled");
-public static final int sel_controlTextDidChange_1 = sel_registerName("controlTextDidChange:");
-public static final int sel_headerLevel = sel_registerName("headerLevel");
-public static final int sel_loadInBackground = sel_registerName("loadInBackground");
-public static final int sel_setNeedsDisplayForItemAtIndex_1 = sel_registerName("setNeedsDisplayForItemAtIndex:");
-public static final int sel_setCellPrototype_1 = sel_registerName("setCellPrototype:");
-public static final int sel_enqueueNotification_1postingStyle_1coalesceMask_1forModes_1 = sel_registerName("enqueueNotification:postingStyle:coalesceMask:forModes:");
-public static final int sel_minColumnWidth = sel_registerName("minColumnWidth");
-public static final int sel_tableView_1shouldTypeSelectForEvent_1withCurrentSearchString_1 = sel_registerName("tableView:shouldTypeSelectForEvent:withCurrentSearchString:");
-public static final int sel_validateValue_1forKey_1error_1 = sel_registerName("validateValue:forKey:error:");
-public static final int sel_canBeConvertedToEncoding_1 = sel_registerName("canBeConvertedToEncoding:");
-public static final int sel_numberOfItems = sel_registerName("numberOfItems");
-public static final int sel_bestRepresentationForDevice_1 = sel_registerName("bestRepresentationForDevice:");
-public static final int sel_setBorderColor_1forEdge_1 = sel_registerName("setBorderColor:forEdge:");
-public static final int sel_setHorizontalLineScroll_1 = sel_registerName("setHorizontalLineScroll:");
-public static final int sel_sharedHTTPCookieStorage = sel_registerName("sharedHTTPCookieStorage");
-public static final int sel_cachesBezierPath = sel_registerName("cachesBezierPath");
-public static final int sel_strokeLineFromPoint_1toPoint_1 = sel_registerName("strokeLineFromPoint:toPoint:");
-public static final int sel_preferredBackingLocation = sel_registerName("preferredBackingLocation");
-public static final int sel_removeRowAtIndex_1 = sel_registerName("removeRowAtIndex:");
-public static final int sel_setCurrentTime_1 = sel_registerName("setCurrentTime:");
-public static final int sel_string = sel_registerName("string");
-public static final int sel_hasVerticalScroller = sel_registerName("hasVerticalScroller");
-public static final int sel_initWithTimeInterval_1sinceDate_1 = sel_registerName("initWithTimeInterval:sinceDate:");
-public static final int sel_showsProgressPanel = sel_registerName("showsProgressPanel");
-public static final int sel_setDirectParameter_1 = sel_registerName("setDirectParameter:");
-public static final int sel_storeCachedResponse_1forRequest_1 = sel_registerName("storeCachedResponse:forRequest:");
-public static final int sel_textUnfilteredPasteboardTypes = sel_registerName("textUnfilteredPasteboardTypes");
-public static final int sel_isDragging = sel_registerName("isDragging");
-public static final int sel_tableView_1shouldTrackCell_1forTableColumn_1row_1 = sel_registerName("tableView:shouldTrackCell:forTableColumn:row:");
-public static final int sel_dictionaryRepresentation = sel_registerName("dictionaryRepresentation");
-public static final int sel_attributesForExtraLineFragment = sel_registerName("attributesForExtraLineFragment");
-public static final int sel_getCharacters_1range_1 = sel_registerName("getCharacters:range:");
-public static final int sel_nibName = sel_registerName("nibName");
-public static final int sel_initWithURL_1options_1documentAttributes_1error_1 = sel_registerName("initWithURL:options:documentAttributes:error:");
-public static final int sel_initWithFrame_1mode_1cellClass_1numberOfRows_1numberOfColumns_1 = sel_registerName("initWithFrame:mode:cellClass:numberOfRows:numberOfColumns:");
-public static final int sel_reflectScrolledClipView_1 = sel_registerName("reflectScrolledClipView:");
-public static final int sel_stringWithContentsOfURL_1usedEncoding_1error_1 = sel_registerName("stringWithContentsOfURL:usedEncoding:error:");
-public static final int sel_displayIfNeededIgnoringOpacity = sel_registerName("displayIfNeededIgnoringOpacity");
-public static final int sel_archiverWillFinish_1 = sel_registerName("archiverWillFinish:");
-public static final int sel_initWithOptions_1 = sel_registerName("initWithOptions:");
-public static final int sel_ruleEditor_1numberOfChildrenForCriterion_1withRowType_1 = sel_registerName("ruleEditor:numberOfChildrenForCriterion:withRowType:");
-public static final int sel_removeColorWithKey_1 = sel_registerName("removeColorWithKey:");
-public static final int sel_setObjectValue_1 = sel_registerName("setObjectValue:");
-public static final int sel_graphicsContextWithGraphicsPort_1flipped_1 = sel_registerName("graphicsContextWithGraphicsPort:flipped:");
-public static final int sel_setMarkedText_1selectedRange_1replacementRange_1 = sel_registerName("setMarkedText:selectedRange:replacementRange:");
-public static final int sel_outlineView_1numberOfChildrenOfItem_1 = sel_registerName("outlineView:numberOfChildrenOfItem:");
-public static final int sel_cellFrameAtRow_1column_1 = sel_registerName("cellFrameAtRow:column:");
-public static final int sel_blueColor = sel_registerName("blueColor");
-public static final int sel_selectedTextBackgroundColor = sel_registerName("selectedTextBackgroundColor");
-public static final int sel_initWithFormat_1locale_1 = sel_registerName("initWithFormat:locale:");
-public static final int sel_propertyListForType_1 = sel_registerName("propertyListForType:");
-public static final int sel_setConfigurationFromDictionary_1 = sel_registerName("setConfigurationFromDictionary:");
-public static final int sel_registerClassDescription_1forClass_1 = sel_registerName("registerClassDescription:forClass:");
-public static final int sel_removeAllItems = sel_registerName("removeAllItems");
-public static final int sel_setFontPanelFactory_1 = sel_registerName("setFontPanelFactory:");
-public static final int sel_didChangeValueForKey_1withSetMutation_1usingObjects_1 = sel_registerName("didChangeValueForKey:withSetMutation:usingObjects:");
-public static final int sel_CGEvent = sel_registerName("CGEvent");
-public static final int sel_disable = sel_registerName("disable");
-public static final int sel_setColumnAutoresizingStyle_1 = sel_registerName("setColumnAutoresizingStyle:");
-public static final int sel_absoluteZ = sel_registerName("absoluteZ");
-public static final int sel_intForKey_1inTable_1 = sel_registerName("intForKey:inTable:");
-public static final int sel_minFrameWidthWithTitle_1styleMask_1 = sel_registerName("minFrameWidthWithTitle:styleMask:");
-public static final int sel_highlightColor = sel_registerName("highlightColor");
-public static final int sel_setRoundingMode_1 = sel_registerName("setRoundingMode:");
-public static final int sel_didChangeValueForKey_1 = sel_registerName("didChangeValueForKey:");
-public static final int sel_setMenuZone_1 = sel_registerName("setMenuZone:");
-public static final int sel_updateFromPrintInfo = sel_registerName("updateFromPrintInfo");
-public static final int sel_setSelectedItemIdentifier_1 = sel_registerName("setSelectedItemIdentifier:");
-public static final int sel_setReplyTimeout_1 = sel_registerName("setReplyTimeout:");
-public static final int sel_showsFirstResponder = sel_registerName("showsFirstResponder");
-public static final int sel_loadNibNamed_1owner_1 = sel_registerName("loadNibNamed:owner:");
-public static final int sel_setDocument_1 = sel_registerName("setDocument:");
-public static final int sel_filePosixPermissions = sel_registerName("filePosixPermissions");
-public static final int sel_collapseItem_1collapseChildren_1 = sel_registerName("collapseItem:collapseChildren:");
-public static final int sel_setCell_1 = sel_registerName("setCell:");
-public static final int sel_setHTTPBodyStream_1 = sel_registerName("setHTTPBodyStream:");
-public static final int sel_updateAttachmentsFromPath_1 = sel_registerName("updateAttachmentsFromPath:");
-public static final int sel_updateFontPanel = sel_registerName("updateFontPanel");
-public static final int sel_animationDidStop_1 = sel_registerName("animationDidStop:");
-public static final int sel_URL_1resourceDidFailLoadingWithReason_1 = sel_registerName("URL:resourceDidFailLoadingWithReason:");
-public static final int sel_defaultBaselineOffsetForFont_1 = sel_registerName("defaultBaselineOffsetForFont:");
-public static final int sel_browser_1shouldShowCellExpansionForRow_1column_1 = sel_registerName("browser:shouldShowCellExpansionForRow:column:");
-public static final int sel_draggingEnded_1 = sel_registerName("draggingEnded:");
-public static final int sel_openURL_1 = sel_registerName("openURL:");
-public static final int sel_longLongValue = sel_registerName("longLongValue");
-public static final int sel_colorPanel = sel_registerName("colorPanel");
-public static final int sel_encodeFloat_1forKey_1 = sel_registerName("encodeFloat:forKey:");
-public static final int sel_shouldBreakLineByHyphenatingBeforeCharacterAtIndex_1 = sel_registerName("shouldBreakLineByHyphenatingBeforeCharacterAtIndex:");
-public static final int sel_performSelectorInBackground_1withObject_1 = sel_registerName("performSelectorInBackground:withObject:");
-public static final int sel_initTextCell_1 = sel_registerName("initTextCell:");
-public static final int sel_classDescription = sel_registerName("classDescription");
-public static final int sel_menuFontOfSize_1 = sel_registerName("menuFontOfSize:");
-public static final int sel_window_1willPositionSheet_1usingRect_1 = sel_registerName("window:willPositionSheet:usingRect:");
-public static final int sel_allowsTypeSelect = sel_registerName("allowsTypeSelect");
-public static final int sel_attributeWithName_1URI_1stringValue_1 = sel_registerName("attributeWithName:URI:stringValue:");
-public static final int sel_setLinkTextAttributes_1 = sel_registerName("setLinkTextAttributes:");
-public static final int sel_stringWithFormat_1 = sel_registerName("stringWithFormat:");
-public static final int sel_initWithTable_1startingRow_1rowSpan_1startingColumn_1columnSpan_1 = sel_registerName("initWithTable:startingRow:rowSpan:startingColumn:columnSpan:");
-public static final int sel_setShouldProcessNamespaces_1 = sel_registerName("setShouldProcessNamespaces:");
-public static final int sel_orderFrontRegardless = sel_registerName("orderFrontRegardless");
-public static final int sel_setProtocolForProxy_1 = sel_registerName("setProtocolForProxy:");
-public static final int sel_bundlePath = sel_registerName("bundlePath");
-public static final int sel_isAutoscroll = sel_registerName("isAutoscroll");
-public static final int sel_addConnection_1toRunLoop_1forMode_1 = sel_registerName("addConnection:toRunLoop:forMode:");
-public static final int sel_moveWordBackwardAndModifySelection_1 = sel_registerName("moveWordBackwardAndModifySelection:");
-public static final int sel_textContainerChangedGeometry_1 = sel_registerName("textContainerChangedGeometry:");
-public static final int sel_conversation = sel_registerName("conversation");
-public static final int sel_showWindow_1 = sel_registerName("showWindow:");
-public static final int sel_showGuessPanel_1 = sel_registerName("showGuessPanel:");
-public static final int sel_setBorderWidth_1 = sel_registerName("setBorderWidth:");
-public static final int sel_buttons = sel_registerName("buttons");
-public static final int sel_bitmapRepresentation = sel_registerName("bitmapRepresentation");
-public static final int sel_nextObject = sel_registerName("nextObject");
-public static final int sel_predicate = sel_registerName("predicate");
-public static final int sel_verticalPagination = sel_registerName("verticalPagination");
-public static final int sel_readInBackgroundAndNotify = sel_registerName("readInBackgroundAndNotify");
-public static final int sel_pixelBufferMipMapLevel = sel_registerName("pixelBufferMipMapLevel");
-public static final int sel_getValue_1 = sel_registerName("getValue:");
-public static final int sel_eventID = sel_registerName("eventID");
-public static final int sel_sortDescriptors = sel_registerName("sortDescriptors");
-public static final int sel_removeObjectAtArrangedObjectIndexPath_1 = sel_registerName("removeObjectAtArrangedObjectIndexPath:");
-public static final int sel_decodeBytesWithReturnedLength_1 = sel_registerName("decodeBytesWithReturnedLength:");
-public static final int sel_textView_1shouldChangeTextInRange_1replacementString_1 = sel_registerName("textView:shouldChangeTextInRange:replacementString:");
-public static final int sel_removeCursorRect_1cursor_1 = sel_registerName("removeCursorRect:cursor:");
-public static final int sel_hasPassword = sel_registerName("hasPassword");
-public static final int sel_updateWindows = sel_registerName("updateWindows");
-public static final int sel_pasteboardWithName_1 = sel_registerName("pasteboardWithName:");
-public static final int sel_writeSelectionToPasteboard_1types_1 = sel_registerName("writeSelectionToPasteboard:types:");
-public static final int sel_setFlipped_1 = sel_registerName("setFlipped:");
-public static final int sel_glyphWithName_1 = sel_registerName("glyphWithName:");
-public static final int sel_launchApplication_1showIcon_1autolaunch_1 = sel_registerName("launchApplication:showIcon:autolaunch:");
-public static final int sel_indexPath = sel_registerName("indexPath");
-public static final int sel_setAttributeDescriptor_1forKeyword_1 = sel_registerName("setAttributeDescriptor:forKeyword:");
-public static final int sel_removeAllActions = sel_registerName("removeAllActions");
-public static final int sel_defaultAttachmentScaling = sel_registerName("defaultAttachmentScaling");
-public static final int sel_localizedStringWithFormat_1 = sel_registerName("localizedStringWithFormat:");
-public static final int sel_setAutoscroll_1 = sel_registerName("setAutoscroll:");
-public static final int sel_heightAdjustLimit = sel_registerName("heightAdjustLimit");
-public static final int sel_moveUpAndModifySelection_1 = sel_registerName("moveUpAndModifySelection:");
-public static final int sel_visibilityPriority = sel_registerName("visibilityPriority");
-public static final int sel_textView_1clickedOnCell_1inRect_1atIndex_1 = sel_registerName("textView:clickedOnCell:inRect:atIndex:");
-public static final int sel_archivedDataWithRootObject_1 = sel_registerName("archivedDataWithRootObject:");
-public static final int sel_parser_1foundCDATA_1 = sel_registerName("parser:foundCDATA:");
-public static final int sel_setWidth_1ofColumn_1 = sel_registerName("setWidth:ofColumn:");
-public static final int sel_setHighlightedTableColumn_1 = sel_registerName("setHighlightedTableColumn:");
-public static final int sel_toggle_1 = sel_registerName("toggle:");
-public static final int sel_parent = sel_registerName("parent");
-public static final int sel_tableView_1shouldSelectRow_1 = sel_registerName("tableView:shouldSelectRow:");
-public static final int sel_setWithObject_1 = sel_registerName("setWithObject:");
-public static final int sel_attribute_1atIndex_1effectiveRange_1 = sel_registerName("attribute:atIndex:effectiveRange:");
-public static final int sel_columnsInRect_1 = sel_registerName("columnsInRect:");
-public static final int sel_setSearchScopes_1 = sel_registerName("setSearchScopes:");
-public static final int sel_setByAddingObjectsFromArray_1 = sel_registerName("setByAddingObjectsFromArray:");
-public static final int sel_textViewDidChangeTypingAttributes_1 = sel_registerName("textViewDidChangeTypingAttributes:");
-public static final int sel_frameRate = sel_registerName("frameRate");
-public static final int sel_browser_1writeRowsWithIndexes_1inColumn_1toPasteboard_1 = sel_registerName("browser:writeRowsWithIndexes:inColumn:toPasteboard:");
-public static final int sel_errorWithDomain_1code_1userInfo_1 = sel_registerName("errorWithDomain:code:userInfo:");
-public static final int sel_setAlternate_1 = sel_registerName("setAlternate:");
-public static final int sel_currentValue = sel_registerName("currentValue");
-public static final int sel_download_1decideDestinationWithSuggestedFilename_1 = sel_registerName("download:decideDestinationWithSuggestedFilename:");
-public static final int sel_setBoxType_1 = sel_registerName("setBoxType:");
-public static final int sel_fileNamesFromRunningOpenPanel = sel_registerName("fileNamesFromRunningOpenPanel");
-public static final int sel_valueWithPointer_1 = sel_registerName("valueWithPointer:");
-public static final int sel_metadataQuery_1replacementObjectForResultObject_1 = sel_registerName("metadataQuery:replacementObjectForResultObject:");
-public static final int sel_editedColumn = sel_registerName("editedColumn");
-public static final int sel_cachedResponseForRequest_1 = sel_registerName("cachedResponseForRequest:");
-public static final int sel_failureReason = sel_registerName("failureReason");
-public static final int sel_constantValue = sel_registerName("constantValue");
-public static final int sel_commandClassName = sel_registerName("commandClassName");
-public static final int sel_fileWrapper = sel_registerName("fileWrapper");
-public static final int sel_setUsesUserKeyEquivalents_1 = sel_registerName("setUsesUserKeyEquivalents:");
-public static final int sel_prototype = sel_registerName("prototype");
-public static final int sel_clearStartAnimation = sel_registerName("clearStartAnimation");
-public static final int sel_setMovableByWindowBackground_1 = sel_registerName("setMovableByWindowBackground:");
-public static final int sel_setDateFormat_1 = sel_registerName("setDateFormat:");
-public static final int sel_stringWithContentsOfFile_1usedEncoding_1error_1 = sel_registerName("stringWithContentsOfFile:usedEncoding:error:");
-public static final int sel_toggleAutomaticLinkDetection_1 = sel_registerName("toggleAutomaticLinkDetection:");
-public static final int sel_statusForTable_1 = sel_registerName("statusForTable:");
-public static final int sel_setAllowsColumnSelection_1 = sel_registerName("setAllowsColumnSelection:");
-public static final int sel_lowercaseWord_1 = sel_registerName("lowercaseWord:");
-public static final int sel_setResolvesAliases_1 = sel_registerName("setResolvesAliases:");
-public static final int sel_appendFormat_1 = sel_registerName("appendFormat:");
-public static final int sel_isAnimating = sel_registerName("isAnimating");
-public static final int sel_dateFormat = sel_registerName("dateFormat");
-public static final int sel_setMuted_1 = sel_registerName("setMuted:");
-public static final int sel_drawWithExpansionFrame_1inView_1 = sel_registerName("drawWithExpansionFrame:inView:");
-public static final int sel_copyPath_1toPath_1handler_1 = sel_registerName("copyPath:toPath:handler:");
-public static final int sel_isExplicitlyIncluded = sel_registerName("isExplicitlyIncluded");
-public static final int sel_isExtensionHidden = sel_registerName("isExtensionHidden");
-public static final int sel_showPackedGlyphs_1length_1glyphRange_1atPoint_1font_1color_1printingAdjustment_1 = sel_registerName("showPackedGlyphs:length:glyphRange:atPoint:font:color:printingAdjustment:");
-public static final int sel_rulerView_1didRemoveMarker_1 = sel_registerName("rulerView:didRemoveMarker:");
-public static final int sel_setControlTint_1 = sel_registerName("setControlTint:");
-public static final int sel_isSelectable = sel_registerName("isSelectable");
-public static final int sel_initWithMachPort_1 = sel_registerName("initWithMachPort:");
-public static final int sel_fill = sel_registerName("fill");
-public static final int sel_isEnteringProximity = sel_registerName("isEnteringProximity");
-public static final int sel_drawingRectForBounds_1 = sel_registerName("drawingRectForBounds:");
-public static final int sel_decodeInt32ForKey_1 = sel_registerName("decodeInt32ForKey:");
-public static final int sel_deltaY = sel_registerName("deltaY");
-public static final int sel_displaysLinkToolTips = sel_registerName("displaysLinkToolTips");
-public static final int sel_moveToEndOfDocument_1 = sel_registerName("moveToEndOfDocument:");
-public static final int sel_isFirstResponder = sel_registerName("isFirstResponder");
-public static final int sel_receiversSpecifier = sel_registerName("receiversSpecifier");
-public static final int sel_canInitWithURL_1 = sel_registerName("canInitWithURL:");
-public static final int sel_parameterString = sel_registerName("parameterString");
-public static final int sel_isMovable = sel_registerName("isMovable");
-public static final int sel_setAvoidsEmptySelection_1 = sel_registerName("setAvoidsEmptySelection:");
-public static final int sel_lockFocusIfCanDrawInContext_1 = sel_registerName("lockFocusIfCanDrawInContext:");
-public static final int sel_updateChangeCount_1 = sel_registerName("updateChangeCount:");
-public static final int sel_rootDocument = sel_registerName("rootDocument");
-public static final int sel_superview = sel_registerName("superview");
-public static final int sel_resolveNamespaceForName_1 = sel_registerName("resolveNamespaceForName:");
-public static final int sel_maxNumberOfColumns = sel_registerName("maxNumberOfColumns");
-public static final int sel_setMaxSize_1 = sel_registerName("setMaxSize:");
-public static final int sel_completePathIntoString_1caseSensitive_1matchesIntoArray_1filterTypes_1 = sel_registerName("completePathIntoString:caseSensitive:matchesIntoArray:filterTypes:");
-public static final int sel_updateCell_1 = sel_registerName("updateCell:");
-public static final int sel_setWeek_1 = sel_registerName("setWeek:");
-public static final int sel_titleRectForBounds_1 = sel_registerName("titleRectForBounds:");
-public static final int sel_rulerView_1willAddMarker_1atLocation_1 = sel_registerName("rulerView:willAddMarker:atLocation:");
-public static final int sel_message = sel_registerName("message");
-public static final int sel_setContentSize_1 = sel_registerName("setContentSize:");
-public static final int sel_broadcast = sel_registerName("broadcast");
-public static final int sel_isNativeType_1 = sel_registerName("isNativeType:");
-public static final int sel_contentBorderThicknessForEdge_1 = sel_registerName("contentBorderThicknessForEdge:");
-public static final int sel_keyEquivalentOffset = sel_registerName("keyEquivalentOffset");
-public static final int sel_makeUntitledDocumentOfType_1 = sel_registerName("makeUntitledDocumentOfType:");
-public static final int sel_windowFrameTextColor = sel_registerName("windowFrameTextColor");
-public static final int sel_addItemsWithTitles_1 = sel_registerName("addItemsWithTitles:");
-public static final int sel_levelForRow_1 = sel_registerName("levelForRow:");
-public static final int sel_dissolveToPoint_1fromRect_1fraction_1 = sel_registerName("dissolveToPoint:fromRect:fraction:");
-public static final int sel_discardCachedImage = sel_registerName("discardCachedImage");
-public static final int sel_rootProxyForConnectionWithRegisteredName_1host_1usingNameServer_1 = sel_registerName("rootProxyForConnectionWithRegisteredName:host:usingNameServer:");
-public static final int sel_mouseExited_1 = sel_registerName("mouseExited:");
-public static final int sel_stringWithCString_1 = sel_registerName("stringWithCString:");
-public static final int sel_standardUserDefaults = sel_registerName("standardUserDefaults");
-public static final int sel_archiver_1didEncodeObject_1 = sel_registerName("archiver:didEncodeObject:");
-public static final int sel_canDraw = sel_registerName("canDraw");
-public static final int sel_shouldDelayWindowOrderingForEvent_1 = sel_registerName("shouldDelayWindowOrderingForEvent:");
-public static final int sel_selectedMenuItemTextColor = sel_registerName("selectedMenuItemTextColor");
-public static final int sel_attachSubmenuForItemAtIndex_1 = sel_registerName("attachSubmenuForItemAtIndex:");
-public static final int sel_condition = sel_registerName("condition");
-public static final int sel_setReservedThicknessForAccessoryView_1 = sel_registerName("setReservedThicknessForAccessoryView:");
-public static final int sel_replaceObjectsInRange_1withObjectsFromArray_1 = sel_registerName("replaceObjectsInRange:withObjectsFromArray:");
-public static final int sel_placeholderString = sel_registerName("placeholderString");
-public static final int sel_setPMSymbol_1 = sel_registerName("setPMSymbol:");
-public static final int sel_localizedNameOfStringEncoding_1 = sel_registerName("localizedNameOfStringEncoding:");
-public static final int sel_outlineViewItemWillCollapse_1 = sel_registerName("outlineViewItemWillCollapse:");
-public static final int sel_localizedKey = sel_registerName("localizedKey");
-public static final int sel_whiteColor = sel_registerName("whiteColor");
-public static final int sel_viewBoundsChanged_1 = sel_registerName("viewBoundsChanged:");
-public static final int sel_vendorDefined = sel_registerName("vendorDefined");
-public static final int sel_classNameDecodedForArchiveClassName_1 = sel_registerName("classNameDecodedForArchiveClassName:");
-public static final int sel_lockDate = sel_registerName("lockDate");
-public static final int sel_twoDigitStartDate = sel_registerName("twoDigitStartDate");
-public static final int sel_rectOfRow_1 = sel_registerName("rectOfRow:");
-public static final int sel_receivePort = sel_registerName("receivePort");
-public static final int sel_decimalNumberByMultiplyingByPowerOf10_1withBehavior_1 = sel_registerName("decimalNumberByMultiplyingByPowerOf10:withBehavior:");
-public static final int sel_isAnyApplicationSpeaking = sel_registerName("isAnyApplicationSpeaking");
-public static final int sel_aeDesc = sel_registerName("aeDesc");
-public static final int sel_windowWillBeginSheet_1 = sel_registerName("windowWillBeginSheet:");
-public static final int sel_accessibilityFocusedUIElement = sel_registerName("accessibilityFocusedUIElement");
-public static final int sel_orderBack_1 = sel_registerName("orderBack:");
-public static final int sel_scanDecimal_1 = sel_registerName("scanDecimal:");
-public static final int sel_transformStruct = sel_registerName("transformStruct");
-public static final int sel_fileAttributesToWriteToFile_1ofType_1saveOperation_1 = sel_registerName("fileAttributesToWriteToFile:ofType:saveOperation:");
-public static final int sel_controlCharacterSet = sel_registerName("controlCharacterSet");
-public static final int sel_setNextResponder_1 = sel_registerName("setNextResponder:");
-public static final int sel_pasteboardChangedOwner_1 = sel_registerName("pasteboardChangedOwner:");
-public static final int sel_canSelectHiddenExtension = sel_registerName("canSelectHiddenExtension");
-public static final int sel_attribute_1atIndex_1longestEffectiveRange_1inRange_1 = sel_registerName("attribute:atIndex:longestEffectiveRange:inRange:");
-public static final int sel_setAutovalidates_1 = sel_registerName("setAutovalidates:");
-public static final int sel_setAllowsFloats_1 = sel_registerName("setAllowsFloats:");
-public static final int sel_sortDescriptorPrototype = sel_registerName("sortDescriptorPrototype");
-public static final int sel_trackKnob_1 = sel_registerName("trackKnob:");
-public static final int sel_comboBox_1indexOfItemWithStringValue_1 = sel_registerName("comboBox:indexOfItemWithStringValue:");
-public static final int sel_setSource_1 = sel_registerName("setSource:");
-public static final int sel_contentFilters = sel_registerName("contentFilters");
-public static final int sel_dictionaryWithContentsOfFile_1 = sel_registerName("dictionaryWithContentsOfFile:");
-public static final int sel_drawArrow_1highlight_1 = sel_registerName("drawArrow:highlight:");
-public static final int sel_handleSaveScriptCommand_1 = sel_registerName("handleSaveScriptCommand:");
-public static final int sel_rangeOfString_1options_1 = sel_registerName("rangeOfString:options:");
-public static final int sel_setPickerMode_1 = sel_registerName("setPickerMode:");
-public static final int sel_setStandaloneQuarterSymbols_1 = sel_registerName("setStandaloneQuarterSymbols:");
-public static final int sel_setSize_1 = sel_registerName("setSize:");
-public static final int sel_setAllowsUndo_1 = sel_registerName("setAllowsUndo:");
-public static final int sel_edge = sel_registerName("edge");
-public static final int sel_stopLoading = sel_registerName("stopLoading");
-public static final int sel_fileURLWithPath_1isDirectory_1 = sel_registerName("fileURLWithPath:isDirectory:");
-public static final int sel_userInfo = sel_registerName("userInfo");
-public static final int sel_components_1fromDate_1 = sel_registerName("components:fromDate:");
-public static final int sel_dictionary = sel_registerName("dictionary");
-public static final int sel_connection_1didCancelAuthenticationChallenge_1 = sel_registerName("connection:didCancelAuthenticationChallenge:");
-public static final int sel_selectParagraph_1 = sel_registerName("selectParagraph:");
-public static final int sel_initWithCapacity_1 = sel_registerName("initWithCapacity:");
-public static final int sel_initWithObjectSpecifier_1comparisonOperator_1testObject_1 = sel_registerName("initWithObjectSpecifier:comparisonOperator:testObject:");
-public static final int sel_nestingMode = sel_registerName("nestingMode");
-public static final int sel_paragraphSpacingBefore = sel_registerName("paragraphSpacingBefore");
-public static final int sel_itemChanged_1 = sel_registerName("itemChanged:");
-public static final int sel_setSelectionIndexes_1 = sel_registerName("setSelectionIndexes:");
-public static final int sel_open = sel_registerName("open");
-public static final int sel_sendActionOn_1 = sel_registerName("sendActionOn:");
-public static final int sel_initWithFireDate_1interval_1target_1selector_1userInfo_1repeats_1 = sel_registerName("initWithFireDate:interval:target:selector:userInfo:repeats:");
-public static final int sel_formatterBehavior = sel_registerName("formatterBehavior");
-public static final int sel_fillRect_1 = sel_registerName("fillRect:");
-public static final int sel_animationCurve = sel_registerName("animationCurve");
-public static final int sel_remoteObjects = sel_registerName("remoteObjects");
-public static final int sel_setSelectionIndexPath_1 = sel_registerName("setSelectionIndexPath:");
-public static final int sel_availableFontNamesWithTraits_1 = sel_registerName("availableFontNamesWithTraits:");
-public static final int sel_convertFont_1toFamily_1 = sel_registerName("convertFont:toFamily:");
-public static final int sel_splitView_1resizeSubviewsWithOldSize_1 = sel_registerName("splitView:resizeSubviewsWithOldSize:");
-public static final int sel_setSmartInsertDeleteEnabled_1 = sel_registerName("setSmartInsertDeleteEnabled:");
-public static final int sel_shouldChangePrintInfo_1 = sel_registerName("shouldChangePrintInfo:");
-public static final int sel_objectBeingTested = sel_registerName("objectBeingTested");
-public static final int sel_selectItemWithObjectValue_1 = sel_registerName("selectItemWithObjectValue:");
-public static final int sel_rightExpressions = sel_registerName("rightExpressions");
-public static final int sel_unableToSetNilForKey_1 = sel_registerName("unableToSetNilForKey:");
-public static final int sel_visibleItems = sel_registerName("visibleItems");
-public static final int sel_items = sel_registerName("items");
-public static final int sel_templatesWithAttributeKeyPaths_1inEntityDescription_1 = sel_registerName("templatesWithAttributeKeyPaths:inEntityDescription:");
-public static final int sel_setMaximumIntegerDigits_1 = sel_registerName("setMaximumIntegerDigits:");
-public static final int sel_scrollRectToVisible_1 = sel_registerName("scrollRectToVisible:");
-public static final int sel_disableKeyEquivalentForDefaultButtonCell = sel_registerName("disableKeyEquivalentForDefaultButtonCell");
-public static final int sel_objectsForXQuery_1error_1 = sel_registerName("objectsForXQuery:error:");
-public static final int sel_readToEndOfFileInBackgroundAndNotifyForModes_1 = sel_registerName("readToEndOfFileInBackgroundAndNotifyForModes:");
-public static final int sel_scanHexLongLong_1 = sel_registerName("scanHexLongLong:");
+public static final int sel_DOMDocument = sel_registerName("DOMDocument");
+public static final int sel_IBeamCursor = sel_registerName("IBeamCursor");
+public static final int sel_TIFFRepresentation = sel_registerName("TIFFRepresentation");
+public static final int sel_URL = sel_registerName("URL");
+public static final int sel_URLWithString_ = sel_registerName("URLWithString:");
+public static final int sel_absoluteString = sel_registerName("absoluteString");
+public static final int sel_acceptsFirstResponder = sel_registerName("acceptsFirstResponder");
+public static final int sel_accessibilityAttributeValue_ = sel_registerName("accessibilityAttributeValue:");
+public static final int sel_action = sel_registerName("action");
+public static final int sel_activateIgnoringOtherApps_ = sel_registerName("activateIgnoringOtherApps:");
+public static final int sel_addAttribute_value_range_ = sel_registerName("addAttribute:value:range:");
+public static final int sel_addClip = sel_registerName("addClip");
+public static final int sel_addEventListener_listener_useCapture_ = sel_registerName("addEventListener:listener:useCapture:");
+public static final int sel_addIndex_ = sel_registerName("addIndex:");
+public static final int sel_addItem_ = sel_registerName("addItem:");
+public static final int sel_addItemWithObjectValue_ = sel_registerName("addItemWithObjectValue:");
+public static final int sel_addLayoutManager_ = sel_registerName("addLayoutManager:");
+public static final int sel_addObject_ = sel_registerName("addObject:");
+public static final int sel_addObjectsFromArray_ = sel_registerName("addObjectsFromArray:");
+public static final int sel_addObserver_selector_name_object_ = sel_registerName("addObserver:selector:name:object:");
+public static final int sel_addRepresentation_ = sel_registerName("addRepresentation:");
+public static final int sel_addSubview_ = sel_registerName("addSubview:");
+public static final int sel_addSubview_positioned_relativeTo_ = sel_registerName("addSubview:positioned:relativeTo:");
+public static final int sel_addTabViewItem_ = sel_registerName("addTabViewItem:");
+public static final int sel_addTableColumn_ = sel_registerName("addTableColumn:");
+public static final int sel_addTemporaryAttribute_value_forCharacterRange_ = sel_registerName("addTemporaryAttribute:value:forCharacterRange:");
+public static final int sel_addTextContainer_ = sel_registerName("addTextContainer:");
+public static final int sel_addTypes_owner_ = sel_registerName("addTypes:owner:");
+public static final int sel_alertWithMessageText_defaultButton_alternateButton_otherButton_informativeTextWithFormat_ = sel_registerName("alertWithMessageText:defaultButton:alternateButton:otherButton:informativeTextWithFormat:");
+public static final int sel_alignment = sel_registerName("alignment");
+public static final int sel_allKeys = sel_registerName("allKeys");
+public static final int sel_alloc = sel_registerName("alloc");
+public static final int sel_alphaComponent = sel_registerName("alphaComponent");
+public static final int sel_alphaValue = sel_registerName("alphaValue");
+public static final int sel_altKey = sel_registerName("altKey");
+public static final int sel_appendBezierPath_ = sel_registerName("appendBezierPath:");
+public static final int sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_ = sel_registerName("appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:");
+public static final int sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_ = sel_registerName("appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:clockwise:");
+public static final int sel_appendBezierPathWithGlyphs_count_inFont_ = sel_registerName("appendBezierPathWithGlyphs:count:inFont:");
+public static final int sel_appendBezierPathWithOvalInRect_ = sel_registerName("appendBezierPathWithOvalInRect:");
+public static final int sel_appendBezierPathWithRect_ = sel_registerName("appendBezierPathWithRect:");
+public static final int sel_appendBezierPathWithRoundedRect_xRadius_yRadius_ = sel_registerName("appendBezierPathWithRoundedRect:xRadius:yRadius:");
+public static final int sel_appendString_ = sel_registerName("appendString:");
+public static final int sel_applicationShouldTerminate_ = sel_registerName("applicationShouldTerminate:");
+public static final int sel_applicationWillFinishLaunching_ = sel_registerName("applicationWillFinishLaunching:");
+public static final int sel_applicationWillTerminate_ = sel_registerName("applicationWillTerminate:");
+public static final int sel_archivedDataWithRootObject_ = sel_registerName("archivedDataWithRootObject:");
+public static final int sel_arrayWithCapacity_ = sel_registerName("arrayWithCapacity:");
+public static final int sel_arrayWithObject_ = sel_registerName("arrayWithObject:");
+public static final int sel_arrowCursor = sel_registerName("arrowCursor");
 public static final int sel_ascender = sel_registerName("ascender");
-public static final int sel_arrangeObjects_1 = sel_registerName("arrangeObjects:");
-public static final int sel_setNegativeSuffix_1 = sel_registerName("setNegativeSuffix:");
-public static final int sel_initWithString_1 = sel_registerName("initWithString:");
-public static final int sel_initWithName_1data_1 = sel_registerName("initWithName:data:");
-public static final int sel_data = sel_registerName("data");
-public static final int sel_encodePortObject_1 = sel_registerName("encodePortObject:");
+public static final int sel_attributedSubstringFromRange_ = sel_registerName("attributedSubstringFromRange:");
+public static final int sel_attributesAtIndex_longestEffectiveRange_inRange_ = sel_registerName("attributesAtIndex:longestEffectiveRange:inRange:");
+public static final int sel_autorelease = sel_registerName("autorelease");
+public static final int sel_availableFonts = sel_registerName("availableFonts");
+public static final int sel_availableTypeFromArray_ = sel_registerName("availableTypeFromArray:");
+public static final int sel_baselineOffsetInLayoutManager_glyphIndex_ = sel_registerName("baselineOffsetInLayoutManager:glyphIndex:");
 public static final int sel_becomeFirstResponder = sel_registerName("becomeFirstResponder");
-public static final int sel_setImage_1forSegment_1 = sel_registerName("setImage:forSegment:");
-public static final int sel_copyRuler_1 = sel_registerName("copyRuler:");
-public static final int sel_appendBezierPathWithGlyphs_1count_1inFont_1 = sel_registerName("appendBezierPathWithGlyphs:count:inFont:");
-public static final int sel_playsSelectionOnly = sel_registerName("playsSelectionOnly");
-public static final int sel_boundsRectForTextBlock_1glyphRange_1 = sel_registerName("boundsRectForTextBlock:glyphRange:");
-public static final int sel_makeObjectsPerformSelector_1withObject_1 = sel_registerName("makeObjectsPerformSelector:withObject:");
-public static final int sel_stringByTrimmingCharactersInSet_1 = sel_registerName("stringByTrimmingCharactersInSet:");
-public static final int sel_timerWithTimeInterval_1invocation_1repeats_1 = sel_registerName("timerWithTimeInterval:invocation:repeats:");
-public static final int sel_viewDidMoveToSuperview = sel_registerName("viewDidMoveToSuperview");
-public static final int sel_pathCell_1willDisplayOpenPanel_1 = sel_registerName("pathCell:willDisplayOpenPanel:");
-public static final int sel_pathSeparator = sel_registerName("pathSeparator");
-public static final int sel_generatesCalendarDates = sel_registerName("generatesCalendarDates");
-public static final int sel_pressure = sel_registerName("pressure");
-public static final int sel_sendPort = sel_registerName("sendPort");
-public static final int sel_argumentsRetained = sel_registerName("argumentsRetained");
-public static final int sel_setContainerSpecifier_1 = sel_registerName("setContainerSpecifier:");
-public static final int sel_decodeNXColor = sel_registerName("decodeNXColor");
-public static final int sel_orientation = sel_registerName("orientation");
-public static final int sel_setScriptErrorString_1 = sel_registerName("setScriptErrorString:");
-public static final int sel_makeDocumentWithContentsOfFile_1ofType_1 = sel_registerName("makeDocumentWithContentsOfFile:ofType:");
-public static final int sel_reason = sel_registerName("reason");
-public static final int sel_currentEvent = sel_registerName("currentEvent");
-public static final int sel_setOffScreen_1width_1height_1rowbytes_1 = sel_registerName("setOffScreen:width:height:rowbytes:");
-public static final int sel_invalidateAttributesInRange_1 = sel_registerName("invalidateAttributesInRange:");
-public static final int sel_descriptorWithDescriptorType_1bytes_1length_1 = sel_registerName("descriptorWithDescriptorType:bytes:length:");
-public static final int sel_setCredential_1forProtectionSpace_1 = sel_registerName("setCredential:forProtectionSpace:");
-public static final int sel_fileGroupOwnerAccountName = sel_registerName("fileGroupOwnerAccountName");
-public static final int sel_setColor_1forKey_1 = sel_registerName("setColor:forKey:");
-public static final int sel_setAutohidesScrollers_1 = sel_registerName("setAutohidesScrollers:");
-public static final int sel_noteNumberOfRowsChanged = sel_registerName("noteNumberOfRowsChanged");
-public static final int sel_disableCursorRects = sel_registerName("disableCursorRects");
-public static final int sel_setLenient_1 = sel_registerName("setLenient:");
-public static final int sel_registerUnitWithName_1abbreviation_1unitToPointsConversionFactor_1stepUpCycle_1stepDownCycle_1 = sel_registerName("registerUnitWithName:abbreviation:unitToPointsConversionFactor:stepUpCycle:stepDownCycle:");
-public static final int sel_standardWindowButton_1 = sel_registerName("standardWindowButton:");
-public static final int sel_objectForProperty_1error_1 = sel_registerName("objectForProperty:error:");
-public static final int sel_imageRepWithData_1 = sel_registerName("imageRepWithData:");
-public static final int sel_flushGraphics = sel_registerName("flushGraphics");
-public static final int sel_setCacheDepthMatchesImageDepth_1 = sel_registerName("setCacheDepthMatchesImageDepth:");
-public static final int sel_highlightColorInView_1 = sel_registerName("highlightColorInView:");
-public static final int sel_setBaseSpecifier_1 = sel_registerName("setBaseSpecifier:");
-public static final int sel_performFileOperation_1source_1destination_1files_1tag_1 = sel_registerName("performFileOperation:source:destination:files:tag:");
-public static final int sel_outlineView_1itemForPersistentObject_1 = sel_registerName("outlineView:itemForPersistentObject:");
-public static final int sel_propertyListFromData_1mutabilityOption_1format_1errorDescription_1 = sel_registerName("propertyListFromData:mutabilityOption:format:errorDescription:");
-public static final int sel_setDocumentView_1 = sel_registerName("setDocumentView:");
-public static final int sel_drawsOutsideLineFragmentForGlyphAtIndex_1 = sel_registerName("drawsOutsideLineFragmentForGlyphAtIndex:");
-public static final int sel_dragImageForSelectionWithEvent_1origin_1 = sel_registerName("dragImageForSelectionWithEvent:origin:");
-public static final int sel_buttonNumber = sel_registerName("buttonNumber");
-public static final int sel_advancementForGlyph_1 = sel_registerName("advancementForGlyph:");
-public static final int sel_parser_1validationErrorOccurred_1 = sel_registerName("parser:validationErrorOccurred:");
-public static final int sel_reusesColumns = sel_registerName("reusesColumns");
-public static final int sel_minute = sel_registerName("minute");
-public static final int sel_setCanChooseFiles_1 = sel_registerName("setCanChooseFiles:");
-public static final int sel_groupingSize = sel_registerName("groupingSize");
-public static final int sel_containsAttachments = sel_registerName("containsAttachments");
-public static final int sel_selectedControlTextColor = sel_registerName("selectedControlTextColor");
-public static final int sel_initWithMantissa_1exponent_1isNegative_1 = sel_registerName("initWithMantissa:exponent:isNegative:");
-public static final int sel_initWithVoice_1 = sel_registerName("initWithVoice:");
-public static final int sel_setResizingMask_1 = sel_registerName("setResizingMask:");
-public static final int sel_setOnMouseExited_1 = sel_registerName("setOnMouseExited:");
-public static final int sel_toggleContinuousSpellChecking_1 = sel_registerName("toggleContinuousSpellChecking:");
-public static final int sel_allowsCutCopyPaste = sel_registerName("allowsCutCopyPaste");
-public static final int sel_endSheet_1 = sel_registerName("endSheet:");
-public static final int sel_allowsBranchSelection = sel_registerName("allowsBranchSelection");
-public static final int sel_initWithRequest_1delegate_1 = sel_registerName("initWithRequest:delegate:");
-public static final int sel_isAtEnd = sel_registerName("isAtEnd");
-public static final int sel_relativeString = sel_registerName("relativeString");
-public static final int sel_tableView_1willDisplayCell_1forTableColumn_1row_1 = sel_registerName("tableView:willDisplayCell:forTableColumn:row:");
-public static final int sel_resizeSubviewsWithOldSize_1 = sel_registerName("resizeSubviewsWithOldSize:");
-public static final int sel_compoundPredicateType = sel_registerName("compoundPredicateType");
-public static final int sel_accessoryControllers = sel_registerName("accessoryControllers");
-public static final int sel_shouldDrawColor = sel_registerName("shouldDrawColor");
-public static final int sel_applicationShouldTerminate_1 = sel_registerName("applicationShouldTerminate:");
-public static final int sel_setTextContainer_1 = sel_registerName("setTextContainer:");
-public static final int sel_discardCursorRects = sel_registerName("discardCursorRects");
-public static final int sel_deviceCMYKColorSpace = sel_registerName("deviceCMYKColorSpace");
-public static final int sel_setDefaultPlaceholder_1forMarker_1withBinding_1 = sel_registerName("setDefaultPlaceholder:forMarker:withBinding:");
-public static final int sel_setIsZoomed_1 = sel_registerName("setIsZoomed:");
+public static final int sel_beginDocument = sel_registerName("beginDocument");
+public static final int sel_beginEditing = sel_registerName("beginEditing");
+public static final int sel_beginPageInRect_atPlacement_ = sel_registerName("beginPageInRect:atPlacement:");
+public static final int sel_bestRepresentationForDevice_ = sel_registerName("bestRepresentationForDevice:");
+public static final int sel_bezierPath = sel_registerName("bezierPath");
+public static final int sel_bezierPathByFlatteningPath = sel_registerName("bezierPathByFlatteningPath");
+public static final int sel_bezierPathWithRect_ = sel_registerName("bezierPathWithRect:");
+public static final int sel_bitmapData = sel_registerName("bitmapData");
+public static final int sel_bitsPerPixel = sel_registerName("bitsPerPixel");
+public static final int sel_bitsPerSample = sel_registerName("bitsPerSample");
+public static final int sel_blackColor = sel_registerName("blackColor");
 public static final int sel_blueComponent = sel_registerName("blueComponent");
-public static final int sel_portWithMachPort_1options_1 = sel_registerName("portWithMachPort:options:");
-public static final int sel_restoreGraphicsState = sel_registerName("restoreGraphicsState");
-public static final int sel_isTemplate = sel_registerName("isTemplate");
-public static final int sel_setScanLocation_1 = sel_registerName("setScanLocation:");
-public static final int sel_initWithBool_1 = sel_registerName("initWithBool:");
-public static final int sel_initWithSet_1copyItems_1 = sel_registerName("initWithSet:copyItems:");
-public static final int sel_setPositivePrefix_1 = sel_registerName("setPositivePrefix:");
-public static final int sel_propertyForKeyIfAvailable_1 = sel_registerName("propertyForKeyIfAvailable:");
-public static final int sel_fileOwnerAccountID = sel_registerName("fileOwnerAccountID");
-public static final int sel_initForIncrementalLoad = sel_registerName("initForIncrementalLoad");
-public static final int sel_cellAttribute_1 = sel_registerName("cellAttribute:");
-public static final int sel_baselineLocation = sel_registerName("baselineLocation");
-public static final int sel_initWithAttributedString_1 = sel_registerName("initWithAttributedString:");
-public static final int sel_showWindows = sel_registerName("showWindows");
-public static final int sel_writeToFile_1atomically_1updateFilenames_1 = sel_registerName("writeToFile:atomically:updateFilenames:");
-public static final int sel_setCookies_1forURL_1mainDocumentURL_1 = sel_registerName("setCookies:forURL:mainDocumentURL:");
-public static final int sel_unarchiver_1cannotDecodeObjectOfClassName_1originalClasses_1 = sel_registerName("unarchiver:cannotDecodeObjectOfClassName:originalClasses:");
-public static final int sel_selectRow_1inColumn_1 = sel_registerName("selectRow:inColumn:");
-public static final int sel_dissolveToPoint_1fraction_1 = sel_registerName("dissolveToPoint:fraction:");
-public static final int sel_wantsToTrackMouseForEvent_1inRect_1ofView_1atCharacterIndex_1 = sel_registerName("wantsToTrackMouseForEvent:inRect:ofView:atCharacterIndex:");
-public static final int sel_openURLs_1withAppBundleIdentifier_1options_1additionalEventParamDescriptor_1launchIdentifiers_1 = sel_registerName("openURLs:withAppBundleIdentifier:options:additionalEventParamDescriptor:launchIdentifiers:");
-public static final int sel_checkForRemovableMedia = sel_registerName("checkForRemovableMedia");
-public static final int sel_setImage_1 = sel_registerName("setImage:");
-public static final int sel_isFixedPitch = sel_registerName("isFixedPitch");
-public static final int sel_protocolFamily = sel_registerName("protocolFamily");
-public static final int sel_protocolCheckerWithTarget_1protocol_1 = sel_registerName("protocolCheckerWithTarget:protocol:");
-public static final int sel_streamError = sel_registerName("streamError");
-public static final int sel_replaceBytesInRange_1withBytes_1length_1 = sel_registerName("replaceBytesInRange:withBytes:length:");
-public static final int sel_canChooseDirectories = sel_registerName("canChooseDirectories");
-public static final int sel_classForPortCoder = sel_registerName("classForPortCoder");
-public static final int sel_mainRunLoop = sel_registerName("mainRunLoop");
-public static final int sel_setItemPrototype_1 = sel_registerName("setItemPrototype:");
-public static final int sel_controlShadowColor = sel_registerName("controlShadowColor");
-public static final int sel_level = sel_registerName("level");
-public static final int sel_setContextHelpModeActive_1 = sel_registerName("setContextHelpModeActive:");
-public static final int sel_levelForItem_1 = sel_registerName("levelForItem:");
-public static final int sel_setHeightTracksTextView_1 = sel_registerName("setHeightTracksTextView:");
-public static final int sel_applicationWillTerminate_1 = sel_registerName("applicationWillTerminate:");
-public static final int sel_wantsPeriodicDraggingUpdates = sel_registerName("wantsPeriodicDraggingUpdates");
-public static final int sel_createCommandInstance = sel_registerName("createCommandInstance");
-public static final int sel_parser_1foundElementDeclarationWithName_1model_1 = sel_registerName("parser:foundElementDeclarationWithName:model:");
-public static final int sel_window_1shouldPopUpDocumentPathMenu_1 = sel_registerName("window:shouldPopUpDocumentPathMenu:");
-public static final int sel_setRepresentedURL_1 = sel_registerName("setRepresentedURL:");
-public static final int sel_outlineView_1didDragTableColumn_1 = sel_registerName("outlineView:didDragTableColumn:");
-public static final int sel_appendTransform_1 = sel_registerName("appendTransform:");
-public static final int sel_setMIMEType_1 = sel_registerName("setMIMEType:");
-public static final int sel_setHeadIndent_1 = sel_registerName("setHeadIndent:");
-public static final int sel_setConstrainedFrameSize_1 = sel_registerName("setConstrainedFrameSize:");
-public static final int sel_setUsesDataSource_1 = sel_registerName("setUsesDataSource:");
-public static final int sel_replaceBytesInRange_1withBytes_1 = sel_registerName("replaceBytesInRange:withBytes:");
-public static final int sel_rowTypeKeyPath = sel_registerName("rowTypeKeyPath");
-public static final int sel_undoManager = sel_registerName("undoManager");
-public static final int sel_frameCenterRotation = sel_registerName("frameCenterRotation");
-public static final int sel_setTextView_1 = sel_registerName("setTextView:");
-public static final int sel_executeAppleEvent_1error_1 = sel_registerName("executeAppleEvent:error:");
-public static final int sel_setFormatter_1 = sel_registerName("setFormatter:");
-public static final int sel_scanLocation = sel_registerName("scanLocation");
-public static final int sel_scrollsDynamically = sel_registerName("scrollsDynamically");
-public static final int sel_setIndentationLevel_1 = sel_registerName("setIndentationLevel:");
-public static final int sel_minimumRangeOfUnit_1 = sel_registerName("minimumRangeOfUnit:");
-public static final int sel_textViewForBeginningOfSelection = sel_registerName("textViewForBeginningOfSelection");
-public static final int sel_tokenFieldCell_1displayStringForRepresentedObject_1 = sel_registerName("tokenFieldCell:displayStringForRepresentedObject:");
-public static final int sel_constrainFrameRect_1toScreen_1 = sel_registerName("constrainFrameRect:toScreen:");
-public static final int sel_getObjectValue_1forString_1range_1error_1 = sel_registerName("getObjectValue:forString:range:error:");
-public static final int sel_writeFileContents_1 = sel_registerName("writeFileContents:");
-public static final int sel_setProgressMarks_1 = sel_registerName("setProgressMarks:");
-public static final int sel_lastComponentOfFileName = sel_registerName("lastComponentOfFileName");
-public static final int sel_preventWindowOrdering = sel_registerName("preventWindowOrdering");
-public static final int sel_setDefaultDate_1 = sel_registerName("setDefaultDate:");
-public static final int sel_submenu = sel_registerName("submenu");
-public static final int sel_setTXTRecordData_1 = sel_registerName("setTXTRecordData:");
+public static final int sel_boundingRectForGlyphRange_inTextContainer_ = sel_registerName("boundingRectForGlyphRange:inTextContainer:");
+public static final int sel_bounds = sel_registerName("bounds");
+public static final int sel_bundleIdentifier = sel_registerName("bundleIdentifier");
+public static final int sel_bundlePath = sel_registerName("bundlePath");
+public static final int sel_bundleWithPath_ = sel_registerName("bundleWithPath:");
+public static final int sel_button = sel_registerName("button");
+public static final int sel_buttonNumber = sel_registerName("buttonNumber");
+public static final int sel_bytes = sel_registerName("bytes");
+public static final int sel_bytesPerPlane = sel_registerName("bytesPerPlane");
 public static final int sel_bytesPerRow = sel_registerName("bytesPerRow");
-public static final int sel_outlineView_1toolTipForCell_1rect_1tableColumn_1item_1mouseLocation_1 = sel_registerName("outlineView:toolTipForCell:rect:tableColumn:item:mouseLocation:");
-public static final int sel_outlineView_1shouldEditTableColumn_1item_1 = sel_registerName("outlineView:shouldEditTableColumn:item:");
-public static final int sel_initWithContainerSize_1 = sel_registerName("initWithContainerSize:");
-public static final int sel_setEvaluationErrorNumber_1 = sel_registerName("setEvaluationErrorNumber:");
-public static final int sel_setTopLevelObject_1 = sel_registerName("setTopLevelObject:");
-public static final int sel_dataOfType_1error_1 = sel_registerName("dataOfType:error:");
-public static final int sel_isSupersetOfSet_1 = sel_registerName("isSupersetOfSet:");
-public static final int sel_initWithURL_1cachePolicy_1timeoutInterval_1 = sel_registerName("initWithURL:cachePolicy:timeoutInterval:");
-public static final int sel_setAutosaveExpandedItems_1 = sel_registerName("setAutosaveExpandedItems:");
-public static final int sel_rangeValue = sel_registerName("rangeValue");
-public static final int sel_indexPathByAddingIndex_1 = sel_registerName("indexPathByAddingIndex:");
-public static final int sel_deleteToMark_1 = sel_registerName("deleteToMark:");
-public static final int sel_appleEventCodeForSuite_1 = sel_registerName("appleEventCodeForSuite:");
-public static final int sel_getBytes_1 = sel_registerName("getBytes:");
-public static final int sel_setMinimumDaysInFirstWeek_1 = sel_registerName("setMinimumDaysInFirstWeek:");
-public static final int sel_refusesFirstResponder = sel_registerName("refusesFirstResponder");
-public static final int sel_setMaxItemSize_1 = sel_registerName("setMaxItemSize:");
-public static final int sel_localizedStringForKey_1value_1table_1 = sel_registerName("localizedStringForKey:value:table:");
-public static final int sel_mapTableWithKeyOptions_1valueOptions_1 = sel_registerName("mapTableWithKeyOptions:valueOptions:");
-public static final int sel_test = sel_registerName("test");
-public static final int sel_trackScrollButtons_1 = sel_registerName("trackScrollButtons:");
-public static final int sel_PDFRepresentation = sel_registerName("PDFRepresentation");
-public static final int sel_setImageFrameStyle_1 = sel_registerName("setImageFrameStyle:");
-public static final int sel_encodeClassName_1intoClassName_1 = sel_registerName("encodeClassName:intoClassName:");
-public static final int sel_beginPageInRect_1atPlacement_1 = sel_registerName("beginPageInRect:atPlacement:");
-public static final int sel_setAllowsOtherFileTypes_1 = sel_registerName("setAllowsOtherFileTypes:");
-public static final int sel_isWordInUserDictionaries_1caseSensitive_1 = sel_registerName("isWordInUserDictionaries:caseSensitive:");
-public static final int sel_dispatchRawAppleEvent_1withRawReply_1handlerRefCon_1 = sel_registerName("dispatchRawAppleEvent:withRawReply:handlerRefCon:");
-public static final int sel_isScrollable = sel_registerName("isScrollable");
-public static final int sel_numberOfColorStops = sel_registerName("numberOfColorStops");
-public static final int sel_unhideAllApplications_1 = sel_registerName("unhideAllApplications:");
-public static final int sel_retainCount = sel_registerName("retainCount");
-public static final int sel_runModalPrintOperation_1delegate_1didRunSelector_1contextInfo_1 = sel_registerName("runModalPrintOperation:delegate:didRunSelector:contextInfo:");
-public static final int sel_update = sel_registerName("update");
-public static final int sel_isRotatedOrScaledFromBase = sel_registerName("isRotatedOrScaledFromBase");
-public static final int sel_initWithWindowNibPath_1owner_1 = sel_registerName("initWithWindowNibPath:owner:");
-public static final int sel_entryType = sel_registerName("entryType");
-public static final int sel_dictionaryFromTXTRecordData_1 = sel_registerName("dictionaryFromTXTRecordData:");
-public static final int sel_setLineCapStyle_1 = sel_registerName("setLineCapStyle:");
-public static final int sel_setValues_1forParameter_1 = sel_registerName("setValues:forParameter:");
-public static final int sel_numberStyle = sel_registerName("numberStyle");
-public static final int sel_disableCollectorForPointer_1 = sel_registerName("disableCollectorForPointer:");
-public static final int sel_initWithPointerFunctions_1capacity_1 = sel_registerName("initWithPointerFunctions:capacity:");
-public static final int sel_sendEvent_1 = sel_registerName("sendEvent:");
-public static final int sel_removeSelectedObjects_1 = sel_registerName("removeSelectedObjects:");
-public static final int sel_serviceConnectionWithName_1rootObject_1usingNameServer_1 = sel_registerName("serviceConnectionWithName:rootObject:usingNameServer:");
-public static final int sel_decimalNumberByMultiplyingBy_1 = sel_registerName("decimalNumberByMultiplyingBy:");
-public static final int sel_shouldChangeTextInRanges_1replacementStrings_1 = sel_registerName("shouldChangeTextInRanges:replacementStrings:");
-public static final int sel_setResizeIncrements_1 = sel_registerName("setResizeIncrements:");
-public static final int sel_alignLeft_1 = sel_registerName("alignLeft:");
-public static final int sel_launch = sel_registerName("launch");
-public static final int sel_executeCommand = sel_registerName("executeCommand");
-public static final int sel_setPixelBuffer_1cubeMapFace_1mipMapLevel_1currentVirtualScreen_1 = sel_registerName("setPixelBuffer:cubeMapFace:mipMapLevel:currentVirtualScreen:");
-public static final int sel_isCachedSeparately = sel_registerName("isCachedSeparately");
-public static final int sel_setUsesSignificantDigits_1 = sel_registerName("setUsesSignificantDigits:");
-public static final int sel_countKeyPathForNode_1 = sel_registerName("countKeyPathForNode:");
-public static final int sel_setContainerIsRangeContainerObject_1 = sel_registerName("setContainerIsRangeContainerObject:");
-public static final int sel_showsStateColumn = sel_registerName("showsStateColumn");
-public static final int sel_uppercaseString = sel_registerName("uppercaseString");
-public static final int sel_directoryContentsAtPath_1 = sel_registerName("directoryContentsAtPath:");
-public static final int sel_titleFont = sel_registerName("titleFont");
-public static final int sel_comparisonPredicateModifier = sel_registerName("comparisonPredicateModifier");
-public static final int sel_isMultiThreaded = sel_registerName("isMultiThreaded");
-public static final int sel_setGroupingAttributes_1 = sel_registerName("setGroupingAttributes:");
-public static final int sel_selectedRowIndexesInColumn_1 = sel_registerName("selectedRowIndexesInColumn:");
-public static final int sel_isFlushWindowDisabled = sel_registerName("isFlushWindowDisabled");
-public static final int sel_setReusesColumns_1 = sel_registerName("setReusesColumns:");
-public static final int sel_getCString_1maxLength_1 = sel_registerName("getCString:maxLength:");
-public static final int sel_setIndicatorImage_1inTableColumn_1 = sel_registerName("setIndicatorImage:inTableColumn:");
-public static final int sel_keyEquivalent = sel_registerName("keyEquivalent");
-public static final int sel_skipDescendents = sel_registerName("skipDescendents");
-public static final int sel_waitUntilExit = sel_registerName("waitUntilExit");
-public static final int sel_initWithWindowNibName_1owner_1 = sel_registerName("initWithWindowNibName:owner:");
-public static final int sel_objectClass = sel_registerName("objectClass");
-public static final int sel_allFrameworks = sel_registerName("allFrameworks");
-public static final int sel_cellWithTag_1 = sel_registerName("cellWithTag:");
-public static final int sel_representationUsingType_1properties_1 = sel_registerName("representationUsingType:properties:");
-public static final int sel_textPasteboardTypes = sel_registerName("textPasteboardTypes");
+public static final int sel_calendarDate = sel_registerName("calendarDate");
+public static final int sel_canGoBack = sel_registerName("canGoBack");
+public static final int sel_canGoForward = sel_registerName("canGoForward");
+public static final int sel_canShowMIMEType_ = sel_registerName("canShowMIMEType:");
+public static final int sel_cancel = sel_registerName("cancel");
+public static final int sel_cancelTracking = sel_registerName("cancelTracking");
+public static final int sel_cascadeTopLeftFromPoint_ = sel_registerName("cascadeTopLeftFromPoint:");
+public static final int sel_cell = sel_registerName("cell");
+public static final int sel_changeColor_ = sel_registerName("changeColor:");
+public static final int sel_changeFont_ = sel_registerName("changeFont:");
+public static final int sel_charCode = sel_registerName("charCode");
+public static final int sel_characterAtIndex_ = sel_registerName("characterAtIndex:");
+public static final int sel_characterIndexForGlyphAtIndex_ = sel_registerName("characterIndexForGlyphAtIndex:");
+public static final int sel_characterIndexForPoint_ = sel_registerName("characterIndexForPoint:");
+public static final int sel_characters = sel_registerName("characters");
+public static final int sel_charactersIgnoringModifiers = sel_registerName("charactersIgnoringModifiers");
+public static final int sel_chooseFilename_ = sel_registerName("chooseFilename:");
+public static final int sel_cleanUpOperation = sel_registerName("cleanUpOperation");
+public static final int sel_clearColor = sel_registerName("clearColor");
+public static final int sel_clearCurrentContext = sel_registerName("clearCurrentContext");
+public static final int sel_clearGLContext = sel_registerName("clearGLContext");
+public static final int sel_clickCount = sel_registerName("clickCount");
+public static final int sel_clientX = sel_registerName("clientX");
+public static final int sel_clientY = sel_registerName("clientY");
+public static final int sel_close = sel_registerName("close");
+public static final int sel_closePath = sel_registerName("closePath");
+public static final int sel_code = sel_registerName("code");
+public static final int sel_collapseItem_ = sel_registerName("collapseItem:");
+public static final int sel_color = sel_registerName("color");
+public static final int sel_colorUsingColorSpace_ = sel_registerName("colorUsingColorSpace:");
+public static final int sel_colorUsingColorSpaceName_ = sel_registerName("colorUsingColorSpaceName:");
+public static final int sel_colorWithDeviceRed_green_blue_alpha_ = sel_registerName("colorWithDeviceRed:green:blue:alpha:");
+public static final int sel_colorWithPatternImage_ = sel_registerName("colorWithPatternImage:");
+public static final int sel_columnAtPoint_ = sel_registerName("columnAtPoint:");
+public static final int sel_comboBoxSelectionDidChange_ = sel_registerName("comboBoxSelectionDidChange:");
+public static final int sel_concat = sel_registerName("concat");
+public static final int sel_conformsToProtocol_ = sel_registerName("conformsToProtocol:");
+public static final int sel_containerSize = sel_registerName("containerSize");
+public static final int sel_containsPoint_ = sel_registerName("containsPoint:");
+public static final int sel_contentRect = sel_registerName("contentRect");
+public static final int sel_contentRectForFrameRect_ = sel_registerName("contentRectForFrameRect:");
+public static final int sel_contentSize = sel_registerName("contentSize");
+public static final int sel_contentSizeForFrameSize_hasHorizontalScroller_hasVerticalScroller_borderType_ = sel_registerName("contentSizeForFrameSize:hasHorizontalScroller:hasVerticalScroller:borderType:");
+public static final int sel_contentView = sel_registerName("contentView");
 public static final int sel_contentViewMargins = sel_registerName("contentViewMargins");
-public static final int sel_canUndo = sel_registerName("canUndo");
-public static final int sel_initWithFormat_1locale_1arguments_1 = sel_registerName("initWithFormat:locale:arguments:");
-public static final int sel_usableParts = sel_registerName("usableParts");
-public static final int sel_comboBoxSelectionIsChanging_1 = sel_registerName("comboBoxSelectionIsChanging:");
-public static final int sel_raise_1format_1arguments_1 = sel_registerName("raise:format:arguments:");
-public static final int sel_isWindowLoaded = sel_registerName("isWindowLoaded");
-public static final int sel_levelIndicatorStyle = sel_registerName("levelIndicatorStyle");
-public static final int sel_localizedFailureReason = sel_registerName("localizedFailureReason");
-public static final int sel_characterRangeForGlyphRange_1actualGlyphRange_1 = sel_registerName("characterRangeForGlyphRange:actualGlyphRange:");
-public static final int sel_lineNumber = sel_registerName("lineNumber");
-public static final int sel_HTTPBody = sel_registerName("HTTPBody");
-public static final int sel_lineBreakMode = sel_registerName("lineBreakMode");
-public static final int sel_isStopped = sel_registerName("isStopped");
-public static final int sel_canResumeDownloadDecodedWithEncodingMIMEType_1 = sel_registerName("canResumeDownloadDecodedWithEncodingMIMEType:");
-public static final int sel_removeObjectsAtArrangedObjectIndexPaths_1 = sel_registerName("removeObjectsAtArrangedObjectIndexPaths:");
-public static final int sel_isHidden = sel_registerName("isHidden");
-public static final int sel_otherMouseDragged_1 = sel_registerName("otherMouseDragged:");
-public static final int sel_headerRectOfColumn_1 = sel_registerName("headerRectOfColumn:");
-public static final int sel_hasVerticalRuler = sel_registerName("hasVerticalRuler");
-public static final int sel_setBottomMargin_1 = sel_registerName("setBottomMargin:");
-public static final int sel_initWithNotificationCenter_1 = sel_registerName("initWithNotificationCenter:");
-public static final int sel_addSpeechDictionary_1 = sel_registerName("addSpeechDictionary:");
-public static final int sel_setPositiveFormat_1 = sel_registerName("setPositiveFormat:");
-public static final int sel_application_1openTempFile_1 = sel_registerName("application:openTempFile:");
-public static final int sel_setEntityName_1 = sel_registerName("setEntityName:");
-public static final int sel_setForegroundColor_1 = sel_registerName("setForegroundColor:");
-public static final int sel_initWithUnsignedLong_1 = sel_registerName("initWithUnsignedLong:");
-public static final int sel_setWindowsMenu_1 = sel_registerName("setWindowsMenu:");
-public static final int sel_applicationDidUnhide_1 = sel_registerName("applicationDidUnhide:");
-public static final int sel_availableData = sel_registerName("availableData");
-public static final int sel_setVertical_1 = sel_registerName("setVertical:");
-public static final int sel_disableUpdates = sel_registerName("disableUpdates");
-public static final int sel_compileAndReturnError_1 = sel_registerName("compileAndReturnError:");
-public static final int sel_containsIndex_1 = sel_registerName("containsIndex:");
-public static final int sel_canSelectPrevious = sel_registerName("canSelectPrevious");
-public static final int sel_initWithBytes_1length_1encoding_1 = sel_registerName("initWithBytes:length:encoding:");
-public static final int sel_setTextColor_1 = sel_registerName("setTextColor:");
-public static final int sel_stream_1handleEvent_1 = sel_registerName("stream:handleEvent:");
-public static final int sel_setWeekdaySymbols_1 = sel_registerName("setWeekdaySymbols:");
-public static final int sel_setHiddenUntilMouseMoves_1 = sel_registerName("setHiddenUntilMouseMoves:");
-public static final int sel_orderFrontStandardAboutPanelWithOptions_1 = sel_registerName("orderFrontStandardAboutPanelWithOptions:");
-public static final int sel_setAttributesAsDictionary_1 = sel_registerName("setAttributesAsDictionary:");
-public static final int sel_rowTypeForRow_1 = sel_registerName("rowTypeForRow:");
-public static final int sel_setRequestTimeout_1 = sel_registerName("setRequestTimeout:");
-public static final int sel_XMLDataWithOptions_1 = sel_registerName("XMLDataWithOptions:");
-public static final int sel_closedHandCursor = sel_registerName("closedHandCursor");
-public static final int sel_nextSibling = sel_registerName("nextSibling");
+public static final int sel_context = sel_registerName("context");
+public static final int sel_controlDarkShadowColor = sel_registerName("controlDarkShadowColor");
+public static final int sel_controlHighlightColor = sel_registerName("controlHighlightColor");
+public static final int sel_controlLightHighlightColor = sel_registerName("controlLightHighlightColor");
+public static final int sel_controlPointBounds = sel_registerName("controlPointBounds");
+public static final int sel_controlShadowColor = sel_registerName("controlShadowColor");
 public static final int sel_controlTextColor = sel_registerName("controlTextColor");
-public static final int sel_abbreviationDictionary = sel_registerName("abbreviationDictionary");
-public static final int sel_archiverDidFinish_1 = sel_registerName("archiverDidFinish:");
-public static final int sel_valueTypeForDimension_1 = sel_registerName("valueTypeForDimension:");
-public static final int sel_setCriteriaKeyPath_1 = sel_registerName("setCriteriaKeyPath:");
-public static final int sel_isLessThan_1 = sel_registerName("isLessThan:");
-public static final int sel_processName = sel_registerName("processName");
-public static final int sel_frameOfOutlineCellAtRow_1 = sel_registerName("frameOfOutlineCellAtRow:");
-public static final int sel_removeObjectsInArray_1 = sel_registerName("removeObjectsInArray:");
-public static final int sel_leftExpression = sel_registerName("leftExpression");
-public static final int sel_removeToolTip_1 = sel_registerName("removeToolTip:");
-public static final int sel_mutableCopy = sel_registerName("mutableCopy");
-public static final int sel_directParameter = sel_registerName("directParameter");
-public static final int sel_name = sel_registerName("name");
-public static final int sel_bitsPerPixel = sel_registerName("bitsPerPixel");
-public static final int sel_weekday = sel_registerName("weekday");
-public static final int sel_descendantNodeAtIndexPath_1 = sel_registerName("descendantNodeAtIndexPath:");
-public static final int sel_setPercentSymbol_1 = sel_registerName("setPercentSymbol:");
-public static final int sel_selectedCell = sel_registerName("selectedCell");
-public static final int sel_windowWillClose_1 = sel_registerName("windowWillClose:");
-public static final int sel_setDatePickerStyle_1 = sel_registerName("setDatePickerStyle:");
-public static final int sel_initWithObjects_1 = sel_registerName("initWithObjects:");
-public static final int sel_numberWithInt_1 = sel_registerName("numberWithInt:");
-public static final int sel_collection = sel_registerName("collection");
-public static final int sel_initWithTarget_1selector_1object_1 = sel_registerName("initWithTarget:selector:object:");
-public static final int sel_insertText_1replacementRange_1 = sel_registerName("insertText:replacementRange:");
-public static final int sel_initWithAEDescNoCopy_1 = sel_registerName("initWithAEDescNoCopy:");
-public static final int sel_usesGroupingSeparator = sel_registerName("usesGroupingSeparator");
-public static final int sel_pathControl_1shouldDragPathComponentCell_1withPasteboard_1 = sel_registerName("pathControl:shouldDragPathComponentCell:withPasteboard:");
-public static final int sel_decimalNumberByAdding_1withBehavior_1 = sel_registerName("decimalNumberByAdding:withBehavior:");
-public static final int sel_setTextContainer_1forGlyphRange_1 = sel_registerName("setTextContainer:forGlyphRange:");
-public static final int sel_needsToDrawRect_1 = sel_registerName("needsToDrawRect:");
-public static final int sel_activeConversationChanged_1toNewConversation_1 = sel_registerName("activeConversationChanged:toNewConversation:");
-public static final int sel_italicAngle = sel_registerName("italicAngle");
-public static final int sel_aeteResource_1 = sel_registerName("aeteResource:");
-public static final int sel_noteNewRecentDocumentURL_1 = sel_registerName("noteNewRecentDocumentURL:");
-public static final int sel_setPageScroll_1 = sel_registerName("setPageScroll:");
-public static final int sel_speechSynthesizer_1didFinishSpeaking_1 = sel_registerName("speechSynthesizer:didFinishSpeaking:");
-public static final int sel_convertSizeToBase_1 = sel_registerName("convertSizeToBase:");
-public static final int sel_pointerFunctionsWithOptions_1 = sel_registerName("pointerFunctionsWithOptions:");
-public static final int sel_setHTTPBody_1 = sel_registerName("setHTTPBody:");
-public static final int sel_itemWithTag_1 = sel_registerName("itemWithTag:");
-public static final int sel_spellServer_1checkGrammarInString_1language_1details_1 = sel_registerName("spellServer:checkGrammarInString:language:details:");
-public static final int sel_vendorPointingDeviceType = sel_registerName("vendorPointingDeviceType");
-public static final int sel_firstRectForCharacterRange_1 = sel_registerName("firstRectForCharacterRange:");
-public static final int sel_classDescriptionsInSuite_1 = sel_registerName("classDescriptionsInSuite:");
-public static final int sel_setAttachmentSize_1forGlyphRange_1 = sel_registerName("setAttachmentSize:forGlyphRange:");
-public static final int sel_isEmpty = sel_registerName("isEmpty");
-public static final int sel_soundNamed_1 = sel_registerName("soundNamed:");
-public static final int sel_preparedCellAtColumn_1row_1 = sel_registerName("preparedCellAtColumn:row:");
-public static final int sel_setLeafKeyPath_1 = sel_registerName("setLeafKeyPath:");
-public static final int sel_initWithUnsignedInteger_1 = sel_registerName("initWithUnsignedInteger:");
-public static final int sel_fractionOfDistanceThroughGlyphForPoint_1inTextContainer_1 = sel_registerName("fractionOfDistanceThroughGlyphForPoint:inTextContainer:");
-public static final int sel_isFloatingPanel = sel_registerName("isFloatingPanel");
-public static final int sel_replaceObjectsAtIndexes_1withObjects_1 = sel_registerName("replaceObjectsAtIndexes:withObjects:");
-public static final int sel_getComponents_1 = sel_registerName("getComponents:");
-public static final int sel_fileType = sel_registerName("fileType");
-public static final int sel_setShowsBaselineSeparator_1 = sel_registerName("setShowsBaselineSeparator:");
-public static final int sel_removeCredential_1forProtectionSpace_1 = sel_registerName("removeCredential:forProtectionSpace:");
-public static final int sel_imageRepWithContentsOfFile_1 = sel_registerName("imageRepWithContentsOfFile:");
-public static final int sel_predicateWithFormat_1argumentArray_1 = sel_registerName("predicateWithFormat:argumentArray:");
-public static final int sel_positiveSuffix = sel_registerName("positiveSuffix");
-public static final int sel_formatter = sel_registerName("formatter");
-public static final int sel_setAnimationDelay_1 = sel_registerName("setAnimationDelay:");
-public static final int sel_maxConcurrentOperationCount = sel_registerName("maxConcurrentOperationCount");
-public static final int sel_childSpecifier = sel_registerName("childSpecifier");
-public static final int sel_cacheMode = sel_registerName("cacheMode");
-public static final int sel_registerForServices = sel_registerName("registerForServices");
-public static final int sel_setFirstWeekday_1 = sel_registerName("setFirstWeekday:");
-public static final int sel_rulerViewClass = sel_registerName("rulerViewClass");
-public static final int sel_initialValue = sel_registerName("initialValue");
-public static final int sel_redColor = sel_registerName("redColor");
-public static final int sel_addDependency_1 = sel_registerName("addDependency:");
-public static final int sel_pathExtension = sel_registerName("pathExtension");
-public static final int sel_fastestEncoding = sel_registerName("fastestEncoding");
-public static final int sel_socketType = sel_registerName("socketType");
-public static final int sel_setRuleThickness_1 = sel_registerName("setRuleThickness:");
-public static final int sel_setDTDKind_1 = sel_registerName("setDTDKind:");
-public static final int sel_setClass_1forClassName_1 = sel_registerName("setClass:forClassName:");
-public static final int sel_setDocumentCursor_1 = sel_registerName("setDocumentCursor:");
-public static final int sel_extraLineFragmentRect = sel_registerName("extraLineFragmentRect");
-public static final int sel_attributeForName_1 = sel_registerName("attributeForName:");
-public static final int sel_defaultCredentialForProtectionSpace_1 = sel_registerName("defaultCredentialForProtectionSpace:");
-public static final int sel_indexOfItemWithTag_1 = sel_registerName("indexOfItemWithTag:");
-public static final int sel_fontManager_1willIncludeFont_1 = sel_registerName("fontManager:willIncludeFont:");
-public static final int sel_scrollRangeToVisible_1 = sel_registerName("scrollRangeToVisible:");
-public static final int sel_fileTypeFromLastRunSavePanel = sel_registerName("fileTypeFromLastRunSavePanel");
-public static final int sel_collectionView = sel_registerName("collectionView");
-public static final int sel_tabView = sel_registerName("tabView");
-public static final int sel_commonISOCurrencyCodes = sel_registerName("commonISOCurrencyCodes");
-public static final int sel_removeFontTrait_1 = sel_registerName("removeFontTrait:");
-public static final int sel_drawKnob_1 = sel_registerName("drawKnob:");
-public static final int sel_tokenField_1menuForRepresentedObject_1 = sel_registerName("tokenField:menuForRepresentedObject:");
-public static final int sel_setFrameUsingName_1 = sel_registerName("setFrameUsingName:");
-public static final int sel_classNameEncodedForTrueClassName_1 = sel_registerName("classNameEncodedForTrueClassName:");
-public static final int sel_windowFrameAutosaveName = sel_registerName("windowFrameAutosaveName");
-public static final int sel_characterAtIndex_1 = sel_registerName("characterAtIndex:");
-public static final int sel_smartInsertAfterStringForString_1replacingRange_1 = sel_registerName("smartInsertAfterStringForString:replacingRange:");
-public static final int sel_version = sel_registerName("version");
-public static final int sel_objectsAtIndexes_1 = sel_registerName("objectsAtIndexes:");
-public static final int sel_requestIsCacheEquivalent_1toRequest_1 = sel_registerName("requestIsCacheEquivalent:toRequest:");
-public static final int sel_columnOfMatrix_1 = sel_registerName("columnOfMatrix:");
-public static final int sel_isBezeled = sel_registerName("isBezeled");
-public static final int sel_setAutosaveName_1 = sel_registerName("setAutosaveName:");
-public static final int sel_becomeMainWindow = sel_registerName("becomeMainWindow");
-public static final int sel_pasteAsRichText_1 = sel_registerName("pasteAsRichText:");
-public static final int sel_isSpeaking = sel_registerName("isSpeaking");
-public static final int sel_format = sel_registerName("format");
-public static final int sel_volume = sel_registerName("volume");
-public static final int sel_setMenu_1 = sel_registerName("setMenu:");
-public static final int sel_setEra_1 = sel_registerName("setEra:");
-public static final int sel_textContainerOrigin = sel_registerName("textContainerOrigin");
-public static final int sel_setLocalizesFormat_1 = sel_registerName("setLocalizesFormat:");
-public static final int sel_removeIndex_1 = sel_registerName("removeIndex:");
-public static final int sel_gotoPosterFrame_1 = sel_registerName("gotoPosterFrame:");
-public static final int sel_validateValue_1forKeyPath_1error_1 = sel_registerName("validateValue:forKeyPath:error:");
-public static final int sel_initWithCharactersNoCopy_1length_1freeWhenDone_1 = sel_registerName("initWithCharactersNoCopy:length:freeWhenDone:");
-public static final int sel_initWithLength_1 = sel_registerName("initWithLength:");
-public static final int sel_setAllowsMultipleSelection_1 = sel_registerName("setAllowsMultipleSelection:");
-public static final int sel_isRotatedFromBase = sel_registerName("isRotatedFromBase");
-public static final int sel_beginDocument = sel_registerName("beginDocument");
-public static final int sel_initWithContentsOfURL_1usedEncoding_1error_1 = sel_registerName("initWithContentsOfURL:usedEncoding:error:");
-public static final int sel_showsSuppressionButton = sel_registerName("showsSuppressionButton");
-public static final int sel_tearOffMenuRepresentation = sel_registerName("tearOffMenuRepresentation");
-public static final int sel_otherEventWithType_1location_1modifierFlags_1timestamp_1windowNumber_1context_1subtype_1data1_1data2_1 = sel_registerName("otherEventWithType:location:modifierFlags:timestamp:windowNumber:context:subtype:data1:data2:");
-public static final int sel_imageUnfilteredFileTypes = sel_registerName("imageUnfilteredFileTypes");
-public static final int sel_isGathering = sel_registerName("isGathering");
-public static final int sel_slideImage_1from_1to_1 = sel_registerName("slideImage:from:to:");
-public static final int sel_initWithTCPPort_1 = sel_registerName("initWithTCPPort:");
-public static final int sel_stringByFoldingWithOptions_1locale_1 = sel_registerName("stringByFoldingWithOptions:locale:");
-public static final int sel_viewDidUnhide = sel_registerName("viewDidUnhide");
-public static final int sel_controlSize = sel_registerName("controlSize");
-public static final int sel_resourceDataUsingCache_1 = sel_registerName("resourceDataUsingCache:");
-public static final int sel_startWhenAnimation_1reachesProgress_1 = sel_registerName("startWhenAnimation:reachesProgress:");
-public static final int sel_registerURLHandleClass_1 = sel_registerName("registerURLHandleClass:");
-public static final int sel_indicatorImageInTableColumn_1 = sel_registerName("indicatorImageInTableColumn:");
-public static final int sel_decimalNumberByMultiplyingByPowerOf10_1 = sel_registerName("decimalNumberByMultiplyingByPowerOf10:");
-public static final int sel_scrollPoint_1 = sel_registerName("scrollPoint:");
-public static final int sel_setValue_1forKeyPath_1 = sel_registerName("setValue:forKeyPath:");
-public static final int sel_fontDescriptorWithMatrix_1 = sel_registerName("fontDescriptorWithMatrix:");
-public static final int sel_parser_1foundProcessingInstructionWithTarget_1data_1 = sel_registerName("parser:foundProcessingInstructionWithTarget:data:");
-public static final int sel_interfaceStyle = sel_registerName("interfaceStyle");
-public static final int sel_comboBox_1objectValueForItemAtIndex_1 = sel_registerName("comboBox:objectValueForItemAtIndex:");
-public static final int sel_applicationDidFinishLaunching_1 = sel_registerName("applicationDidFinishLaunching:");
-public static final int sel_currentMemoryUsage = sel_registerName("currentMemoryUsage");
-public static final int sel_altersStateOfSelectedItem = sel_registerName("altersStateOfSelectedItem");
-public static final int sel_selectedColumn = sel_registerName("selectedColumn");
-public static final int sel_convertBaseToScreen_1 = sel_registerName("convertBaseToScreen:");
-public static final int sel_lineHeightMultiple = sel_registerName("lineHeightMultiple");
-public static final int sel_CGColorSpace = sel_registerName("CGColorSpace");
-public static final int sel_descriptionInStringsFileFormat = sel_registerName("descriptionInStringsFileFormat");
-public static final int sel_isOutputStackInReverseOrder = sel_registerName("isOutputStackInReverseOrder");
-public static final int sel_takeValue_1forKey_1 = sel_registerName("takeValue:forKey:");
-public static final int sel_stringWithContentsOfFile_1 = sel_registerName("stringWithContentsOfFile:");
-public static final int sel_addItem_1 = sel_registerName("addItem:");
-public static final int sel_viewWillMoveToWindow_1 = sel_registerName("viewWillMoveToWindow:");
-public static final int sel_changeFileAttributes_1atPath_1 = sel_registerName("changeFileAttributes:atPath:");
-public static final int sel_userFixedPitchFontOfSize_1 = sel_registerName("userFixedPitchFontOfSize:");
-public static final int sel_selectRowIndexes_1inColumn_1 = sel_registerName("selectRowIndexes:inColumn:");
-public static final int sel_defaultLineCapStyle = sel_registerName("defaultLineCapStyle");
-public static final int sel_attributedAlternateTitle = sel_registerName("attributedAlternateTitle");
-public static final int sel_fileExistsAtPath_1 = sel_registerName("fileExistsAtPath:");
-public static final int sel_textView_1clickedOnLink_1atIndex_1 = sel_registerName("textView:clickedOnLink:atIndex:");
-public static final int sel_drawers = sel_registerName("drawers");
-public static final int sel_outlineView_1shouldSelectTableColumn_1 = sel_registerName("outlineView:shouldSelectTableColumn:");
-public static final int sel_pointValue = sel_registerName("pointValue");
-public static final int sel_integerValue = sel_registerName("integerValue");
-public static final int sel_modifyFontViaPanel_1 = sel_registerName("modifyFontViaPanel:");
-public static final int sel_windowTitleForDocumentDisplayName_1 = sel_registerName("windowTitleForDocumentDisplayName:");
-public static final int sel_shortWeekdaySymbols = sel_registerName("shortWeekdaySymbols");
-public static final int sel_titleOfSelectedItem = sel_registerName("titleOfSelectedItem");
-public static final int sel_setWindowsNeedUpdate_1 = sel_registerName("setWindowsNeedUpdate:");
-public static final int sel_stringWithUTF8String_1 = sel_registerName("stringWithUTF8String:");
-public static final int sel_transformedValueClass = sel_registerName("transformedValueClass");
-public static final int sel_initWithColorsAndLocations_1 = sel_registerName("initWithColorsAndLocations:");
-public static final int sel_acceptsMouseMovedEvents = sel_registerName("acceptsMouseMovedEvents");
-public static final int sel_toolTipsFontOfSize_1 = sel_registerName("toolTipsFontOfSize:");
-public static final int sel_setTextAttributesForPositiveValues_1 = sel_registerName("setTextAttributesForPositiveValues:");
-public static final int sel_setAlwaysShowsDecimalSeparator_1 = sel_registerName("setAlwaysShowsDecimalSeparator:");
-public static final int sel_setNumberOfColumns_1 = sel_registerName("setNumberOfColumns:");
-public static final int sel_moveRightAndModifySelection_1 = sel_registerName("moveRightAndModifySelection:");
-public static final int sel_indexOfItem_1 = sel_registerName("indexOfItem:");
-public static final int sel_moveWordRight_1 = sel_registerName("moveWordRight:");
-public static final int sel_numberWithUnsignedLongLong_1 = sel_registerName("numberWithUnsignedLongLong:");
-public static final int sel_initWithAuthenticationChallenge_1sender_1 = sel_registerName("initWithAuthenticationChallenge:sender:");
-public static final int sel_panelConvertFont_1 = sel_registerName("panelConvertFont:");
-public static final int sel_temporaryAttribute_1atCharacterIndex_1effectiveRange_1 = sel_registerName("temporaryAttribute:atCharacterIndex:effectiveRange:");
-public static final int sel_intersectHashTable_1 = sel_registerName("intersectHashTable:");
-public static final int sel_positionOfGlyph_1precededByGlyph_1isNominal_1 = sel_registerName("positionOfGlyph:precededByGlyph:isNominal:");
-public static final int sel_setLocalizedKeyTable_1 = sel_registerName("setLocalizedKeyTable:");
-public static final int sel_fileManager_1shouldLinkItemAtPath_1toPath_1 = sel_registerName("fileManager:shouldLinkItemAtPath:toPath:");
-public static final int sel_setScriptErrorNumber_1 = sel_registerName("setScriptErrorNumber:");
-public static final int sel_initWithLocaleIdentifier_1 = sel_registerName("initWithLocaleIdentifier:");
-public static final int sel_toolTip = sel_registerName("toolTip");
-public static final int sel_alternateMnemonic = sel_registerName("alternateMnemonic");
-public static final int sel_setChannelMapping_1 = sel_registerName("setChannelMapping:");
-public static final int sel_setLocalizedKey_1 = sel_registerName("setLocalizedKey:");
-public static final int sel_selector = sel_registerName("selector");
-public static final int sel_setCurrencyGroupingSeparator_1 = sel_registerName("setCurrencyGroupingSeparator:");
-public static final int sel_initWithKeyOptions_1valueOptions_1capacity_1 = sel_registerName("initWithKeyOptions:valueOptions:capacity:");
-public static final int sel_setStandaloneMonthSymbols_1 = sel_registerName("setStandaloneMonthSymbols:");
-public static final int sel_physicalMemory = sel_registerName("physicalMemory");
-public static final int sel_parse = sel_registerName("parse");
-public static final int sel_defaultTypesetterBehavior = sel_registerName("defaultTypesetterBehavior");
-public static final int sel_setRulerVisible_1 = sel_registerName("setRulerVisible:");
-public static final int sel_resizeDownCursor = sel_registerName("resizeDownCursor");
-public static final int sel_getBoundingRects_1forGlyphs_1count_1 = sel_registerName("getBoundingRects:forGlyphs:count:");
-public static final int sel_openPanel = sel_registerName("openPanel");
-public static final int sel_setEntryWidth_1 = sel_registerName("setEntryWidth:");
-public static final int sel_insertChildren_1atIndex_1 = sel_registerName("insertChildren:atIndex:");
-public static final int sel_selectNext_1 = sel_registerName("selectNext:");
-public static final int sel_paragraphGlyphRange = sel_registerName("paragraphGlyphRange");
-public static final int sel_animations = sel_registerName("animations");
-public static final int sel_setMarkers_1 = sel_registerName("setMarkers:");
-public static final int sel_raise = sel_registerName("raise");
-public static final int sel_menuZone = sel_registerName("menuZone");
-public static final int sel_weekdaySymbols = sel_registerName("weekdaySymbols");
-public static final int sel_setHTTPMethod_1 = sel_registerName("setHTTPMethod:");
-public static final int sel_placeholderAttributedString = sel_registerName("placeholderAttributedString");
-public static final int sel_filenameExtension_1isValidForType_1 = sel_registerName("filenameExtension:isValidForType:");
-public static final int sel_initWithReceivePort_1sendPort_1 = sel_registerName("initWithReceivePort:sendPort:");
-public static final int sel_setContextHelp_1forObject_1 = sel_registerName("setContextHelp:forObject:");
-public static final int sel_archiveRootObject_1toFile_1 = sel_registerName("archiveRootObject:toFile:");
-public static final int sel_setAnimations_1 = sel_registerName("setAnimations:");
-public static final int sel_locationOfPrintRect_1 = sel_registerName("locationOfPrintRect:");
-public static final int sel_setInterfaceStyle_1 = sel_registerName("setInterfaceStyle:");
-public static final int sel_startMonitoring = sel_registerName("startMonitoring");
-public static final int sel_presentError_1modalForWindow_1delegate_1didPresentSelector_1contextInfo_1 = sel_registerName("presentError:modalForWindow:delegate:didPresentSelector:contextInfo:");
-public static final int sel_windowFrameColor = sel_registerName("windowFrameColor");
-public static final int sel_paragraphSpacing = sel_registerName("paragraphSpacing");
-public static final int sel_fileAttributes = sel_registerName("fileAttributes");
-public static final int sel_setDisplayedCommandsTitle_1 = sel_registerName("setDisplayedCommandsTitle:");
-public static final int sel_preflightAndReturnError_1 = sel_registerName("preflightAndReturnError:");
-public static final int sel_setObservationInfo_1 = sel_registerName("setObservationInfo:");
-public static final int sel_currentCommand = sel_registerName("currentCommand");
-public static final int sel_processInfo = sel_registerName("processInfo");
-public static final int sel_appendString_1 = sel_registerName("appendString:");
-public static final int sel_setShowsHelp_1 = sel_registerName("setShowsHelp:");
-public static final int sel_datePickerStyle = sel_registerName("datePickerStyle");
-public static final int sel_addFileWrapper_1 = sel_registerName("addFileWrapper:");
-public static final int sel_bitmapImageRepForCachingDisplayInRect_1 = sel_registerName("bitmapImageRepForCachingDisplayInRect:");
-public static final int sel_initWithFileAtPath_1 = sel_registerName("initWithFileAtPath:");
-public static final int sel_cellClass = sel_registerName("cellClass");
-public static final int sel_imageRepsWithContentsOfFile_1 = sel_registerName("imageRepsWithContentsOfFile:");
-public static final int sel_localizedScannerWithString_1 = sel_registerName("localizedScannerWithString:");
-public static final int sel_isExpandable_1 = sel_registerName("isExpandable:");
-public static final int sel_isLoaded = sel_registerName("isLoaded");
-public static final int sel_browser_1acceptDrop_1atRow_1column_1dropOperation_1 = sel_registerName("browser:acceptDrop:atRow:column:dropOperation:");
-public static final int sel_panel_1directoryDidChange_1 = sel_registerName("panel:directoryDidChange:");
-public static final int sel_publicID = sel_registerName("publicID");
-public static final int sel_contentMaxSize = sel_registerName("contentMaxSize");
-public static final int sel_menuDidClose_1 = sel_registerName("menuDidClose:");
-public static final int sel_setPrinter_1 = sel_registerName("setPrinter:");
-public static final int sel_keywordForDescriptorAtIndex_1 = sel_registerName("keywordForDescriptorAtIndex:");
-public static final int sel_notANumberSymbol = sel_registerName("notANumberSymbol");
-public static final int sel_minimumLineHeight = sel_registerName("minimumLineHeight");
-public static final int sel_setContentBorderThickness_1forEdge_1 = sel_registerName("setContentBorderThickness:forEdge:");
-public static final int sel_titleFrameOfColumn_1 = sel_registerName("titleFrameOfColumn:");
+public static final int sel_convertBaseToScreen_ = sel_registerName("convertBaseToScreen:");
+public static final int sel_convertPoint_fromView_ = sel_registerName("convertPoint:fromView:");
+public static final int sel_convertPoint_toView_ = sel_registerName("convertPoint:toView:");
+public static final int sel_convertPointFromBase_ = sel_registerName("convertPointFromBase:");
+public static final int sel_convertPointToBase_ = sel_registerName("convertPointToBase:");
+public static final int sel_convertRect_fromView_ = sel_registerName("convertRect:fromView:");
+public static final int sel_convertRect_toView_ = sel_registerName("convertRect:toView:");
+public static final int sel_convertRectFromBase_ = sel_registerName("convertRectFromBase:");
+public static final int sel_convertRectToBase_ = sel_registerName("convertRectToBase:");
+public static final int sel_convertScreenToBase_ = sel_registerName("convertScreenToBase:");
+public static final int sel_convertSize_fromView_ = sel_registerName("convertSize:fromView:");
+public static final int sel_convertSize_toView_ = sel_registerName("convertSize:toView:");
+public static final int sel_convertSizeFromBase_ = sel_registerName("convertSizeFromBase:");
+public static final int sel_convertSizeToBase_ = sel_registerName("convertSizeToBase:");
+public static final int sel_cookies = sel_registerName("cookies");
+public static final int sel_copy = sel_registerName("copy");
+public static final int sel_copy_ = sel_registerName("copy:");
+public static final int sel_count = sel_registerName("count");
+public static final int sel_createContext = sel_registerName("createContext");
+public static final int sel_createFileAtPath_contents_attributes_ = sel_registerName("createFileAtPath:contents:attributes:");
+public static final int sel_crosshairCursor = sel_registerName("crosshairCursor");
+public static final int sel_ctrlKey = sel_registerName("ctrlKey");
+public static final int sel_currentContext = sel_registerName("currentContext");
+public static final int sel_currentEditor = sel_registerName("currentEditor");
+public static final int sel_currentEvent = sel_registerName("currentEvent");
+public static final int sel_currentInputManager = sel_registerName("currentInputManager");
+public static final int sel_currentPoint = sel_registerName("currentPoint");
+public static final int sel_currentRunLoop = sel_registerName("currentRunLoop");
+public static final int sel_curveToPoint_controlPoint1_controlPoint2_ = sel_registerName("curveToPoint:controlPoint1:controlPoint2:");
+public static final int sel_cut_ = sel_registerName("cut:");
+public static final int sel_dataForType_ = sel_registerName("dataForType:");
+public static final int sel_dataSource = sel_registerName("dataSource");
+public static final int sel_dataWithBytes_length_ = sel_registerName("dataWithBytes:length:");
 public static final int sel_dateValue = sel_registerName("dateValue");
-public static final int sel_numberOfRows = sel_registerName("numberOfRows");
-public static final int sel_isReadableFileAtPath_1 = sel_registerName("isReadableFileAtPath:");
-public static final int sel_canInsertChild = sel_registerName("canInsertChild");
-public static final int sel_stringByReplacingOccurrencesOfString_1withString_1options_1range_1 = sel_registerName("stringByReplacingOccurrencesOfString:withString:options:range:");
-public static final int sel_ok_1 = sel_registerName("ok:");
-public static final int sel_hourOfDay = sel_registerName("hourOfDay");
-public static final int sel_paragraphRangeForRange_1 = sel_registerName("paragraphRangeForRange:");
-public static final int sel_focusStack = sel_registerName("focusStack");
-public static final int sel_setUsesThreadedAnimation_1 = sel_registerName("setUsesThreadedAnimation:");
-public static final int sel_dataForType_1 = sel_registerName("dataForType:");
-public static final int sel_isByref = sel_registerName("isByref");
-public static final int sel_initWithResponse_1data_1userInfo_1storagePolicy_1 = sel_registerName("initWithResponse:data:userInfo:storagePolicy:");
-public static final int sel_initWithSerializedRepresentation_1 = sel_registerName("initWithSerializedRepresentation:");
-public static final int sel_openDocument_1 = sel_registerName("openDocument:");
-public static final int sel_translateRectsNeedingDisplayInRect_1by_1 = sel_registerName("translateRectsNeedingDisplayInRect:by:");
-public static final int sel_highlightsBy = sel_registerName("highlightsBy");
-public static final int sel_openHandCursor = sel_registerName("openHandCursor");
-public static final int sel_lineFragmentRectForProposedRect_1remainingRect_1 = sel_registerName("lineFragmentRectForProposedRect:remainingRect:");
-public static final int sel_selectedNodes = sel_registerName("selectedNodes");
-public static final int sel_replaceObjectAtIndex_1withObject_1 = sel_registerName("replaceObjectAtIndex:withObject:");
-public static final int sel_indexOfItemAtPoint_1 = sel_registerName("indexOfItemAtPoint:");
-public static final int sel_setCriteria_1andDisplayValues_1forRowAtIndex_1 = sel_registerName("setCriteria:andDisplayValues:forRowAtIndex:");
-public static final int sel_textStorage_1edited_1range_1changeInLength_1invalidatedRange_1 = sel_registerName("textStorage:edited:range:changeInLength:invalidatedRange:");
-public static final int sel_synchronizeWindowTitleWithDocumentName = sel_registerName("synchronizeWindowTitleWithDocumentName");
-public static final int sel_fileHandleWithNullDevice = sel_registerName("fileHandleWithNullDevice");
-public static final int sel_descriptorWithTypeCode_1 = sel_registerName("descriptorWithTypeCode:");
-public static final int sel_initWithDocFormat_1documentAttributes_1 = sel_registerName("initWithDocFormat:documentAttributes:");
-public static final int sel_setAutoresizingMask_1 = sel_registerName("setAutoresizingMask:");
-public static final int sel_methodReturnLength = sel_registerName("methodReturnLength");
-public static final int sel_recentDocumentURLs = sel_registerName("recentDocumentURLs");
-public static final int sel_setCurrentDirectoryPath_1 = sel_registerName("setCurrentDirectoryPath:");
-public static final int sel_characterSetWithRange_1 = sel_registerName("characterSetWithRange:");
-public static final int sel_resizeUpCursor = sel_registerName("resizeUpCursor");
-public static final int sel_rect = sel_registerName("rect");
-public static final int sel_removeCharactersInRange_1 = sel_registerName("removeCharactersInRange:");
-public static final int sel_performSelectorOnMainThread_1withObject_1waitUntilDone_1 = sel_registerName("performSelectorOnMainThread:withObject:waitUntilDone:");
-public static final int sel_elementAtIndex_1associatedPoints_1 = sel_registerName("elementAtIndex:associatedPoints:");
-public static final int sel_dataForKey_1 = sel_registerName("dataForKey:");
-public static final int sel_defaultDepthLimit = sel_registerName("defaultDepthLimit");
-public static final int sel_rulersVisible = sel_registerName("rulersVisible");
-public static final int sel_generalPasteboard = sel_registerName("generalPasteboard");
-public static final int sel_setAllowsTickMarkValuesOnly_1 = sel_registerName("setAllowsTickMarkValuesOnly:");
-public static final int sel_stateImageOffset = sel_registerName("stateImageOffset");
-public static final int sel_isBordered = sel_registerName("isBordered");
-public static final int sel_insertPointer_1atIndex_1 = sel_registerName("insertPointer:atIndex:");
-public static final int sel_keyForFileWrapper_1 = sel_registerName("keyForFileWrapper:");
-public static final int sel_renewGState = sel_registerName("renewGState");
-public static final int sel_autovalidates = sel_registerName("autovalidates");
-public static final int sel_localizedNameForFamily_1face_1 = sel_registerName("localizedNameForFamily:face:");
-public static final int sel_setAltIncrementValue_1 = sel_registerName("setAltIncrementValue:");
-public static final int sel_sortUsingFunction_1context_1 = sel_registerName("sortUsingFunction:context:");
-public static final int sel_fileNameExtensionWasHiddenInLastRunSavePanel = sel_registerName("fileNameExtensionWasHiddenInLastRunSavePanel");
-public static final int sel_endSheet_1returnCode_1 = sel_registerName("endSheet:returnCode:");
-public static final int sel_insertObjects_1atIndexes_1 = sel_registerName("insertObjects:atIndexes:");
-public static final int sel_standaloneMonthSymbols = sel_registerName("standaloneMonthSymbols");
-public static final int sel_prefersAllColumnUserResizing = sel_registerName("prefersAllColumnUserResizing");
-public static final int sel_separatesColumns = sel_registerName("separatesColumns");
-public static final int sel_moveToBeginningOfDocument_1 = sel_registerName("moveToBeginningOfDocument:");
-public static final int sel_objectZone = sel_registerName("objectZone");
-public static final int sel_initWithURL_1MIMEType_1expectedContentLength_1textEncodingName_1 = sel_registerName("initWithURL:MIMEType:expectedContentLength:textEncodingName:");
-public static final int sel_gotoEnd_1 = sel_registerName("gotoEnd:");
-public static final int sel_superscriptRange_1 = sel_registerName("superscriptRange:");
-public static final int sel_readInBackgroundAndNotifyForModes_1 = sel_registerName("readInBackgroundAndNotifyForModes:");
-public static final int sel_initWithObjects_1forKeys_1 = sel_registerName("initWithObjects:forKeys:");
-public static final int sel_cancel = sel_registerName("cancel");
-public static final int sel_suiteName = sel_registerName("suiteName");
-public static final int sel_sortedArrayUsingFunction_1context_1hint_1 = sel_registerName("sortedArrayUsingFunction:context:hint:");
-public static final int sel_countWordsInString_1language_1 = sel_registerName("countWordsInString:language:");
-public static final int sel_prepareWithInvocationTarget_1 = sel_registerName("prepareWithInvocationTarget:");
-public static final int sel_statusItemWithLength_1 = sel_registerName("statusItemWithLength:");
-public static final int sel_tableView_1shouldEditTableColumn_1row_1 = sel_registerName("tableView:shouldEditTableColumn:row:");
-public static final int sel_appendBezierPathWithRect_1 = sel_registerName("appendBezierPathWithRect:");
-public static final int sel_scrollColumnsRightBy_1 = sel_registerName("scrollColumnsRightBy:");
-public static final int sel_negativeInfinitySymbol = sel_registerName("negativeInfinitySymbol");
-public static final int sel_firstLineHeadIndent = sel_registerName("firstLineHeadIndent");
-public static final int sel_generateGlyphsForGlyphStorage_1desiredNumberOfCharacters_1glyphIndex_1characterIndex_1 = sel_registerName("generateGlyphsForGlyphStorage:desiredNumberOfCharacters:glyphIndex:characterIndex:");
-public static final int sel_dateWithTimeIntervalSinceReferenceDate_1 = sel_registerName("dateWithTimeIntervalSinceReferenceDate:");
-public static final int sel_menu_1updateItem_1atIndex_1shouldCancel_1 = sel_registerName("menu:updateItem:atIndex:shouldCancel:");
-public static final int sel_connection_1willSendRequest_1redirectResponse_1 = sel_registerName("connection:willSendRequest:redirectResponse:");
-public static final int sel_attemptRecoveryFromError_1optionIndex_1delegate_1didRecoverSelector_1contextInfo_1 = sel_registerName("attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:");
-public static final int sel_cursorUpdate_1 = sel_registerName("cursorUpdate:");
-public static final int sel_initWithMachPort_1options_1 = sel_registerName("initWithMachPort:options:");
-public static final int sel_applyFontTraits_1range_1 = sel_registerName("applyFontTraits:range:");
-public static final int sel_noteHeightOfRowsWithIndexesChanged_1 = sel_registerName("noteHeightOfRowsWithIndexesChanged:");
-public static final int sel_orderFrontTablePanel_1 = sel_registerName("orderFrontTablePanel:");
-public static final int sel_arrayWithObjects_1 = sel_registerName("arrayWithObjects:");
-public static final int sel_enableFlushWindow = sel_registerName("enableFlushWindow");
-public static final int sel_minimum = sel_registerName("minimum");
-public static final int sel_stopListening = sel_registerName("stopListening");
-public static final int sel_endParagraph = sel_registerName("endParagraph");
-public static final int sel_sharingType = sel_registerName("sharingType");
-public static final int sel_backgroundLayoutEnabled = sel_registerName("backgroundLayoutEnabled");
-public static final int sel_yellowColor = sel_registerName("yellowColor");
-public static final int sel_columnIndexesInRect_1 = sel_registerName("columnIndexesInRect:");
-public static final int sel_compositingOperation = sel_registerName("compositingOperation");
-public static final int sel_stopModalWithCode_1 = sel_registerName("stopModalWithCode:");
-public static final int sel_smallSystemFontSize = sel_registerName("smallSystemFontSize");
-public static final int sel_nonretainedObjectValue = sel_registerName("nonretainedObjectValue");
-public static final int sel_encodeBytes_1length_1forKey_1 = sel_registerName("encodeBytes:length:forKey:");
-public static final int sel_objectValues = sel_registerName("objectValues");
-public static final int sel_destroyContext = sel_registerName("destroyContext");
-public static final int sel_setFileModificationDate_1 = sel_registerName("setFileModificationDate:");
-public static final int sel_rightMouseDragged_1 = sel_registerName("rightMouseDragged:");
-public static final int sel_systemStatusBar = sel_registerName("systemStatusBar");
-public static final int sel_executableArchitectures = sel_registerName("executableArchitectures");
-public static final int sel_recentSearches = sel_registerName("recentSearches");
-public static final int sel_getWhite_1alpha_1 = sel_registerName("getWhite:alpha:");
-public static final int sel_readDataToEndOfFile = sel_registerName("readDataToEndOfFile");
-public static final int sel_setHour_1 = sel_registerName("setHour:");
-public static final int sel_titleBarFontOfSize_1 = sel_registerName("titleBarFontOfSize:");
-public static final int sel_canDragRowsWithIndexes_1atPoint_1 = sel_registerName("canDragRowsWithIndexes:atPoint:");
-public static final int sel_acceptsArrowKeys = sel_registerName("acceptsArrowKeys");
-public static final int sel_availableColorLists = sel_registerName("availableColorLists");
-public static final int sel_setUsesLazyFetching_1 = sel_registerName("setUsesLazyFetching:");
-public static final int sel_convertAttributes_1 = sel_registerName("convertAttributes:");
-public static final int sel_isWritableFileAtPath_1 = sel_registerName("isWritableFileAtPath:");
-public static final int sel_timerWithTimeInterval_1target_1selector_1userInfo_1repeats_1 = sel_registerName("timerWithTimeInterval:target:selector:userInfo:repeats:");
-public static final int sel_windowDidChangeScreen_1 = sel_registerName("windowDidChangeScreen:");
-public static final int sel_insertTextContainer_1atIndex_1 = sel_registerName("insertTextContainer:atIndex:");
-public static final int sel_weightOfFont_1 = sel_registerName("weightOfFont:");
-public static final int sel_temporaryAttributesAtCharacterIndex_1longestEffectiveRange_1inRange_1 = sel_registerName("temporaryAttributesAtCharacterIndex:longestEffectiveRange:inRange:");
-public static final int sel_trackWithEvent_1 = sel_registerName("trackWithEvent:");
-public static final int sel_selectRowIndexes_1byExtendingSelection_1 = sel_registerName("selectRowIndexes:byExtendingSelection:");
-public static final int sel_charactersToBeSkipped = sel_registerName("charactersToBeSkipped");
-public static final int sel_names = sel_registerName("names");
-public static final int sel_setAllowsCutCopyPaste_1 = sel_registerName("setAllowsCutCopyPaste:");
-public static final int sel_setDuration_1 = sel_registerName("setDuration:");
-public static final int sel_sleepForTimeInterval_1 = sel_registerName("sleepForTimeInterval:");
-public static final int sel_removeChildAtIndex_1 = sel_registerName("removeChildAtIndex:");
-public static final int sel_tokenFieldCell_1writeRepresentedObjects_1toPasteboard_1 = sel_registerName("tokenFieldCell:writeRepresentedObjects:toPasteboard:");
-public static final int sel_backgroundStyle = sel_registerName("backgroundStyle");
-public static final int sel_open_1 = sel_registerName("open:");
-public static final int sel_indexGreaterThanOrEqualToIndex_1 = sel_registerName("indexGreaterThanOrEqualToIndex:");
-public static final int sel_isAbsolutePath = sel_registerName("isAbsolutePath");
-public static final int sel_paletteLabel = sel_registerName("paletteLabel");
-public static final int sel_setQuarterSymbols_1 = sel_registerName("setQuarterSymbols:");
-public static final int sel_suppressionButton = sel_registerName("suppressionButton");
-public static final int sel_undo = sel_registerName("undo");
-public static final int sel_rangeOfString_1options_1range_1locale_1 = sel_registerName("rangeOfString:options:range:locale:");
-public static final int sel_localizedName_1locale_1 = sel_registerName("localizedName:locale:");
-public static final int sel_setTableView_1 = sel_registerName("setTableView:");
-public static final int sel_isExecutableFileAtPath_1 = sel_registerName("isExecutableFileAtPath:");
-public static final int sel_standaloneQuarterSymbols = sel_registerName("standaloneQuarterSymbols");
-public static final int sel_textView_1shouldSetSpellingState_1range_1 = sel_registerName("textView:shouldSetSpellingState:range:");
-public static final int sel_newObject = sel_registerName("newObject");
-public static final int sel_setDocumentEdited_1 = sel_registerName("setDocumentEdited:");
-public static final int sel_setRelativePosition_1 = sel_registerName("setRelativePosition:");
-public static final int sel_allConnections = sel_registerName("allConnections");
-public static final int sel_isLessThanOrEqualTo_1 = sel_registerName("isLessThanOrEqualTo:");
-public static final int sel_attributeWithName_1stringValue_1 = sel_registerName("attributeWithName:stringValue:");
-public static final int sel_floatForKey_1 = sel_registerName("floatForKey:");
-public static final int sel_initWithDomain_1type_1name_1port_1 = sel_registerName("initWithDomain:type:name:port:");
-public static final int sel_setShadowOffset_1 = sel_registerName("setShadowOffset:");
-public static final int sel_tabViewItems = sel_registerName("tabViewItems");
-public static final int sel_appleEventCodeForReturnType = sel_registerName("appleEventCodeForReturnType");
-public static final int sel_createFileAtPath_1contents_1attributes_1 = sel_registerName("createFileAtPath:contents:attributes:");
-public static final int sel_ruleEditor_1predicatePartsForCriterion_1withDisplayValue_1inRow_1 = sel_registerName("ruleEditor:predicatePartsForCriterion:withDisplayValue:inRow:");
-public static final int sel_evaluateWithObject_1 = sel_registerName("evaluateWithObject:");
-public static final int sel_pathComponents = sel_registerName("pathComponents");
-public static final int sel_setTarget_1 = sel_registerName("setTarget:");
-public static final int sel_fileCreationDate = sel_registerName("fileCreationDate");
-public static final int sel_port = sel_registerName("port");
-public static final int sel_publish = sel_registerName("publish");
-public static final int sel_downloadDidFinish_1 = sel_registerName("downloadDidFinish:");
-public static final int sel_endEditing_1 = sel_registerName("endEditing:");
-public static final int sel_expectedResourceDataSize = sel_registerName("expectedResourceDataSize");
-public static final int sel_paddingCharacter = sel_registerName("paddingCharacter");
-public static final int sel_convertPoint_1fromView_1 = sel_registerName("convertPoint:fromView:");
-public static final int sel_setIntValue_1 = sel_registerName("setIntValue:");
-public static final int sel_appendBezierPathWithArcFromPoint_1toPoint_1radius_1 = sel_registerName("appendBezierPathWithArcFromPoint:toPoint:radius:");
-public static final int sel_currentFontAction = sel_registerName("currentFontAction");
-public static final int sel_expressionForFunction_1arguments_1 = sel_registerName("expressionForFunction:arguments:");
-public static final int sel_minimumDaysInFirstWeek = sel_registerName("minimumDaysInFirstWeek");
-public static final int sel_setDeletesFileUponFailure_1 = sel_registerName("setDeletesFileUponFailure:");
-public static final int sel_pageCount = sel_registerName("pageCount");
-public static final int sel_imageAlignment = sel_registerName("imageAlignment");
-public static final int sel_URLProtocol_1didCancelAuthenticationChallenge_1 = sel_registerName("URLProtocol:didCancelAuthenticationChallenge:");
-public static final int sel_localizedPaperName = sel_registerName("localizedPaperName");
-public static final int sel_setAllowsBranchSelection_1 = sel_registerName("setAllowsBranchSelection:");
-public static final int sel_symbolicLinkDestination = sel_registerName("symbolicLinkDestination");
-public static final int sel_prepareSavePanel_1 = sel_registerName("prepareSavePanel:");
-public static final int sel_enableMultipleThreads = sel_registerName("enableMultipleThreads");
-public static final int sel_configurePersistentStoreCoordinatorForURL_1ofType_1modelConfiguration_1storeOptions_1error_1 = sel_registerName("configurePersistentStoreCoordinatorForURL:ofType:modelConfiguration:storeOptions:error:");
-public static final int sel_backgroundLoadDidFailWithReason_1 = sel_registerName("backgroundLoadDidFailWithReason:");
-public static final int sel_copyAttributesFromContext_1withMask_1 = sel_registerName("copyAttributesFromContext:withMask:");
-public static final int sel_isVertical = sel_registerName("isVertical");
-public static final int sel_wait = sel_registerName("wait");
-public static final int sel_firstObjectCommonWithArray_1 = sel_registerName("firstObjectCommonWithArray:");
-public static final int sel_hideOtherApplications_1 = sel_registerName("hideOtherApplications:");
-public static final int sel_startSpeakingString_1 = sel_registerName("startSpeakingString:");
-public static final int sel_makeKeyAndOrderFront_1 = sel_registerName("makeKeyAndOrderFront:");
-public static final int sel_drawCellAtIndex_1 = sel_registerName("drawCellAtIndex:");
-public static final int sel_headerToolTip = sel_registerName("headerToolTip");
-public static final int sel_readRTFDFromFile_1 = sel_registerName("readRTFDFromFile:");
-public static final int sel_knownTimeZoneNames = sel_registerName("knownTimeZoneNames");
-public static final int sel_toOneRelationshipKeys = sel_registerName("toOneRelationshipKeys");
-public static final int sel_replyTimeout = sel_registerName("replyTimeout");
-public static final int sel_setDelegate_1 = sel_registerName("setDelegate:");
-public static final int sel_initWithTarget_1protocol_1 = sel_registerName("initWithTarget:protocol:");
-public static final int sel_setShowsPrintPanel_1 = sel_registerName("setShowsPrintPanel:");
-public static final int sel_trackingNumber = sel_registerName("trackingNumber");
-public static final int sel_initWithDecimal_1 = sel_registerName("initWithDecimal:");
-public static final int sel_proxyWithTarget_1connection_1 = sel_registerName("proxyWithTarget:connection:");
-public static final int sel_setCompositingFilter_1 = sel_registerName("setCompositingFilter:");
-public static final int sel_systemFontSizeForControlSize_1 = sel_registerName("systemFontSizeForControlSize:");
-public static final int sel_registerDefaults_1 = sel_registerName("registerDefaults:");
-public static final int sel_veryShortStandaloneMonthSymbols = sel_registerName("veryShortStandaloneMonthSymbols");
-public static final int sel_setPlusSign_1 = sel_registerName("setPlusSign:");
-public static final int sel_colorRenderingIntent = sel_registerName("colorRenderingIntent");
-public static final int sel_thicknessRequiredInRuler = sel_registerName("thicknessRequiredInRuler");
-public static final int sel_setAlertStyle_1 = sel_registerName("setAlertStyle:");
-public static final int sel_searchScopes = sel_registerName("searchScopes");
-public static final int sel_tag = sel_registerName("tag");
-public static final int sel_autosavingDelay = sel_registerName("autosavingDelay");
-public static final int sel_setDateStyle_1 = sel_registerName("setDateStyle:");
-public static final int sel_setIcon_1forFile_1options_1 = sel_registerName("setIcon:forFile:options:");
-public static final int sel_internationalCurrencySymbol = sel_registerName("internationalCurrencySymbol");
-public static final int sel_netService_1didUpdateTXTRecordData_1 = sel_registerName("netService:didUpdateTXTRecordData:");
-public static final int sel_setOnMouseEntered_1 = sel_registerName("setOnMouseEntered:");
-public static final int sel_setTextBaseWritingDirection_1 = sel_registerName("setTextBaseWritingDirection:");
-public static final int sel_startSpecifier = sel_registerName("startSpecifier");
-public static final int sel_setExcludedFromWindowsMenu_1 = sel_registerName("setExcludedFromWindowsMenu:");
-public static final int sel_operatingSystemName = sel_registerName("operatingSystemName");
-public static final int sel_isConcurrent = sel_registerName("isConcurrent");
-public static final int sel_enableRelease_1 = sel_registerName("enableRelease:");
-public static final int sel_getValues_1forAttribute_1forVirtualScreen_1 = sel_registerName("getValues:forAttribute:forVirtualScreen:");
-public static final int sel_interrupt = sel_registerName("interrupt");
-public static final int sel_whiteComponent = sel_registerName("whiteComponent");
-public static final int sel_keyEquivalentRectForBounds_1 = sel_registerName("keyEquivalentRectForBounds:");
-public static final int sel_numberOfVisibleColumns = sel_registerName("numberOfVisibleColumns");
-public static final int sel_windowNibName = sel_registerName("windowNibName");
-public static final int sel_parser_1foundIgnorableWhitespace_1 = sel_registerName("parser:foundIgnorableWhitespace:");
-public static final int sel_menuItemCellForItemAtIndex_1 = sel_registerName("menuItemCellForItemAtIndex:");
-public static final int sel_addTrackingArea_1 = sel_registerName("addTrackingArea:");
-public static final int sel_arrangedObjects = sel_registerName("arrangedObjects");
-public static final int sel_timeStyle = sel_registerName("timeStyle");
-public static final int sel_indexPathWithIndexes_1length_1 = sel_registerName("indexPathWithIndexes:length:");
-public static final int sel_addNamespace_1 = sel_registerName("addNamespace:");
-public static final int sel_setDisplayValuesKeyPath_1 = sel_registerName("setDisplayValuesKeyPath:");
-public static final int sel_notificationBatchingInterval = sel_registerName("notificationBatchingInterval");
-public static final int sel_MIMEType = sel_registerName("MIMEType");
-public static final int sel_drawerWillClose_1 = sel_registerName("drawerWillClose:");
-public static final int sel_sortedArrayHint = sel_registerName("sortedArrayHint");
-public static final int sel_shortQuarterSymbols = sel_registerName("shortQuarterSymbols");
-public static final int sel_usesAlternatingRowBackgroundColors = sel_registerName("usesAlternatingRowBackgroundColors");
-public static final int sel_colorWithKey_1 = sel_registerName("colorWithKey:");
-public static final int sel_rangeForUserCompletion = sel_registerName("rangeForUserCompletion");
-public static final int sel_boolValue = sel_registerName("boolValue");
-public static final int sel_autosaveName = sel_registerName("autosaveName");
-public static final int sel_childWindows = sel_registerName("childWindows");
-public static final int sel_mapTableWithStrongToWeakObjects = sel_registerName("mapTableWithStrongToWeakObjects");
-public static final int sel_unhide = sel_registerName("unhide");
-public static final int sel_setRowClass_1 = sel_registerName("setRowClass:");
-public static final int sel_endSubelementIndex = sel_registerName("endSubelementIndex");
-public static final int sel_preferredLocalizations = sel_registerName("preferredLocalizations");
-public static final int sel_fileSystemChanged = sel_registerName("fileSystemChanged");
-public static final int sel_secondOfMinute = sel_registerName("secondOfMinute");
-public static final int sel_scrollWheel_1 = sel_registerName("scrollWheel:");
-public static final int sel_characterIndexForGlyphAtIndex_1 = sel_registerName("characterIndexForGlyphAtIndex:");
-public static final int sel_drawRepresentation_1inRect_1 = sel_registerName("drawRepresentation:inRect:");
-public static final int sel_setByAddingObject_1 = sel_registerName("setByAddingObject:");
-public static final int sel_rotateByAngle_1 = sel_registerName("rotateByAngle:");
-public static final int sel_allValues = sel_registerName("allValues");
-public static final int sel_addItemWithObjectValue_1 = sel_registerName("addItemWithObjectValue:");
-public static final int sel_tabViewItemAtIndex_1 = sel_registerName("tabViewItemAtIndex:");
-public static final int sel_servicePortWithName_1 = sel_registerName("servicePortWithName:");
-public static final int sel_multiplier = sel_registerName("multiplier");
-public static final int sel_setSelectionGranularity_1 = sel_registerName("setSelectionGranularity:");
-public static final int sel_setViewsNeedDisplay_1 = sel_registerName("setViewsNeedDisplay:");
-public static final int sel_object = sel_registerName("object");
-public static final int sel_writeFileWrapper_1 = sel_registerName("writeFileWrapper:");
-public static final int sel_authenticationMethod = sel_registerName("authenticationMethod");
-public static final int sel_frameLength = sel_registerName("frameLength");
-public static final int sel_nextNode = sel_registerName("nextNode");
-public static final int sel_characterSetWithCharactersInString_1 = sel_registerName("characterSetWithCharactersInString:");
-public static final int sel_messageText = sel_registerName("messageText");
-public static final int sel_setArguments_1 = sel_registerName("setArguments:");
-public static final int sel_getBytes_1length_1 = sel_registerName("getBytes:length:");
-public static final int sel_setDropItem_1dropChildIndex_1 = sel_registerName("setDropItem:dropChildIndex:");
-public static final int sel_expressionForVariable_1 = sel_registerName("expressionForVariable:");
-public static final int sel_rectPreservedDuringLiveResize = sel_registerName("rectPreservedDuringLiveResize");
-public static final int sel_isMuted = sel_registerName("isMuted");
-public static final int sel_allowsColumnResizing = sel_registerName("allowsColumnResizing");
-public static final int sel_readFileWrapper = sel_registerName("readFileWrapper");
-public static final int sel_undoNestedGroup = sel_registerName("undoNestedGroup");
-public static final int sel_setIncludedKeys_1 = sel_registerName("setIncludedKeys:");
-public static final int sel_textWithStringValue_1 = sel_registerName("textWithStringValue:");
-public static final int sel_ruleEditorRowsDidChange_1 = sel_registerName("ruleEditorRowsDidChange:");
-public static final int sel_handleMouseEvent_1 = sel_registerName("handleMouseEvent:");
-public static final int sel_browser_1canDragRowsWithIndexes_1inColumn_1withEvent_1 = sel_registerName("browser:canDragRowsWithIndexes:inColumn:withEvent:");
-public static final int sel_drawPageBorderWithSize_1 = sel_registerName("drawPageBorderWithSize:");
-public static final int sel_valueWithBytes_1objCType_1 = sel_registerName("valueWithBytes:objCType:");
-public static final int sel_subpathsAtPath_1 = sel_registerName("subpathsAtPath:");
-public static final int sel_mnemonicLocation = sel_registerName("mnemonicLocation");
-public static final int sel_dockTile = sel_registerName("dockTile");
-public static final int sel_setFirstLineHeadIndent_1 = sel_registerName("setFirstLineHeadIndent:");
-public static final int sel_isAutomaticQuoteSubstitutionEnabled = sel_registerName("isAutomaticQuoteSubstitutionEnabled");
-public static final int sel_allowsReverseTransformation = sel_registerName("allowsReverseTransformation");
-public static final int sel_moveNodes_1toIndexPath_1 = sel_registerName("moveNodes:toIndexPath:");
-public static final int sel_seekToFileOffset_1 = sel_registerName("seekToFileOffset:");
-public static final int sel_scriptingBeginsWith_1 = sel_registerName("scriptingBeginsWith:");
-public static final int sel_setInformativeText_1 = sel_registerName("setInformativeText:");
-public static final int sel_initWithIndexSet_1 = sel_registerName("initWithIndexSet:");
-public static final int sel_write_1maxLength_1 = sel_registerName("write:maxLength:");
-public static final int sel_canInitWithRequest_1 = sel_registerName("canInitWithRequest:");
-public static final int sel_enqueueNotification_1postingStyle_1 = sel_registerName("enqueueNotification:postingStyle:");
-public static final int sel_setShouldResolveExternalEntities_1 = sel_registerName("setShouldResolveExternalEntities:");
-public static final int sel_usesFindPanel = sel_registerName("usesFindPanel");
-public static final int sel_perMillSymbol = sel_registerName("perMillSymbol");
-public static final int sel_setClearsFilterPredicateOnInsertion_1 = sel_registerName("setClearsFilterPredicateOnInsertion:");
-public static final int sel_currentLocale = sel_registerName("currentLocale");
-public static final int sel_pasteboardByFilteringData_1ofType_1 = sel_registerName("pasteboardByFilteringData:ofType:");
-public static final int sel_isSheet = sel_registerName("isSheet");
-public static final int sel_hasWritablePropertyForKey_1 = sel_registerName("hasWritablePropertyForKey:");
-public static final int sel_drawDividerInRect_1 = sel_registerName("drawDividerInRect:");
-public static final int sel_sharedUserDefaultsController = sel_registerName("sharedUserDefaultsController");
-public static final int sel_preferredFontNames = sel_registerName("preferredFontNames");
-public static final int sel_menuBarFontOfSize_1 = sel_registerName("menuBarFontOfSize:");
-public static final int sel_sharedColorPanelExists = sel_registerName("sharedColorPanelExists");
-public static final int sel_reshape = sel_registerName("reshape");
-public static final int sel_initWithLong_1 = sel_registerName("initWithLong:");
-public static final int sel_reservedThicknessForAccessoryView = sel_registerName("reservedThicknessForAccessoryView");
-public static final int sel_setTitleCell_1 = sel_registerName("setTitleCell:");
-public static final int sel_sharedSpellCheckerExists = sel_registerName("sharedSpellCheckerExists");
-public static final int sel_locationForSubmenu_1 = sel_registerName("locationForSubmenu:");
-public static final int sel_nodesForXPath_1error_1 = sel_registerName("nodesForXPath:error:");
-public static final int sel_setHasVerticalRuler_1 = sel_registerName("setHasVerticalRuler:");
-public static final int sel_controlHighlightColor = sel_registerName("controlHighlightColor");
-public static final int sel_rowSpan = sel_registerName("rowSpan");
-public static final int sel_decodeObject = sel_registerName("decodeObject");
-public static final int sel_fileHandleForReadingAtPath_1 = sel_registerName("fileHandleForReadingAtPath:");
-public static final int sel_didLoadBytes_1loadComplete_1 = sel_registerName("didLoadBytes:loadComplete:");
-public static final int sel_renewRows_1columns_1 = sel_registerName("renewRows:columns:");
-public static final int sel_performKeyEquivalent_1 = sel_registerName("performKeyEquivalent:");
-public static final int sel_windowDidResignKey_1 = sel_registerName("windowDidResignKey:");
-public static final int sel_typeForKey_1 = sel_registerName("typeForKey:");
-public static final int sel_selectedObjects = sel_registerName("selectedObjects");
+public static final int sel_dateWithCalendarFormat_timeZone_ = sel_registerName("dateWithCalendarFormat:timeZone:");
+public static final int sel_dateWithTimeIntervalSinceNow_ = sel_registerName("dateWithTimeIntervalSinceNow:");
+public static final int sel_dateWithYear_month_day_hour_minute_second_timeZone_ = sel_registerName("dateWithYear:month:day:hour:minute:second:timeZone:");
+public static final int sel_dayOfMonth = sel_registerName("dayOfMonth");
+public static final int sel_declareTypes_owner_ = sel_registerName("declareTypes:owner:");
+public static final int sel_defaultCenter = sel_registerName("defaultCenter");
+public static final int sel_defaultFlatness = sel_registerName("defaultFlatness");
+public static final int sel_defaultLineHeightForFont_ = sel_registerName("defaultLineHeightForFont:");
+public static final int sel_defaultManager = sel_registerName("defaultManager");
 public static final int sel_defaultPrinter = sel_registerName("defaultPrinter");
-public static final int sel_colorWithPatternImage_1 = sel_registerName("colorWithPatternImage:");
-public static final int sel_setAttributedAlternateTitle_1 = sel_registerName("setAttributedAlternateTitle:");
-public static final int sel_setValue_1forKey_1 = sel_registerName("setValue:forKey:");
-public static final int sel_drawInteriorWithFrame_1inView_1 = sel_registerName("drawInteriorWithFrame:inView:");
-public static final int sel_copy_1 = sel_registerName("copy:");
-public static final int sel_scanString_1intoString_1 = sel_registerName("scanString:intoString:");
-public static final int sel_fileManager_1shouldProceedAfterError_1 = sel_registerName("fileManager:shouldProceedAfterError:");
-public static final int sel_fileManager_1shouldRemoveItemAtPath_1 = sel_registerName("fileManager:shouldRemoveItemAtPath:");
-public static final int sel_removeSavedColumnsWithAutosaveName_1 = sel_registerName("removeSavedColumnsWithAutosaveName:");
-public static final int sel_numberWithUnsignedInteger_1 = sel_registerName("numberWithUnsignedInteger:");
-public static final int sel_rulerMarkersForTextView_1paragraphStyle_1ruler_1 = sel_registerName("rulerMarkersForTextView:paragraphStyle:ruler:");
-public static final int sel_layoutRectForTextBlock_1atIndex_1effectiveRange_1 = sel_registerName("layoutRectForTextBlock:atIndex:effectiveRange:");
-public static final int sel_maxPossiblePositionOfDividerAtIndex_1 = sel_registerName("maxPossiblePositionOfDividerAtIndex:");
-public static final int sel_removePort_1forMode_1 = sel_registerName("removePort:forMode:");
-public static final int sel_drawHashMarksAndLabelsInRect_1 = sel_registerName("drawHashMarksAndLabelsInRect:");
-public static final int sel_control_1textView_1doCommandBySelector_1 = sel_registerName("control:textView:doCommandBySelector:");
-public static final int sel_getLineFragmentRect_1usedRect_1remainingRect_1forStartingGlyphAtIndex_1proposedRect_1lineSpacing_1paragraphSpacingBefore_1paragraphSpacingAfter_1 = sel_registerName("getLineFragmentRect:usedRect:remainingRect:forStartingGlyphAtIndex:proposedRect:lineSpacing:paragraphSpacingBefore:paragraphSpacingAfter:");
-public static final int sel_textContainerInset = sel_registerName("textContainerInset");
-public static final int sel_positionsForCompositeSequence_1numberOfGlyphs_1pointArray_1 = sel_registerName("positionsForCompositeSequence:numberOfGlyphs:pointArray:");
-public static final int sel_stringByAppendingPathComponent_1 = sel_registerName("stringByAppendingPathComponent:");
-public static final int sel_application_1printFiles_1 = sel_registerName("application:printFiles:");
-public static final int sel_scanInt_1 = sel_registerName("scanInt:");
-public static final int sel_operators = sel_registerName("operators");
-public static final int sel_fireDate = sel_registerName("fireDate");
-public static final int sel_isExternal = sel_registerName("isExternal");
-public static final int sel_setImagePosition_1 = sel_registerName("setImagePosition:");
-public static final int sel_predicateWithFormat_1arguments_1 = sel_registerName("predicateWithFormat:arguments:");
-public static final int sel_stopSpeaking = sel_registerName("stopSpeaking");
-public static final int sel_contentWidthValueType = sel_registerName("contentWidthValueType");
-public static final int sel_paddingPosition = sel_registerName("paddingPosition");
-public static final int sel_removeLastObject = sel_registerName("removeLastObject");
-public static final int sel_stringByReplacingCharactersInRange_1withString_1 = sel_registerName("stringByReplacingCharactersInRange:withString:");
-public static final int sel_pointerValue = sel_registerName("pointerValue");
-public static final int sel_setTruncatesLastVisibleLine_1 = sel_registerName("setTruncatesLastVisibleLine:");
-public static final int sel_URLHandleResourceDidBeginLoading_1 = sel_registerName("URLHandleResourceDidBeginLoading:");
-public static final int sel_valueForKeyPath_1 = sel_registerName("valueForKeyPath:");
-public static final int sel_setPeriodicDelay_1interval_1 = sel_registerName("setPeriodicDelay:interval:");
-public static final int sel_imageRepWithCIImage_1 = sel_registerName("imageRepWithCIImage:");
-public static final int sel_wantsNotificationForMarkedText = sel_registerName("wantsNotificationForMarkedText");
-public static final int sel_rectForPart_1 = sel_registerName("rectForPart:");
-public static final int sel_setWeekday_1 = sel_registerName("setWeekday:");
-public static final int sel_streamStatus = sel_registerName("streamStatus");
-public static final int sel_containsPoint_1 = sel_registerName("containsPoint:");
-public static final int sel_underlineThickness = sel_registerName("underlineThickness");
-public static final int sel_allObjects = sel_registerName("allObjects");
-public static final int sel_characters = sel_registerName("characters");
-public static final int sel_outlineViewSelectionIsChanging_1 = sel_registerName("outlineViewSelectionIsChanging:");
-public static final int sel_netServiceBrowser_1didNotSearch_1 = sel_registerName("netServiceBrowser:didNotSearch:");
-public static final int sel_poolCountHighWaterMark = sel_registerName("poolCountHighWaterMark");
-public static final int sel_setColorSpaceName_1 = sel_registerName("setColorSpaceName:");
-public static final int sel_graphicsPort = sel_registerName("graphicsPort");
-public static final int sel_fontDescriptorWithName_1matrix_1 = sel_registerName("fontDescriptorWithName:matrix:");
-public static final int sel_setSelectable_1 = sel_registerName("setSelectable:");
-public static final int sel_scriptErrorOffendingObjectDescriptor = sel_registerName("scriptErrorOffendingObjectDescriptor");
-public static final int sel_resizingMask = sel_registerName("resizingMask");
-public static final int sel_canHandleRequest_1 = sel_registerName("canHandleRequest:");
-public static final int sel_imageRepWithPasteboard_1 = sel_registerName("imageRepWithPasteboard:");
-public static final int sel_stopQuery = sel_registerName("stopQuery");
-public static final int sel_dataWithBytes_1length_1 = sel_registerName("dataWithBytes:length:");
-public static final int sel_setCachesBezierPath_1 = sel_registerName("setCachesBezierPath:");
-public static final int sel_arrayForKey_1 = sel_registerName("arrayForKey:");
-public static final int sel_cell = sel_registerName("cell");
-public static final int sel_dealloc = sel_registerName("dealloc");
-public static final int sel_constrainScrollPoint_1 = sel_registerName("constrainScrollPoint:");
-public static final int sel_printSettings = sel_registerName("printSettings");
-public static final int sel_autoresizesOutlineColumn = sel_registerName("autoresizesOutlineColumn");
-public static final int sel_setFont_1range_1 = sel_registerName("setFont:range:");
-public static final int sel_limitDateForMode_1 = sel_registerName("limitDateForMode:");
-public static final int sel_stroke = sel_registerName("stroke");
-public static final int sel_parser_1parseErrorOccurred_1 = sel_registerName("parser:parseErrorOccurred:");
-public static final int sel_sendsActionOnEndEditing = sel_registerName("sendsActionOnEndEditing");
-public static final int sel_toggleGrammarChecking_1 = sel_registerName("toggleGrammarChecking:");
-public static final int sel_acceptsBinary = sel_registerName("acceptsBinary");
-public static final int sel_indexLessThanIndex_1 = sel_registerName("indexLessThanIndex:");
-public static final int sel_setCollapsesBorders_1 = sel_registerName("setCollapsesBorders:");
-public static final int sel_setTimeoutInterval_1 = sel_registerName("setTimeoutInterval:");
-public static final int sel_setNeedsDisplayInRect_1avoidAdditionalLayout_1 = sel_registerName("setNeedsDisplayInRect:avoidAdditionalLayout:");
-public static final int sel_encodeWithCoder_1 = sel_registerName("encodeWithCoder:");
-public static final int sel_compositeToPoint_1operation_1 = sel_registerName("compositeToPoint:operation:");
-public static final int sel_textView_1doubleClickedOnCell_1inRect_1atIndex_1 = sel_registerName("textView:doubleClickedOnCell:inRect:atIndex:");
-public static final int sel_setAlternateTitleWithMnemonic_1 = sel_registerName("setAlternateTitleWithMnemonic:");
-public static final int sel_minimumSignificantDigits = sel_registerName("minimumSignificantDigits");
-public static final int sel_stackSize = sel_registerName("stackSize");
-public static final int sel_setLayoutManager_1 = sel_registerName("setLayoutManager:");
-public static final int sel_image_1didLoadRepresentationHeader_1 = sel_registerName("image:didLoadRepresentationHeader:");
+public static final int sel_defaultTimeZone = sel_registerName("defaultTimeZone");
+public static final int sel_deleteCookie_ = sel_registerName("deleteCookie:");
+public static final int sel_deliverResult = sel_registerName("deliverResult");
+public static final int sel_deltaX = sel_registerName("deltaX");
+public static final int sel_deltaY = sel_registerName("deltaY");
 public static final int sel_depth = sel_registerName("depth");
-public static final int sel_setTypesetter_1 = sel_registerName("setTypesetter:");
-public static final int sel_isSessionOnly = sel_registerName("isSessionOnly");
-public static final int sel_performFindPanelAction_1 = sel_registerName("performFindPanelAction:");
-public static final int sel_fileManager_1shouldProceedAfterError_1removingItemAtPath_1 = sel_registerName("fileManager:shouldProceedAfterError:removingItemAtPath:");
-public static final int sel_paperSize = sel_registerName("paperSize");
-public static final int sel_changeColor_1 = sel_registerName("changeColor:");
-public static final int sel_unarchiverDidFinish_1 = sel_registerName("unarchiverDidFinish:");
-public static final int sel_initWithObjectsAndKeys_1 = sel_registerName("initWithObjectsAndKeys:");
-public static final int sel_notationDeclarationForName_1 = sel_registerName("notationDeclarationForName:");
-public static final int sel_maximumSignificantDigits = sel_registerName("maximumSignificantDigits");
-public static final int sel_receivesCredentialSecurely = sel_registerName("receivesCredentialSecurely");
-public static final int sel_setObjectBeingTested_1 = sel_registerName("setObjectBeingTested:");
-public static final int sel_cacheDepthMatchesImageDepth = sel_registerName("cacheDepthMatchesImageDepth");
-public static final int sel_hasPropertyForKey_1 = sel_registerName("hasPropertyForKey:");
-public static final int sel_draggingDestinationWindow = sel_registerName("draggingDestinationWindow");
-public static final int sel_typeCodeValue = sel_registerName("typeCodeValue");
-public static final int sel_portForName_1 = sel_registerName("portForName:");
-public static final int sel_getCString_1maxLength_1encoding_1 = sel_registerName("getCString:maxLength:encoding:");
-public static final int sel_attributedString = sel_registerName("attributedString");
-public static final int sel_fileExistsAtPath_1isDirectory_1 = sel_registerName("fileExistsAtPath:isDirectory:");
-public static final int sel_updateRuler = sel_registerName("updateRuler");
-public static final int sel_print_1 = sel_registerName("print:");
-public static final int sel_setFrameSize_1 = sel_registerName("setFrameSize:");
-public static final int sel_dataFromPropertyList_1format_1errorDescription_1 = sel_registerName("dataFromPropertyList:format:errorDescription:");
-public static final int sel_initWithContentsOfURL_1ofType_1 = sel_registerName("initWithContentsOfURL:ofType:");
-public static final int sel_replaceValueAtIndex_1inPropertyWithKey_1withValue_1 = sel_registerName("replaceValueAtIndex:inPropertyWithKey:withValue:");
-public static final int sel_formIntersectionWithCharacterSet_1 = sel_registerName("formIntersectionWithCharacterSet:");
-public static final int sel_renderingMode = sel_registerName("renderingMode");
-public static final int sel_viewsNeedDisplay = sel_registerName("viewsNeedDisplay");
-public static final int sel_lineFragmentRectForProposedRect_1sweepDirection_1movementDirection_1remainingRect_1 = sel_registerName("lineFragmentRectForProposedRect:sweepDirection:movementDirection:remainingRect:");
-public static final int sel_rulerAccessoryViewForTextView_1paragraphStyle_1ruler_1enabled_1 = sel_registerName("rulerAccessoryViewForTextView:paragraphStyle:ruler:enabled:");
-public static final int sel_initWithArray_1copyItems_1 = sel_registerName("initWithArray:copyItems:");
-public static final int sel_ensureLayoutForGlyphRange_1 = sel_registerName("ensureLayoutForGlyphRange:");
-public static final int sel_availableLocaleIdentifiers = sel_registerName("availableLocaleIdentifiers");
-public static final int sel_viewDidHide = sel_registerName("viewDidHide");
-public static final int sel_setShouldReportNamespacePrefixes_1 = sel_registerName("setShouldReportNamespacePrefixes:");
-public static final int sel_runToolbarCustomizationPalette_1 = sel_registerName("runToolbarCustomizationPalette:");
-public static final int sel_roundingBehavior = sel_registerName("roundingBehavior");
-public static final int sel_expressionForEvaluatedObject = sel_registerName("expressionForEvaluatedObject");
-public static final int sel_rulerView_1handleMouseDown_1 = sel_registerName("rulerView:handleMouseDown:");
-public static final int sel_scanCharactersFromSet_1intoString_1 = sel_registerName("scanCharactersFromSet:intoString:");
-public static final int sel_applicationDidChangeScreenParameters_1 = sel_registerName("applicationDidChangeScreenParameters:");
-public static final int sel_textView_1clickedOnCell_1inRect_1 = sel_registerName("textView:clickedOnCell:inRect:");
-public static final int sel_decodeDoubleForKey_1 = sel_registerName("decodeDoubleForKey:");
-public static final int sel_URLHandle_1resourceDidFailLoadingWithReason_1 = sel_registerName("URLHandle:resourceDidFailLoadingWithReason:");
-public static final int sel_setCountKeyPath_1 = sel_registerName("setCountKeyPath:");
-public static final int sel_showContextHelpForObject_1locationHint_1 = sel_registerName("showContextHelpForObject:locationHint:");
-public static final int sel_setData_1forType_1 = sel_registerName("setData:forType:");
-public static final int sel_setPixel_1atX_1y_1 = sel_registerName("setPixel:atX:y:");
-public static final int sel_setReceiversSpecifier_1 = sel_registerName("setReceiversSpecifier:");
-public static final int sel_postNotificationName_1object_1userInfo_1 = sel_registerName("postNotificationName:object:userInfo:");
-public static final int sel_rowForItem_1 = sel_registerName("rowForItem:");
-public static final int sel_fetch_1 = sel_registerName("fetch:");
-public static final int sel_propertyList_1isValidForFormat_1 = sel_registerName("propertyList:isValidForFormat:");
-public static final int sel_configureAsServer = sel_registerName("configureAsServer");
-public static final int sel_setAllowsColumnReordering_1 = sel_registerName("setAllowsColumnReordering:");
-public static final int sel_charValue = sel_registerName("charValue");
-public static final int sel_setInsertionClassDescription_1 = sel_registerName("setInsertionClassDescription:");
-public static final int sel_cyanColor = sel_registerName("cyanColor");
-public static final int sel_lockWhenCondition_1 = sel_registerName("lockWhenCondition:");
-public static final int sel_cacheImageInRect_1 = sel_registerName("cacheImageInRect:");
-public static final int sel_keyboardFocusIndicatorColor = sel_registerName("keyboardFocusIndicatorColor");
-public static final int sel_hasUndoManager = sel_registerName("hasUndoManager");
-public static final int sel_drawInBezierPath_1relativeCenterPosition_1 = sel_registerName("drawInBezierPath:relativeCenterPosition:");
-public static final int sel_decimalNumberByAdding_1 = sel_registerName("decimalNumberByAdding:");
-public static final int sel_initWithDescriptorType_1data_1 = sel_registerName("initWithDescriptorType:data:");
-public static final int sel_isUndoing = sel_registerName("isUndoing");
-public static final int sel_boolForKey_1 = sel_registerName("boolForKey:");
-public static final int sel_localizedCatalogNameComponent = sel_registerName("localizedCatalogNameComponent");
-public static final int sel_representations = sel_registerName("representations");
-public static final int sel_expressionValueWithObject_1context_1 = sel_registerName("expressionValueWithObject:context:");
-public static final int sel_viewWillMoveToSuperview_1 = sel_registerName("viewWillMoveToSuperview:");
-public static final int sel_alphaValue = sel_registerName("alphaValue");
-public static final int sel_learnWord_1 = sel_registerName("learnWord:");
-public static final int sel_releaseGlobally = sel_registerName("releaseGlobally");
-public static final int sel_defaultCompletionDelay = sel_registerName("defaultCompletionDelay");
-public static final int sel_control_1textShouldEndEditing_1 = sel_registerName("control:textShouldEndEditing:");
-public static final int sel_alertWithMessageText_1defaultButton_1alternateButton_1otherButton_1informativeTextWithFormat_1 = sel_registerName("alertWithMessageText:defaultButton:alternateButton:otherButton:informativeTextWithFormat:");
-public static final int sel_control_1textShouldBeginEditing_1 = sel_registerName("control:textShouldBeginEditing:");
-public static final int sel_sizeMode = sel_registerName("sizeMode");
-public static final int sel_representedURL = sel_registerName("representedURL");
-public static final int sel_fileHFSCreatorCode = sel_registerName("fileHFSCreatorCode");
-public static final int sel_removeDependency_1 = sel_registerName("removeDependency:");
-public static final int sel_parentForItem_1 = sel_registerName("parentForItem:");
-public static final int sel_adjustPageHeightNew_1top_1bottom_1limit_1 = sel_registerName("adjustPageHeightNew:top:bottom:limit:");
-public static final int sel_showPanels = sel_registerName("showPanels");
-public static final int sel_alwaysUsesMultipleValuesMarker = sel_registerName("alwaysUsesMultipleValuesMarker");
-public static final int sel_setUpFieldEditorAttributes_1 = sel_registerName("setUpFieldEditorAttributes:");
-public static final int sel_comboBoxCell_1completedString_1 = sel_registerName("comboBoxCell:completedString:");
-public static final int sel_null = sel_registerName("null");
-public static final int sel_setTextAttributesForNil_1 = sel_registerName("setTextAttributesForNil:");
-public static final int sel_currencyGroupingSeparator = sel_registerName("currencyGroupingSeparator");
-public static final int sel_toolbarSelectableItemIdentifiers_1 = sel_registerName("toolbarSelectableItemIdentifiers:");
-public static final int sel_size = sel_registerName("size");
-public static final int sel_fileModificationDate = sel_registerName("fileModificationDate");
-public static final int sel_timestamp = sel_registerName("timestamp");
-public static final int sel_canonicalRequestForRequest_1 = sel_registerName("canonicalRequestForRequest:");
-public static final int sel_moveBackwardAndModifySelection_1 = sel_registerName("moveBackwardAndModifySelection:");
-public static final int sel_frameOfColumn_1 = sel_registerName("frameOfColumn:");
-public static final int sel_setRefusesFirstResponder_1 = sel_registerName("setRefusesFirstResponder:");
-public static final int sel_hasDynamicDepthLimit = sel_registerName("hasDynamicDepthLimit");
-public static final int sel_decodeIntForKey_1 = sel_registerName("decodeIntForKey:");
-public static final int sel_autoupdatingCurrentLocale = sel_registerName("autoupdatingCurrentLocale");
-public static final int sel_transformBezierPath_1 = sel_registerName("transformBezierPath:");
-public static final int sel_registerPort_1name_1nameServerPortNumber_1 = sel_registerName("registerPort:name:nameServerPortNumber:");
-public static final int sel_contentWidth = sel_registerName("contentWidth");
-public static final int sel_noteUserDefaultsChanged = sel_registerName("noteUserDefaultsChanged");
-public static final int sel_orangeColor = sel_registerName("orangeColor");
-public static final int sel_lastItem = sel_registerName("lastItem");
-public static final int sel_setButtonType_1 = sel_registerName("setButtonType:");
-public static final int sel_initWithContentsOfURL_1ofType_1error_1 = sel_registerName("initWithContentsOfURL:ofType:error:");
-public static final int sel_rowTemplates = sel_registerName("rowTemplates");
-public static final int sel_setEnabled_1forSegment_1 = sel_registerName("setEnabled:forSegment:");
-public static final int sel_avoidsEmptySelection = sel_registerName("avoidsEmptySelection");
-public static final int sel_encodeInt_1forKey_1 = sel_registerName("encodeInt:forKey:");
-public static final int sel_dictionaryWithValuesForKeys_1 = sel_registerName("dictionaryWithValuesForKeys:");
-public static final int sel_start_1 = sel_registerName("start:");
-public static final int sel_sortUsingDescriptors_1 = sel_registerName("sortUsingDescriptors:");
-public static final int sel_currentParagraphStyle = sel_registerName("currentParagraphStyle");
-public static final int sel_treeNodeWithRepresentedObject_1 = sel_registerName("treeNodeWithRepresentedObject:");
-public static final int sel_tableColumnWithIdentifier_1 = sel_registerName("tableColumnWithIdentifier:");
-public static final int sel_attributedTitle = sel_registerName("attributedTitle");
-public static final int sel_setEntryType_1 = sel_registerName("setEntryType:");
-public static final int sel_pixelFormat = sel_registerName("pixelFormat");
-public static final int sel_temporaryAttribute_1atCharacterIndex_1longestEffectiveRange_1inRange_1 = sel_registerName("temporaryAttribute:atCharacterIndex:longestEffectiveRange:inRange:");
-public static final int sel_treatsFilePackagesAsDirectories = sel_registerName("treatsFilePackagesAsDirectories");
-public static final int sel_glyphAtIndex_1 = sel_registerName("glyphAtIndex:");
-public static final int sel_titleWidth_1 = sel_registerName("titleWidth:");
-public static final int sel_setWords_1 = sel_registerName("setWords:");
-public static final int sel_glyphIndexForPoint_1inTextContainer_1 = sel_registerName("glyphIndexForPoint:inTextContainer:");
-public static final int sel_alternateSelectedControlColor = sel_registerName("alternateSelectedControlColor");
-public static final int sel_sizeToCells = sel_registerName("sizeToCells");
-public static final int sel_flushWindow = sel_registerName("flushWindow");
-public static final int sel_URLAtIndex_1effectiveRange_1 = sel_registerName("URLAtIndex:effectiveRange:");
-public static final int sel_isSimpleRectangularTextContainer = sel_registerName("isSimpleRectangularTextContainer");
-public static final int sel_dragImageForRowsWithIndexes_1tableColumns_1event_1offset_1 = sel_registerName("dragImageForRowsWithIndexes:tableColumns:event:offset:");
-public static final int sel_takeDoubleValueFrom_1 = sel_registerName("takeDoubleValueFrom:");
-public static final int sel_selectItem_1 = sel_registerName("selectItem:");
-public static final int sel_isMultiple = sel_registerName("isMultiple");
-public static final int sel_arrangeInFront_1 = sel_registerName("arrangeInFront:");
-public static final int sel_defaultFocusRingType = sel_registerName("defaultFocusRingType");
-public static final int sel_componentsSeparatedByString_1 = sel_registerName("componentsSeparatedByString:");
-public static final int sel_calendar = sel_registerName("calendar");
-public static final int sel_openFile_1withApplication_1 = sel_registerName("openFile:withApplication:");
-public static final int sel_moveWordBackward_1 = sel_registerName("moveWordBackward:");
-public static final int sel_getCharacters_1 = sel_registerName("getCharacters:");
-public static final int sel_initWithInt_1 = sel_registerName("initWithInt:");
-public static final int sel_initWithReceivePort_1sendPort_1components_1 = sel_registerName("initWithReceivePort:sendPort:components:");
-public static final int sel_setBool_1forKey_1 = sel_registerName("setBool:forKey:");
-public static final int sel_keyPathsForValuesAffectingValueForKey_1 = sel_registerName("keyPathsForValuesAffectingValueForKey:");
-public static final int sel_saveDocumentTo_1 = sel_registerName("saveDocumentTo:");
-public static final int sel_knobRectFlipped_1 = sel_registerName("knobRectFlipped:");
-public static final int sel_isEqualToAttributedString_1 = sel_registerName("isEqualToAttributedString:");
-public static final int sel_indexOfResult_1 = sel_registerName("indexOfResult:");
-public static final int sel_attributesForVoice_1 = sel_registerName("attributesForVoice:");
-public static final int sel_encodeConditionalObject_1 = sel_registerName("encodeConditionalObject:");
-public static final int sel_pixelBufferCubeMapFace = sel_registerName("pixelBufferCubeMapFace");
-public static final int sel_index = sel_registerName("index");
-public static final int sel_transactionID = sel_registerName("transactionID");
-public static final int sel_displayRectIgnoringOpacity_1 = sel_registerName("displayRectIgnoringOpacity:");
-public static final int sel_setKeyboardFocusRingNeedsDisplayInRect_1 = sel_registerName("setKeyboardFocusRingNeedsDisplayInRect:");
-public static final int sel_invalidateLayoutForCharacterRange_1isSoft_1actualCharacterRange_1 = sel_registerName("invalidateLayoutForCharacterRange:isSoft:actualCharacterRange:");
-public static final int sel_contentsEqualAtPath_1andPath_1 = sel_registerName("contentsEqualAtPath:andPath:");
-public static final int sel_cancelOperation_1 = sel_registerName("cancelOperation:");
-public static final int sel_accessibilityAttributeValue_1 = sel_registerName("accessibilityAttributeValue:");
-public static final int sel_windowNibPath = sel_registerName("windowNibPath");
-public static final int sel_saveToFile_1saveOperation_1delegate_1didSaveSelector_1contextInfo_1 = sel_registerName("saveToFile:saveOperation:delegate:didSaveSelector:contextInfo:");
-public static final int sel_setMixedStateImage_1 = sel_registerName("setMixedStateImage:");
-public static final int sel_predicateWithFormat_1 = sel_registerName("predicateWithFormat:");
-public static final int sel_initWithSendPort_1receivePort_1components_1 = sel_registerName("initWithSendPort:receivePort:components:");
-public static final int sel_setRecentsAutosaveName_1 = sel_registerName("setRecentsAutosaveName:");
-public static final int sel_autosavesConfiguration = sel_registerName("autosavesConfiguration");
-public static final int sel_setSubitems_1 = sel_registerName("setSubitems:");
-public static final int sel_setPathStyle_1 = sel_registerName("setPathStyle:");
-public static final int sel_startAnimation_1 = sel_registerName("startAnimation:");
-public static final int sel_bezierPath = sel_registerName("bezierPath");
-public static final int sel_archiver_1willEncodeObject_1 = sel_registerName("archiver:willEncodeObject:");
-public static final int sel_acceptInputForMode_1beforeDate_1 = sel_registerName("acceptInputForMode:beforeDate:");
-public static final int sel_setTearOffMenuRepresentation_1 = sel_registerName("setTearOffMenuRepresentation:");
-public static final int sel_writableTypes = sel_registerName("writableTypes");
-public static final int sel_domain = sel_registerName("domain");
-public static final int sel_removeDocument_1 = sel_registerName("removeDocument:");
-public static final int sel_showsBaselineSeparator = sel_registerName("showsBaselineSeparator");
-public static final int sel_dragImageForRows_1event_1dragImageOffset_1 = sel_registerName("dragImageForRows:event:dragImageOffset:");
-public static final int sel_table = sel_registerName("table");
-public static final int sel_initRegularFileWithContents_1 = sel_registerName("initRegularFileWithContents:");
-public static final int sel_add_1 = sel_registerName("add:");
-public static final int sel_stateImageWidth = sel_registerName("stateImageWidth");
-public static final int sel_URLProtocol_1didReceiveAuthenticationChallenge_1 = sel_registerName("URLProtocol:didReceiveAuthenticationChallenge:");
-public static final int sel_imageAndTitleWidth = sel_registerName("imageAndTitleWidth");
-public static final int sel_trackingAreas = sel_registerName("trackingAreas");
-public static final int sel_initRecordDescriptor = sel_registerName("initRecordDescriptor");
-public static final int sel_itemIdentifier = sel_registerName("itemIdentifier");
-public static final int sel_doubleClickAtIndex_1 = sel_registerName("doubleClickAtIndex:");
-public static final int sel_fixesAttributesLazily = sel_registerName("fixesAttributesLazily");
-public static final int sel_netServiceBrowserWillSearch_1 = sel_registerName("netServiceBrowserWillSearch:");
-public static final int sel_textureInternalFormat = sel_registerName("textureInternalFormat");
-public static final int sel_valueWithSize_1 = sel_registerName("valueWithSize:");
-public static final int sel_setVerticalScroller_1 = sel_registerName("setVerticalScroller:");
-public static final int sel_absolutePathForAppBundleWithIdentifier_1 = sel_registerName("absolutePathForAppBundleWithIdentifier:");
-public static final int sel_contentMinSize = sel_registerName("contentMinSize");
-public static final int sel_persistentDomainForName_1 = sel_registerName("persistentDomainForName:");
-public static final int sel_cellAtIndex_1 = sel_registerName("cellAtIndex:");
-public static final int sel_setWithArray_1 = sel_registerName("setWithArray:");
-public static final int sel_resetCursorRects = sel_registerName("resetCursorRects");
-public static final int sel_imageRepClassForFileType_1 = sel_registerName("imageRepClassForFileType:");
-public static final int sel_setContainerIsObjectBeingTested_1 = sel_registerName("setContainerIsObjectBeingTested:");
-public static final int sel_removeProgressMark_1 = sel_registerName("removeProgressMark:");
-public static final int sel_hitTestForEvent_1inRect_1ofView_1 = sel_registerName("hitTestForEvent:inRect:ofView:");
-public static final int sel_listDescriptor = sel_registerName("listDescriptor");
-public static final int sel_rangeOfUnit_1startDate_1interval_1forDate_1 = sel_registerName("rangeOfUnit:startDate:interval:forDate:");
-public static final int sel_checkSpaceForParts = sel_registerName("checkSpaceForParts");
-public static final int sel_availableVoices = sel_registerName("availableVoices");
-public static final int sel_PMPrintSettings = sel_registerName("PMPrintSettings");
-public static final int sel_nonBaseCharacterSet = sel_registerName("nonBaseCharacterSet");
-public static final int sel_launchedTaskWithLaunchPath_1arguments_1 = sel_registerName("launchedTaskWithLaunchPath:arguments:");
-public static final int sel_clearCurrentContext = sel_registerName("clearCurrentContext");
-public static final int sel_applicationWillUpdate_1 = sel_registerName("applicationWillUpdate:");
-public static final int sel_addFontTrait_1 = sel_registerName("addFontTrait:");
-public static final int sel_arrayByAddingObjectsFromArray_1 = sel_registerName("arrayByAddingObjectsFromArray:");
-public static final int sel_abortParsing = sel_registerName("abortParsing");
-public static final int sel_subviews = sel_registerName("subviews");
-public static final int sel_initWithContainerClassDescription_1containerSpecifier_1key_1uniqueID_1 = sel_registerName("initWithContainerClassDescription:containerSpecifier:key:uniqueID:");
-public static final int sel_acceptableDragTypes = sel_registerName("acceptableDragTypes");
-public static final int sel_managedObjectContext = sel_registerName("managedObjectContext");
-public static final int sel_resizeWithMagnification_1 = sel_registerName("resizeWithMagnification:");
-public static final int sel_setUsesFindPanel_1 = sel_registerName("setUsesFindPanel:");
-public static final int sel_application_1printFiles_1withSettings_1showPrintPanels_1 = sel_registerName("application:printFiles:withSettings:showPrintPanels:");
-public static final int sel_loadAndReturnError_1 = sel_registerName("loadAndReturnError:");
-public static final int sel_initWithLeftExpressions_1rightExpressions_1modifier_1operators_1options_1 = sel_registerName("initWithLeftExpressions:rightExpressions:modifier:operators:options:");
-public static final int sel_addSelectionIndexes_1 = sel_registerName("addSelectionIndexes:");
-public static final int sel_initWithBitmapDataPlanes_1pixelsWide_1pixelsHigh_1bitsPerSample_1samplesPerPixel_1hasAlpha_1isPlanar_1colorSpaceName_1bitmapFormat_1bytesPerRow_1bitsPerPixel_1 = sel_registerName("initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bitmapFormat:bytesPerRow:bitsPerPixel:");
-public static final int sel_initToFileAtPath_1append_1 = sel_registerName("initToFileAtPath:append:");
-public static final int sel_currencyDecimalSeparator = sel_registerName("currencyDecimalSeparator");
-public static final int sel_expansionFrameWithFrame_1inView_1 = sel_registerName("expansionFrameWithFrame:inView:");
-public static final int sel_HTTPShouldHandleCookies = sel_registerName("HTTPShouldHandleCookies");
-public static final int sel_rearrangeObjects = sel_registerName("rearrangeObjects");
-public static final int sel_graphicsContextWithWindow_1 = sel_registerName("graphicsContextWithWindow:");
-public static final int sel_stringWithCapacity_1 = sel_registerName("stringWithCapacity:");
-public static final int sel_results = sel_registerName("results");
-public static final int sel_loadFileWrapperRepresentation_1ofType_1 = sel_registerName("loadFileWrapperRepresentation:ofType:");
-public static final int sel_secondsFromGMTForDate_1 = sel_registerName("secondsFromGMTForDate:");
-public static final int sel_clearStopAnimation = sel_registerName("clearStopAnimation");
-public static final int sel_numberWithShort_1 = sel_registerName("numberWithShort:");
-public static final int sel_setHorizontallyCentered_1 = sel_registerName("setHorizontallyCentered:");
-public static final int sel_setNeedsDisplayInRect_1 = sel_registerName("setNeedsDisplayInRect:");
-public static final int sel_objectDidBeginEditing_1 = sel_registerName("objectDidBeginEditing:");
-public static final int sel_rightMouseDown_1 = sel_registerName("rightMouseDown:");
-public static final int sel_data2 = sel_registerName("data2");
-public static final int sel_initWithCalendarIdentifier_1 = sel_registerName("initWithCalendarIdentifier:");
-public static final int sel_containsValueForKey_1 = sel_registerName("containsValueForKey:");
-public static final int sel_result = sel_registerName("result");
-public static final int sel_printDocument_1 = sel_registerName("printDocument:");
-public static final int sel_addSuiteNamed_1 = sel_registerName("addSuiteNamed:");
-public static final int sel_deleteCookie_1 = sel_registerName("deleteCookie:");
-public static final int sel_isLocationRequiredToCreateForKey_1 = sel_registerName("isLocationRequiredToCreateForKey:");
-public static final int sel_saveGraphicsState = sel_registerName("saveGraphicsState");
-public static final int sel_getInfoForFile_1application_1type_1 = sel_registerName("getInfoForFile:application:type:");
-public static final int sel_HTTPBodyStream = sel_registerName("HTTPBodyStream");
-public static final int sel_accessibilityParameterizedAttributeNames = sel_registerName("accessibilityParameterizedAttributeNames");
-public static final int sel_objectForKey_1 = sel_registerName("objectForKey:");
-public static final int sel_classForArchiver = sel_registerName("classForArchiver");
-public static final int sel_allBundles = sel_registerName("allBundles");
-public static final int sel_rangeOfComposedCharacterSequenceAtIndex_1 = sel_registerName("rangeOfComposedCharacterSequenceAtIndex:");
-public static final int sel_allowsDuplicatesInToolbar = sel_registerName("allowsDuplicatesInToolbar");
-public static final int sel_speechSynthesizer_1didEncounterSyncMessage_1 = sel_registerName("speechSynthesizer:didEncounterSyncMessage:");
-public static final int sel_performSelector_1withObject_1afterDelay_1inModes_1 = sel_registerName("performSelector:withObject:afterDelay:inModes:");
-public static final int sel_setScalesWhenResized_1 = sel_registerName("setScalesWhenResized:");
-public static final int sel_fileWrappers = sel_registerName("fileWrappers");
-public static final int sel_setSubmenu_1 = sel_registerName("setSubmenu:");
-public static final int sel_setSendsSearchStringImmediately_1 = sel_registerName("setSendsSearchStringImmediately:");
-public static final int sel_movieUnfilteredPasteboardTypes = sel_registerName("movieUnfilteredPasteboardTypes");
-public static final int sel_browser_1willDisplayCell_1atRow_1column_1 = sel_registerName("browser:willDisplayCell:atRow:column:");
-public static final int sel_valueOfAttribute_1forResultAtIndex_1 = sel_registerName("valueOfAttribute:forResultAtIndex:");
-public static final int sel_rightExpression = sel_registerName("rightExpression");
-public static final int sel_moveNode_1toIndexPath_1 = sel_registerName("moveNode:toIndexPath:");
-public static final int sel_insertionKey = sel_registerName("insertionKey");
-public static final int sel_columnsAutosaveName = sel_registerName("columnsAutosaveName");
-public static final int sel_connection_1didReceiveResponse_1 = sel_registerName("connection:didReceiveResponse:");
-public static final int sel_delegate = sel_registerName("delegate");
-public static final int sel_valueForHTTPHeaderField_1 = sel_registerName("valueForHTTPHeaderField:");
-public static final int sel_requiredThickness = sel_registerName("requiredThickness");
-public static final int sel_selectedCells = sel_registerName("selectedCells");
-public static final int sel_setResizable_1 = sel_registerName("setResizable:");
-public static final int sel_resizeRightCursor = sel_registerName("resizeRightCursor");
-public static final int sel_arrayWithContentsOfURL_1 = sel_registerName("arrayWithContentsOfURL:");
-public static final int sel_setEchosBullets_1 = sel_registerName("setEchosBullets:");
-public static final int sel_outlineViewItemDidCollapse_1 = sel_registerName("outlineViewItemDidCollapse:");
-public static final int sel_mutableSetValueForKey_1 = sel_registerName("mutableSetValueForKey:");
-public static final int sel_initWithObjects_1forKeys_1count_1 = sel_registerName("initWithObjects:forKeys:count:");
-public static final int sel_canBeDisabled = sel_registerName("canBeDisabled");
-public static final int sel_selectTabViewItemWithIdentifier_1 = sel_registerName("selectTabViewItemWithIdentifier:");
-public static final int sel_setLongEraSymbols_1 = sel_registerName("setLongEraSymbols:");
-public static final int sel_displayRect_1 = sel_registerName("displayRect:");
-public static final int sel_initRemoteWithProtocolFamily_1socketType_1protocol_1address_1 = sel_registerName("initRemoteWithProtocolFamily:socketType:protocol:address:");
-public static final int sel_setQueuePriority_1 = sel_registerName("setQueuePriority:");
-public static final int sel_initWithFileDescriptor_1closeOnDealloc_1 = sel_registerName("initWithFileDescriptor:closeOnDealloc:");
-public static final int sel_comboBoxWillDismiss_1 = sel_registerName("comboBoxWillDismiss:");
-public static final int sel_setMatchesOnMultipleResolution_1 = sel_registerName("setMatchesOnMultipleResolution:");
-public static final int sel_connection = sel_registerName("connection");
-public static final int sel_includedKeys = sel_registerName("includedKeys");
-public static final int sel_writeToURL_1options_1error_1 = sel_registerName("writeToURL:options:error:");
-public static final int sel_activeProcessorCount = sel_registerName("activeProcessorCount");
-public static final int sel_countByEnumeratingWithState_1objects_1count_1 = sel_registerName("countByEnumeratingWithState:objects:count:");
-public static final int sel_setTransformStruct_1 = sel_registerName("setTransformStruct:");
-public static final int sel_setVeryShortWeekdaySymbols_1 = sel_registerName("setVeryShortWeekdaySymbols:");
-public static final int sel_markerLocation = sel_registerName("markerLocation");
-public static final int sel_widthForLayer_1edge_1 = sel_registerName("widthForLayer:edge:");
-public static final int sel_transform = sel_registerName("transform");
-public static final int sel_addSelectionIndexPaths_1 = sel_registerName("addSelectionIndexPaths:");
-public static final int sel_removeRequestMode_1 = sel_registerName("removeRequestMode:");
-public static final int sel_indexOfObject_1inRange_1 = sel_registerName("indexOfObject:inRange:");
-public static final int sel_awakeAfterUsingCoder_1 = sel_registerName("awakeAfterUsingCoder:");
-public static final int sel_setKnobProportion_1 = sel_registerName("setKnobProportion:");
-public static final int sel_setAllowsUserCustomization_1 = sel_registerName("setAllowsUserCustomization:");
-public static final int sel_setCurrentOperation_1 = sel_registerName("setCurrentOperation:");
-public static final int sel_outlineView_1isGroupItem_1 = sel_registerName("outlineView:isGroupItem:");
-public static final int sel_deleteGlyphsInRange_1 = sel_registerName("deleteGlyphsInRange:");
-public static final int sel_setSelectedObjects_1 = sel_registerName("setSelectedObjects:");
-public static final int sel_pathComponentCellAtPoint_1withFrame_1inView_1 = sel_registerName("pathComponentCellAtPoint:withFrame:inView:");
-public static final int sel_outlineView_1acceptDrop_1item_1childIndex_1 = sel_registerName("outlineView:acceptDrop:item:childIndex:");
-public static final int sel_setBackgroundColor_1 = sel_registerName("setBackgroundColor:");
-public static final int sel_canSelectNext = sel_registerName("canSelectNext");
-public static final int sel_encodeRect_1forKey_1 = sel_registerName("encodeRect:forKey:");
-public static final int sel_resetCursorRect_1inView_1 = sel_registerName("resetCursorRect:inView:");
-public static final int sel_resumeData = sel_registerName("resumeData");
-public static final int sel_levelsOfUndo = sel_registerName("levelsOfUndo");
-public static final int sel_objectIsForcedForKey_1 = sel_registerName("objectIsForcedForKey:");
-public static final int sel_minSize = sel_registerName("minSize");
-public static final int sel_indentationPerLevel = sel_registerName("indentationPerLevel");
-public static final int sel_browserColumnConfigurationDidChange_1 = sel_registerName("browserColumnConfigurationDidChange:");
-public static final int sel_startAnimation = sel_registerName("startAnimation");
-public static final int sel_outlineView_1namesOfPromisedFilesDroppedAtDestination_1forDraggedItems_1 = sel_registerName("outlineView:namesOfPromisedFilesDroppedAtDestination:forDraggedItems:");
-public static final int sel_setAlignment_1range_1 = sel_registerName("setAlignment:range:");
-public static final int sel_zeroSymbol = sel_registerName("zeroSymbol");
-public static final int sel_draggedImage_1beganAt_1 = sel_registerName("draggedImage:beganAt:");
-public static final int sel_buttonMask = sel_registerName("buttonMask");
+public static final int sel_descender = sel_registerName("descender");
+public static final int sel_deselectAll_ = sel_registerName("deselectAll:");
+public static final int sel_deselectItemAtIndex_ = sel_registerName("deselectItemAtIndex:");
+public static final int sel_deselectRow_ = sel_registerName("deselectRow:");
+public static final int sel_destroyContext = sel_registerName("destroyContext");
+public static final int sel_detail = sel_registerName("detail");
+public static final int sel_deviceDescription = sel_registerName("deviceDescription");
+public static final int sel_deviceRGBColorSpace = sel_registerName("deviceRGBColorSpace");
+public static final int sel_dictionary = sel_registerName("dictionary");
+public static final int sel_dictionaryWithCapacity_ = sel_registerName("dictionaryWithCapacity:");
+public static final int sel_dictionaryWithObject_forKey_ = sel_registerName("dictionaryWithObject:forKey:");
+public static final int sel_disabledControlTextColor = sel_registerName("disabledControlTextColor");
+public static final int sel_displayIfNeeded = sel_registerName("displayIfNeeded");
+public static final int sel_distantFuture = sel_registerName("distantFuture");
+public static final int sel_doCommandBySelector_ = sel_registerName("doCommandBySelector:");
+public static final int sel_documentSource = sel_registerName("documentSource");
+public static final int sel_documentView = sel_registerName("documentView");
+public static final int sel_documentViewShouldHandlePrint = sel_registerName("documentViewShouldHandlePrint");
+public static final int sel_documentVisibleRect = sel_registerName("documentVisibleRect");
+public static final int sel_doubleClickAtIndex_ = sel_registerName("doubleClickAtIndex:");
+public static final int sel_doubleValue = sel_registerName("doubleValue");
+public static final int sel_download = sel_registerName("download");
+public static final int sel_download_decideDestinationWithSuggestedFilename_ = sel_registerName("download:decideDestinationWithSuggestedFilename:");
+public static final int sel_drawAtPoint_ = sel_registerName("drawAtPoint:");
+public static final int sel_drawAtPoint_fromRect_operation_fraction_ = sel_registerName("drawAtPoint:fromRect:operation:fraction:");
+public static final int sel_drawBackgroundForGlyphRange_atPoint_ = sel_registerName("drawBackgroundForGlyphRange:atPoint:");
+public static final int sel_drawFromPoint_toPoint_options_ = sel_registerName("drawFromPoint:toPoint:options:");
+public static final int sel_drawGlyphsForGlyphRange_atPoint_ = sel_registerName("drawGlyphsForGlyphRange:atPoint:");
+public static final int sel_drawInRect_ = sel_registerName("drawInRect:");
+public static final int sel_drawInRect_angle_ = sel_registerName("drawInRect:angle:");
+public static final int sel_drawInRect_fromRect_operation_fraction_ = sel_registerName("drawInRect:fromRect:operation:fraction:");
+public static final int sel_drawInteriorWithFrame_inView_ = sel_registerName("drawInteriorWithFrame:inView:");
+public static final int sel_drawRect_ = sel_registerName("drawRect:");
+public static final int sel_drawSortIndicatorWithFrame_inView_ascending_priority_ = sel_registerName("drawSortIndicatorWithFrame:inView:ascending:priority:");
+public static final int sel_drawStatusBarBackgroundInRect_withHighlight_ = sel_registerName("drawStatusBarBackgroundInRect:withHighlight:");
+public static final int sel_drawingRectForBounds_ = sel_registerName("drawingRectForBounds:");
+public static final int sel_elementAtIndex_associatedPoints_ = sel_registerName("elementAtIndex:associatedPoints:");
+public static final int sel_elementCount = sel_registerName("elementCount");
+public static final int sel_enableFreedObjectCheck_ = sel_registerName("enableFreedObjectCheck:");
+public static final int sel_endDocument = sel_registerName("endDocument");
+public static final int sel_endEditing = sel_registerName("endEditing");
+public static final int sel_endPage = sel_registerName("endPage");
+public static final int sel_enumeratorAtPath_ = sel_registerName("enumeratorAtPath:");
+public static final int sel_expandItem_ = sel_registerName("expandItem:");
+public static final int sel_familyName = sel_registerName("familyName");
+public static final int sel_fieldEditor_forObject_ = sel_registerName("fieldEditor:forObject:");
+public static final int sel_fileURLWithPath_ = sel_registerName("fileURLWithPath:");
+public static final int sel_filename = sel_registerName("filename");
+public static final int sel_filenames = sel_registerName("filenames");
+public static final int sel_fill = sel_registerName("fill");
+public static final int sel_fillRect_ = sel_registerName("fillRect:");
+public static final int sel_finishLaunching = sel_registerName("finishLaunching");
+public static final int sel_firstRectForCharacterRange_ = sel_registerName("firstRectForCharacterRange:");
+public static final int sel_firstResponder = sel_registerName("firstResponder");
+public static final int sel_flagsChanged_ = sel_registerName("flagsChanged:");
+public static final int sel_floatValue = sel_registerName("floatValue");
+public static final int sel_flushBuffer = sel_registerName("flushBuffer");
+public static final int sel_flushGraphics = sel_registerName("flushGraphics");
+public static final int sel_font = sel_registerName("font");
+public static final int sel_fontName = sel_registerName("fontName");
+public static final int sel_fontWithName_size_ = sel_registerName("fontWithName:size:");
 public static final int sel_frame = sel_registerName("frame");
-public static final int sel_markers = sel_registerName("markers");
-public static final int sel_initWithObjects_1count_1 = sel_registerName("initWithObjects:count:");
-public static final int sel_unload = sel_registerName("unload");
-public static final int sel_initForReadingWithData_1 = sel_registerName("initForReadingWithData:");
-public static final int sel_year = sel_registerName("year");
-public static final int sel_ruleEditor_1child_1forCriterion_1withRowType_1 = sel_registerName("ruleEditor:child:forCriterion:withRowType:");
-public static final int sel_dayOfMonth = sel_registerName("dayOfMonth");
-public static final int sel_colorUsingColorSpaceName_1 = sel_registerName("colorUsingColorSpaceName:");
-public static final int sel_registerCoercer_1selector_1toConvertFromClass_1toClass_1 = sel_registerName("registerCoercer:selector:toConvertFromClass:toClass:");
-public static final int sel_removeObject_1inRange_1 = sel_registerName("removeObject:inRange:");
-public static final int sel_setFrameFromString_1 = sel_registerName("setFrameFromString:");
-public static final int sel_canAdd = sel_registerName("canAdd");
-public static final int sel_era = sel_registerName("era");
-public static final int sel_expressionForSubquery_1usingIteratorVariable_1predicate_1 = sel_registerName("expressionForSubquery:usingIteratorVariable:predicate:");
-public static final int sel_setAMSymbol_1 = sel_registerName("setAMSymbol:");
-public static final int sel_groupedResults = sel_registerName("groupedResults");
-public static final int sel_attributedStringValue = sel_registerName("attributedStringValue");
-public static final int sel_enclosingScrollView = sel_registerName("enclosingScrollView");
-public static final int sel_isEqualToNumber_1 = sel_registerName("isEqualToNumber:");
-public static final int sel_mainBundle = sel_registerName("mainBundle");
-public static final int sel_textContainerForGlyphAtIndex_1effectiveRange_1 = sel_registerName("textContainerForGlyphAtIndex:effectiveRange:");
-public static final int sel_setUsesGroupingSeparator_1 = sel_registerName("setUsesGroupingSeparator:");
-public static final int sel_pointerAtIndex_1 = sel_registerName("pointerAtIndex:");
-public static final int sel_arrowsPosition = sel_registerName("arrowsPosition");
-public static final int sel_panel_1compareFilename_1with_1caseSensitive_1 = sel_registerName("panel:compareFilename:with:caseSensitive:");
-public static final int sel_drawSeparatorItemWithFrame_1inView_1 = sel_registerName("drawSeparatorItemWithFrame:inView:");
-public static final int sel_objectsByEvaluatingWithContainers_1 = sel_registerName("objectsByEvaluatingWithContainers:");
-public static final int sel_textTabForGlyphLocation_1writingDirection_1maxLocation_1 = sel_registerName("textTabForGlyphLocation:writingDirection:maxLocation:");
-public static final int sel_fontDescriptor = sel_registerName("fontDescriptor");
-public static final int sel_validAttributesForMarkedText = sel_registerName("validAttributesForMarkedText");
-public static final int sel_scriptingEndsWith_1 = sel_registerName("scriptingEndsWith:");
-public static final int sel_scrollViaScroller_1 = sel_registerName("scrollViaScroller:");
-public static final int sel_setAlwaysUsesMultipleValuesMarker_1 = sel_registerName("setAlwaysUsesMultipleValuesMarker:");
-public static final int sel_attributeKeys = sel_registerName("attributeKeys");
-public static final int sel_darkGrayColor = sel_registerName("darkGrayColor");
-public static final int sel_setExtensionHidden_1 = sel_registerName("setExtensionHidden:");
-public static final int sel_drawInRect_1withAttributes_1 = sel_registerName("drawInRect:withAttributes:");
-public static final int sel_selectTabViewItemAtIndex_1 = sel_registerName("selectTabViewItemAtIndex:");
-public static final int sel_contentRectForFrameRect_1 = sel_registerName("contentRectForFrameRect:");
-public static final int sel_setParagraphSpacingBefore_1 = sel_registerName("setParagraphSpacingBefore:");
-public static final int sel_minDate = sel_registerName("minDate");
-public static final int sel_isARepeat = sel_registerName("isARepeat");
-public static final int sel_selectedTabViewItem = sel_registerName("selectedTabViewItem");
-public static final int sel_minusHashTable_1 = sel_registerName("minusHashTable:");
-public static final int sel_preferredLocalizationsFromArray_1forPreferences_1 = sel_registerName("preferredLocalizationsFromArray:forPreferences:");
-public static final int sel_setTextBlocks_1 = sel_registerName("setTextBlocks:");
-public static final int sel_writePrintInfo = sel_registerName("writePrintInfo");
-public static final int sel_paperName = sel_registerName("paperName");
-public static final int sel_pauseSpeakingAtBoundary_1 = sel_registerName("pauseSpeakingAtBoundary:");
-public static final int sel_markedTextAbandoned_1 = sel_registerName("markedTextAbandoned:");
-public static final int sel_setTitled_1 = sel_registerName("setTitled:");
-public static final int sel_hidesOnDeactivate = sel_registerName("hidesOnDeactivate");
-public static final int sel_selectedRange = sel_registerName("selectedRange");
-public static final int sel_reportException_1 = sel_registerName("reportException:");
-public static final int sel_drawBezelWithFrame_1inView_1 = sel_registerName("drawBezelWithFrame:inView:");
-public static final int sel_relativeMoveToPoint_1 = sel_registerName("relativeMoveToPoint:");
-public static final int sel_printingAdjustmentInLayoutManager_1forNominallySpacedGlyphRange_1packedGlyphs_1count_1 = sel_registerName("printingAdjustmentInLayoutManager:forNominallySpacedGlyphRange:packedGlyphs:count:");
-public static final int sel_longValue = sel_registerName("longValue");
-public static final int sel_setMaxNumberOfColumns_1 = sel_registerName("setMaxNumberOfColumns:");
-public static final int sel_textView_1draggedCell_1inRect_1event_1atIndex_1 = sel_registerName("textView:draggedCell:inRect:event:atIndex:");
-public static final int sel_isRemovable = sel_registerName("isRemovable");
-public static final int sel_handleCloseScriptCommand_1 = sel_registerName("handleCloseScriptCommand:");
-public static final int sel_layoutManager_1shouldUseTemporaryAttributes_1forDrawingToScreen_1atCharacterIndex_1effectiveRange_1 = sel_registerName("layoutManager:shouldUseTemporaryAttributes:forDrawingToScreen:atCharacterIndex:effectiveRange:");
-public static final int sel_expressionForKeyPath_1 = sel_registerName("expressionForKeyPath:");
-public static final int sel_bezierPathWithOvalInRect_1 = sel_registerName("bezierPathWithOvalInRect:");
-public static final int sel_deselectSelectedCell = sel_registerName("deselectSelectedCell");
-public static final int sel_defaultSubcontainerAttributeKey = sel_registerName("defaultSubcontainerAttributeKey");
-public static final int sel_yank_1 = sel_registerName("yank:");
-public static final int sel_changeSpelling_1 = sel_registerName("changeSpelling:");
-public static final int sel_totalAutoreleasedObjects = sel_registerName("totalAutoreleasedObjects");
-public static final int sel_loops = sel_registerName("loops");
-public static final int sel_boundsRectForTextBlock_1atIndex_1effectiveRange_1 = sel_registerName("boundsRectForTextBlock:atIndex:effectiveRange:");
-public static final int sel_resignMainWindow = sel_registerName("resignMainWindow");
-public static final int sel_availableLanguages = sel_registerName("availableLanguages");
-public static final int sel_initWithMarkerFormat_1options_1 = sel_registerName("initWithMarkerFormat:options:");
-public static final int sel_runInNewThread = sel_registerName("runInNewThread");
-public static final int sel_tableView_1selectionIndexesForProposedSelection_1 = sel_registerName("tableView:selectionIndexesForProposedSelection:");
-public static final int sel_fetchWithRequest_1merge_1error_1 = sel_registerName("fetchWithRequest:merge:error:");
-public static final int sel_endSubelementIdentifier = sel_registerName("endSubelementIdentifier");
-public static final int sel_implementationClassName = sel_registerName("implementationClassName");
-public static final int sel_eventNumber = sel_registerName("eventNumber");
-public static final int sel_requestTimeout = sel_registerName("requestTimeout");
-public static final int sel_boldSystemFontOfSize_1 = sel_registerName("boldSystemFontOfSize:");
-public static final int sel_setPixelsWide_1 = sel_registerName("setPixelsWide:");
-public static final int sel_labelForSegment_1 = sel_registerName("labelForSegment:");
-public static final int sel_setAlternateTitle_1 = sel_registerName("setAlternateTitle:");
-public static final int sel_shouldBreakLineByWordBeforeCharacterAtIndex_1 = sel_registerName("shouldBreakLineByWordBeforeCharacterAtIndex:");
-public static final int sel_lockFocusIfCanDraw = sel_registerName("lockFocusIfCanDraw");
-public static final int sel_setFormat_1 = sel_registerName("setFormat:");
-public static final int sel_setSegmentCount_1 = sel_registerName("setSegmentCount:");
-public static final int sel_accessInstanceVariablesDirectly = sel_registerName("accessInstanceVariablesDirectly");
-public static final int sel_comboBox_1completedString_1 = sel_registerName("comboBox:completedString:");
-public static final int sel_moveToBeginningOfParagraph_1 = sel_registerName("moveToBeginningOfParagraph:");
-public static final int sel_defaultParagraphStyle = sel_registerName("defaultParagraphStyle");
-public static final int sel_availableTypeFromArray_1 = sel_registerName("availableTypeFromArray:");
-public static final int sel_setGregorianStartDate_1 = sel_registerName("setGregorianStartDate:");
-public static final int sel_dateWithTimeIntervalSince1970_1 = sel_registerName("dateWithTimeIntervalSince1970:");
-public static final int sel_imagePasteboardTypes = sel_registerName("imagePasteboardTypes");
-public static final int sel_laterDate_1 = sel_registerName("laterDate:");
-public static final int sel_setBounds_1 = sel_registerName("setBounds:");
-public static final int sel_HTTPMethod = sel_registerName("HTTPMethod");
-public static final int sel_getGlyphsInRange_1glyphs_1characterIndexes_1glyphInscriptions_1elasticBits_1bidiLevels_1 = sel_registerName("getGlyphsInRange:glyphs:characterIndexes:glyphInscriptions:elasticBits:bidiLevels:");
-public static final int sel_rectArrayForCharacterRange_1withinSelectedCharacterRange_1inTextContainer_1rectCount_1 = sel_registerName("rectArrayForCharacterRange:withinSelectedCharacterRange:inTextContainer:rectCount:");
-public static final int sel_drawGridInClipRect_1 = sel_registerName("drawGridInClipRect:");
-public static final int sel_isStarted = sel_registerName("isStarted");
-public static final int sel_descriptorType = sel_registerName("descriptorType");
-public static final int sel_ISOCurrencyCodes = sel_registerName("ISOCurrencyCodes");
-public static final int sel_resetCancelButtonCell = sel_registerName("resetCancelButtonCell");
-public static final int sel_positiveInfinitySymbol = sel_registerName("positiveInfinitySymbol");
-public static final int sel_sendsActionOnArrowKeys = sel_registerName("sendsActionOnArrowKeys");
-public static final int sel_delete_1 = sel_registerName("delete:");
-public static final int sel_toolbarWillAddItem_1 = sel_registerName("toolbarWillAddItem:");
-public static final int sel_updateCellInside_1 = sel_registerName("updateCellInside:");
-public static final int sel_inputClientResignActive_1 = sel_registerName("inputClientResignActive:");
-public static final int sel_initWithEventClass_1eventID_1targetDescriptor_1returnID_1transactionID_1 = sel_registerName("initWithEventClass:eventID:targetDescriptor:returnID:transactionID:");
-public static final int sel_decimalNumberByDividingBy_1withBehavior_1 = sel_registerName("decimalNumberByDividingBy:withBehavior:");
-public static final int sel_spellServer_1suggestCompletionsForPartialWordRange_1inString_1language_1 = sel_registerName("spellServer:suggestCompletionsForPartialWordRange:inString:language:");
-public static final int sel_arrayWithObjects_1count_1 = sel_registerName("arrayWithObjects:count:");
-public static final int sel_connectionWithRegisteredName_1host_1 = sel_registerName("connectionWithRegisteredName:host:");
-public static final int sel_initWithFormat_1 = sel_registerName("initWithFormat:");
-public static final int sel_sharedURLCache = sel_registerName("sharedURLCache");
-public static final int sel_edited_1range_1changeInLength_1 = sel_registerName("edited:range:changeInLength:");
-public static final int sel_prepareContent = sel_registerName("prepareContent");
-public static final int sel_stringWithCString_1encoding_1 = sel_registerName("stringWithCString:encoding:");
-public static final int sel_postNotificationName_1object_1userInfo_1deliverImmediately_1 = sel_registerName("postNotificationName:object:userInfo:deliverImmediately:");
-public static final int sel_coerceToDescriptorType_1 = sel_registerName("coerceToDescriptorType:");
-public static final int sel_selectionIndex = sel_registerName("selectionIndex");
-public static final int sel_setContentMaxSize_1 = sel_registerName("setContentMaxSize:");
-public static final int sel_setColor_1atX_1y_1 = sel_registerName("setColor:atX:y:");
+public static final int sel_frameOfCellAtColumn_row_ = sel_registerName("frameOfCellAtColumn:row:");
+public static final int sel_frameRectForContentRect_ = sel_registerName("frameRectForContentRect:");
+public static final int sel_frameSizeForContentSize_hasHorizontalScroller_hasVerticalScroller_borderType_ = sel_registerName("frameSizeForContentSize:hasHorizontalScroller:hasVerticalScroller:borderType:");
+public static final int sel_fullPathForApplication_ = sel_registerName("fullPathForApplication:");
+public static final int sel_generalPasteboard = sel_registerName("generalPasteboard");
+public static final int sel_getBytes_ = sel_registerName("getBytes:");
+public static final int sel_getBytes_length_ = sel_registerName("getBytes:length:");
+public static final int sel_getCharacters_ = sel_registerName("getCharacters:");
+public static final int sel_getCharacters_range_ = sel_registerName("getCharacters:range:");
+public static final int sel_getComponents_ = sel_registerName("getComponents:");
+public static final int sel_getGlyphs_range_ = sel_registerName("getGlyphs:range:");
+public static final int sel_getIndexes_maxCount_inIndexRange_ = sel_registerName("getIndexes:maxCount:inIndexRange:");
+public static final int sel_getInfoForFile_application_type_ = sel_registerName("getInfoForFile:application:type:");
+public static final int sel_glyphIndexForCharacterAtIndex_ = sel_registerName("glyphIndexForCharacterAtIndex:");
+public static final int sel_glyphIndexForPoint_inTextContainer_fractionOfDistanceThroughGlyph_ = sel_registerName("glyphIndexForPoint:inTextContainer:fractionOfDistanceThroughGlyph:");
+public static final int sel_glyphRangeForTextContainer_ = sel_registerName("glyphRangeForTextContainer:");
+public static final int sel_goBack = sel_registerName("goBack");
+public static final int sel_goForward = sel_registerName("goForward");
 public static final int sel_graphicsContext = sel_registerName("graphicsContext");
-public static final int sel_hostWithName_1 = sel_registerName("hostWithName:");
-public static final int sel_toggleRuler_1 = sel_registerName("toggleRuler:");
-public static final int sel_glyphInfoWithGlyph_1forFont_1baseString_1 = sel_registerName("glyphInfoWithGlyph:forFont:baseString:");
-public static final int sel_panel_1willExpand_1 = sel_registerName("panel:willExpand:");
-public static final int sel_selectText_1 = sel_registerName("selectText:");
-public static final int sel_setShortMonthSymbols_1 = sel_registerName("setShortMonthSymbols:");
-public static final int sel_setBorderType_1 = sel_registerName("setBorderType:");
-public static final int sel_rangeOfString_1 = sel_registerName("rangeOfString:");
-public static final int sel_invalidateGlyphsOnLayoutInvalidationForGlyphRange_1 = sel_registerName("invalidateGlyphsOnLayoutInvalidationForGlyphRange:");
-public static final int sel_availableMembersOfFontFamily_1 = sel_registerName("availableMembersOfFontFamily:");
-public static final int sel_XPath = sel_registerName("XPath");
-public static final int sel_contentsOfDirectoryAtPath_1error_1 = sel_registerName("contentsOfDirectoryAtPath:error:");
-public static final int sel_newItemForRepresentedObject_1 = sel_registerName("newItemForRepresentedObject:");
-public static final int sel_setMatrixClass_1 = sel_registerName("setMatrixClass:");
-public static final int sel_compositeToPoint_1operation_1fraction_1 = sel_registerName("compositeToPoint:operation:fraction:");
-public static final int sel_setHorizontallyResizable_1 = sel_registerName("setHorizontallyResizable:");
-public static final int sel_mapTableWithStrongToStrongObjects = sel_registerName("mapTableWithStrongToStrongObjects");
-public static final int sel_colorSpaceModel = sel_registerName("colorSpaceModel");
-public static final int sel_setCriticalValue_1 = sel_registerName("setCriticalValue:");
-public static final int sel_allowsToolTipsWhenApplicationIsInactive = sel_registerName("allowsToolTipsWhenApplicationIsInactive");
-public static final int sel_transformUsingAffineTransform_1 = sel_registerName("transformUsingAffineTransform:");
-public static final int sel_initWithInvocation_1 = sel_registerName("initWithInvocation:");
-public static final int sel_containerClassDescription = sel_registerName("containerClassDescription");
-public static final int sel_parser_1resolveExternalEntityName_1systemID_1 = sel_registerName("parser:resolveExternalEntityName:systemID:");
-public static final int sel_mouseLocationOutsideOfEventStream = sel_registerName("mouseLocationOutsideOfEventStream");
-public static final int sel_detach = sel_registerName("detach");
-public static final int sel_setPickerMask_1 = sel_registerName("setPickerMask:");
-public static final int sel_tokenStyle = sel_registerName("tokenStyle");
-public static final int sel_setOptions_1 = sel_registerName("setOptions:");
-public static final int sel_PDFOperationWithView_1insideRect_1toPath_1printInfo_1 = sel_registerName("PDFOperationWithView:insideRect:toPath:printInfo:");
-public static final int sel_parser_1didStartElement_1namespaceURI_1qualifiedName_1attributes_1 = sel_registerName("parser:didStartElement:namespaceURI:qualifiedName:attributes:");
-public static final int sel_availableFontNamesMatchingFontDescriptor_1 = sel_registerName("availableFontNamesMatchingFontDescriptor:");
-public static final int sel_relativePath = sel_registerName("relativePath");
-public static final int sel_moveWordForwardAndModifySelection_1 = sel_registerName("moveWordForwardAndModifySelection:");
-public static final int sel_currentTime = sel_registerName("currentTime");
-public static final int sel_slideDraggedImageTo_1 = sel_registerName("slideDraggedImageTo:");
-public static final int sel_application_1printFile_1 = sel_registerName("application:printFile:");
-public static final int sel_punctuationCharacterSet = sel_registerName("punctuationCharacterSet");
-public static final int sel_allKeysForObject_1 = sel_registerName("allKeysForObject:");
-public static final int sel_pathStyle = sel_registerName("pathStyle");
-public static final int sel_allowsEditingTextAttributes = sel_registerName("allowsEditingTextAttributes");
-public static final int sel_lineSpacingAfterGlyphAtIndex_1withProposedLineFragmentRect_1 = sel_registerName("lineSpacingAfterGlyphAtIndex:withProposedLineFragmentRect:");
-public static final int sel_initWithContentsOfMappedFile_1 = sel_registerName("initWithContentsOfMappedFile:");
-public static final int sel_initWithFrame_1pullsDown_1 = sel_registerName("initWithFrame:pullsDown:");
-public static final int sel_setView_1 = sel_registerName("setView:");
-public static final int sel_outlineViewSelectionDidChange_1 = sel_registerName("outlineViewSelectionDidChange:");
-public static final int sel_widthValueTypeForLayer_1edge_1 = sel_registerName("widthValueTypeForLayer:edge:");
-public static final int sel_dateWithTimeIntervalSinceNow_1 = sel_registerName("dateWithTimeIntervalSinceNow:");
-public static final int sel_display = sel_registerName("display");
-public static final int sel_setRoundingBehavior_1 = sel_registerName("setRoundingBehavior:");
-public static final int sel_valueWithPoint_1 = sel_registerName("valueWithPoint:");
-public static final int sel_tickMarkValueAtIndex_1 = sel_registerName("tickMarkValueAtIndex:");
-public static final int sel_addColumnWithCells_1 = sel_registerName("addColumnWithCells:");
-public static final int sel_exposeBinding_1 = sel_registerName("exposeBinding:");
-public static final int sel_weekdayOrdinal = sel_registerName("weekdayOrdinal");
-public static final int sel_canAddChild = sel_registerName("canAddChild");
-public static final int sel_hitTest_1 = sel_registerName("hitTest:");
-public static final int sel_nibBundle = sel_registerName("nibBundle");
-public static final int sel_resumeExecutionWithResult_1 = sel_registerName("resumeExecutionWithResult:");
-public static final int sel_setMonthSymbols_1 = sel_registerName("setMonthSymbols:");
-public static final int sel_hitPart = sel_registerName("hitPart");
-public static final int sel_download_1didCancelAuthenticationChallenge_1 = sel_registerName("download:didCancelAuthenticationChallenge:");
-public static final int sel_descriptionWithCalendarFormat_1 = sel_registerName("descriptionWithCalendarFormat:");
-public static final int sel_setProtocolSpecificInformation_1 = sel_registerName("setProtocolSpecificInformation:");
-public static final int sel_tokenField_1shouldAddObjects_1atIndex_1 = sel_registerName("tokenField:shouldAddObjects:atIndex:");
-public static final int sel_popUpContextMenu_1withEvent_1forView_1 = sel_registerName("popUpContextMenu:withEvent:forView:");
-public static final int sel_stopPeriodicEvents = sel_registerName("stopPeriodicEvents");
-public static final int sel_setDTD_1 = sel_registerName("setDTD:");
-public static final int sel_glyphAtIndex_1isValidIndex_1 = sel_registerName("glyphAtIndex:isValidIndex:");
-public static final int sel_encodeSize_1 = sel_registerName("encodeSize:");
-public static final int sel_windowForSheet = sel_registerName("windowForSheet");
-public static final int sel_displayMode = sel_registerName("displayMode");
-public static final int sel_revertDocumentToSaved_1 = sel_registerName("revertDocumentToSaved:");
-public static final int sel_tableView_1objectValueForTableColumn_1row_1 = sel_registerName("tableView:objectValueForTableColumn:row:");
-public static final int sel_setBackingType_1 = sel_registerName("setBackingType:");
-public static final int sel_scanUpToCharactersFromSet_1intoString_1 = sel_registerName("scanUpToCharactersFromSet:intoString:");
-public static final int sel_nextValidKeyView = sel_registerName("nextValidKeyView");
-public static final int sel_arrayWithObject_1 = sel_registerName("arrayWithObject:");
-public static final int sel_flushBuffer = sel_registerName("flushBuffer");
-public static final int sel_hasValidObjectValue = sel_registerName("hasValidObjectValue");
-public static final int sel_numberWithUnsignedLong_1 = sel_registerName("numberWithUnsignedLong:");
-public static final int sel_collectExhaustively = sel_registerName("collectExhaustively");
-public static final int sel_setImageInterpolation_1 = sel_registerName("setImageInterpolation:");
-public static final int sel_setSystemID_1 = sel_registerName("setSystemID:");
-public static final int sel_setCornerView_1 = sel_registerName("setCornerView:");
-public static final int sel_initWithDouble_1 = sel_registerName("initWithDouble:");
-public static final int sel_sortedArrayUsingDescriptors_1 = sel_registerName("sortedArrayUsingDescriptors:");
-public static final int sel_removeTextContainerAtIndex_1 = sel_registerName("removeTextContainerAtIndex:");
-public static final int sel_whitespaceCharacterSet = sel_registerName("whitespaceCharacterSet");
-public static final int sel_classDescriptionForClass_1 = sel_registerName("classDescriptionForClass:");
-public static final int sel_setAttributedString_1 = sel_registerName("setAttributedString:");
-public static final int sel_setPixelsHigh_1 = sel_registerName("setPixelsHigh:");
-public static final int sel_setDynamicDepthLimit_1 = sel_registerName("setDynamicDepthLimit:");
-public static final int sel_sharedApplication = sel_registerName("sharedApplication");
-public static final int sel_sound_1didFinishPlaying_1 = sel_registerName("sound:didFinishPlaying:");
-public static final int sel_defaultBehavior = sel_registerName("defaultBehavior");
-public static final int sel_beginSheetForDirectory_1file_1types_1modalForWindow_1modalDelegate_1didEndSelector_1contextInfo_1 = sel_registerName("beginSheetForDirectory:file:types:modalForWindow:modalDelegate:didEndSelector:contextInfo:");
-public static final int sel_orderFrontFontPanel_1 = sel_registerName("orderFrontFontPanel:");
-public static final int sel_searchForBrowsableDomains = sel_registerName("searchForBrowsableDomains");
-public static final int sel_toggleAutomaticQuoteSubstitution_1 = sel_registerName("toggleAutomaticQuoteSubstitution:");
-public static final int sel_textView_1willChangeSelectionFromCharacterRanges_1toCharacterRanges_1 = sel_registerName("textView:willChangeSelectionFromCharacterRanges:toCharacterRanges:");
-public static final int sel_alignRight_1 = sel_registerName("alignRight:");
-public static final int sel_getBytes_1maxLength_1usedLength_1encoding_1options_1range_1remainingRange_1 = sel_registerName("getBytes:maxLength:usedLength:encoding:options:range:remainingRange:");
-public static final int sel_keyPointerFunctions = sel_registerName("keyPointerFunctions");
-public static final int sel_mouseDownFlags = sel_registerName("mouseDownFlags");
-public static final int sel_expandItem_1 = sel_registerName("expandItem:");
-public static final int sel_bezierPathWithRect_1 = sel_registerName("bezierPathWithRect:");
-public static final int sel_setGradientType_1 = sel_registerName("setGradientType:");
-public static final int sel_alphanumericCharacterSet = sel_registerName("alphanumericCharacterSet");
-public static final int sel_deleteWordForward_1 = sel_registerName("deleteWordForward:");
-public static final int sel_cStringUsingEncoding_1 = sel_registerName("cStringUsingEncoding:");
-public static final int sel_storedValueForKey_1 = sel_registerName("storedValueForKey:");
-public static final int sel_fileSize = sel_registerName("fileSize");
-public static final int sel_elementWithName_1URI_1 = sel_registerName("elementWithName:URI:");
-public static final int sel_pointSize = sel_registerName("pointSize");
-public static final int sel_veryShortMonthSymbols = sel_registerName("veryShortMonthSymbols");
-public static final int sel_transformSize_1 = sel_registerName("transformSize:");
-public static final int sel_titleWidth = sel_registerName("titleWidth");
-public static final int sel_setTextContainerInset_1 = sel_registerName("setTextContainerInset:");
-public static final int sel_supportedWindowDepths = sel_registerName("supportedWindowDepths");
-public static final int sel_appleEvent = sel_registerName("appleEvent");
-public static final int sel_valueClassForBinding_1 = sel_registerName("valueClassForBinding:");
-public static final int sel_setFullScreen = sel_registerName("setFullScreen");
-public static final int sel_encodeObject_1forKey_1 = sel_registerName("encodeObject:forKey:");
-public static final int sel_setSpellingState_1range_1 = sel_registerName("setSpellingState:range:");
+public static final int sel_graphicsContextWithBitmapImageRep_ = sel_registerName("graphicsContextWithBitmapImageRep:");
+public static final int sel_graphicsContextWithWindow_ = sel_registerName("graphicsContextWithWindow:");
 public static final int sel_greenComponent = sel_registerName("greenComponent");
-public static final int sel_textBackgroundColor = sel_registerName("textBackgroundColor");
-public static final int sel_currentEditor = sel_registerName("currentEditor");
-public static final int sel_attachedSheet = sel_registerName("attachedSheet");
-public static final int sel_new = sel_registerName("new");
-public static final int sel_setChildren_1 = sel_registerName("setChildren:");
-public static final int sel_options = sel_registerName("options");
-public static final int sel_setObjectClass_1 = sel_registerName("setObjectClass:");
-public static final int sel_borderWidth = sel_registerName("borderWidth");
-public static final int sel_secondarySelectedControlColor = sel_registerName("secondarySelectedControlColor");
-public static final int sel_scrollItemAtIndexToVisible_1 = sel_registerName("scrollItemAtIndexToVisible:");
-public static final int sel_wantsLayer = sel_registerName("wantsLayer");
-public static final int sel_setPath_1 = sel_registerName("setPath:");
-public static final int sel_setKeys_1triggerChangeNotificationsForDependentKey_1 = sel_registerName("setKeys:triggerChangeNotificationsForDependentKey:");
-public static final int sel_verticalAlignment = sel_registerName("verticalAlignment");
-public static final int sel_selectionGranularity = sel_registerName("selectionGranularity");
-public static final int sel_minimumIntegerDigits = sel_registerName("minimumIntegerDigits");
-public static final int sel_canCreateDirectories = sel_registerName("canCreateDirectories");
-public static final int sel_fixAttributesInRange_1 = sel_registerName("fixAttributesInRange:");
-public static final int sel_URLWithString_1 = sel_registerName("URLWithString:");
-public static final int sel_setFrameFromContentFrame_1 = sel_registerName("setFrameFromContentFrame:");
-public static final int sel_setFillColor_1 = sel_registerName("setFillColor:");
-public static final int sel_dictionaryWithCapacity_1 = sel_registerName("dictionaryWithCapacity:");
-public static final int sel_updateFromPath_1 = sel_registerName("updateFromPath:");
-public static final int sel_netServiceDidResolveAddress_1 = sel_registerName("netServiceDidResolveAddress:");
-public static final int sel_usesLazyFetching = sel_registerName("usesLazyFetching");
-public static final int sel_setMenuBarVisible_1 = sel_registerName("setMenuBarVisible:");
-public static final int sel_windowDidBecomeKey_1 = sel_registerName("windowDidBecomeKey:");
-public static final int sel_menuChanged_1 = sel_registerName("menuChanged:");
-public static final int sel_itemObjectValueAtIndex_1 = sel_registerName("itemObjectValueAtIndex:");
-public static final int sel_setClassName_1forClass_1 = sel_registerName("setClassName:forClass:");
-public static final int sel_setShowsToolbarButton_1 = sel_registerName("setShowsToolbarButton:");
-public static final int sel_plusSign = sel_registerName("plusSign");
-public static final int sel_sharedSpellChecker = sel_registerName("sharedSpellChecker");
-public static final int sel_getNumberOfRows_1columns_1 = sel_registerName("getNumberOfRows:columns:");
-public static final int sel_valueTransformerNames = sel_registerName("valueTransformerNames");
-public static final int sel_interpolatedColorAtLocation_1 = sel_registerName("interpolatedColorAtLocation:");
-public static final int sel_updateSpellingPanelWithMisspelledWord_1 = sel_registerName("updateSpellingPanelWithMisspelledWord:");
-public static final int sel_yellowComponent = sel_registerName("yellowComponent");
-public static final int sel_acceptsFirstResponder = sel_registerName("acceptsFirstResponder");
-public static final int sel_valueWithRect_1 = sel_registerName("valueWithRect:");
-public static final int sel_frameOfCellAtColumn_1row_1 = sel_registerName("frameOfCellAtColumn:row:");
-public static final int sel_makeWindowsPerform_1inOrder_1 = sel_registerName("makeWindowsPerform:inOrder:");
-public static final int sel_lastIndex = sel_registerName("lastIndex");
-public static final int sel_initWithCharacters_1length_1 = sel_registerName("initWithCharacters:length:");
-public static final int sel_initWithIdentifier_1 = sel_registerName("initWithIdentifier:");
-public static final int sel_proxyWithLocal_1connection_1 = sel_registerName("proxyWithLocal:connection:");
-public static final int sel_scrollColumnToVisible_1 = sel_registerName("scrollColumnToVisible:");
-public static final int sel_descriptor = sel_registerName("descriptor");
-public static final int sel_ISOCountryCodes = sel_registerName("ISOCountryCodes");
-public static final int sel_setStandardInput_1 = sel_registerName("setStandardInput:");
-public static final int sel_getAdvancements_1forGlyphs_1count_1 = sel_registerName("getAdvancements:forGlyphs:count:");
-public static final int sel_displayColumn_1 = sel_registerName("displayColumn:");
-public static final int sel_setAltersStateOfSelectedItem_1 = sel_registerName("setAltersStateOfSelectedItem:");
-public static final int sel_setFrameRotation_1 = sel_registerName("setFrameRotation:");
-public static final int sel_clickedOnLink_1atIndex_1 = sel_registerName("clickedOnLink:atIndex:");
-public static final int sel_addAttribute_1 = sel_registerName("addAttribute:");
-public static final int sel_readPrintInfo = sel_registerName("readPrintInfo");
-public static final int sel_setCurrentContext_1 = sel_registerName("setCurrentContext:");
-public static final int sel_setVerticalLineScroll_1 = sel_registerName("setVerticalLineScroll:");
-public static final int sel_commands = sel_registerName("commands");
-public static final int sel_setNamespaces_1 = sel_registerName("setNamespaces:");
-public static final int sel_removeEntryAtIndex_1 = sel_registerName("removeEntryAtIndex:");
-public static final int sel_setAllowsColumnResizing_1 = sel_registerName("setAllowsColumnResizing:");
-public static final int sel_colorWithDeviceCyan_1magenta_1yellow_1black_1alpha_1 = sel_registerName("colorWithDeviceCyan:magenta:yellow:black:alpha:");
-public static final int sel_textView_1shouldChangeTypingAttributes_1toAttributes_1 = sel_registerName("textView:shouldChangeTypingAttributes:toAttributes:");
-public static final int sel_usesFeedbackWindow = sel_registerName("usesFeedbackWindow");
-public static final int sel_setCookie_1 = sel_registerName("setCookie:");
-public static final int sel_keyWindow = sel_registerName("keyWindow");
-public static final int sel_headIndent = sel_registerName("headIndent");
-public static final int sel_removeObjectIdenticalTo_1inRange_1 = sel_registerName("removeObjectIdenticalTo:inRange:");
-public static final int sel_applicationWillUnhide_1 = sel_registerName("applicationWillUnhide:");
-public static final int sel_currentPage = sel_registerName("currentPage");
-public static final int sel_setOffStateImage_1 = sel_registerName("setOffStateImage:");
-public static final int sel_addRowWithCells_1 = sel_registerName("addRowWithCells:");
-public static final int sel_setInterlineSpacing_1 = sel_registerName("setInterlineSpacing:");
-public static final int sel_imageFileTypes = sel_registerName("imageFileTypes");
-public static final int sel_setArray_1 = sel_registerName("setArray:");
-public static final int sel_addLayoutManager_1 = sel_registerName("addLayoutManager:");
-public static final int sel_outputStreamToFileAtPath_1append_1 = sel_registerName("outputStreamToFileAtPath:append:");
-public static final int sel_registeredDraggedTypes = sel_registerName("registeredDraggedTypes");
-public static final int sel_colorWithCalibratedRed_1green_1blue_1alpha_1 = sel_registerName("colorWithCalibratedRed:green:blue:alpha:");
-public static final int sel_invalidateClassDescriptionCache = sel_registerName("invalidateClassDescriptionCache");
-public static final int sel_URLProtocolDidFinishLoading_1 = sel_registerName("URLProtocolDidFinishLoading:");
-public static final int sel_didChangeArrangementCriteria = sel_registerName("didChangeArrangementCriteria");
-public static final int sel_ICCProfileData = sel_registerName("ICCProfileData");
-public static final int sel_availableResourceData = sel_registerName("availableResourceData");
-public static final int sel_glyphIndexForPoint_1inTextContainer_1fractionOfDistanceThroughGlyph_1 = sel_registerName("glyphIndexForPoint:inTextContainer:fractionOfDistanceThroughGlyph:");
-public static final int sel_moveToEndOfParagraph_1 = sel_registerName("moveToEndOfParagraph:");
-public static final int sel_enterFullScreenMode_1withOptions_1 = sel_registerName("enterFullScreenMode:withOptions:");
-public static final int sel_fieldEditor_1forObject_1 = sel_registerName("fieldEditor:forObject:");
-public static final int sel_setTreatsFilePackagesAsDirectories_1 = sel_registerName("setTreatsFilePackagesAsDirectories:");
-public static final int sel_setLevelIndicatorStyle_1 = sel_registerName("setLevelIndicatorStyle:");
-public static final int sel_minimumDecimalNumber = sel_registerName("minimumDecimalNumber");
-public static final int sel_hasSpaceAvailable = sel_registerName("hasSpaceAvailable");
-public static final int sel_widthOfString_1 = sel_registerName("widthOfString:");
-public static final int sel_setLocale_1 = sel_registerName("setLocale:");
-public static final int sel_setPreferredEdge_1 = sel_registerName("setPreferredEdge:");
-public static final int sel_setRichText_1 = sel_registerName("setRichText:");
-public static final int sel_rangesForUserCharacterAttributeChange = sel_registerName("rangesForUserCharacterAttributeChange");
-public static final int sel_rectForPage_1 = sel_registerName("rectForPage:");
-public static final int sel_rowHeight = sel_registerName("rowHeight");
-public static final int sel_windowDidChangeScreenProfile_1 = sel_registerName("windowDidChangeScreenProfile:");
-public static final int sel_setCachePolicy_1 = sel_registerName("setCachePolicy:");
-public static final int sel_parser_1didEndMappingPrefix_1 = sel_registerName("parser:didEndMappingPrefix:");
-public static final int sel_cleanUpAfterDragOperation = sel_registerName("cleanUpAfterDragOperation");
-public static final int sel_browser_1typeSelectStringForRow_1inColumn_1 = sel_registerName("browser:typeSelectStringForRow:inColumn:");
-public static final int sel_canInitWithPasteboard_1 = sel_registerName("canInitWithPasteboard:");
-public static final int sel_startListening = sel_registerName("startListening");
-public static final int sel_setExcludedKeys_1 = sel_registerName("setExcludedKeys:");
-public static final int sel_readFromFile_1ofType_1 = sel_registerName("readFromFile:ofType:");
-public static final int sel_setReservedThicknessForMarkers_1 = sel_registerName("setReservedThicknessForMarkers:");
-public static final int sel_windowRef = sel_registerName("windowRef");
-public static final int sel_browser_1selectRow_1inColumn_1 = sel_registerName("browser:selectRow:inColumn:");
-public static final int sel_isOpaque = sel_registerName("isOpaque");
-public static final int sel_fontDescriptorWithFamily_1 = sel_registerName("fontDescriptorWithFamily:");
-public static final int sel_itemTitleAtIndex_1 = sel_registerName("itemTitleAtIndex:");
-public static final int sel_boundingBox = sel_registerName("boundingBox");
-public static final int sel_moveColumn_1toColumn_1 = sel_registerName("moveColumn:toColumn:");
-public static final int sel_badgeLabel = sel_registerName("badgeLabel");
-public static final int sel_outline_1 = sel_registerName("outline:");
-public static final int sel_characterIndexForInsertionAtPoint_1 = sel_registerName("characterIndexForInsertionAtPoint:");
-public static final int sel_URLHandleClassForURL_1 = sel_registerName("URLHandleClassForURL:");
-public static final int sel_selectKeyViewFollowingView_1 = sel_registerName("selectKeyViewFollowingView:");
-public static final int sel_fullPathForApplication_1 = sel_registerName("fullPathForApplication:");
-public static final int sel_outlineView_1willDisplayOutlineCell_1forTableColumn_1item_1 = sel_registerName("outlineView:willDisplayOutlineCell:forTableColumn:item:");
-public static final int sel_encodePropertyList_1 = sel_registerName("encodePropertyList:");
-public static final int sel_generatesDecimalNumbers = sel_registerName("generatesDecimalNumbers");
-public static final int sel_appendAttributedString_1 = sel_registerName("appendAttributedString:");
-public static final int sel_persistentDomainNames = sel_registerName("persistentDomainNames");
-public static final int sel_setUserFont_1 = sel_registerName("setUserFont:");
-public static final int sel_initWithProperties_1 = sel_registerName("initWithProperties:");
-public static final int sel_loadResourceDataNotifyingClient_1usingCache_1 = sel_registerName("loadResourceDataNotifyingClient:usingCache:");
-public static final int sel_closeFile = sel_registerName("closeFile");
-public static final int sel_allHeaderFields = sel_registerName("allHeaderFields");
-public static final int sel_unlearnWord_1 = sel_registerName("unlearnWord:");
-public static final int sel_drawsCellBackground = sel_registerName("drawsCellBackground");
-public static final int sel_PICTRepresentation = sel_registerName("PICTRepresentation");
-public static final int sel_imageScaling = sel_registerName("imageScaling");
-public static final int sel_scanUpToString_1intoString_1 = sel_registerName("scanUpToString:intoString:");
-public static final int sel_scrollBarColor = sel_registerName("scrollBarColor");
-public static final int sel_initWithDelegate_1name_1 = sel_registerName("initWithDelegate:name:");
-public static final int sel_setDateValue_1 = sel_registerName("setDateValue:");
-public static final int sel_dividerStyle = sel_registerName("dividerStyle");
-public static final int sel_scrollPageDown_1 = sel_registerName("scrollPageDown:");
-public static final int sel_removeLayoutManager_1 = sel_registerName("removeLayoutManager:");
-public static final int sel_textAttributesForNegativeValues = sel_registerName("textAttributesForNegativeValues");
-public static final int sel_attachment = sel_registerName("attachment");
-public static final int sel_reset = sel_registerName("reset");
-public static final int sel_initWithAttributes_1 = sel_registerName("initWithAttributes:");
-public static final int sel_allowsMixedState = sel_registerName("allowsMixedState");
-public static final int sel_addPort_1forMode_1 = sel_registerName("addPort:forMode:");
-public static final int sel_windowDidDeminiaturize_1 = sel_registerName("windowDidDeminiaturize:");
-public static final int sel_setRowHeight_1 = sel_registerName("setRowHeight:");
-public static final int sel_setGraphicsState_1 = sel_registerName("setGraphicsState:");
-public static final int sel_replaceCharactersInRange_1withAttributedString_1 = sel_registerName("replaceCharactersInRange:withAttributedString:");
-public static final int sel_setAttributedStringValue_1 = sel_registerName("setAttributedStringValue:");
-public static final int sel_criteriaKeyPath = sel_registerName("criteriaKeyPath");
-public static final int sel_standardInput = sel_registerName("standardInput");
-public static final int sel_isFontAvailable_1 = sel_registerName("isFontAvailable:");
-public static final int sel_setAllowsTypeSelect_1 = sel_registerName("setAllowsTypeSelect:");
-public static final int sel_portWithMachPort_1 = sel_registerName("portWithMachPort:");
-public static final int sel_panel_1isValidFilename_1 = sel_registerName("panel:isValidFilename:");
+public static final int sel_handleEvent_ = sel_registerName("handleEvent:");
+public static final int sel_handleMouseEvent_ = sel_registerName("handleMouseEvent:");
+public static final int sel_hasAlpha = sel_registerName("hasAlpha");
+public static final int sel_hasMarkedText = sel_registerName("hasMarkedText");
+public static final int sel_headerCell = sel_registerName("headerCell");
+public static final int sel_headerRectOfColumn_ = sel_registerName("headerRectOfColumn:");
+public static final int sel_headerView = sel_registerName("headerView");
+public static final int sel_helpRequested_ = sel_registerName("helpRequested:");
+public static final int sel_hide_ = sel_registerName("hide:");
+public static final int sel_hideOtherApplications_ = sel_registerName("hideOtherApplications:");
+public static final int sel_hitPart = sel_registerName("hitPart");
+public static final int sel_hitTest_ = sel_registerName("hitTest:");
+public static final int sel_hourOfDay = sel_registerName("hourOfDay");
+public static final int sel_iconForFile_ = sel_registerName("iconForFile:");
+public static final int sel_iconForFileType_ = sel_registerName("iconForFileType:");
+public static final int sel_ignore = sel_registerName("ignore");
+public static final int sel_imageInterpolation = sel_registerName("imageInterpolation");
 public static final int sel_imageablePageBounds = sel_registerName("imageablePageBounds");
-public static final int sel_notificationWithName_1object_1 = sel_registerName("notificationWithName:object:");
-public static final int sel_sharedFontPanelExists = sel_registerName("sharedFontPanelExists");
-public static final int sel_blackColor = sel_registerName("blackColor");
-public static final int sel_removeDescriptorAtIndex_1 = sel_registerName("removeDescriptorAtIndex:");
-public static final int sel_dataUsingEncoding_1allowLossyConversion_1 = sel_registerName("dataUsingEncoding:allowLossyConversion:");
-public static final int sel_propertyForKey_1inRequest_1 = sel_registerName("propertyForKey:inRequest:");
-public static final int sel_setHeaderLevel_1 = sel_registerName("setHeaderLevel:");
-public static final int sel_jobTitle = sel_registerName("jobTitle");
-public static final int sel_removePersistentDomainForName_1 = sel_registerName("removePersistentDomainForName:");
-public static final int sel_contentResizeIncrements = sel_registerName("contentResizeIncrements");
-public static final int sel_textFileTypes = sel_registerName("textFileTypes");
-public static final int sel_setAction_1 = sel_registerName("setAction:");
-public static final int sel_knobProportion = sel_registerName("knobProportion");
-public static final int sel_numberOfArguments = sel_registerName("numberOfArguments");
-public static final int sel_setScrollsDynamically_1 = sel_registerName("setScrollsDynamically:");
-public static final int sel_setTextColor_1range_1 = sel_registerName("setTextColor:range:");
-public static final int sel_setBoundsSize_1 = sel_registerName("setBoundsSize:");
-public static final int sel_setVolume_1 = sel_registerName("setVolume:");
-public static final int sel_windowControllers = sel_registerName("windowControllers");
-public static final int sel_insertAttributedString_1atIndex_1 = sel_registerName("insertAttributedString:atIndex:");
-public static final int sel_eventWithEventRef_1 = sel_registerName("eventWithEventRef:");
-public static final int sel_initByReferencingFile_1 = sel_registerName("initByReferencingFile:");
-public static final int sel_fire = sel_registerName("fire");
-public static final int sel_writeToPasteboard_1 = sel_registerName("writeToPasteboard:");
-public static final int sel_connectionForProxy = sel_registerName("connectionForProxy");
-public static final int sel_outlineView_1mouseDownInHeaderOfTableColumn_1 = sel_registerName("outlineView:mouseDownInHeaderOfTableColumn:");
-public static final int sel_mutableArrayValueForKeyPath_1 = sel_registerName("mutableArrayValueForKeyPath:");
-public static final int sel_validRequestorForSendType_1returnType_1 = sel_registerName("validRequestorForSendType:returnType:");
-public static final int sel_isRichText = sel_registerName("isRichText");
-public static final int sel_moveWordLeft_1 = sel_registerName("moveWordLeft:");
-public static final int sel_indexSetWithIndex_1 = sel_registerName("indexSetWithIndex:");
-public static final int sel_setContextMenuRepresentation_1 = sel_registerName("setContextMenuRepresentation:");
-public static final int sel_updateTrackingAreas = sel_registerName("updateTrackingAreas");
-public static final int sel_defaultCollector = sel_registerName("defaultCollector");
-public static final int sel_orderedIndex = sel_registerName("orderedIndex");
-public static final int sel_relativeCurveToPoint_1controlPoint1_1controlPoint2_1 = sel_registerName("relativeCurveToPoint:controlPoint1:controlPoint2:");
-public static final int sel_setShowsApplicationBadge_1 = sel_registerName("setShowsApplicationBadge:");
-public static final int sel_setValue_1 = sel_registerName("setValue:");
-public static final int sel_attributeDeclarationForName_1elementName_1 = sel_registerName("attributeDeclarationForName:elementName:");
-public static final int sel_setWidth_1type_1forLayer_1 = sel_registerName("setWidth:type:forLayer:");
-public static final int sel_decodePoint = sel_registerName("decodePoint");
-public static final int sel_makeWindowControllers = sel_registerName("makeWindowControllers");
-public static final int sel_userFontOfSize_1 = sel_registerName("userFontOfSize:");
-public static final int sel_dependencies = sel_registerName("dependencies");
-public static final int sel_setAttributes_1 = sel_registerName("setAttributes:");
-public static final int sel_setFrameCenterRotation_1 = sel_registerName("setFrameCenterRotation:");
-public static final int sel_nilSymbol = sel_registerName("nilSymbol");
-public static final int sel_scalesWhenResized = sel_registerName("scalesWhenResized");
-public static final int sel_setMinusSign_1 = sel_registerName("setMinusSign:");
-public static final int sel_predicateOperatorType = sel_registerName("predicateOperatorType");
-public static final int sel_replyWithException_1 = sel_registerName("replyWithException:");
-public static final int sel_fileName = sel_registerName("fileName");
-public static final int sel_indexPathByRemovingLastIndex = sel_registerName("indexPathByRemovingLastIndex");
-public static final int sel_openHelpAnchor_1inBook_1 = sel_registerName("openHelpAnchor:inBook:");
-public static final int sel_initWithBytes_1objCType_1 = sel_registerName("initWithBytes:objCType:");
-public static final int sel_removeObject_1 = sel_registerName("removeObject:");
-public static final int sel_colorNameComponent = sel_registerName("colorNameComponent");
-public static final int sel_setCellBackgroundColor_1 = sel_registerName("setCellBackgroundColor:");
-public static final int sel_getLineDash_1count_1phase_1 = sel_registerName("getLineDash:count:phase:");
-public static final int sel_scriptingContains_1 = sel_registerName("scriptingContains:");
-public static final int sel_setDefaultWindingRule_1 = sel_registerName("setDefaultWindingRule:");
-public static final int sel_outputStreamToBuffer_1capacity_1 = sel_registerName("outputStreamToBuffer:capacity:");
-public static final int sel_defaultButtonTitle = sel_registerName("defaultButtonTitle");
-public static final int sel_draggingSourceOperationMask = sel_registerName("draggingSourceOperationMask");
-public static final int sel_textDidChange_1 = sel_registerName("textDidChange:");
-public static final int sel_drawSheetBorderWithSize_1 = sel_registerName("drawSheetBorderWithSize:");
-public static final int sel_integerForKey_1 = sel_registerName("integerForKey:");
-public static final int sel_setDefaultNameServerPortNumber_1 = sel_registerName("setDefaultNameServerPortNumber:");
-public static final int sel_previousNode = sel_registerName("previousNode");
-public static final int sel_trackingArea = sel_registerName("trackingArea");
-public static final int sel_highlightWithLevel_1 = sel_registerName("highlightWithLevel:");
-public static final int sel_trackMouse_1inRect_1ofView_1atCharacterIndex_1untilMouseUp_1 = sel_registerName("trackMouse:inRect:ofView:atCharacterIndex:untilMouseUp:");
-public static final int sel_signatureWithObjCTypes_1 = sel_registerName("signatureWithObjCTypes:");
-public static final int sel_saveToURL_1ofType_1forSaveOperation_1error_1 = sel_registerName("saveToURL:ofType:forSaveOperation:error:");
-public static final int sel_dataWithBytesNoCopy_1length_1freeWhenDone_1 = sel_registerName("dataWithBytesNoCopy:length:freeWhenDone:");
-public static final int sel_encodeInteger_1forKey_1 = sel_registerName("encodeInteger:forKey:");
-public static final int sel_removeFromSuperview = sel_registerName("removeFromSuperview");
-public static final int sel_dataWithBytesNoCopy_1length_1 = sel_registerName("dataWithBytesNoCopy:length:");
-public static final int sel_initWithIndexesInRange_1 = sel_registerName("initWithIndexesInRange:");
-public static final int sel_initWithKeyPointerFunctions_1valuePointerFunctions_1capacity_1 = sel_registerName("initWithKeyPointerFunctions:valuePointerFunctions:capacity:");
-public static final int sel_tilt = sel_registerName("tilt");
-public static final int sel_setHidden_1 = sel_registerName("setHidden:");
-public static final int sel_setMenuFormRepresentation_1 = sel_registerName("setMenuFormRepresentation:");
-public static final int sel_setCanChooseDirectories_1 = sel_registerName("setCanChooseDirectories:");
-public static final int sel_usedRectForTextContainer_1 = sel_registerName("usedRectForTextContainer:");
-public static final int sel_allowsColumnSelection = sel_registerName("allowsColumnSelection");
-public static final int sel_orderOut_1 = sel_registerName("orderOut:");
-public static final int sel_filterUsingPredicate_1 = sel_registerName("filterUsingPredicate:");
-public static final int sel_setTest_1 = sel_registerName("setTest:");
-public static final int sel_setAllowedTypes_1 = sel_registerName("setAllowedTypes:");
-public static final int sel_registerForDraggedTypes_1 = sel_registerName("registerForDraggedTypes:");
-public static final int sel_objectEnumerator = sel_registerName("objectEnumerator");
-public static final int sel_setWindowController_1 = sel_registerName("setWindowController:");
-public static final int sel_setDestination_1 = sel_registerName("setDestination:");
-public static final int sel_addRepresentation_1 = sel_registerName("addRepresentation:");
-public static final int sel_isEqual_1 = sel_registerName("isEqual:");
-public static final int sel_glyphRangeForTextContainer_1 = sel_registerName("glyphRangeForTextContainer:");
-public static final int sel_setStandaloneWeekdaySymbols_1 = sel_registerName("setStandaloneWeekdaySymbols:");
-public static final int sel_setIgnoresAlpha_1 = sel_registerName("setIgnoresAlpha:");
-public static final int sel_drawBarInside_1flipped_1 = sel_registerName("drawBarInside:flipped:");
-public static final int sel_doesNotRecognizeSelector_1 = sel_registerName("doesNotRecognizeSelector:");
-public static final int sel_windowDidResignMain_1 = sel_registerName("windowDidResignMain:");
-public static final int sel_scrollItemAtIndexToTop_1 = sel_registerName("scrollItemAtIndexToTop:");
-public static final int sel_makePreviousSegmentKey = sel_registerName("makePreviousSegmentKey");
-public static final int sel_download_1shouldDecodeSourceDataOfMIMEType_1 = sel_registerName("download:shouldDecodeSourceDataOfMIMEType:");
-public static final int sel_compareObject_1toObject_1 = sel_registerName("compareObject:toObject:");
-public static final int sel_widthTracksTextView = sel_registerName("widthTracksTextView");
-public static final int sel_subpredicates = sel_registerName("subpredicates");
-public static final int sel_relativeLineToPoint_1 = sel_registerName("relativeLineToPoint:");
-public static final int sel_gridStyleMask = sel_registerName("gridStyleMask");
-public static final int sel_initWithCString_1 = sel_registerName("initWithCString:");
-public static final int sel_imageScalingForSegment_1 = sel_registerName("imageScalingForSegment:");
-public static final int sel_editWithFrame_1inView_1editor_1delegate_1event_1 = sel_registerName("editWithFrame:inView:editor:delegate:event:");
-public static final int sel_glyphPacking = sel_registerName("glyphPacking");
-public static final int sel_resolveWithTimeout_1 = sel_registerName("resolveWithTimeout:");
-public static final int sel_hasEditedDocuments = sel_registerName("hasEditedDocuments");
-public static final int sel_getLineFragmentRect_1usedRect_1forParagraphSeparatorGlyphRange_1atProposedOrigin_1 = sel_registerName("getLineFragmentRect:usedRect:forParagraphSeparatorGlyphRange:atProposedOrigin:");
-public static final int sel_autosaveDocumentWithDelegate_1didAutosaveSelector_1contextInfo_1 = sel_registerName("autosaveDocumentWithDelegate:didAutosaveSelector:contextInfo:");
-public static final int sel_readSelectionFromPasteboard_1type_1 = sel_registerName("readSelectionFromPasteboard:type:");
-public static final int sel_spellServer_1suggestGuessesForWord_1inLanguage_1 = sel_registerName("spellServer:suggestGuessesForWord:inLanguage:");
-public static final int sel_initWithTimeIntervalSinceNow_1 = sel_registerName("initWithTimeIntervalSinceNow:");
-public static final int sel_setMaxWidth_1 = sel_registerName("setMaxWidth:");
-public static final int sel_userDefaultsChanged = sel_registerName("userDefaultsChanged");
-public static final int sel_setWidth_1 = sel_registerName("setWidth:");
-public static final int sel_setPrintPanel_1 = sel_registerName("setPrintPanel:");
-public static final int sel_setCurrentPage_1 = sel_registerName("setCurrentPage:");
-public static final int sel_resizeIncrements = sel_registerName("resizeIncrements");
-public static final int sel_selectWithFrame_1inView_1editor_1delegate_1start_1length_1 = sel_registerName("selectWithFrame:inView:editor:delegate:start:length:");
-public static final int sel_sRGBColorSpace = sel_registerName("sRGBColorSpace");
-public static final int sel_scriptErrorExpectedTypeDescriptor = sel_registerName("scriptErrorExpectedTypeDescriptor");
-public static final int sel_setHasHorizontalRuler_1 = sel_registerName("setHasHorizontalRuler:");
-public static final int sel_initialFirstResponder = sel_registerName("initialFirstResponder");
-public static final int sel_stringForObjectValue_1 = sel_registerName("stringForObjectValue:");
-public static final int sel_pageRange = sel_registerName("pageRange");
-public static final int sel_printOperationWithView_1 = sel_registerName("printOperationWithView:");
-public static final int sel_initWithFrame_1pixelFormat_1 = sel_registerName("initWithFrame:pixelFormat:");
-public static final int sel_fileWrapperOfType_1error_1 = sel_registerName("fileWrapperOfType:error:");
-public static final int sel_doesContain_1 = sel_registerName("doesContain:");
-public static final int sel_mutableSetValueForKeyPath_1 = sel_registerName("mutableSetValueForKeyPath:");
-public static final int sel_initWithURL_1cached_1 = sel_registerName("initWithURL:cached:");
-public static final int sel_controlAlternatingRowBackgroundColors = sel_registerName("controlAlternatingRowBackgroundColors");
-public static final int sel_pathComponentCellClass = sel_registerName("pathComponentCellClass");
-public static final int sel_arrayWithCapacity_1 = sel_registerName("arrayWithCapacity:");
-public static final int sel_types = sel_registerName("types");
-public static final int sel_setPrintInfo_1 = sel_registerName("setPrintInfo:");
-public static final int sel_indexOfTabViewItemWithIdentifier_1 = sel_registerName("indexOfTabViewItemWithIdentifier:");
-public static final int sel_isEnabled = sel_registerName("isEnabled");
-public static final int sel_setHeaderView_1 = sel_registerName("setHeaderView:");
-public static final int sel_accessibilityHitTest_1 = sel_registerName("accessibilityHitTest:");
-public static final int sel_removeMarker_1 = sel_registerName("removeMarker:");
-public static final int sel_showContextHelp_1 = sel_registerName("showContextHelp:");
-public static final int sel_selectsInsertedObjects = sel_registerName("selectsInsertedObjects");
-public static final int sel_selectedRowInColumn_1 = sel_registerName("selectedRowInColumn:");
-public static final int sel_noteNewRecentDocument_1 = sel_registerName("noteNewRecentDocument:");
-public static final int sel_setAttachment_1 = sel_registerName("setAttachment:");
-public static final int sel_localeIdentifier = sel_registerName("localeIdentifier");
-public static final int sel_scrollLineUp_1 = sel_registerName("scrollLineUp:");
-public static final int sel_setCalendarFormat_1 = sel_registerName("setCalendarFormat:");
-public static final int sel_setAssociatedPoints_1atIndex_1 = sel_registerName("setAssociatedPoints:atIndex:");
-public static final int sel_resourceData = sel_registerName("resourceData");
-public static final int sel_setVeryShortStandaloneMonthSymbols_1 = sel_registerName("setVeryShortStandaloneMonthSymbols:");
-public static final int sel_windowDidUpdate_1 = sel_registerName("windowDidUpdate:");
-public static final int sel_moveLeft_1 = sel_registerName("moveLeft:");
-public static final int sel_showsBorderOnlyWhileMouseInside = sel_registerName("showsBorderOnlyWhileMouseInside");
-public static final int sel_valueForKey_1 = sel_registerName("valueForKey:");
-public static final int sel_setContentResizeIncrements_1 = sel_registerName("setContentResizeIncrements:");
-public static final int sel_drain = sel_registerName("drain");
-public static final int sel_concat = sel_registerName("concat");
-public static final int sel_scrollerWidthForControlSize_1 = sel_registerName("scrollerWidthForControlSize:");
-public static final int sel_insertItemWithTitle_1action_1keyEquivalent_1atIndex_1 = sel_registerName("insertItemWithTitle:action:keyEquivalent:atIndex:");
-public static final int sel_doubleValue = sel_registerName("doubleValue");
-public static final int sel_dividerThickness = sel_registerName("dividerThickness");
-public static final int sel_rowAtPoint_1 = sel_registerName("rowAtPoint:");
-public static final int sel_updateWindowsItem_1 = sel_registerName("updateWindowsItem:");
-public static final int sel_calendarDate = sel_registerName("calendarDate");
-public static final int sel_fixAttachmentAttributeInRange_1 = sel_registerName("fixAttachmentAttributeInRange:");
-public static final int sel_mapTableWithWeakToWeakObjects = sel_registerName("mapTableWithWeakToWeakObjects");
-public static final int sel_setClip = sel_registerName("setClip");
-public static final int sel_evaluationErrorNumber = sel_registerName("evaluationErrorNumber");
-public static final int sel_revertToSavedFromURL_1ofType_1 = sel_registerName("revertToSavedFromURL:ofType:");
-public static final int sel_autorecalculatesContentBorderThicknessForEdge_1 = sel_registerName("autorecalculatesContentBorderThicknessForEdge:");
-public static final int sel_lineToPoint_1 = sel_registerName("lineToPoint:");
-public static final int sel_insertionReplaces = sel_registerName("insertionReplaces");
-public static final int sel_smallestEncoding = sel_registerName("smallestEncoding");
-public static final int sel_elementAtIndex_1 = sel_registerName("elementAtIndex:");
-public static final int sel_getReturnValue_1 = sel_registerName("getReturnValue:");
-public static final int sel_regularFileContents = sel_registerName("regularFileContents");
-public static final int sel_recache = sel_registerName("recache");
-public static final int sel_setTextAttributesForNegativeInfinity_1 = sel_registerName("setTextAttributesForNegativeInfinity:");
-public static final int sel_horizontalRulerView = sel_registerName("horizontalRulerView");
-public static final int sel_initToMemory = sel_registerName("initToMemory");
-public static final int sel_shouldCreateUI = sel_registerName("shouldCreateUI");
-public static final int sel_scheme = sel_registerName("scheme");
-public static final int sel_raiseBaseline_1 = sel_registerName("raiseBaseline:");
-public static final int sel_initWithArray_1 = sel_registerName("initWithArray:");
-public static final int sel_displayNameForKey_1value_1 = sel_registerName("displayNameForKey:value:");
-public static final int sel_centerScanRect_1 = sel_registerName("centerScanRect:");
-public static final int sel_memoryCapacity = sel_registerName("memoryCapacity");
-public static final int sel_setBackgroundLayoutEnabled_1 = sel_registerName("setBackgroundLayoutEnabled:");
-public static final int sel_machPort = sel_registerName("machPort");
-public static final int sel_selectedFont = sel_registerName("selectedFont");
-public static final int sel_tableColumns = sel_registerName("tableColumns");
-public static final int sel_removeObjectAtIndex_1 = sel_registerName("removeObjectAtIndex:");
-public static final int sel_insertNewButtonImage_1in_1 = sel_registerName("insertNewButtonImage:in:");
-public static final int sel_stringWithContentsOfURL_1encoding_1error_1 = sel_registerName("stringWithContentsOfURL:encoding:error:");
-public static final int sel_menuChangedMessagesEnabled = sel_registerName("menuChangedMessagesEnabled");
-public static final int sel_initWithShort_1 = sel_registerName("initWithShort:");
-public static final int sel_setColorRenderingIntent_1 = sel_registerName("setColorRenderingIntent:");
-public static final int sel_descriptionWithCalendarFormat_1locale_1 = sel_registerName("descriptionWithCalendarFormat:locale:");
-public static final int sel_resourceSpecifier = sel_registerName("resourceSpecifier");
-public static final int sel_pasteboardByFilteringFile_1 = sel_registerName("pasteboardByFilteringFile:");
-public static final int sel_dragColor_1withEvent_1fromView_1 = sel_registerName("dragColor:withEvent:fromView:");
-public static final int sel_setStroke = sel_registerName("setStroke");
-public static final int sel_isControllerVisible = sel_registerName("isControllerVisible");
-public static final int sel_putCell_1atRow_1column_1 = sel_registerName("putCell:atRow:column:");
-public static final int sel_firstIndex = sel_registerName("firstIndex");
-public static final int sel_setFontManagerFactory_1 = sel_registerName("setFontManagerFactory:");
-public static final int sel_exponentSymbol = sel_registerName("exponentSymbol");
-public static final int sel_stringValue = sel_registerName("stringValue");
-public static final int sel_getObjects_1range_1 = sel_registerName("getObjects:range:");
-public static final int sel_scriptingProperties = sel_registerName("scriptingProperties");
-public static final int sel_query = sel_registerName("query");
-public static final int sel_eventClass = sel_registerName("eventClass");
-public static final int sel_dateWithNaturalLanguageString_1 = sel_registerName("dateWithNaturalLanguageString:");
-public static final int sel_datePickerMode = sel_registerName("datePickerMode");
-public static final int sel_setAlternateMnemonicLocation_1 = sel_registerName("setAlternateMnemonicLocation:");
-public static final int sel_stringByDeletingLastPathComponent = sel_registerName("stringByDeletingLastPathComponent");
-public static final int sel_encodeObject_1 = sel_registerName("encodeObject:");
-public static final int sel_unarchiveObjectWithData_1 = sel_registerName("unarchiveObjectWithData:");
-public static final int sel_destination = sel_registerName("destination");
-public static final int sel_ensureLayoutForCharacterRange_1 = sel_registerName("ensureLayoutForCharacterRange:");
-public static final int sel_tabView_1didSelectTabViewItem_1 = sel_registerName("tabView:didSelectTabViewItem:");
-public static final int sel_removeContextHelpForObject_1 = sel_registerName("removeContextHelpForObject:");
-public static final int sel_ensureGlyphsForCharacterRange_1 = sel_registerName("ensureGlyphsForCharacterRange:");
-public static final int sel_setMinimumFractionDigits_1 = sel_registerName("setMinimumFractionDigits:");
-public static final int sel_boundsRotation = sel_registerName("boundsRotation");
-public static final int sel_invalidateDisplayForGlyphRange_1 = sel_registerName("invalidateDisplayForGlyphRange:");
-public static final int sel_rectForBlock_1layoutAtPoint_1inRect_1textContainer_1characterRange_1 = sel_registerName("rectForBlock:layoutAtPoint:inRect:textContainer:characterRange:");
-public static final int sel_pasteFont_1 = sel_registerName("pasteFont:");
-public static final int sel_backgroundColor = sel_registerName("backgroundColor");
-public static final int sel_stringFromNumber_1 = sel_registerName("stringFromNumber:");
-public static final int sel_expiresDate = sel_registerName("expiresDate");
-public static final int sel_initWithWindowRef_1 = sel_registerName("initWithWindowRef:");
-public static final int sel_toggleToolbarShown_1 = sel_registerName("toggleToolbarShown:");
-public static final int sel_outlineViewItemDidExpand_1 = sel_registerName("outlineViewItemDidExpand:");
-public static final int sel_TIFFRepresentationOfImageRepsInArray_1usingCompression_1factor_1 = sel_registerName("TIFFRepresentationOfImageRepsInArray:usingCompression:factor:");
-public static final int sel_variable = sel_registerName("variable");
-public static final int sel_objectsForKeys_1notFoundMarker_1 = sel_registerName("objectsForKeys:notFoundMarker:");
-public static final int sel_controlColor = sel_registerName("controlColor");
-public static final int sel_unarchiverWillFinish_1 = sel_registerName("unarchiverWillFinish:");
-public static final int sel_proposedCredential = sel_registerName("proposedCredential");
-public static final int sel_isPaneSplitter = sel_registerName("isPaneSplitter");
-public static final int sel_endUndoGrouping = sel_registerName("endUndoGrouping");
-public static final int sel_setFrameRate_1 = sel_registerName("setFrameRate:");
-public static final int sel_completionDelay = sel_registerName("completionDelay");
-public static final int sel_setUserFixedPitchFont_1 = sel_registerName("setUserFixedPitchFont:");
-public static final int sel_isIndeterminate = sel_registerName("isIndeterminate");
-public static final int sel_menuItem = sel_registerName("menuItem");
-public static final int sel_setNumberStyle_1 = sel_registerName("setNumberStyle:");
-public static final int sel_takeIntegerValueFrom_1 = sel_registerName("takeIntegerValueFrom:");
-public static final int sel_setIndentationMarkerFollowsCell_1 = sel_registerName("setIndentationMarkerFollowsCell:");
-public static final int sel_tile = sel_registerName("tile");
-public static final int sel_cancelButtonRectForBounds_1 = sel_registerName("cancelButtonRectForBounds:");
-public static final int sel_deselectRow_1 = sel_registerName("deselectRow:");
-public static final int sel_setMouseCoalescingEnabled_1 = sel_registerName("setMouseCoalescingEnabled:");
-public static final int sel_removeWindowController_1 = sel_registerName("removeWindowController:");
-public static final int sel_warningValue = sel_registerName("warningValue");
-public static final int sel_isVerticallyResizable = sel_registerName("isVerticallyResizable");
-public static final int sel_defaultFetchRequest = sel_registerName("defaultFetchRequest");
-public static final int sel_netServiceWillResolve_1 = sel_registerName("netServiceWillResolve:");
-public static final int sel_addProgressMark_1 = sel_registerName("addProgressMark:");
-public static final int sel_recentsAutosaveName = sel_registerName("recentsAutosaveName");
-public static final int sel_commitEditing = sel_registerName("commitEditing");
-public static final int sel_attributesOfItemAtPath_1error_1 = sel_registerName("attributesOfItemAtPath:error:");
-public static final int sel_download_1willSendRequest_1redirectResponse_1 = sel_registerName("download:willSendRequest:redirectResponse:");
-public static final int sel_canBeCompressedUsing_1 = sel_registerName("canBeCompressedUsing:");
-public static final int sel_strokeRect_1 = sel_registerName("strokeRect:");
-public static final int sel_descriptionWithLocale_1indent_1 = sel_registerName("descriptionWithLocale:indent:");
-public static final int sel_applicationDockMenu_1 = sel_registerName("applicationDockMenu:");
-public static final int sel_initWithCString_1length_1 = sel_registerName("initWithCString:length:");
-public static final int sel_runPageLayout_1 = sel_registerName("runPageLayout:");
-public static final int sel_toolbar_1itemForItemIdentifier_1willBeInsertedIntoToolbar_1 = sel_registerName("toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:");
-public static final int sel_setSelectsInsertedObjects_1 = sel_registerName("setSelectsInsertedObjects:");
-public static final int sel_alternateSelectedControlTextColor = sel_registerName("alternateSelectedControlTextColor");
-public static final int sel_isValidGlyphIndex_1 = sel_registerName("isValidGlyphIndex:");
-public static final int sel_stringForKey_1inTable_1 = sel_registerName("stringForKey:inTable:");
-public static final int sel_cellSizeForBounds_1 = sel_registerName("cellSizeForBounds:");
-public static final int sel_beginSheetForDirectory_1file_1modalForWindow_1modalDelegate_1didEndSelector_1contextInfo_1 = sel_registerName("beginSheetForDirectory:file:modalForWindow:modalDelegate:didEndSelector:contextInfo:");
-public static final int sel_invalidateLayoutForCharacterRange_1actualCharacterRange_1 = sel_registerName("invalidateLayoutForCharacterRange:actualCharacterRange:");
-public static final int sel_initAsTearOff = sel_registerName("initAsTearOff");
-public static final int sel_allowsOtherFileTypes = sel_registerName("allowsOtherFileTypes");
-public static final int sel_mouseMoved_1 = sel_registerName("mouseMoved:");
-public static final int sel_deleteCharactersInRange_1 = sel_registerName("deleteCharactersInRange:");
-public static final int sel_setTitleFont_1 = sel_registerName("setTitleFont:");
-public static final int sel_showsApplicationBadge = sel_registerName("showsApplicationBadge");
-public static final int sel_initWithLeftExpression_1rightExpression_1modifier_1type_1options_1 = sel_registerName("initWithLeftExpression:rightExpression:modifier:type:options:");
-public static final int sel_distantPast = sel_registerName("distantPast");
-public static final int sel_isReady = sel_registerName("isReady");
-public static final int sel_draggedImage_1movedTo_1 = sel_registerName("draggedImage:movedTo:");
-public static final int sel_resetTotalAutoreleasedObjects = sel_registerName("resetTotalAutoreleasedObjects");
-public static final int sel_setGlyphGenerator_1 = sel_registerName("setGlyphGenerator:");
-public static final int sel_groupsByEvent = sel_registerName("groupsByEvent");
-public static final int sel_shortMonthSymbols = sel_registerName("shortMonthSymbols");
-public static final int sel_setDescriptor_1forKeyword_1 = sel_registerName("setDescriptor:forKeyword:");
-public static final int sel_description = sel_registerName("description");
-public static final int sel_replaceOccurrencesOfString_1withString_1options_1range_1 = sel_registerName("replaceOccurrencesOfString:withString:options:range:");
-public static final int sel_boundsRectForContentRect_1inRect_1textContainer_1characterRange_1 = sel_registerName("boundsRectForContentRect:inRect:textContainer:characterRange:");
-public static final int sel_authenticationDataForComponents_1 = sel_registerName("authenticationDataForComponents:");
-public static final int sel_isExecuting = sel_registerName("isExecuting");
-public static final int sel_branchImage = sel_registerName("branchImage");
-public static final int sel_decodeRectForKey_1 = sel_registerName("decodeRectForKey:");
-public static final int sel_rectValue = sel_registerName("rectValue");
-public static final int sel_setFrameTopLeftPoint_1 = sel_registerName("setFrameTopLeftPoint:");
-public static final int sel_initWithFileDescriptor_1 = sel_registerName("initWithFileDescriptor:");
-public static final int sel_removePointerAtIndex_1 = sel_registerName("removePointerAtIndex:");
-public static final int sel_executeAndReturnError_1 = sel_registerName("executeAndReturnError:");
-public static final int sel_changeCaseOfLetter_1 = sel_registerName("changeCaseOfLetter:");
-public static final int sel_appendBezierPathWithArcWithCenter_1radius_1startAngle_1endAngle_1clockwise_1 = sel_registerName("appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:clockwise:");
-public static final int sel_insertNewlineIgnoringFieldEditor_1 = sel_registerName("insertNewlineIgnoringFieldEditor:");
-public static final int sel_attributeDescriptorForKeyword_1 = sel_registerName("attributeDescriptorForKeyword:");
-public static final int sel_decimalNumberWithMantissa_1exponent_1isNegative_1 = sel_registerName("decimalNumberWithMantissa:exponent:isNegative:");
-public static final int sel_activeConversationWillChange_1fromOldConversation_1 = sel_registerName("activeConversationWillChange:fromOldConversation:");
-public static final int sel_layoutAlgorithm = sel_registerName("layoutAlgorithm");
-public static final int sel_itemNumberInTextList_1atIndex_1 = sel_registerName("itemNumberInTextList:atIndex:");
-public static final int sel_initWithImage_1hotSpot_1 = sel_registerName("initWithImage:hotSpot:");
-public static final int sel_setStackSize_1 = sel_registerName("setStackSize:");
-public static final int sel_matrixInColumn_1 = sel_registerName("matrixInColumn:");
-public static final int sel_performSelector_1withObject_1 = sel_registerName("performSelector:withObject:");
-public static final int sel_setSound_1 = sel_registerName("setSound:");
-public static final int sel_accessibilityPerformAction_1 = sel_registerName("accessibilityPerformAction:");
-public static final int sel_comment = sel_registerName("comment");
-public static final int sel_rangeOfNominallySpacedGlyphsContainingIndex_1 = sel_registerName("rangeOfNominallySpacedGlyphsContainingIndex:");
-public static final int sel_showAttachmentCell_1inRect_1characterIndex_1 = sel_registerName("showAttachmentCell:inRect:characterIndex:");
-public static final int sel_isDisplayedWhenStopped = sel_registerName("isDisplayedWhenStopped");
-public static final int sel_addCollection_1options_1 = sel_registerName("addCollection:options:");
-public static final int sel_drawInRect_1angle_1 = sel_registerName("drawInRect:angle:");
-public static final int sel_initWithFrame_1mode_1prototype_1numberOfRows_1numberOfColumns_1 = sel_registerName("initWithFrame:mode:prototype:numberOfRows:numberOfColumns:");
-public static final int sel_sharedCredentialStorage = sel_registerName("sharedCredentialStorage");
-public static final int sel_colorWithDeviceWhite_1alpha_1 = sel_registerName("colorWithDeviceWhite:alpha:");
-public static final int sel_setMainDocumentURL_1 = sel_registerName("setMainDocumentURL:");
-public static final int sel_interpretKeyEvents_1 = sel_registerName("interpretKeyEvents:");
-public static final int sel_readFromData_1ofType_1error_1 = sel_registerName("readFromData:ofType:error:");
-public static final int sel_tokenFieldCell_1menuForRepresentedObject_1 = sel_registerName("tokenFieldCell:menuForRepresentedObject:");
-public static final int sel_setEventHandler_1andSelector_1forEventClass_1andEventID_1 = sel_registerName("setEventHandler:andSelector:forEventClass:andEventID:");
-public static final int sel_addAttribute_1value_1range_1 = sel_registerName("addAttribute:value:range:");
-public static final int sel_outlineView_1writeItems_1toPasteboard_1 = sel_registerName("outlineView:writeItems:toPasteboard:");
-public static final int sel_initWithCString_1encoding_1 = sel_registerName("initWithCString:encoding:");
-public static final int sel_setTypesetterBehavior_1 = sel_registerName("setTypesetterBehavior:");
-public static final int sel_removeObjectAtArrangedObjectIndex_1 = sel_registerName("removeObjectAtArrangedObjectIndex:");
-public static final int sel_redo = sel_registerName("redo");
-public static final int sel_addMarker_1 = sel_registerName("addMarker:");
-public static final int sel_backgroundColors = sel_registerName("backgroundColors");
-public static final int sel_leafKeyPath = sel_registerName("leafKeyPath");
-public static final int sel_setMinimumIntegerDigits_1 = sel_registerName("setMinimumIntegerDigits:");
-public static final int sel_waitForDataInBackgroundAndNotify = sel_registerName("waitForDataInBackgroundAndNotify");
-public static final int sel_setPreservesContentDuringLiveResize_1 = sel_registerName("setPreservesContentDuringLiveResize:");
-public static final int sel_setRootElement_1 = sel_registerName("setRootElement:");
-public static final int sel_dataWithEPSInsideRect_1 = sel_registerName("dataWithEPSInsideRect:");
-public static final int sel_valuesForKeys_1 = sel_registerName("valuesForKeys:");
-public static final int sel_imageOrigin = sel_registerName("imageOrigin");
-public static final int sel_writePDFInsideRect_1toPasteboard_1 = sel_registerName("writePDFInsideRect:toPasteboard:");
-public static final int sel_sortIndicatorRectForBounds_1 = sel_registerName("sortIndicatorRectForBounds:");
-public static final int sel_predefinedNamespaceForPrefix_1 = sel_registerName("predefinedNamespaceForPrefix:");
-public static final int sel_viewWillStartLiveResize = sel_registerName("viewWillStartLiveResize");
-public static final int sel_becomeKeyWindow = sel_registerName("becomeKeyWindow");
-public static final int sel_isHighlighted = sel_registerName("isHighlighted");
-public static final int sel_initWithPickerMask_1colorPanel_1 = sel_registerName("initWithPickerMask:colorPanel:");
-public static final int sel_systemFontOfSize_1 = sel_registerName("systemFontOfSize:");
-public static final int sel_decimalNumberBySubtracting_1withBehavior_1 = sel_registerName("decimalNumberBySubtracting:withBehavior:");
-public static final int sel_hide_1 = sel_registerName("hide:");
-public static final int sel_resetSearchButtonCell = sel_registerName("resetSearchButtonCell");
-public static final int sel_runModalForDirectory_1file_1types_1 = sel_registerName("runModalForDirectory:file:types:");
-public static final int sel_pathForImageResource_1 = sel_registerName("pathForImageResource:");
-public static final int sel_setFilterPredicate_1 = sel_registerName("setFilterPredicate:");
-public static final int sel_validateEditing = sel_registerName("validateEditing");
-public static final int sel_makeDocumentForURL_1withContentsOfURL_1ofType_1error_1 = sel_registerName("makeDocumentForURL:withContentsOfURL:ofType:error:");
-public static final int sel_localizedCompare_1 = sel_registerName("localizedCompare:");
-public static final int sel_sharedWorkspace = sel_registerName("sharedWorkspace");
-public static final int sel_deliverResult = sel_registerName("deliverResult");
-public static final int sel_aspectRatio = sel_registerName("aspectRatio");
-public static final int sel_keyEventWithType_1location_1modifierFlags_1timestamp_1windowNumber_1context_1characters_1charactersIgnoringModifiers_1isARepeat_1keyCode_1 = sel_registerName("keyEventWithType:location:modifierFlags:timestamp:windowNumber:context:characters:charactersIgnoringModifiers:isARepeat:keyCode:");
-public static final int sel_soundUnfilteredPasteboardTypes = sel_registerName("soundUnfilteredPasteboardTypes");
-public static final int sel_dateByAddingComponents_1toDate_1options_1 = sel_registerName("dateByAddingComponents:toDate:options:");
-public static final int sel_indentationMarkerFollowsCell = sel_registerName("indentationMarkerFollowsCell");
-public static final int sel_typesetter = sel_registerName("typesetter");
-public static final int sel_childCount = sel_registerName("childCount");
-public static final int sel_borderRect = sel_registerName("borderRect");
-public static final int sel_setPageOrder_1 = sel_registerName("setPageOrder:");
-public static final int sel_currentThread = sel_registerName("currentThread");
-public static final int sel_textViewDidChangeSelection_1 = sel_registerName("textViewDidChangeSelection:");
-public static final int sel_setBaseWritingDirection_1 = sel_registerName("setBaseWritingDirection:");
-public static final int sel_attributedSubstringForProposedRange_1actualRange_1 = sel_registerName("attributedSubstringForProposedRange:actualRange:");
-public static final int sel_pop = sel_registerName("pop");
-public static final int sel_animator = sel_registerName("animator");
-public static final int sel_allowsEmptySelection = sel_registerName("allowsEmptySelection");
-public static final int sel_scriptingIsGreaterThanOrEqualTo_1 = sel_registerName("scriptingIsGreaterThanOrEqualTo:");
-public static final int sel_numberOfSelectedRows = sel_registerName("numberOfSelectedRows");
-public static final int sel_imageDidNotDraw_1inRect_1 = sel_registerName("imageDidNotDraw:inRect:");
-public static final int sel_topLevelObject = sel_registerName("topLevelObject");
-public static final int sel_openDocumentWithContentsOfURL_1display_1 = sel_registerName("openDocumentWithContentsOfURL:display:");
-public static final int sel_valueListAttributes = sel_registerName("valueListAttributes");
-public static final int sel_enableFreedObjectCheck_1 = sel_registerName("enableFreedObjectCheck:");
-public static final int sel_moveForward_1 = sel_registerName("moveForward:");
-public static final int sel_setSendsActionOnArrowKeys_1 = sel_registerName("setSendsActionOnArrowKeys:");
-public static final int sel_versionForClassName_1 = sel_registerName("versionForClassName:");
-public static final int sel_coerceValue_1forKey_1 = sel_registerName("coerceValue:forKey:");
-public static final int sel_operatingSystem = sel_registerName("operatingSystem");
-public static final int sel_characterEncoding = sel_registerName("characterEncoding");
-public static final int sel_blendedColorWithFraction_1ofColor_1 = sel_registerName("blendedColorWithFraction:ofColor:");
-public static final int sel_panel_1userEnteredFilename_1confirmed_1 = sel_registerName("panel:userEnteredFilename:confirmed:");
-public static final int sel_addSelectedObjects_1 = sel_registerName("addSelectedObjects:");
-public static final int sel_pointingDeviceID = sel_registerName("pointingDeviceID");
-public static final int sel_children = sel_registerName("children");
-public static final int sel_takeObjectValueFrom_1 = sel_registerName("takeObjectValueFrom:");
-public static final int sel_indexSet = sel_registerName("indexSet");
-public static final int sel_setMovie_1 = sel_registerName("setMovie:");
-public static final int sel_setKeyEquivalentModifierMask_1 = sel_registerName("setKeyEquivalentModifierMask:");
-public static final int sel_allowsKeyedCoding = sel_registerName("allowsKeyedCoding");
-public static final int sel_rotateByDegrees_1 = sel_registerName("rotateByDegrees:");
-public static final int sel_compoundTypes = sel_registerName("compoundTypes");
-public static final int sel_setShortStandaloneWeekdaySymbols_1 = sel_registerName("setShortStandaloneWeekdaySymbols:");
-public static final int sel_removeWindowsItem_1 = sel_registerName("removeWindowsItem:");
-public static final int sel_stringArrayForKey_1 = sel_registerName("stringArrayForKey:");
-public static final int sel_outlineView_1typeSelectStringForTableColumn_1item_1 = sel_registerName("outlineView:typeSelectStringForTableColumn:item:");
-public static final int sel_initWithWindow_1 = sel_registerName("initWithWindow:");
-public static final int sel_accessibilityIsAttributeSettable_1 = sel_registerName("accessibilityIsAttributeSettable:");
-public static final int sel_rangeForUserCharacterAttributeChange = sel_registerName("rangeForUserCharacterAttributeChange");
-public static final int sel_setCalendar_1 = sel_registerName("setCalendar:");
-public static final int sel_beginEditing = sel_registerName("beginEditing");
-public static final int sel_enableUpdates = sel_registerName("enableUpdates");
-public static final int sel_setPrefersAllColumnUserResizing_1 = sel_registerName("setPrefersAllColumnUserResizing:");
-public static final int sel_isTornOff = sel_registerName("isTornOff");
-public static final int sel_checkSpellingOfString_1startingAt_1 = sel_registerName("checkSpellingOfString:startingAt:");
-public static final int sel_drawPackedGlyphs_1atPoint_1 = sel_registerName("drawPackedGlyphs:atPoint:");
-public static final int sel_graphicsContextWithAttributes_1 = sel_registerName("graphicsContextWithAttributes:");
-public static final int sel_textView_1completions_1forPartialWordRange_1indexOfSelectedItem_1 = sel_registerName("textView:completions:forPartialWordRange:indexOfSelectedItem:");
-public static final int sel_outlineView_1shouldExpandItem_1 = sel_registerName("outlineView:shouldExpandItem:");
-public static final int sel_isInFullScreenMode = sel_registerName("isInFullScreenMode");
-public static final int sel_userKeyEquivalent = sel_registerName("userKeyEquivalent");
-public static final int sel_menuBarHeight = sel_registerName("menuBarHeight");
-public static final int sel_initWithSize_1depth_1separate_1alpha_1 = sel_registerName("initWithSize:depth:separate:alpha:");
-public static final int sel_criticalValue = sel_registerName("criticalValue");
-public static final int sel_tableView_1didClickTableColumn_1 = sel_registerName("tableView:didClickTableColumn:");
-public static final int sel_addChildWindow_1ordered_1 = sel_registerName("addChildWindow:ordered:");
-public static final int sel_autoscroll_1 = sel_registerName("autoscroll:");
+public static final int sel_increment = sel_registerName("increment");
+public static final int sel_indentationPerLevel = sel_registerName("indentationPerLevel");
+public static final int sel_indexOfSelectedItem = sel_registerName("indexOfSelectedItem");
 public static final int sel_infoDictionary = sel_registerName("infoDictionary");
-public static final int sel_printOperationWithSettings_1error_1 = sel_registerName("printOperationWithSettings:error:");
-public static final int sel_translateOriginToPoint_1 = sel_registerName("translateOriginToPoint:");
-public static final int sel_takeStoredValue_1forKey_1 = sel_registerName("takeStoredValue:forKey:");
-public static final int sel_mouseUp_1 = sel_registerName("mouseUp:");
-public static final int sel_setNotationName_1 = sel_registerName("setNotationName:");
-public static final int sel_setArgument_1atIndex_1 = sel_registerName("setArgument:atIndex:");
-public static final int sel_setSelectedAttributes_1isMultiple_1 = sel_registerName("setSelectedAttributes:isMultiple:");
-public static final int sel_dayOfCommonEra = sel_registerName("dayOfCommonEra");
-public static final int sel_greenColor = sel_registerName("greenColor");
-public static final int sel_initWithProtocolFamily_1socketType_1protocol_1address_1 = sel_registerName("initWithProtocolFamily:socketType:protocol:address:");
-public static final int sel_setAttachmentCell_1 = sel_registerName("setAttachmentCell:");
-public static final int sel_previousFailureCount = sel_registerName("previousFailureCount");
-public static final int sel_currentOperation = sel_registerName("currentOperation");
-public static final int sel_tokenField_1completionsForSubstring_1indexOfToken_1indexOfSelectedItem_1 = sel_registerName("tokenField:completionsForSubstring:indexOfToken:indexOfSelectedItem:");
-public static final int sel_positionOfGlyph_1struckOverGlyph_1metricsExist_1 = sel_registerName("positionOfGlyph:struckOverGlyph:metricsExist:");
-public static final int sel_setMarkedTextAttributes_1 = sel_registerName("setMarkedTextAttributes:");
-public static final int sel_validateToolbarItem_1 = sel_registerName("validateToolbarItem:");
-public static final int sel_startingColumn = sel_registerName("startingColumn");
-public static final int sel_setSelectedRanges_1 = sel_registerName("setSelectedRanges:");
-public static final int sel_addItemWithTitle_1action_1keyEquivalent_1 = sel_registerName("addItemWithTitle:action:keyEquivalent:");
-public static final int sel_postNotificationName_1object_1 = sel_registerName("postNotificationName:object:");
-public static final int sel_replacementObjectForKeyedArchiver_1 = sel_registerName("replacementObjectForKeyedArchiver:");
-public static final int sel_deletesFileUponFailure = sel_registerName("deletesFileUponFailure");
-public static final int sel_speechRecognizer_1didRecognizeCommand_1 = sel_registerName("speechRecognizer:didRecognizeCommand:");
-public static final int sel_columnSpan = sel_registerName("columnSpan");
-public static final int sel_animationBlockingMode = sel_registerName("animationBlockingMode");
-public static final int sel_drawParts = sel_registerName("drawParts");
-public static final int sel_style = sel_registerName("style");
-public static final int sel_makeUntitledDocumentOfType_1error_1 = sel_registerName("makeUntitledDocumentOfType:error:");
-public static final int sel_filteredArrayUsingPredicate_1 = sel_registerName("filteredArrayUsingPredicate:");
-public static final int sel_wantsDefaultClipping = sel_registerName("wantsDefaultClipping");
-public static final int sel_one = sel_registerName("one");
-public static final int sel_persistentStoreTypeForFileType_1 = sel_registerName("persistentStoreTypeForFileType:");
-public static final int sel_pixelsHigh = sel_registerName("pixelsHigh");
-public static final int sel_rulerView_1shouldMoveMarker_1 = sel_registerName("rulerView:shouldMoveMarker:");
-public static final int sel_sizeWithAttributes_1 = sel_registerName("sizeWithAttributes:");
-public static final int sel_drawTitleOfColumn_1inRect_1 = sel_registerName("drawTitleOfColumn:inRect:");
-public static final int sel_setLevelsOfUndo_1 = sel_registerName("setLevelsOfUndo:");
-public static final int sel_invoke = sel_registerName("invoke");
-public static final int sel_keyEnumerator = sel_registerName("keyEnumerator");
-public static final int sel_convertFont_1toSize_1 = sel_registerName("convertFont:toSize:");
-public static final int sel_mouseExited_1withFrame_1inView_1 = sel_registerName("mouseExited:withFrame:inView:");
-public static final int sel_widthAdjustLimit = sel_registerName("widthAdjustLimit");
-public static final int sel_animationResizeTime_1 = sel_registerName("animationResizeTime:");
-public static final int sel_ensureLayoutForBoundingRect_1inTextContainer_1 = sel_registerName("ensureLayoutForBoundingRect:inTextContainer:");
-public static final int sel_initWithExpressionType_1 = sel_registerName("initWithExpressionType:");
-public static final int sel_numberWithUnsignedChar_1 = sel_registerName("numberWithUnsignedChar:");
-public static final int sel_directory = sel_registerName("directory");
-public static final int sel_address = sel_registerName("address");
-public static final int sel_defaultPixelFormat = sel_registerName("defaultPixelFormat");
-public static final int sel_deleteBackwardByDecomposingPreviousCharacter_1 = sel_registerName("deleteBackwardByDecomposingPreviousCharacter:");
-public static final int sel_clickCount = sel_registerName("clickCount");
-public static final int sel_trackMarker_1withMouseEvent_1 = sel_registerName("trackMarker:withMouseEvent:");
-public static final int sel_URL_1resourceDataDidBecomeAvailable_1 = sel_registerName("URL:resourceDataDidBecomeAvailable:");
-public static final int sel_outlineView_1setObjectValue_1forTableColumn_1byItem_1 = sel_registerName("outlineView:setObjectValue:forTableColumn:byItem:");
-public static final int sel_insert_1 = sel_registerName("insert:");
-public static final int sel_methodForSelector_1 = sel_registerName("methodForSelector:");
-public static final int sel_insertGlyph_1atGlyphIndex_1characterIndex_1 = sel_registerName("insertGlyph:atGlyphIndex:characterIndex:");
-public static final int sel_readFromFileWrapper_1ofType_1error_1 = sel_registerName("readFromFileWrapper:ofType:error:");
-public static final int sel_selectedControlColor = sel_registerName("selectedControlColor");
-public static final int sel_selectedRow = sel_registerName("selectedRow");
-public static final int sel_control_1isValidObject_1 = sel_registerName("control:isValidObject:");
-public static final int sel_setUniqueID_1 = sel_registerName("setUniqueID:");
-public static final int sel_initWithName_1fromFile_1 = sel_registerName("initWithName:fromFile:");
-public static final int sel_sizeOfLabel_1 = sel_registerName("sizeOfLabel:");
-public static final int sel_credentialsForProtectionSpace_1 = sel_registerName("credentialsForProtectionSpace:");
-public static final int sel_anyObject = sel_registerName("anyObject");
-public static final int sel_runLoopModesForAnimating = sel_registerName("runLoopModesForAnimating");
-public static final int sel_setSortDescriptors_1 = sel_registerName("setSortDescriptors:");
-public static final int sel_convertSize_1toView_1 = sel_registerName("convertSize:toView:");
-public static final int sel_setLineFragmentRect_1forGlyphRange_1usedRect_1 = sel_registerName("setLineFragmentRect:forGlyphRange:usedRect:");
-public static final int sel_discardEditing = sel_registerName("discardEditing");
-public static final int sel_isAutodisplay = sel_registerName("isAutodisplay");
-public static final int sel_matchesOnMultipleResolution = sel_registerName("matchesOnMultipleResolution");
-public static final int sel_multipleThreadsEnabled = sel_registerName("multipleThreadsEnabled");
-public static final int sel_positionOfGlyph_1forCharacter_1struckOverRect_1 = sel_registerName("positionOfGlyph:forCharacter:struckOverRect:");
-public static final int sel_boundsRectForBlock_1contentRect_1inRect_1textContainer_1characterRange_1 = sel_registerName("boundsRectForBlock:contentRect:inRect:textContainer:characterRange:");
-public static final int sel_outlineView_1objectValueForTableColumn_1byItem_1 = sel_registerName("outlineView:objectValueForTableColumn:byItem:");
-public static final int sel_transformPoint_1 = sel_registerName("transformPoint:");
-public static final int sel_createClassDescription = sel_registerName("createClassDescription");
-public static final int sel_inputStreamWithFileAtPath_1 = sel_registerName("inputStreamWithFileAtPath:");
-public static final int sel_menuForEvent_1inRect_1ofView_1 = sel_registerName("menuForEvent:inRect:ofView:");
-public static final int sel_setRowTypeKeyPath_1 = sel_registerName("setRowTypeKeyPath:");
-public static final int sel_infoForBinding_1 = sel_registerName("infoForBinding:");
-public static final int sel_setDataRetained_1 = sel_registerName("setDataRetained:");
-public static final int sel_revertToContentsOfURL_1ofType_1error_1 = sel_registerName("revertToContentsOfURL:ofType:error:");
-public static final int sel_currentControlTint = sel_registerName("currentControlTint");
-public static final int sel_selection = sel_registerName("selection");
-public static final int sel_array = sel_registerName("array");
-public static final int sel_setStyle_1 = sel_registerName("setStyle:");
-public static final int sel_setPredicate_1 = sel_registerName("setPredicate:");
-public static final int sel_endEditing = sel_registerName("endEditing");
-public static final int sel_doClick_1 = sel_registerName("doClick:");
-public static final int sel_toManyRelationshipKeys = sel_registerName("toManyRelationshipKeys");
-public static final int sel_selectedKnobColor = sel_registerName("selectedKnobColor");
-public static final int sel_setOrderedIndex_1 = sel_registerName("setOrderedIndex:");
-public static final int sel_initWithSet_1 = sel_registerName("initWithSet:");
-public static final int sel_drawSelector = sel_registerName("drawSelector");
-public static final int sel_requestWithURL_1 = sel_registerName("requestWithURL:");
-public static final int sel_imageNamed_1 = sel_registerName("imageNamed:");
-public static final int sel_hyphenationFactorForGlyphAtIndex_1 = sel_registerName("hyphenationFactorForGlyphAtIndex:");
-public static final int sel_miniwindowTitle = sel_registerName("miniwindowTitle");
-public static final int sel_isFileURL = sel_registerName("isFileURL");
-public static final int sel_selectedSegment = sel_registerName("selectedSegment");
-public static final int sel_applicationDidResignActive_1 = sel_registerName("applicationDidResignActive:");
-public static final int sel_initWithString_1calendarFormat_1 = sel_registerName("initWithString:calendarFormat:");
-public static final int sel_initWithProtectionSpace_1proposedCredential_1previousFailureCount_1failureResponse_1error_1sender_1 = sel_registerName("initWithProtectionSpace:proposedCredential:previousFailureCount:failureResponse:error:sender:");
-public static final int sel_menuHasKeyEquivalent_1forEvent_1target_1action_1 = sel_registerName("menuHasKeyEquivalent:forEvent:target:action:");
-public static final int sel_minPossiblePositionOfDividerAtIndex_1 = sel_registerName("minPossiblePositionOfDividerAtIndex:");
-public static final int sel_abbreviationForDate_1 = sel_registerName("abbreviationForDate:");
-public static final int sel_absoluteX = sel_registerName("absoluteX");
-public static final int sel_scriptErrorNumber = sel_registerName("scriptErrorNumber");
-public static final int sel_previousValidKeyView = sel_registerName("previousValidKeyView");
-public static final int sel_valueWithRange_1 = sel_registerName("valueWithRange:");
-public static final int sel_initWithDefaults_1initialValues_1 = sel_registerName("initWithDefaults:initialValues:");
-public static final int sel_initNotTestWithTest_1 = sel_registerName("initNotTestWithTest:");
-public static final int sel_abortModal = sel_registerName("abortModal");
-public static final int sel_isSuspended = sel_registerName("isSuspended");
-public static final int sel_isFilePackageAtPath_1 = sel_registerName("isFilePackageAtPath:");
-public static final int sel_useCredential_1forAuthenticationChallenge_1 = sel_registerName("useCredential:forAuthenticationChallenge:");
-public static final int sel_draggingSequenceNumber = sel_registerName("draggingSequenceNumber");
-public static final int sel_lastColumn = sel_registerName("lastColumn");
-public static final int sel_distantFuture = sel_registerName("distantFuture");
-public static final int sel_download_1didReceiveResponse_1 = sel_registerName("download:didReceiveResponse:");
-public static final int sel_textTransform = sel_registerName("textTransform");
-public static final int sel_hasHorizontalScroller = sel_registerName("hasHorizontalScroller");
-public static final int sel_shadowBlurRadius = sel_registerName("shadowBlurRadius");
-public static final int sel_pointingDeviceType = sel_registerName("pointingDeviceType");
-public static final int sel_setMenuView_1 = sel_registerName("setMenuView:");
-public static final int sel_setWindingRule_1 = sel_registerName("setWindingRule:");
-public static final int sel_imageForSegment_1 = sel_registerName("imageForSegment:");
-public static final int sel_bytes = sel_registerName("bytes");
-public static final int sel_propertyListFromStringsFileFormat = sel_registerName("propertyListFromStringsFileFormat");
-public static final int sel_setParagraphStyle_1 = sel_registerName("setParagraphStyle:");
-public static final int sel_highlightMode = sel_registerName("highlightMode");
-public static final int sel_voice = sel_registerName("voice");
-public static final int sel_hostName = sel_registerName("hostName");
-public static final int sel_removeAccessoryController_1 = sel_registerName("removeAccessoryController:");
-public static final int sel_rowsInRect_1 = sel_registerName("rowsInRect:");
-public static final int sel_registerImageRepClass_1 = sel_registerName("registerImageRepClass:");
-public static final int sel_value_1withObjCType_1 = sel_registerName("value:withObjCType:");
-public static final int sel_enclosingMenuItem = sel_registerName("enclosingMenuItem");
-public static final int sel_exposedBindings = sel_registerName("exposedBindings");
-public static final int sel_setSharedScriptSuiteRegistry_1 = sel_registerName("setSharedScriptSuiteRegistry:");
-public static final int sel_readablePasteboardTypes = sel_registerName("readablePasteboardTypes");
-public static final int sel_drawViewBackgroundInRect_1 = sel_registerName("drawViewBackgroundInRect:");
-public static final int sel_setDataCell_1 = sel_registerName("setDataCell:");
-public static final int sel_dataRepresentationOfType_1 = sel_registerName("dataRepresentationOfType:");
-public static final int sel_setOrientation_1 = sel_registerName("setOrientation:");
-public static final int sel_setFileWrapper_1 = sel_registerName("setFileWrapper:");
-public static final int sel_runModalOpenPanel_1forTypes_1 = sel_registerName("runModalOpenPanel:forTypes:");
-public static final int sel_adjustSubviews = sel_registerName("adjustSubviews");
-public static final int sel_setCurrencyDecimalSeparator_1 = sel_registerName("setCurrencyDecimalSeparator:");
-public static final int sel_needsDisplay = sel_registerName("needsDisplay");
-public static final int sel_insertValue_1atIndex_1inPropertyWithKey_1 = sel_registerName("insertValue:atIndex:inPropertyWithKey:");
-public static final int sel_setTextStorage_1 = sel_registerName("setTextStorage:");
-public static final int sel_isAlternate = sel_registerName("isAlternate");
-public static final int sel_setOutputFormat_1 = sel_registerName("setOutputFormat:");
-public static final int sel_comboBoxWillPopUp_1 = sel_registerName("comboBoxWillPopUp:");
-public static final int sel_insertChild_1 = sel_registerName("insertChild:");
-public static final int sel_initWithCommandDescription_1 = sel_registerName("initWithCommandDescription:");
-public static final int sel_setLineDash_1count_1phase_1 = sel_registerName("setLineDash:count:phase:");
-public static final int sel_setHardInvalidation_1forGlyphRange_1 = sel_registerName("setHardInvalidation:forGlyphRange:");
-public static final int sel_setAllowsToolTipsWhenApplicationIsInactive_1 = sel_registerName("setAllowsToolTipsWhenApplicationIsInactive:");
-public static final int sel_tableView_1namesOfPromisedFilesDroppedAtDestination_1forDraggedRowsWithIndexes_1 = sel_registerName("tableView:namesOfPromisedFilesDroppedAtDestination:forDraggedRowsWithIndexes:");
-public static final int sel_highlightedItemIndex = sel_registerName("highlightedItemIndex");
-public static final int sel_trailingOffset = sel_registerName("trailingOffset");
-public static final int sel_layer = sel_registerName("layer");
-public static final int sel_isDeletableFileAtPath_1 = sel_registerName("isDeletableFileAtPath:");
-public static final int sel_textUnfilteredTypes = sel_registerName("textUnfilteredTypes");
-public static final int sel_gregorianStartDate = sel_registerName("gregorianStartDate");
-public static final int sel_isDocumentEdited = sel_registerName("isDocumentEdited");
-public static final int sel_colorWithCalibratedWhite_1alpha_1 = sel_registerName("colorWithCalibratedWhite:alpha:");
-public static final int sel_shouldRunSavePanelWithAccessoryView = sel_registerName("shouldRunSavePanelWithAccessoryView");
-public static final int sel_finishEncoding = sel_registerName("finishEncoding");
-public static final int sel_setKeyCell_1 = sel_registerName("setKeyCell:");
-public static final int sel_isPartialStringValid_1newEditingString_1errorDescription_1 = sel_registerName("isPartialStringValid:newEditingString:errorDescription:");
-public static final int sel_setRangeContainerObject_1 = sel_registerName("setRangeContainerObject:");
-public static final int sel_typeOfFile_1error_1 = sel_registerName("typeOfFile:error:");
-public static final int sel_disappearingItemCursor = sel_registerName("disappearingItemCursor");
-public static final int sel_textureMaxMipMapLevel = sel_registerName("textureMaxMipMapLevel");
-public static final int sel_setEraSymbols_1 = sel_registerName("setEraSymbols:");
-public static final int sel_setBordered_1 = sel_registerName("setBordered:");
-public static final int sel_precomposedStringWithCanonicalMapping = sel_registerName("precomposedStringWithCanonicalMapping");
-public static final int sel_setEnabled_1 = sel_registerName("setEnabled:");
-public static final int sel_setChildrenKeyPath_1 = sel_registerName("setChildrenKeyPath:");
-public static final int sel_applicationDidBecomeActive_1 = sel_registerName("applicationDidBecomeActive:");
-public static final int sel_setCancelButtonCell_1 = sel_registerName("setCancelButtonCell:");
-public static final int sel_backgroundFilters = sel_registerName("backgroundFilters");
-public static final int sel_indexOfCellWithTag_1 = sel_registerName("indexOfCellWithTag:");
-public static final int sel_UTF8String = sel_registerName("UTF8String");
-public static final int sel_horizontalPagination = sel_registerName("horizontalPagination");
-public static final int sel_allowedInputSourceLocales = sel_registerName("allowedInputSourceLocales");
-public static final int sel_toolbar = sel_registerName("toolbar");
-public static final int sel_setGeneratesDecimalNumbers_1 = sel_registerName("setGeneratesDecimalNumbers:");
-public static final int sel_highlight_1withFrame_1inView_1 = sel_registerName("highlight:withFrame:inView:");
-public static final int sel_rotation = sel_registerName("rotation");
-public static final int sel_colorForControlTint_1 = sel_registerName("colorForControlTint:");
-public static final int sel_mutableString = sel_registerName("mutableString");
-public static final int sel_shadowWithLevel_1 = sel_registerName("shadowWithLevel:");
-public static final int sel_frameRectForContentRect_1styleMask_1 = sel_registerName("frameRectForContentRect:styleMask:");
-public static final int sel_numberOfColorComponents = sel_registerName("numberOfColorComponents");
-public static final int sel_alternateImage = sel_registerName("alternateImage");
-public static final int sel_initWithString_1relativeToURL_1 = sel_registerName("initWithString:relativeToURL:");
-public static final int sel_pageOrder = sel_registerName("pageOrder");
-public static final int sel_cancel_1 = sel_registerName("cancel:");
-public static final int sel_declareTypes_1owner_1 = sel_registerName("declareTypes:owner:");
-public static final int sel_lastObject = sel_registerName("lastObject");
-public static final int sel_type_1conformsToType_1 = sel_registerName("type:conformsToType:");
-public static final int sel_mutableArrayValueForKey_1 = sel_registerName("mutableArrayValueForKey:");
-public static final int sel_initWithName_1host_1 = sel_registerName("initWithName:host:");
-public static final int sel_keyEquivalentWidth = sel_registerName("keyEquivalentWidth");
-public static final int sel_modifier = sel_registerName("modifier");
-public static final int sel_setPerMillSymbol_1 = sel_registerName("setPerMillSymbol:");
-public static final int sel_setToolbar_1 = sel_registerName("setToolbar:");
-public static final int sel_changeAttributes_1 = sel_registerName("changeAttributes:");
-public static final int sel_removeItemWithTitle_1 = sel_registerName("removeItemWithTitle:");
-public static final int sel_setAspectRatio_1 = sel_registerName("setAspectRatio:");
-public static final int sel_undoManagerForTextView_1 = sel_registerName("undoManagerForTextView:");
-public static final int sel_clickedPathComponentCell = sel_registerName("clickedPathComponentCell");
-public static final int sel_commentWithStringValue_1 = sel_registerName("commentWithStringValue:");
-public static final int sel_initWithContainerSpecifier_1key_1 = sel_registerName("initWithContainerSpecifier:key:");
-public static final int sel_windowWillReturnUndoManager_1 = sel_registerName("windowWillReturnUndoManager:");
-public static final int sel_imageAndTitleOffset = sel_registerName("imageAndTitleOffset");
-public static final int sel_initialize = sel_registerName("initialize");
-public static final int sel_truncatesLastVisibleLine = sel_registerName("truncatesLastVisibleLine");
-public static final int sel_setExponentSymbol_1 = sel_registerName("setExponentSymbol:");
-public static final int sel_setCurrentProgress_1 = sel_registerName("setCurrentProgress:");
-public static final int sel_initWithContentsOfFile_1options_1error_1 = sel_registerName("initWithContentsOfFile:options:error:");
-public static final int sel_titleCell = sel_registerName("titleCell");
-public static final int sel_setCurrencySymbol_1 = sel_registerName("setCurrencySymbol:");
-public static final int sel_usesScreenFonts = sel_registerName("usesScreenFonts");
-public static final int sel_propertyList = sel_registerName("propertyList");
-public static final int sel_subgroups = sel_registerName("subgroups");
-public static final int sel_setFloatValue_1knobProportion_1 = sel_registerName("setFloatValue:knobProportion:");
-public static final int sel_componentsJoinedByString_1 = sel_registerName("componentsJoinedByString:");
-public static final int sel_initWithICCProfileData_1 = sel_registerName("initWithICCProfileData:");
-public static final int sel_setNextKeyView_1 = sel_registerName("setNextKeyView:");
-public static final int sel_setAnimationCurve_1 = sel_registerName("setAnimationCurve:");
-public static final int sel_tokenFieldCell_1completionsForSubstring_1indexOfToken_1indexOfSelectedItem_1 = sel_registerName("tokenFieldCell:completionsForSubstring:indexOfToken:indexOfSelectedItem:");
-public static final int sel_takeValuesFromDictionary_1 = sel_registerName("takeValuesFromDictionary:");
-public static final int sel_imageRepClassForPasteboardType_1 = sel_registerName("imageRepClassForPasteboardType:");
-public static final int sel_setPlaybackDeviceIdentifier_1 = sel_registerName("setPlaybackDeviceIdentifier:");
-public static final int sel_globallyUniqueString = sel_registerName("globallyUniqueString");
-public static final int sel_setLineWidth_1 = sel_registerName("setLineWidth:");
-public static final int sel_selectedColumnIndexes = sel_registerName("selectedColumnIndexes");
-public static final int sel_addWindowsItem_1title_1filename_1 = sel_registerName("addWindowsItem:title:filename:");
-public static final int sel_truncateFileAtOffset_1 = sel_registerName("truncateFileAtOffset:");
-public static final int sel_setStandardOutput_1 = sel_registerName("setStandardOutput:");
-public static final int sel_encodeInt32_1forKey_1 = sel_registerName("encodeInt32:forKey:");
-public static final int sel_baselineDeltaForCharacterAtIndex_1 = sel_registerName("baselineDeltaForCharacterAtIndex:");
-public static final int sel_setValueWraps_1 = sel_registerName("setValueWraps:");
-public static final int sel_addOperation_1 = sel_registerName("addOperation:");
-public static final int sel_resignKeyWindow = sel_registerName("resignKeyWindow");
-public static final int sel_insertNewline_1 = sel_registerName("insertNewline:");
-public static final int sel_saveFrameUsingName_1 = sel_registerName("saveFrameUsingName:");
-public static final int sel_setWithObjects_1 = sel_registerName("setWithObjects:");
-public static final int sel_indexOfItemWithTarget_1andAction_1 = sel_registerName("indexOfItemWithTarget:andAction:");
-public static final int sel_processEditing = sel_registerName("processEditing");
-public static final int sel_removeValueAtIndex_1fromPropertyWithKey_1 = sel_registerName("removeValueAtIndex:fromPropertyWithKey:");
-public static final int sel_setShouldCascadeWindows_1 = sel_registerName("setShouldCascadeWindows:");
-public static final int sel_stepBack_1 = sel_registerName("stepBack:");
-public static final int sel_lockWhenCondition_1beforeDate_1 = sel_registerName("lockWhenCondition:beforeDate:");
-public static final int sel_realm = sel_registerName("realm");
-public static final int sel_appendBezierPathWithPackedGlyphs_1 = sel_registerName("appendBezierPathWithPackedGlyphs:");
-public static final int sel_inputStreamWithData_1 = sel_registerName("inputStreamWithData:");
-public static final int sel_clickedRow = sel_registerName("clickedRow");
-public static final int sel_animationShouldStart_1 = sel_registerName("animationShouldStart:");
-public static final int sel_appleEventCodeForKey_1 = sel_registerName("appleEventCodeForKey:");
-public static final int sel_sendAction_1to_1forAllCells_1 = sel_registerName("sendAction:to:forAllCells:");
-public static final int sel_writableTypesForSaveOperation_1 = sel_registerName("writableTypesForSaveOperation:");
-public static final int sel_drawWellInside_1 = sel_registerName("drawWellInside:");
-public static final int sel_intersectsSet_1 = sel_registerName("intersectsSet:");
-public static final int sel_runOperationModalForWindow_1delegate_1didRunSelector_1contextInfo_1 = sel_registerName("runOperationModalForWindow:delegate:didRunSelector:contextInfo:");
-public static final int sel_setAllowsEmptySelection_1 = sel_registerName("setAllowsEmptySelection:");
-public static final int sel_tighteningFactorForTruncation = sel_registerName("tighteningFactorForTruncation");
-public static final int sel_insertDescriptor_1atIndex_1 = sel_registerName("insertDescriptor:atIndex:");
-public static final int sel_setDefaultBehavior_1 = sel_registerName("setDefaultBehavior:");
-public static final int sel_allowsFloats = sel_registerName("allowsFloats");
-public static final int sel_representedObject = sel_registerName("representedObject");
+public static final int sel_init = sel_registerName("init");
+public static final int sel_initListDescriptor = sel_registerName("initListDescriptor");
+public static final int sel_initWithAttributes_ = sel_registerName("initWithAttributes:");
+public static final int sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_ = sel_registerName("initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bitmapFormat:bytesPerRow:bitsPerPixel:");
+public static final int sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_ = sel_registerName("initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bytesPerRow:bitsPerPixel:");
+public static final int sel_initWithContainerSize_ = sel_registerName("initWithContainerSize:");
+public static final int sel_initWithContentRect_styleMask_backing_defer_ = sel_registerName("initWithContentRect:styleMask:backing:defer:");
+public static final int sel_initWithContentRect_styleMask_backing_defer_screen_ = sel_registerName("initWithContentRect:styleMask:backing:defer:screen:");
+public static final int sel_initWithData_ = sel_registerName("initWithData:");
+public static final int sel_initWithDictionary_ = sel_registerName("initWithDictionary:");
+public static final int sel_initWithFrame_ = sel_registerName("initWithFrame:");
+public static final int sel_initWithFrame_frameName_groupName_ = sel_registerName("initWithFrame:frameName:groupName:");
+public static final int sel_initWithFrame_pixelFormat_ = sel_registerName("initWithFrame:pixelFormat:");
+public static final int sel_initWithFrame_pullsDown_ = sel_registerName("initWithFrame:pullsDown:");
+public static final int sel_initWithIdentifier_ = sel_registerName("initWithIdentifier:");
+public static final int sel_initWithImage_hotSpot_ = sel_registerName("initWithImage:hotSpot:");
+public static final int sel_initWithIndex_ = sel_registerName("initWithIndex:");
+public static final int sel_initWithIndexesInRange_ = sel_registerName("initWithIndexesInRange:");
+public static final int sel_initWithSize_ = sel_registerName("initWithSize:");
+public static final int sel_initWithStartingColor_endingColor_ = sel_registerName("initWithStartingColor:endingColor:");
+public static final int sel_initWithString_ = sel_registerName("initWithString:");
+public static final int sel_initWithString_attributes_ = sel_registerName("initWithString:attributes:");
+public static final int sel_initWithTitle_ = sel_registerName("initWithTitle:");
+public static final int sel_initWithTitle_action_keyEquivalent_ = sel_registerName("initWithTitle:action:keyEquivalent:");
+public static final int sel_initWithTransform_ = sel_registerName("initWithTransform:");
+public static final int sel_initWithURL_ = sel_registerName("initWithURL:");
+public static final int sel_insertItem_atIndex_ = sel_registerName("insertItem:atIndex:");
+public static final int sel_insertItemWithObjectValue_atIndex_ = sel_registerName("insertItemWithObjectValue:atIndex:");
+public static final int sel_insertTabViewItem_atIndex_ = sel_registerName("insertTabViewItem:atIndex:");
+public static final int sel_insertText_ = sel_registerName("insertText:");
+public static final int sel_intValue = sel_registerName("intValue");
+public static final int sel_interpretKeyEvents_ = sel_registerName("interpretKeyEvents:");
+public static final int sel_invalidate = sel_registerName("invalidate");
+public static final int sel_invert = sel_registerName("invert");
+public static final int sel_isEmpty = sel_registerName("isEmpty");
+public static final int sel_isEqual_ = sel_registerName("isEqual:");
+public static final int sel_isEqualTo_ = sel_registerName("isEqualTo:");
+public static final int sel_isFilePackageAtPath_ = sel_registerName("isFilePackageAtPath:");
 public static final int sel_isFlipped = sel_registerName("isFlipped");
-public static final int sel_rectOfColumn_1 = sel_registerName("rectOfColumn:");
-public static final int sel_setFrame_1display_1 = sel_registerName("setFrame:display:");
-public static final int sel_setTextAttributesForPositiveInfinity_1 = sel_registerName("setTextAttributesForPositiveInfinity:");
-public static final int sel_textUnfilteredFileTypes = sel_registerName("textUnfilteredFileTypes");
-public static final int sel_bezierPathByFlatteningPath = sel_registerName("bezierPathByFlatteningPath");
-public static final int sel_week = sel_registerName("week");
-public static final int sel_takeIntValueFrom_1 = sel_registerName("takeIntValueFrom:");
-public static final int sel_setWantsNotificationForMarkedText_1 = sel_registerName("setWantsNotificationForMarkedText:");
-public static final int sel_stringByPaddingToLength_1withString_1startingAtIndex_1 = sel_registerName("stringByPaddingToLength:withString:startingAtIndex:");
-public static final int sel_stopModal = sel_registerName("stopModal");
-public static final int sel_veryShortWeekdaySymbols = sel_registerName("veryShortWeekdaySymbols");
-public static final int sel_user = sel_registerName("user");
-public static final int sel_animation_1didReachProgressMark_1 = sel_registerName("animation:didReachProgressMark:");
-public static final int sel_fontWithName_1size_1 = sel_registerName("fontWithName:size:");
-public static final int sel_selectWord_1 = sel_registerName("selectWord:");
-public static final int sel_initWithDuration_1animationCurve_1 = sel_registerName("initWithDuration:animationCurve:");
-public static final int sel_afmDictionary = sel_registerName("afmDictionary");
-public static final int sel_canChooseFiles = sel_registerName("canChooseFiles");
-public static final int sel_defaultLineWidth = sel_registerName("defaultLineWidth");
-public static final int sel_childAtIndex_1 = sel_registerName("childAtIndex:");
-public static final int sel_pathForResource_1ofType_1inDirectory_1 = sel_registerName("pathForResource:ofType:inDirectory:");
-public static final int sel_outlineView_1heightOfRowByItem_1 = sel_registerName("outlineView:heightOfRowByItem:");
-public static final int sel_PMSymbol = sel_registerName("PMSymbol");
-public static final int sel_setBackgroundStyle_1 = sel_registerName("setBackgroundStyle:");
-public static final int sel_decimalSeparator = sel_registerName("decimalSeparator");
-public static final int sel_knobThickness = sel_registerName("knobThickness");
-public static final int sel_request = sel_registerName("request");
-public static final int sel_indicesOfObjectsByEvaluatingWithContainer_1count_1 = sel_registerName("indicesOfObjectsByEvaluatingWithContainer:count:");
-public static final int sel_objectByApplyingXSLTString_1arguments_1error_1 = sel_registerName("objectByApplyingXSLTString:arguments:error:");
-public static final int sel_colorizeByMappingGray_1toColor_1blackMapping_1whiteMapping_1 = sel_registerName("colorizeByMappingGray:toColor:blackMapping:whiteMapping:");
-public static final int sel_minusSet_1 = sel_registerName("minusSet:");
-public static final int sel_setAutomaticallyRearrangesObjects_1 = sel_registerName("setAutomaticallyRearrangesObjects:");
-public static final int sel_fixFontAttributeInRange_1 = sel_registerName("fixFontAttributeInRange:");
-public static final int sel_frameRotation = sel_registerName("frameRotation");
-public static final int sel_addObserver_1forKeyPath_1options_1context_1 = sel_registerName("addObserver:forKeyPath:options:context:");
-public static final int sel_collectionNames = sel_registerName("collectionNames");
-public static final int sel_titleOfColumn_1 = sel_registerName("titleOfColumn:");
-public static final int sel_characterIdentifier = sel_registerName("characterIdentifier");
-public static final int sel_setPanelFont_1isMultiple_1 = sel_registerName("setPanelFont:isMultiple:");
-public static final int sel_ruleThickness = sel_registerName("ruleThickness");
-public static final int sel_customSelector = sel_registerName("customSelector");
-public static final int sel_startSpeakingString_1toURL_1 = sel_registerName("startSpeakingString:toURL:");
-public static final int sel_language = sel_registerName("language");
-public static final int sel_draggedImage_1endedAt_1operation_1 = sel_registerName("draggedImage:endedAt:operation:");
-public static final int sel_removeSelectionIndexPaths_1 = sel_registerName("removeSelectionIndexPaths:");
-public static final int sel_TIFFRepresentationOfImageRepsInArray_1 = sel_registerName("TIFFRepresentationOfImageRepsInArray:");
-public static final int sel_setSet_1 = sel_registerName("setSet:");
-public static final int sel_stringWithCString_1length_1 = sel_registerName("stringWithCString:length:");
-public static final int sel_objectsByEvaluatingSpecifier = sel_registerName("objectsByEvaluatingSpecifier");
-public static final int sel_subarrayWithRange_1 = sel_registerName("subarrayWithRange:");
-public static final int sel_collectIfNeeded = sel_registerName("collectIfNeeded");
-public static final int sel_pathWithComponents_1 = sel_registerName("pathWithComponents:");
-public static final int sel_autoreleasedObjectCount = sel_registerName("autoreleasedObjectCount");
-public static final int sel_addCharactersInString_1 = sel_registerName("addCharactersInString:");
-public static final int sel_setTemplate_1 = sel_registerName("setTemplate:");
-public static final int sel_indexOfObjectIdenticalTo_1 = sel_registerName("indexOfObjectIdenticalTo:");
-public static final int sel_setRepresentation = sel_registerName("setRepresentation");
-public static final int sel_URLResourceDidFinishLoading_1 = sel_registerName("URLResourceDidFinishLoading:");
-public static final int sel_type = sel_registerName("type");
-public static final int sel_setMarkedText_1selectedRange_1 = sel_registerName("setMarkedText:selectedRange:");
-public static final int sel_dictionaryWithObjects_1forKeys_1 = sel_registerName("dictionaryWithObjects:forKeys:");
-public static final int sel_wantsToDelayTextChangeNotifications = sel_registerName("wantsToDelayTextChangeNotifications");
-public static final int sel_setCompletes_1 = sel_registerName("setCompletes:");
-public static final int sel_releaseGState = sel_registerName("releaseGState");
-public static final int sel_descriptorWithEnumCode_1 = sel_registerName("descriptorWithEnumCode:");
-public static final int sel_label = sel_registerName("label");
-public static final int sel_run = sel_registerName("run");
-public static final int sel_hasHorizontalRuler = sel_registerName("hasHorizontalRuler");
-public static final int sel_rowClass = sel_registerName("rowClass");
-public static final int sel_automaticRearrangementKeyPaths = sel_registerName("automaticRearrangementKeyPaths");
-public static final int sel_fileManager_1shouldProceedAfterError_1movingItemAtPath_1toPath_1 = sel_registerName("fileManager:shouldProceedAfterError:movingItemAtPath:toPath:");
-public static final int sel_writeToURL_1atomically_1encoding_1error_1 = sel_registerName("writeToURL:atomically:encoding:error:");
-public static final int sel_deviceID = sel_registerName("deviceID");
-public static final int sel_descriptorWithInt32_1 = sel_registerName("descriptorWithInt32:");
-public static final int sel_encodeInt64_1forKey_1 = sel_registerName("encodeInt64:forKey:");
-public static final int sel_insertEntry_1atIndex_1 = sel_registerName("insertEntry:atIndex:");
-public static final int sel_leftMargin = sel_registerName("leftMargin");
-public static final int sel_setKeyEquivalentFont_1size_1 = sel_registerName("setKeyEquivalentFont:size:");
-public static final int sel_colorWithDeviceHue_1saturation_1brightness_1alpha_1 = sel_registerName("colorWithDeviceHue:saturation:brightness:alpha:");
-public static final int sel_nextState = sel_registerName("nextState");
-public static final int sel_scanHexInt_1 = sel_registerName("scanHexInt:");
-public static final int sel_lineSpacing = sel_registerName("lineSpacing");
-public static final int sel_textureTarget = sel_registerName("textureTarget");
-public static final int sel_miniaturize_1 = sel_registerName("miniaturize:");
-public static final int sel_browser_1namesOfPromisedFilesDroppedAtDestination_1forDraggedRowsWithIndexes_1inColumn_1 = sel_registerName("browser:namesOfPromisedFilesDroppedAtDestination:forDraggedRowsWithIndexes:inColumn:");
-public static final int sel_localizedNameForTIFFCompressionType_1 = sel_registerName("localizedNameForTIFFCompressionType:");
-public static final int sel_acceptConnectionInBackgroundAndNotifyForModes_1 = sel_registerName("acceptConnectionInBackgroundAndNotifyForModes:");
-public static final int sel_setCanBecomeVisibleWithoutLogin_1 = sel_registerName("setCanBecomeVisibleWithoutLogin:");
-public static final int sel_dictionaryWithObjectsAndKeys_1 = sel_registerName("dictionaryWithObjectsAndKeys:");
-public static final int sel_ensureGlyphsForGlyphRange_1 = sel_registerName("ensureGlyphsForGlyphRange:");
-public static final int sel_indexOfTickMarkAtPoint_1 = sel_registerName("indexOfTickMarkAtPoint:");
-public static final int sel_dayOfWeek = sel_registerName("dayOfWeek");
-public static final int sel_glyphRangeForCharacterRange_1actualCharacterRange_1 = sel_registerName("glyphRangeForCharacterRange:actualCharacterRange:");
-public static final int sel_enableCollectorForPointer_1 = sel_registerName("enableCollectorForPointer:");
-public static final int sel_rulerView_1willMoveMarker_1toLocation_1 = sel_registerName("rulerView:willMoveMarker:toLocation:");
-public static final int sel_comboBoxCell_1objectValueForItemAtIndex_1 = sel_registerName("comboBoxCell:objectValueForItemAtIndex:");
-public static final int sel_setValidateSize_1 = sel_registerName("setValidateSize:");
-public static final int sel_controlTint = sel_registerName("controlTint");
-public static final int sel_deselectItemAtIndex_1 = sel_registerName("deselectItemAtIndex:");
-public static final int sel_defaultWindingRule = sel_registerName("defaultWindingRule");
-public static final int sel_setMaxValue_1 = sel_registerName("setMaxValue:");
-public static final int sel_longEraSymbols = sel_registerName("longEraSymbols");
-public static final int sel_canRedo = sel_registerName("canRedo");
-public static final int sel_arguments = sel_registerName("arguments");
-public static final int sel_windows = sel_registerName("windows");
-public static final int sel_downloadDidBegin_1 = sel_registerName("downloadDidBegin:");
-public static final int sel_pasteboard_1provideDataForType_1 = sel_registerName("pasteboard:provideDataForType:");
-public static final int sel_length = sel_registerName("length");
-public static final int sel_imagePosition = sel_registerName("imagePosition");
-public static final int sel_setAllowedFileTypes_1 = sel_registerName("setAllowedFileTypes:");
-public static final int sel_moveForwardAndModifySelection_1 = sel_registerName("moveForwardAndModifySelection:");
-public static final int sel_filename = sel_registerName("filename");
-public static final int sel_mountedLocalVolumePaths = sel_registerName("mountedLocalVolumePaths");
-public static final int sel_sharedFontManager = sel_registerName("sharedFontManager");
-public static final int sel_dictionaryWithObjects_1forKeys_1count_1 = sel_registerName("dictionaryWithObjects:forKeys:count:");
-public static final int sel_transpose_1 = sel_registerName("transpose:");
-public static final int sel_drawTitleWithFrame_1inView_1 = sel_registerName("drawTitleWithFrame:inView:");
-public static final int sel_worksWhenModal = sel_registerName("worksWhenModal");
-public static final int sel_registerClassDescription_1 = sel_registerName("registerClassDescription:");
-public static final int sel_setAllowsTruncatedLabels_1 = sel_registerName("setAllowsTruncatedLabels:");
-public static final int sel_bezierPathWithRoundedRect_1xRadius_1yRadius_1 = sel_registerName("bezierPathWithRoundedRect:xRadius:yRadius:");
-public static final int sel_prefix = sel_registerName("prefix");
-public static final int sel_usesStrongWriteBarrier = sel_registerName("usesStrongWriteBarrier");
-public static final int sel_argumentNames = sel_registerName("argumentNames");
-public static final int sel_setCaseSensitive_1 = sel_registerName("setCaseSensitive:");
-public static final int sel_outlineView_1didClickTableColumn_1 = sel_registerName("outlineView:didClickTableColumn:");
-public static final int sel_textDidBeginEditing_1 = sel_registerName("textDidBeginEditing:");
-public static final int sel_visibleRect = sel_registerName("visibleRect");
-public static final int sel_isSubviewCollapsed_1 = sel_registerName("isSubviewCollapsed:");
-public static final int sel_completionsForPartialWordRange_1indexOfSelectedItem_1 = sel_registerName("completionsForPartialWordRange:indexOfSelectedItem:");
-public static final int sel_setMinDate_1 = sel_registerName("setMinDate:");
-public static final int sel_colorFromPasteboard_1 = sel_registerName("colorFromPasteboard:");
-public static final int sel_instanceMethodSignatureForSelector_1 = sel_registerName("instanceMethodSignatureForSelector:");
-public static final int sel_makeCellAtRow_1column_1 = sel_registerName("makeCellAtRow:column:");
-public static final int sel_pasteAsPlainText_1 = sel_registerName("pasteAsPlainText:");
-public static final int sel_willRemoveSubview_1 = sel_registerName("willRemoveSubview:");
-public static final int sel_beginSheet_1modalForWindow_1modalDelegate_1didEndSelector_1contextInfo_1 = sel_registerName("beginSheet:modalForWindow:modalDelegate:didEndSelector:contextInfo:");
-public static final int sel_notificationCenterForType_1 = sel_registerName("notificationCenterForType:");
-public static final int sel_isDaylightSavingTimeForDate_1 = sel_registerName("isDaylightSavingTimeForDate:");
-public static final int sel_load = sel_registerName("load");
-public static final int sel_menuForSegment_1 = sel_registerName("menuForSegment:");
-public static final int sel_scheduledTimerWithTimeInterval_1invocation_1repeats_1 = sel_registerName("scheduledTimerWithTimeInterval:invocation:repeats:");
-public static final int sel_unregisterClass_1 = sel_registerName("unregisterClass:");
-public static final int sel_setByAddingObjectsFromSet_1 = sel_registerName("setByAddingObjectsFromSet:");
-public static final int sel_setDepthLimit_1 = sel_registerName("setDepthLimit:");
-public static final int sel_setVeryShortMonthSymbols_1 = sel_registerName("setVeryShortMonthSymbols:");
-public static final int sel_writeToURL_1ofType_1forSaveOperation_1originalContentsURL_1error_1 = sel_registerName("writeToURL:ofType:forSaveOperation:originalContentsURL:error:");
-public static final int sel_directoryAttributes = sel_registerName("directoryAttributes");
-public static final int sel_otherMouseDown_1 = sel_registerName("otherMouseDown:");
-public static final int sel_unhideWithoutActivation = sel_registerName("unhideWithoutActivation");
-public static final int sel_initWithContainerClassDescription_1containerSpecifier_1key_1startSpecifier_1endSpecifier_1 = sel_registerName("initWithContainerClassDescription:containerSpecifier:key:startSpecifier:endSpecifier:");
-public static final int sel_setHasHorizontalScroller_1 = sel_registerName("setHasHorizontalScroller:");
-public static final int sel_trackMouse_1adding_1 = sel_registerName("trackMouse:adding:");
-public static final int sel_substituteGlyphsInRange_1withGlyphs_1 = sel_registerName("substituteGlyphsInRange:withGlyphs:");
-public static final int sel_drawCell_1 = sel_registerName("drawCell:");
-public static final int sel_currentCursor = sel_registerName("currentCursor");
-public static final int sel_maxSize = sel_registerName("maxSize");
-public static final int sel_cookiesWithResponseHeaderFields_1forURL_1 = sel_registerName("cookiesWithResponseHeaderFields:forURL:");
-public static final int sel_isBycopy = sel_registerName("isBycopy");
-public static final int sel_addCursorRect_1cursor_1 = sel_registerName("addCursorRect:cursor:");
-public static final int sel_accessibilityActionNames = sel_registerName("accessibilityActionNames");
-public static final int sel_openDocumentWithContentsOfURL_1display_1error_1 = sel_registerName("openDocumentWithContentsOfURL:display:error:");
-public static final int sel_templateViews = sel_registerName("templateViews");
-public static final int sel_keyPath = sel_registerName("keyPath");
-public static final int sel_minValue = sel_registerName("minValue");
-public static final int sel_setImageDimsWhenDisabled_1 = sel_registerName("setImageDimsWhenDisabled:");
-public static final int sel_appendData_1 = sel_registerName("appendData:");
-public static final int sel_netServiceBrowser_1didFindDomain_1moreComing_1 = sel_registerName("netServiceBrowser:didFindDomain:moreComing:");
-public static final int sel_initWithDescriptorType_1bytes_1length_1 = sel_registerName("initWithDescriptorType:bytes:length:");
-public static final int sel_hasReadablePropertyForKey_1 = sel_registerName("hasReadablePropertyForKey:");
-public static final int sel_stopWhenAnimation_1reachesProgress_1 = sel_registerName("stopWhenAnimation:reachesProgress:");
-public static final int sel_setWorksWhenModal_1 = sel_registerName("setWorksWhenModal:");
-public static final int sel_localizedInputManagerName = sel_registerName("localizedInputManagerName");
-public static final int sel_knobColor = sel_registerName("knobColor");
-public static final int sel_screens = sel_registerName("screens");
-public static final int sel_deminiaturize_1 = sel_registerName("deminiaturize:");
-public static final int sel_bundleIdentifier = sel_registerName("bundleIdentifier");
-public static final int sel_setLoopMode_1 = sel_registerName("setLoopMode:");
-public static final int sel_expandItem_1expandChildren_1 = sel_registerName("expandItem:expandChildren:");
-public static final int sel_dataWithContentsOfFile_1options_1error_1 = sel_registerName("dataWithContentsOfFile:options:error:");
-public static final int sel_lineBreakBeforeIndex_1withinRange_1 = sel_registerName("lineBreakBeforeIndex:withinRange:");
-public static final int sel_fileOwnerAccountName = sel_registerName("fileOwnerAccountName");
-public static final int sel_insertColumn_1withCells_1 = sel_registerName("insertColumn:withCells:");
-public static final int sel_windowLevel = sel_registerName("windowLevel");
-public static final int sel_setGrammarCheckingEnabled_1 = sel_registerName("setGrammarCheckingEnabled:");
-public static final int sel_shortStandaloneWeekdaySymbols = sel_registerName("shortStandaloneWeekdaySymbols");
-public static final int sel_push = sel_registerName("push");
-public static final int sel_initWithContentsOfFile_1ofType_1 = sel_registerName("initWithContentsOfFile:ofType:");
-public static final int sel_removePortForName_1 = sel_registerName("removePortForName:");
-public static final int sel_setMaximumRecents_1 = sel_registerName("setMaximumRecents:");
-public static final int sel_supermenu = sel_registerName("supermenu");
-public static final int sel_setWidth_1type_1forLayer_1edge_1 = sel_registerName("setWidth:type:forLayer:edge:");
-public static final int sel_itemRemoved_1 = sel_registerName("itemRemoved:");
-public static final int sel_initWithBytesNoCopy_1length_1 = sel_registerName("initWithBytesNoCopy:length:");
-public static final int sel_printer = sel_registerName("printer");
-public static final int sel_compact = sel_registerName("compact");
-public static final int sel_setDefaultLineWidth_1 = sel_registerName("setDefaultLineWidth:");
-public static final int sel_CGLPixelFormatObj = sel_registerName("CGLPixelFormatObj");
-public static final int sel_initWithDictionary_1copyItems_1 = sel_registerName("initWithDictionary:copyItems:");
-public static final int sel_tableView_1didDragTableColumn_1 = sel_registerName("tableView:didDragTableColumn:");
-public static final int sel_formattingStringsFilename = sel_registerName("formattingStringsFilename");
-public static final int sel_setScrollView_1 = sel_registerName("setScrollView:");
-public static final int sel_value = sel_registerName("value");
-public static final int sel_editedMask = sel_registerName("editedMask");
-public static final int sel_ruleEditor_1displayValueForCriterion_1inRow_1 = sel_registerName("ruleEditor:displayValueForCriterion:inRow:");
-public static final int sel_leading = sel_registerName("leading");
-public static final int sel_titleRect = sel_registerName("titleRect");
-public static final int sel_setColumnsAutosaveName_1 = sel_registerName("setColumnsAutosaveName:");
-public static final int sel_stop_1 = sel_registerName("stop:");
-public static final int sel_titleColor = sel_registerName("titleColor");
-public static final int sel_initWithContainerClassDescription_1containerSpecifier_1key_1test_1 = sel_registerName("initWithContainerClassDescription:containerSpecifier:key:test:");
-public static final int sel_bytesPerPlane = sel_registerName("bytesPerPlane");
-public static final int sel_pageScroll = sel_registerName("pageScroll");
-public static final int sel_groupingAttributes = sel_registerName("groupingAttributes");
-public static final int sel_setAutomaticLinkDetectionEnabled_1 = sel_registerName("setAutomaticLinkDetectionEnabled:");
-public static final int sel_tableView_1mouseDownInHeaderOfTableColumn_1 = sel_registerName("tableView:mouseDownInHeaderOfTableColumn:");
-public static final int sel_representationOfImageRepsInArray_1usingType_1properties_1 = sel_registerName("representationOfImageRepsInArray:usingType:properties:");
-public static final int sel_attributeRuns = sel_registerName("attributeRuns");
-public static final int sel_decodeRect = sel_registerName("decodeRect");
-public static final int sel_drawerDidOpen_1 = sel_registerName("drawerDidOpen:");
-public static final int sel_scrollerWidth = sel_registerName("scrollerWidth");
-public static final int sel_defaultMenu = sel_registerName("defaultMenu");
-public static final int sel_URLProtocol_1didLoadData_1 = sel_registerName("URLProtocol:didLoadData:");
-public static final int sel_allKeys = sel_registerName("allKeys");
-public static final int sel_startPeriodicEventsAfterDelay_1withPeriod_1 = sel_registerName("startPeriodicEventsAfterDelay:withPeriod:");
-public static final int sel_tableViewSelectionDidChange_1 = sel_registerName("tableViewSelectionDidChange:");
-public static final int sel_setStandalone_1 = sel_registerName("setStandalone:");
-public static final int sel_makeMainWindow = sel_registerName("makeMainWindow");
-public static final int sel_moveLeftAndModifySelection_1 = sel_registerName("moveLeftAndModifySelection:");
-public static final int sel_pasteboardWithUniqueName = sel_registerName("pasteboardWithUniqueName");
-public static final int sel_fileSystemFileNumber = sel_registerName("fileSystemFileNumber");
-public static final int sel_jobDisposition = sel_registerName("jobDisposition");
-public static final int sel_setCurrentVirtualScreen_1 = sel_registerName("setCurrentVirtualScreen:");
-public static final int sel_setHasThousandSeparators_1 = sel_registerName("setHasThousandSeparators:");
-public static final int sel_alternateMnemonicLocation = sel_registerName("alternateMnemonicLocation");
-public static final int sel_characterSetWithBitmapRepresentation_1 = sel_registerName("characterSetWithBitmapRepresentation:");
-public static final int sel_startLoading = sel_registerName("startLoading");
-public static final int sel_member_1 = sel_registerName("member:");
-public static final int sel_setSelectedFont_1isMultiple_1 = sel_registerName("setSelectedFont:isMultiple:");
-public static final int sel_monthOfYear = sel_registerName("monthOfYear");
-public static final int sel_restoreCachedImage = sel_registerName("restoreCachedImage");
-public static final int sel_image_1didLoadPartOfRepresentation_1withValidRows_1 = sel_registerName("image:didLoadPartOfRepresentation:withValidRows:");
-public static final int sel_mouseEventWithType_1location_1modifierFlags_1timestamp_1windowNumber_1context_1eventNumber_1clickCount_1pressure_1 = sel_registerName("mouseEventWithType:location:modifierFlags:timestamp:windowNumber:context:eventNumber:clickCount:pressure:");
-public static final int sel_setInternationalCurrencySymbol_1 = sel_registerName("setInternationalCurrencySymbol:");
-public static final int sel_mainThread = sel_registerName("mainThread");
-public static final int sel_lineCapStyle = sel_registerName("lineCapStyle");
-public static final int sel_setDefaultParagraphStyle_1 = sel_registerName("setDefaultParagraphStyle:");
-public static final int sel_cellFrameForTextContainer_1proposedLineFragment_1glyphPosition_1characterIndex_1 = sel_registerName("cellFrameForTextContainer:proposedLineFragment:glyphPosition:characterIndex:");
-public static final int sel_resolveInstanceMethod_1 = sel_registerName("resolveInstanceMethod:");
-public static final int sel_illegalCharacterSet = sel_registerName("illegalCharacterSet");
-public static final int sel_setKnobThickness_1 = sel_registerName("setKnobThickness:");
-public static final int sel_runModalPageLayoutWithPrintInfo_1 = sel_registerName("runModalPageLayoutWithPrintInfo:");
-public static final int sel_popUpContextMenu_1withEvent_1forView_1withFont_1 = sel_registerName("popUpContextMenu:withEvent:forView:withFont:");
-public static final int sel_modalWindow = sel_registerName("modalWindow");
-public static final int sel_autorelease = sel_registerName("autorelease");
-public static final int sel_draggingEntered_1 = sel_registerName("draggingEntered:");
-public static final int sel_allowsTruncatedLabels = sel_registerName("allowsTruncatedLabels");
-public static final int sel_fileDescriptor = sel_registerName("fileDescriptor");
-public static final int sel_ISOLanguageCodes = sel_registerName("ISOLanguageCodes");
-public static final int sel_onStateImage = sel_registerName("onStateImage");
-public static final int sel_imageFrameStyle = sel_registerName("imageFrameStyle");
-public static final int sel_setFloatValue_1 = sel_registerName("setFloatValue:");
-public static final int sel_initWithColors_1atLocations_1colorSpace_1 = sel_registerName("initWithColors:atLocations:colorSpace:");
-public static final int sel_descriptorWithString_1 = sel_registerName("descriptorWithString:");
-public static final int sel_setPoolCountHighWaterMark_1 = sel_registerName("setPoolCountHighWaterMark:");
-public static final int sel_veryShortStandaloneWeekdaySymbols = sel_registerName("veryShortStandaloneWeekdaySymbols");
-public static final int sel_addTypes_1owner_1 = sel_registerName("addTypes:owner:");
-public static final int sel_numberWithLongLong_1 = sel_registerName("numberWithLongLong:");
-public static final int sel_setDay_1 = sel_registerName("setDay:");
-public static final int sel_initWithHTML_1documentAttributes_1 = sel_registerName("initWithHTML:documentAttributes:");
-public static final int sel_replaceSubview_1with_1 = sel_registerName("replaceSubview:with:");
-public static final int sel_makeObjectsPerformSelector_1 = sel_registerName("makeObjectsPerformSelector:");
-public static final int sel_setRunLoopModes_1 = sel_registerName("setRunLoopModes:");
-public static final int sel_getFileSystemRepresentation_1maxLength_1 = sel_registerName("getFileSystemRepresentation:maxLength:");
-public static final int sel_scale = sel_registerName("scale");
-public static final int sel_draggedImageLocation = sel_registerName("draggedImageLocation");
-public static final int sel_setFocusStack_1 = sel_registerName("setFocusStack:");
-public static final int sel_isReadOnlyKey_1 = sel_registerName("isReadOnlyKey:");
-public static final int sel_shadowOffset = sel_registerName("shadowOffset");
-public static final int sel_URLHandleUsingCache_1 = sel_registerName("URLHandleUsingCache:");
-public static final int sel_isWellFormed = sel_registerName("isWellFormed");
-public static final int sel_tokenField_1editingStringForRepresentedObject_1 = sel_registerName("tokenField:editingStringForRepresentedObject:");
-public static final int sel_setGroupsByEvent_1 = sel_registerName("setGroupsByEvent:");
-public static final int sel_parser_1foundComment_1 = sel_registerName("parser:foundComment:");
-public static final int sel_initWithHTML_1baseURL_1documentAttributes_1 = sel_registerName("initWithHTML:baseURL:documentAttributes:");
-public static final int sel_uppercaseWord_1 = sel_registerName("uppercaseWord:");
-public static final int sel_testPart_1 = sel_registerName("testPart:");
-public static final int sel_dataSource = sel_registerName("dataSource");
-public static final int sel_lineRangeForRange_1 = sel_registerName("lineRangeForRange:");
-public static final int sel_hostWithAddress_1 = sel_registerName("hostWithAddress:");
-public static final int sel_removeRunLoop_1 = sel_registerName("removeRunLoop:");
-public static final int sel_fileHandleWithStandardInput = sel_registerName("fileHandleWithStandardInput");
+public static final int sel_isKindOfClass_ = sel_registerName("isKindOfClass:");
+public static final int sel_isOpaque = sel_registerName("isOpaque");
+public static final int sel_isPlanar = sel_registerName("isPlanar");
+public static final int sel_isRowSelected_ = sel_registerName("isRowSelected:");
+public static final int sel_isSessionOnly = sel_registerName("isSessionOnly");
+public static final int sel_isVisible = sel_registerName("isVisible");
 public static final int sel_itemArray = sel_registerName("itemArray");
-public static final int sel_rectOfPathComponentCell_1withFrame_1inView_1 = sel_registerName("rectOfPathComponentCell:withFrame:inView:");
-public static final int sel_TIFFRepresentation = sel_registerName("TIFFRepresentation");
-public static final int sel_archiver_1willReplaceObject_1withObject_1 = sel_registerName("archiver:willReplaceObject:withObject:");
-public static final int sel_currentVirtualScreen = sel_registerName("currentVirtualScreen");
-public static final int sel_gridColor = sel_registerName("gridColor");
-public static final int sel_boundingRectForGlyph_1 = sel_registerName("boundingRectForGlyph:");
-public static final int sel_setDataSource_1 = sel_registerName("setDataSource:");
-public static final int sel_setDefaultLineJoinStyle_1 = sel_registerName("setDefaultLineJoinStyle:");
-public static final int sel_textBlocks = sel_registerName("textBlocks");
-public static final int sel_drawerDidClose_1 = sel_registerName("drawerDidClose:");
-public static final int sel_valueWithName_1inPropertyWithKey_1 = sel_registerName("valueWithName:inPropertyWithKey:");
-public static final int sel_managedObjectModel = sel_registerName("managedObjectModel");
-public static final int sel_outlineView_1persistentObjectForItem_1 = sel_registerName("outlineView:persistentObjectForItem:");
-public static final int sel_setSelectedRange_1 = sel_registerName("setSelectedRange:");
-public static final int sel_magentaComponent = sel_registerName("magentaComponent");
-public static final int sel_setIncrement_1 = sel_registerName("setIncrement:");
-public static final int sel_editingStringForObjectValue_1 = sel_registerName("editingStringForObjectValue:");
-public static final int sel_addClip = sel_registerName("addClip");
-public static final int sel_setSelectionIndex_1 = sel_registerName("setSelectionIndex:");
-public static final int sel_replyAppleEventForSuspensionID_1 = sel_registerName("replyAppleEventForSuspensionID:");
-public static final int sel_URLProtocol_1didFailWithError_1 = sel_registerName("URLProtocol:didFailWithError:");
-public static final int sel_ignoresMouseEvents = sel_registerName("ignoresMouseEvents");
-public static final int sel_dateWithNaturalLanguageString_1locale_1 = sel_registerName("dateWithNaturalLanguageString:locale:");
-public static final int sel_recordDescriptor = sel_registerName("recordDescriptor");
-public static final int sel_makeCurrentContext = sel_registerName("makeCurrentContext");
-public static final int sel_excludedKeys = sel_registerName("excludedKeys");
-public static final int sel_fileManager_1shouldProceedAfterError_1linkingItemAtPath_1toPath_1 = sel_registerName("fileManager:shouldProceedAfterError:linkingItemAtPath:toPath:");
-public static final int sel_set = sel_registerName("set");
+public static final int sel_itemAtIndex_ = sel_registerName("itemAtIndex:");
+public static final int sel_itemAtRow_ = sel_registerName("itemAtRow:");
+public static final int sel_itemObjectValueAtIndex_ = sel_registerName("itemObjectValueAtIndex:");
+public static final int sel_itemTitleAtIndex_ = sel_registerName("itemTitleAtIndex:");
+public static final int sel_jobDisposition = sel_registerName("jobDisposition");
+public static final int sel_keyCode = sel_registerName("keyCode");
+public static final int sel_keyDown_ = sel_registerName("keyDown:");
+public static final int sel_keyUp_ = sel_registerName("keyUp:");
+public static final int sel_keyWindow = sel_registerName("keyWindow");
+public static final int sel_lastPathComponent = sel_registerName("lastPathComponent");
+public static final int sel_leading = sel_registerName("leading");
+public static final int sel_length = sel_registerName("length");
+public static final int sel_levelForItem_ = sel_registerName("levelForItem:");
+public static final int sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_ = sel_registerName("lineFragmentUsedRectForGlyphAtIndex:effectiveRange:");
+public static final int sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_ = sel_registerName("lineFragmentUsedRectForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:");
+public static final int sel_lineToPoint_ = sel_registerName("lineToPoint:");
+public static final int sel_loadHTMLString_baseURL_ = sel_registerName("loadHTMLString:baseURL:");
+public static final int sel_loadNibFile_externalNameTable_withZone_ = sel_registerName("loadNibFile:externalNameTable:withZone:");
+public static final int sel_loadRequest_ = sel_registerName("loadRequest:");
+public static final int sel_localizedDescription = sel_registerName("localizedDescription");
+public static final int sel_locationForGlyphAtIndex_ = sel_registerName("locationForGlyphAtIndex:");
+public static final int sel_locationInWindow = sel_registerName("locationInWindow");
+public static final int sel_lowercaseString = sel_registerName("lowercaseString");
+public static final int sel_mainFrame = sel_registerName("mainFrame");
+public static final int sel_mainMenu = sel_registerName("mainMenu");
+public static final int sel_mainRunLoop = sel_registerName("mainRunLoop");
 public static final int sel_mainScreen = sel_registerName("mainScreen");
-public static final int sel_setVersion_1 = sel_registerName("setVersion:");
-public static final int sel_displayRectIgnoringOpacity_1inContext_1 = sel_registerName("displayRectIgnoringOpacity:inContext:");
-public static final int sel_setNumberOfTickMarks_1 = sel_registerName("setNumberOfTickMarks:");
-public static final int sel_showsHelp = sel_registerName("showsHelp");
-public static final int sel_takeColorFrom_1 = sel_registerName("takeColorFrom:");
-public static final int sel_horizontalPageScroll = sel_registerName("horizontalPageScroll");
-public static final int sel_pointingHandCursor = sel_registerName("pointingHandCursor");
-public static final int sel_vendorID = sel_registerName("vendorID");
-public static final int sel_setSelectedRanges_1affinity_1stillSelecting_1 = sel_registerName("setSelectedRanges:affinity:stillSelecting:");
-public static final int sel_setHTTPShouldHandleCookies_1 = sel_registerName("setHTTPShouldHandleCookies:");
-public static final int sel_initWithType_1location_1 = sel_registerName("initWithType:location:");
-public static final int sel_stringByResolvingSymlinksInPath = sel_registerName("stringByResolvingSymlinksInPath");
-public static final int sel_tryLock = sel_registerName("tryLock");
-public static final int sel_convertSizeFromBase_1 = sel_registerName("convertSizeFromBase:");
-public static final int sel_setCacheMode_1 = sel_registerName("setCacheMode:");
-public static final int sel_entityName = sel_registerName("entityName");
-public static final int sel_takeFloatValueFrom_1 = sel_registerName("takeFloatValueFrom:");
-public static final int sel_showsStateBy = sel_registerName("showsStateBy");
-public static final int sel_highlightedItem = sel_registerName("highlightedItem");
-public static final int sel_superclassDescription = sel_registerName("superclassDescription");
-public static final int sel_flagsChanged_1 = sel_registerName("flagsChanged:");
-public static final int sel_alloc = sel_registerName("alloc");
-public static final int sel_setDisplaysWhenScreenProfileChanges_1 = sel_registerName("setDisplaysWhenScreenProfileChanges:");
-public static final int sel_CIImage = sel_registerName("CIImage");
-public static final int sel_setSupermenu_1 = sel_registerName("setSupermenu:");
-public static final int sel_setSharedURLCache_1 = sel_registerName("setSharedURLCache:");
-public static final int sel_pathCell_1willPopUpMenu_1 = sel_registerName("pathCell:willPopUpMenu:");
-public static final int sel_setAttributes_1ofItemAtPath_1error_1 = sel_registerName("setAttributes:ofItemAtPath:error:");
-public static final int sel_tableView_1typeSelectStringForTableColumn_1row_1 = sel_registerName("tableView:typeSelectStringForTableColumn:row:");
-public static final int sel_moveWordLeftAndModifySelection_1 = sel_registerName("moveWordLeftAndModifySelection:");
-public static final int sel_whitespaceAndNewlineCharacterSet = sel_registerName("whitespaceAndNewlineCharacterSet");
-public static final int sel_pathControl_1validateDrop_1 = sel_registerName("pathControl:validateDrop:");
-public static final int sel_createCommandInstanceWithZone_1 = sel_registerName("createCommandInstanceWithZone:");
-public static final int sel_configurationDictionary = sel_registerName("configurationDictionary");
-public static final int sel_classFallbacksForKeyedArchiver = sel_registerName("classFallbacksForKeyedArchiver");
-public static final int sel_DTDKind = sel_registerName("DTDKind");
-public static final int sel_initWithPath_1documentAttributes_1 = sel_registerName("initWithPath:documentAttributes:");
-public static final int sel_addObjectsFromArray_1 = sel_registerName("addObjectsFromArray:");
-public static final int sel_tokenField_1displayStringForRepresentedObject_1 = sel_registerName("tokenField:displayStringForRepresentedObject:");
-public static final int sel_firstVisibleColumn = sel_registerName("firstVisibleColumn");
-public static final int sel_gradientType = sel_registerName("gradientType");
-public static final int sel_familyName = sel_registerName("familyName");
-public static final int sel_uniqueID = sel_registerName("uniqueID");
-public static final int sel_setFormatterBehavior_1 = sel_registerName("setFormatterBehavior:");
-public static final int sel_tokenFieldCell_1hasMenuForRepresentedObject_1 = sel_registerName("tokenFieldCell:hasMenuForRepresentedObject:");
-public static final int sel_fileManager_1shouldCopyItemAtPath_1toPath_1 = sel_registerName("fileManager:shouldCopyItemAtPath:toPath:");
-public static final int sel_keySpecifier = sel_registerName("keySpecifier");
-public static final int sel_copyItemAtPath_1toPath_1error_1 = sel_registerName("copyItemAtPath:toPath:error:");
-public static final int sel_setLength_1 = sel_registerName("setLength:");
-public static final int sel_reloadItem_1 = sel_registerName("reloadItem:");
-public static final int sel_removeObjectsAtArrangedObjectIndexes_1 = sel_registerName("removeObjectsAtArrangedObjectIndexes:");
-public static final int sel_setVisibilityPriority_1 = sel_registerName("setVisibilityPriority:");
-public static final int sel_insertItemWithObjectValue_1atIndex_1 = sel_registerName("insertItemWithObjectValue:atIndex:");
-public static final int sel_searchButtonCell = sel_registerName("searchButtonCell");
-public static final int sel_getCString_1maxLength_1range_1remainingRange_1 = sel_registerName("getCString:maxLength:range:remainingRange:");
-public static final int sel_outlineView_1child_1ofItem_1 = sel_registerName("outlineView:child:ofItem:");
-public static final int sel_numberOfComponents = sel_registerName("numberOfComponents");
-public static final int sel_isKindOfClass_1 = sel_registerName("isKindOfClass:");
-public static final int sel_processorCount = sel_registerName("processorCount");
-public static final int sel_lineJoinStyle = sel_registerName("lineJoinStyle");
-public static final int sel_collectionBehavior = sel_registerName("collectionBehavior");
-public static final int sel_setApplicationIconImage_1 = sel_registerName("setApplicationIconImage:");
-public static final int sel_setLaunchPath_1 = sel_registerName("setLaunchPath:");
-public static final int sel_initFileURLWithPath_1 = sel_registerName("initFileURLWithPath:");
-public static final int sel_selectItemAtIndex_1 = sel_registerName("selectItemAtIndex:");
-public static final int sel_IBeamCursor = sel_registerName("IBeamCursor");
-public static final int sel_isColor = sel_registerName("isColor");
-public static final int sel_cancelAuthenticationChallenge_1 = sel_registerName("cancelAuthenticationChallenge:");
-public static final int sel_echosBullets = sel_registerName("echosBullets");
-public static final int sel_setHasUndoManager_1 = sel_registerName("setHasUndoManager:");
-public static final int sel_RTFDFileWrapperFromRange_1documentAttributes_1 = sel_registerName("RTFDFileWrapperFromRange:documentAttributes:");
-public static final int sel_highlightCell_1atRow_1column_1 = sel_registerName("highlightCell:atRow:column:");
-public static final int sel_currentHost = sel_registerName("currentHost");
-public static final int sel_setURI_1 = sel_registerName("setURI:");
-public static final int sel_suiteNames = sel_registerName("suiteNames");
-public static final int sel_genericGrayColorSpace = sel_registerName("genericGrayColorSpace");
-public static final int sel_volatileDomainForName_1 = sel_registerName("volatileDomainForName:");
-public static final int sel_tokenizingCharacterSet = sel_registerName("tokenizingCharacterSet");
-public static final int sel_initWithXMLString_1 = sel_registerName("initWithXMLString:");
-public static final int sel_function = sel_registerName("function");
-public static final int sel_sizeForMagnification_1 = sel_registerName("sizeForMagnification:");
-public static final int sel_commitEditingWithDelegate_1didCommitSelector_1contextInfo_1 = sel_registerName("commitEditingWithDelegate:didCommitSelector:contextInfo:");
-public static final int sel_writeToFile_1 = sel_registerName("writeToFile:");
-public static final int sel_displayIfNeededInRect_1 = sel_registerName("displayIfNeededInRect:");
-public static final int sel_optionDescriptionsForBinding_1 = sel_registerName("optionDescriptionsForBinding:");
-public static final int sel_initWithSize_1 = sel_registerName("initWithSize:");
-public static final int sel_cornerView = sel_registerName("cornerView");
-public static final int sel_redoActionName = sel_registerName("redoActionName");
-public static final int sel_setLocation_1forStartOfGlyphRange_1 = sel_registerName("setLocation:forStartOfGlyphRange:");
-public static final int sel_setAllowedInputSourceLocales_1 = sel_registerName("setAllowedInputSourceLocales:");
-public static final int sel_convertRect_1toView_1 = sel_registerName("convertRect:toView:");
-public static final int sel_preferredFilenameExtensionForType_1 = sel_registerName("preferredFilenameExtensionForType:");
-public static final int sel_tableView_1writeRows_1toPasteboard_1 = sel_registerName("tableView:writeRows:toPasteboard:");
-public static final int sel_rootObject = sel_registerName("rootObject");
-public static final int sel_isEqualToHashTable_1 = sel_registerName("isEqualToHashTable:");
-public static final int sel_indent_1 = sel_registerName("indent:");
-public static final int sel_removeIndexesInRange_1 = sel_registerName("removeIndexesInRange:");
-public static final int sel_numberWithBool_1 = sel_registerName("numberWithBool:");
-public static final int sel_setPersistentDomain_1forName_1 = sel_registerName("setPersistentDomain:forName:");
-public static final int sel_netServiceBrowser_1didRemoveService_1moreComing_1 = sel_registerName("netServiceBrowser:didRemoveService:moreComing:");
-public static final int sel_timeZoneWithName_1data_1 = sel_registerName("timeZoneWithName:data:");
-public static final int sel_drawImage_1withFrame_1inView_1 = sel_registerName("drawImage:withFrame:inView:");
-public static final int sel_buttonToolTip = sel_registerName("buttonToolTip");
-public static final int sel_enableCursorRects = sel_registerName("enableCursorRects");
-public static final int sel_rulerAttributesInRange_1 = sel_registerName("rulerAttributesInRange:");
-public static final int sel_setMemoryCapacity_1 = sel_registerName("setMemoryCapacity:");
-public static final int sel_isSeparatorItem = sel_registerName("isSeparatorItem");
-public static final int sel_save_1 = sel_registerName("save:");
-public static final int sel_documentView = sel_registerName("documentView");
-public static final int sel_setHostCacheEnabled_1 = sel_registerName("setHostCacheEnabled:");
-public static final int sel_setDatePickerElements_1 = sel_registerName("setDatePickerElements:");
-public static final int sel_mixedStateImage = sel_registerName("mixedStateImage");
-public static final int sel_setAcceptsMouseMovedEvents_1 = sel_registerName("setAcceptsMouseMovedEvents:");
-public static final int sel_numberOfTabViewItems = sel_registerName("numberOfTabViewItems");
-public static final int sel_portForName_1host_1nameServerPortNumber_1 = sel_registerName("portForName:host:nameServerPortNumber:");
-public static final int sel_printerWithName_1domain_1includeUnavailable_1 = sel_registerName("printerWithName:domain:includeUnavailable:");
-public static final int sel_insertObjects_1atArrangedObjectIndexPaths_1 = sel_registerName("insertObjects:atArrangedObjectIndexPaths:");
-public static final int sel_browser_1shouldTypeSelectForEvent_1withCurrentSearchString_1 = sel_registerName("browser:shouldTypeSelectForEvent:withCurrentSearchString:");
-public static final int sel_defaultTabInterval = sel_registerName("defaultTabInterval");
-public static final int sel_initWithTitle_1 = sel_registerName("initWithTitle:");
-public static final int sel_timeZoneForSecondsFromGMT_1 = sel_registerName("timeZoneForSecondsFromGMT:");
-public static final int sel_initWithPasteboard_1 = sel_registerName("initWithPasteboard:");
-public static final int sel_subscriptRange_1 = sel_registerName("subscriptRange:");
-public static final int sel_highlightColorWithFrame_1inView_1 = sel_registerName("highlightColorWithFrame:inView:");
-public static final int sel_didChangeText = sel_registerName("didChangeText");
-public static final int sel_storagePolicy = sel_registerName("storagePolicy");
-public static final int sel_respondsToSelector_1 = sel_registerName("respondsToSelector:");
-public static final int sel_namesOfPromisedFilesDroppedAtDestination_1 = sel_registerName("namesOfPromisedFilesDroppedAtDestination:");
-public static final int sel_unsignedShortValue = sel_registerName("unsignedShortValue");
-public static final int sel_setZeroSymbol_1 = sel_registerName("setZeroSymbol:");
-public static final int sel_resourcePath = sel_registerName("resourcePath");
-public static final int sel_markerFormat = sel_registerName("markerFormat");
-public static final int sel_hotSpot = sel_registerName("hotSpot");
-public static final int sel_imageUnfilteredPasteboardTypes = sel_registerName("imageUnfilteredPasteboardTypes");
-public static final int sel_editedRange = sel_registerName("editedRange");
-public static final int sel_setMenuChangedMessagesEnabled_1 = sel_registerName("setMenuChangedMessagesEnabled:");
-public static final int sel_tailIndent = sel_registerName("tailIndent");
-public static final int sel_release = sel_registerName("release");
-public static final int sel_readFromURL_1options_1documentAttributes_1 = sel_registerName("readFromURL:options:documentAttributes:");
-public static final int sel_underlinePosition = sel_registerName("underlinePosition");
-public static final int sel_setMinItemSize_1 = sel_registerName("setMinItemSize:");
-public static final int sel_initWithImage_1foregroundColorHint_1backgroundColorHint_1hotSpot_1 = sel_registerName("initWithImage:foregroundColorHint:backgroundColorHint:hotSpot:");
-public static final int sel_setPlaceholderString_1 = sel_registerName("setPlaceholderString:");
-public static final int sel_createDirectoryAtPath_1withIntermediateDirectories_1attributes_1error_1 = sel_registerName("createDirectoryAtPath:withIntermediateDirectories:attributes:error:");
-public static final int sel_setDefaultTabInterval_1 = sel_registerName("setDefaultTabInterval:");
-public static final int sel_invertedSet = sel_registerName("invertedSet");
-public static final int sel_iconForFile_1 = sel_registerName("iconForFile:");
-public static final int sel_modifyFont_1 = sel_registerName("modifyFont:");
-public static final int sel_setProcessName_1 = sel_registerName("setProcessName:");
-public static final int sel_addObserver_1toObjectsAtIndexes_1forKeyPath_1options_1context_1 = sel_registerName("addObserver:toObjectsAtIndexes:forKeyPath:options:context:");
-public static final int sel_resolve = sel_registerName("resolve");
-public static final int sel_namespaces = sel_registerName("namespaces");
-public static final int sel_drawInBezierPath_1angle_1 = sel_registerName("drawInBezierPath:angle:");
-public static final int sel_setPixelFormat_1 = sel_registerName("setPixelFormat:");
-public static final int sel_resizeUpDownCursor = sel_registerName("resizeUpDownCursor");
-public static final int sel_daylightSavingTimeOffsetForDate_1 = sel_registerName("daylightSavingTimeOffsetForDate:");
-public static final int sel_setCanSpawnSeparateThread_1 = sel_registerName("setCanSpawnSeparateThread:");
-public static final int sel_setTitleBaseWritingDirection_1 = sel_registerName("setTitleBaseWritingDirection:");
-public static final int sel_subscript_1 = sel_registerName("subscript:");
-public static final int sel_URL = sel_registerName("URL");
-public static final int sel_headerColor = sel_registerName("headerColor");
-public static final int sel_stringByAddingPercentEscapesUsingEncoding_1 = sel_registerName("stringByAddingPercentEscapesUsingEncoding:");
-public static final int sel_draggingExited_1 = sel_registerName("draggingExited:");
-public static final int sel_ignoreModifierKeysWhileDragging = sel_registerName("ignoreModifierKeysWhileDragging");
-public static final int sel_componentsToDisplayForPath_1 = sel_registerName("componentsToDisplayForPath:");
-public static final int sel_glyphRangeForBoundingRectWithoutAdditionalLayout_1inTextContainer_1 = sel_registerName("glyphRangeForBoundingRectWithoutAdditionalLayout:inTextContainer:");
-public static final int sel_removeTrackingRect_1 = sel_registerName("removeTrackingRect:");
-public static final int sel_handlePrintScriptCommand_1 = sel_registerName("handlePrintScriptCommand:");
-public static final int sel_viewDidMoveToWindow = sel_registerName("viewDidMoveToWindow");
-public static final int sel_allocateGState = sel_registerName("allocateGState");
-public static final int sel_availableStringEncodings = sel_registerName("availableStringEncodings");
-public static final int sel_instantiateNibWithExternalNameTable_1 = sel_registerName("instantiateNibWithExternalNameTable:");
-public static final int sel_setWeekdayOrdinal_1 = sel_registerName("setWeekdayOrdinal:");
-public static final int sel_setWithCapacity_1 = sel_registerName("setWithCapacity:");
-public static final int sel_setCurrentAppleEventAndReplyEventWithSuspensionID_1 = sel_registerName("setCurrentAppleEventAndReplyEventWithSuspensionID:");
-public static final int sel_convertFont_1toNotHaveTrait_1 = sel_registerName("convertFont:toNotHaveTrait:");
-public static final int sel_performSelector_1withObject_1withObject_1 = sel_registerName("performSelector:withObject:withObject:");
-public static final int sel_removeIndexes_1 = sel_registerName("removeIndexes:");
-public static final int sel_objectSpecifierWithDescriptor_1 = sel_registerName("objectSpecifierWithDescriptor:");
-public static final int sel_objectValue = sel_registerName("objectValue");
-public static final int sel_timeZone = sel_registerName("timeZone");
-public static final int sel_viewSizeChanged_1 = sel_registerName("viewSizeChanged:");
-public static final int sel_clearDrawable = sel_registerName("clearDrawable");
-public static final int sel_parentRowForRow_1 = sel_registerName("parentRowForRow:");
-public static final int sel_trackingMode = sel_registerName("trackingMode");
-public static final int sel_selectedRanges = sel_registerName("selectedRanges");
-public static final int sel_suspendExecution = sel_registerName("suspendExecution");
-public static final int sel_setDefaultPrinter_1 = sel_registerName("setDefaultPrinter:");
-public static final int sel_loadDataRepresentation_1ofType_1 = sel_registerName("loadDataRepresentation:ofType:");
-public static final int sel_closestTickMarkValueToValue_1 = sel_registerName("closestTickMarkValueToValue:");
-public static final int sel_removeFromRunLoop_1forMode_1 = sel_registerName("removeFromRunLoop:forMode:");
-public static final int sel_cancelUserAttentionRequest_1 = sel_registerName("cancelUserAttentionRequest:");
-public static final int sel_dictionaryWithObject_1forKey_1 = sel_registerName("dictionaryWithObject:forKey:");
-public static final int sel_isDataRetained = sel_registerName("isDataRetained");
-public static final int sel_setLoops_1 = sel_registerName("setLoops:");
-public static final int sel_hashTableWithWeakObjects = sel_registerName("hashTableWithWeakObjects");
-public static final int sel_documentForURL_1 = sel_registerName("documentForURL:");
-public static final int sel_removeRepresentation_1 = sel_registerName("removeRepresentation:");
-public static final int sel_keyClassDescription = sel_registerName("keyClassDescription");
-public static final int sel_noResponderFor_1 = sel_registerName("noResponderFor:");
-public static final int sel_setBidiLevels_1forGlyphRange_1 = sel_registerName("setBidiLevels:forGlyphRange:");
-public static final int sel_cancelIncrementalLoad = sel_registerName("cancelIncrementalLoad");
-public static final int sel_highlightedBranchImage = sel_registerName("highlightedBranchImage");
-public static final int sel_setAttributedStringForZero_1 = sel_registerName("setAttributedStringForZero:");
-public static final int sel_drawAtPoint_1fromRect_1operation_1fraction_1 = sel_registerName("drawAtPoint:fromRect:operation:fraction:");
-public static final int sel_fileHFSTypeCode = sel_registerName("fileHFSTypeCode");
-public static final int sel_maximumRecents = sel_registerName("maximumRecents");
-public static final int sel_useFont_1 = sel_registerName("useFont:");
-public static final int sel_selectKeyViewPrecedingView_1 = sel_registerName("selectKeyViewPrecedingView:");
-public static final int sel_attributedStringForNil = sel_registerName("attributedStringForNil");
-public static final int sel_isGrammarCheckingEnabled = sel_registerName("isGrammarCheckingEnabled");
-public static final int sel_owner = sel_registerName("owner");
-public static final int sel_searchForServicesOfType_1inDomain_1 = sel_registerName("searchForServicesOfType:inDomain:");
-public static final int sel_frameAutosaveName = sel_registerName("frameAutosaveName");
-public static final int sel_setCommands_1 = sel_registerName("setCommands:");
-public static final int sel_URLResourceDidCancelLoading_1 = sel_registerName("URLResourceDidCancelLoading:");
-public static final int sel_uniqueSpellDocumentTag = sel_registerName("uniqueSpellDocumentTag");
-public static final int sel_needsToBeUpdatedFromPath_1 = sel_registerName("needsToBeUpdatedFromPath:");
-public static final int sel_bounds = sel_registerName("bounds");
-public static final int sel_contextHelpForKey_1 = sel_registerName("contextHelpForKey:");
-public static final int sel_setSendsActionOnEndEditing_1 = sel_registerName("setSendsActionOnEndEditing:");
-public static final int sel_scanDouble_1 = sel_registerName("scanDouble:");
-public static final int sel_download_1willResumeWithResponse_1fromByte_1 = sel_registerName("download:willResumeWithResponse:fromByte:");
-public static final int sel_drawFromCenter_1radius_1toCenter_1radius_1options_1 = sel_registerName("drawFromCenter:radius:toCenter:radius:options:");
-public static final int sel_defaultFlatness = sel_registerName("defaultFlatness");
-public static final int sel_keepBackupFile = sel_registerName("keepBackupFile");
-public static final int sel_willChangeValueForKey_1 = sel_registerName("willChangeValueForKey:");
-public static final int sel_initWithDateFormat_1allowNaturalLanguage_1 = sel_registerName("initWithDateFormat:allowNaturalLanguage:");
-public static final int sel_textView_1writablePasteboardTypesForCell_1atIndex_1 = sel_registerName("textView:writablePasteboardTypesForCell:atIndex:");
-public static final int sel_getTIFFCompressionTypes_1count_1 = sel_registerName("getTIFFCompressionTypes:count:");
-public static final int sel_decodePropertyList = sel_registerName("decodePropertyList");
-public static final int sel_saveDocumentWithDelegate_1didSaveSelector_1contextInfo_1 = sel_registerName("saveDocumentWithDelegate:didSaveSelector:contextInfo:");
-public static final int sel_encodePoint_1 = sel_registerName("encodePoint:");
-public static final int sel_selectRow_1byExtendingSelection_1 = sel_registerName("selectRow:byExtendingSelection:");
-public static final int sel_preservesContentDuringLiveResize = sel_registerName("preservesContentDuringLiveResize");
-public static final int sel_registerUndoWithTarget_1selector_1object_1 = sel_registerName("registerUndoWithTarget:selector:object:");
-public static final int sel_removeCollection_1 = sel_registerName("removeCollection:");
-public static final int sel_nextEventMatchingMask_1 = sel_registerName("nextEventMatchingMask:");
-public static final int sel_getObjects_1andKeys_1 = sel_registerName("getObjects:andKeys:");
-public static final int sel_EPSRepresentation = sel_registerName("EPSRepresentation");
-public static final int sel_isModalPanel = sel_registerName("isModalPanel");
-public static final int sel_statusCode = sel_registerName("statusCode");
-public static final int sel_setCopiesOnScroll_1 = sel_registerName("setCopiesOnScroll:");
-public static final int sel_setHorizontalPagination_1 = sel_registerName("setHorizontalPagination:");
-public static final int sel_removeAllIndexes = sel_registerName("removeAllIndexes");
-public static final int sel_download_1didFailWithError_1 = sel_registerName("download:didFailWithError:");
-public static final int sel_modifierFlags = sel_registerName("modifierFlags");
-public static final int sel_draggedColumn = sel_registerName("draggedColumn");
-public static final int sel_initWithUser_1 = sel_registerName("initWithUser:");
-public static final int sel_setLayoutRect_1forTextBlock_1glyphRange_1 = sel_registerName("setLayoutRect:forTextBlock:glyphRange:");
-public static final int sel_selectionAffinity = sel_registerName("selectionAffinity");
-public static final int sel_beginParagraph = sel_registerName("beginParagraph");
-public static final int sel_runModalForTypes_1 = sel_registerName("runModalForTypes:");
-public static final int sel_reloadCriteria = sel_registerName("reloadCriteria");
-public static final int sel_PDFOperationWithView_1insideRect_1toData_1printInfo_1 = sel_registerName("PDFOperationWithView:insideRect:toData:printInfo:");
-public static final int sel_cellAtRow_1column_1 = sel_registerName("cellAtRow:column:");
-public static final int sel_selectColumn_1byExtendingSelection_1 = sel_registerName("selectColumn:byExtendingSelection:");
-public static final int sel_addresses = sel_registerName("addresses");
-public static final int sel_setCanBeVisibleOnAllSpaces_1 = sel_registerName("setCanBeVisibleOnAllSpaces:");
-public static final int sel_bundleForSuite_1 = sel_registerName("bundleForSuite:");
-public static final int sel_stringWithCharacters_1length_1 = sel_registerName("stringWithCharacters:length:");
-public static final int sel_dataWithContentsOfURL_1options_1error_1 = sel_registerName("dataWithContentsOfURL:options:error:");
-public static final int sel_isExpanded = sel_registerName("isExpanded");
-public static final int sel_rectForLayoutAtPoint_1inRect_1textContainer_1characterRange_1 = sel_registerName("rectForLayoutAtPoint:inRect:textContainer:characterRange:");
-public static final int sel_initWithXMLString_1options_1error_1 = sel_registerName("initWithXMLString:options:error:");
-public static final int sel_datePickerCell_1validateProposedDateValue_1timeInterval_1 = sel_registerName("datePickerCell:validateProposedDateValue:timeInterval:");
-public static final int sel_replaceCharactersInRange_1withRTFD_1 = sel_registerName("replaceCharactersInRange:withRTFD:");
-public static final int sel_setNeedsDisplay_1 = sel_registerName("setNeedsDisplay:");
-public static final int sel_tableViewColumnDidMove_1 = sel_registerName("tableViewColumnDidMove:");
-public static final int sel_printOperationWithView_1printInfo_1 = sel_registerName("printOperationWithView:printInfo:");
-public static final int sel_parserDidStartDocument_1 = sel_registerName("parserDidStartDocument:");
-public static final int sel_privateFrameworksPath = sel_registerName("privateFrameworksPath");
-public static final int sel_informativeText = sel_registerName("informativeText");
-public static final int sel_attributesAtIndex_1effectiveRange_1 = sel_registerName("attributesAtIndex:effectiveRange:");
-public static final int sel_rectArrayForGlyphRange_1withinSelectedGlyphRange_1inTextContainer_1rectCount_1 = sel_registerName("rectArrayForGlyphRange:withinSelectedGlyphRange:inTextContainer:rectCount:");
-public static final int sel_swapWithMark_1 = sel_registerName("swapWithMark:");
-public static final int sel_setDrawsGrid_1 = sel_registerName("setDrawsGrid:");
-public static final int sel_highlight_1 = sel_registerName("highlight:");
-public static final int sel_maximumLineHeight = sel_registerName("maximumLineHeight");
-public static final int sel_phonemesFromText_1 = sel_registerName("phonemesFromText:");
-public static final int sel_convertSize_1fromView_1 = sel_registerName("convertSize:fromView:");
-public static final int sel_setProperty_1withValue_1 = sel_registerName("setProperty:withValue:");
-public static final int sel_cookieAcceptPolicy = sel_registerName("cookieAcceptPolicy");
-public static final int sel_hasThousandSeparators = sel_registerName("hasThousandSeparators");
-public static final int sel_setTighteningFactorForTruncation_1 = sel_registerName("setTighteningFactorForTruncation:");
-public static final int sel_contextMenuRepresentation = sel_registerName("contextMenuRepresentation");
-public static final int sel_precomposedStringWithCompatibilityMapping = sel_registerName("precomposedStringWithCompatibilityMapping");
-public static final int sel_threadDictionary = sel_registerName("threadDictionary");
-public static final int sel_redoMenuTitleForUndoActionName_1 = sel_registerName("redoMenuTitleForUndoActionName:");
-public static final int sel_setNumberOfVisibleItems_1 = sel_registerName("setNumberOfVisibleItems:");
-public static final int sel_preferredLanguages = sel_registerName("preferredLanguages");
-public static final int sel_mouseDraggedOnCharacterIndex_1atCoordinate_1withModifier_1client_1 = sel_registerName("mouseDraggedOnCharacterIndex:atCoordinate:withModifier:client:");
-public static final int sel_setMultiplier_1 = sel_registerName("setMultiplier:");
-public static final int sel_sortedArrayUsingSelector_1 = sel_registerName("sortedArrayUsingSelector:");
-public static final int sel_drawInRect_1 = sel_registerName("drawInRect:");
-public static final int sel_reversedSortDescriptor = sel_registerName("reversedSortDescriptor");
-public static final int sel_setIdentifier_1 = sel_registerName("setIdentifier:");
-public static final int sel_systemLocale = sel_registerName("systemLocale");
-public static final int sel_rulerView_1didMoveMarker_1 = sel_registerName("rulerView:didMoveMarker:");
-public static final int sel_serviceConnectionWithName_1rootObject_1 = sel_registerName("serviceConnectionWithName:rootObject:");
-public static final int sel_mouseDownCanMoveWindow = sel_registerName("mouseDownCanMoveWindow");
-public static final int sel_setMode_1 = sel_registerName("setMode:");
-public static final int sel_rectOfTickMarkAtIndex_1 = sel_registerName("rectOfTickMarkAtIndex:");
-public static final int sel_rangeOfCharacterFromSet_1 = sel_registerName("rangeOfCharacterFromSet:");
-public static final int sel_pageUp_1 = sel_registerName("pageUp:");
-public static final int sel_sendsWholeSearchString = sel_registerName("sendsWholeSearchString");
-public static final int sel_selectColumnIndexes_1byExtendingSelection_1 = sel_registerName("selectColumnIndexes:byExtendingSelection:");
-public static final int sel_localizedCaseInsensitiveCompare_1 = sel_registerName("localizedCaseInsensitiveCompare:");
-public static final int sel_isEqualToString_1 = sel_registerName("isEqualToString:");
-public static final int sel_invalidateHashMarks = sel_registerName("invalidateHashMarks");
-public static final int sel_setInitialKey_1 = sel_registerName("setInitialKey:");
-public static final int sel_setDividerStyle_1 = sel_registerName("setDividerStyle:");
-public static final int sel_expressionForMinusSet_1with_1 = sel_registerName("expressionForMinusSet:with:");
-public static final int sel_netService_1didNotPublish_1 = sel_registerName("netService:didNotPublish:");
-public static final int sel_evaluatedReceivers = sel_registerName("evaluatedReceivers");
-public static final int sel_removeTabViewItem_1 = sel_registerName("removeTabViewItem:");
-public static final int sel_initWithContainerClassDescription_1containerSpecifier_1key_1index_1 = sel_registerName("initWithContainerClassDescription:containerSpecifier:key:index:");
-public static final int sel_predicateWithLeftExpression_1rightExpression_1customSelector_1 = sel_registerName("predicateWithLeftExpression:rightExpression:customSelector:");
-public static final int sel_brownColor = sel_registerName("brownColor");
-public static final int sel_leafKeyPathForNode_1 = sel_registerName("leafKeyPathForNode:");
-public static final int sel_drawBackgroundForGlyphRange_1atPoint_1 = sel_registerName("drawBackgroundForGlyphRange:atPoint:");
-public static final int sel_rulerView_1willSetClientView_1 = sel_registerName("rulerView:willSetClientView:");
-public static final int sel_className = sel_registerName("className");
-public static final int sel_runMode_1beforeDate_1 = sel_registerName("runMode:beforeDate:");
-public static final int sel_applicationShouldTerminateAfterLastWindowClosed_1 = sel_registerName("applicationShouldTerminateAfterLastWindowClosed:");
-public static final int sel_newDocument_1 = sel_registerName("newDocument:");
-public static final int sel_arrayByAddingObject_1 = sel_registerName("arrayByAddingObject:");
-public static final int sel_savePanel = sel_registerName("savePanel");
-public static final int sel_prefersTrackingUntilMouseUp = sel_registerName("prefersTrackingUntilMouseUp");
-public static final int sel_setLocations_1startingGlyphIndexes_1count_1forGlyphRange_1 = sel_registerName("setLocations:startingGlyphIndexes:count:forGlyphRange:");
-public static final int sel_setListensInForegroundOnly_1 = sel_registerName("setListensInForegroundOnly:");
-public static final int sel_initWithUnsignedShort_1 = sel_registerName("initWithUnsignedShort:");
-public static final int sel_letterCharacterSet = sel_registerName("letterCharacterSet");
-public static final int sel_listensInForegroundOnly = sel_registerName("listensInForegroundOnly");
-public static final int sel_menu_1willHighlightItem_1 = sel_registerName("menu:willHighlightItem:");
-public static final int sel_charactersIgnoringModifiers = sel_registerName("charactersIgnoringModifiers");
-public static final int sel_insertionContainer = sel_registerName("insertionContainer");
-public static final int sel_searchButtonRectForBounds_1 = sel_registerName("searchButtonRectForBounds:");
-public static final int sel_accessibilitySetValue_1forAttribute_1 = sel_registerName("accessibilitySetValue:forAttribute:");
-public static final int sel_setPathSeparator_1 = sel_registerName("setPathSeparator:");
-public static final int sel_applicationWillResignActive_1 = sel_registerName("applicationWillResignActive:");
-public static final int sel_scriptingIsLessThanOrEqualTo_1 = sel_registerName("scriptingIsLessThanOrEqualTo:");
-public static final int sel_decodeValuesOfObjCTypes_1 = sel_registerName("decodeValuesOfObjCTypes:");
-public static final int sel_setIntercellSpacing_1 = sel_registerName("setIntercellSpacing:");
-public static final int sel_sharedSystemTypesetterForBehavior_1 = sel_registerName("sharedSystemTypesetterForBehavior:");
-public static final int sel_drawFromPoint_1toPoint_1options_1 = sel_registerName("drawFromPoint:toPoint:options:");
-public static final int sel_windowDidMove_1 = sel_registerName("windowDidMove:");
-public static final int sel_setVisible_1 = sel_registerName("setVisible:");
-public static final int sel_credentialWithUser_1password_1persistence_1 = sel_registerName("credentialWithUser:password:persistence:");
-public static final int sel_decomposedStringWithCanonicalMapping = sel_registerName("decomposedStringWithCanonicalMapping");
-public static final int sel_openFile_1withApplication_1andDeactivate_1 = sel_registerName("openFile:withApplication:andDeactivate:");
-public static final int sel_convertRectToBase_1 = sel_registerName("convertRectToBase:");
-public static final int sel_outputStreamToMemory = sel_registerName("outputStreamToMemory");
-public static final int sel_autorepeat = sel_registerName("autorepeat");
-public static final int sel_servicesMenu = sel_registerName("servicesMenu");
-public static final int sel_beginGrouping = sel_registerName("beginGrouping");
-public static final int sel_setNilValueForKey_1 = sel_registerName("setNilValueForKey:");
-public static final int sel_usesFontLeading = sel_registerName("usesFontLeading");
-public static final int sel_lineFragmentRectForGlyphAtIndex_1effectiveRange_1 = sel_registerName("lineFragmentRectForGlyphAtIndex:effectiveRange:");
-public static final int sel_takeStringValueFrom_1 = sel_registerName("takeStringValueFrom:");
-public static final int sel_fontDescriptorByAddingAttributes_1 = sel_registerName("fontDescriptorByAddingAttributes:");
-public static final int sel_startTrackingAt_1inView_1 = sel_registerName("startTrackingAt:inView:");
-public static final int sel_application_1delegateHandlesKey_1 = sel_registerName("application:delegateHandlesKey:");
-public static final int sel_stringByExpandingTildeInPath = sel_registerName("stringByExpandingTildeInPath");
-public static final int sel_menu = sel_registerName("menu");
-public static final int sel_setMinute_1 = sel_registerName("setMinute:");
-public static final int sel_startSubelementIdentifier = sel_registerName("startSubelementIdentifier");
-public static final int sel_waitForDataInBackgroundAndNotifyForModes_1 = sel_registerName("waitForDataInBackgroundAndNotifyForModes:");
-public static final int sel_removeCachedResponseForRequest_1 = sel_registerName("removeCachedResponseForRequest:");
-public static final int sel_attributeForLocalName_1URI_1 = sel_registerName("attributeForLocalName:URI:");
-public static final int sel_saveDocumentAs_1 = sel_registerName("saveDocumentAs:");
-public static final int sel_containerIsObjectBeingTested = sel_registerName("containerIsObjectBeingTested");
-public static final int sel_mouseDownOnCharacterIndex_1atCoordinate_1withModifier_1client_1 = sel_registerName("mouseDownOnCharacterIndex:atCoordinate:withModifier:client:");
-public static final int sel_setPosition_1ofDividerAtIndex_1 = sel_registerName("setPosition:ofDividerAtIndex:");
-public static final int sel_terminationStatus = sel_registerName("terminationStatus");
-public static final int sel_imageWidth = sel_registerName("imageWidth");
-public static final int sel_accessoryView = sel_registerName("accessoryView");
-public static final int sel_outlineView_1shouldTrackCell_1forTableColumn_1item_1 = sel_registerName("outlineView:shouldTrackCell:forTableColumn:item:");
-public static final int sel_initWithLevelIndicatorStyle_1 = sel_registerName("initWithLevelIndicatorStyle:");
-public static final int sel_deltaX = sel_registerName("deltaX");
-public static final int sel_valueForUndefinedKey_1 = sel_registerName("valueForUndefinedKey:");
-public static final int sel_mainDocumentURL = sel_registerName("mainDocumentURL");
-public static final int sel_position = sel_registerName("position");
-public static final int sel_animates = sel_registerName("animates");
-public static final int sel_addTabViewItem_1 = sel_registerName("addTabViewItem:");
-public static final int sel_unlockFocus = sel_registerName("unlockFocus");
-public static final int sel_download_1didCreateDestination_1 = sel_registerName("download:didCreateDestination:");
-public static final int sel_defaults = sel_registerName("defaults");
-public static final int sel_viewWillDraw = sel_registerName("viewWillDraw");
-public static final int sel_findApplications = sel_registerName("findApplications");
-public static final int sel_unbind_1 = sel_registerName("unbind:");
-public static final int sel_positionOfGlyph_1withRelation_1toBaseGlyph_1totalAdvancement_1metricsExist_1 = sel_registerName("positionOfGlyph:withRelation:toBaseGlyph:totalAdvancement:metricsExist:");
-public static final int sel_isGreaterThan_1 = sel_registerName("isGreaterThan:");
-public static final int sel_dataWithPDFInsideRect_1 = sel_registerName("dataWithPDFInsideRect:");
-public static final int sel_setAttributedTitle_1 = sel_registerName("setAttributedTitle:");
-public static final int sel_expressionType = sel_registerName("expressionType");
-public static final int sel_tokenFieldCell_1shouldAddObjects_1atIndex_1 = sel_registerName("tokenFieldCell:shouldAddObjects:atIndex:");
-public static final int sel_removeEventHandlerForEventClass_1andEventID_1 = sel_registerName("removeEventHandlerForEventClass:andEventID:");
-public static final int sel_postNotification_1 = sel_registerName("postNotification:");
-public static final int sel_indexOfTabViewItem_1 = sel_registerName("indexOfTabViewItem:");
-public static final int sel_outlineView_1shouldSelectItem_1 = sel_registerName("outlineView:shouldSelectItem:");
-public static final int sel_setSegmentStyle_1 = sel_registerName("setSegmentStyle:");
-public static final int sel_stateImageRectForBounds_1 = sel_registerName("stateImageRectForBounds:");
-public static final int sel_setContentAspectRatio_1 = sel_registerName("setContentAspectRatio:");
-public static final int sel_instantiateNibWithOwner_1topLevelObjects_1 = sel_registerName("instantiateNibWithOwner:topLevelObjects:");
-public static final int sel_setPrototype_1 = sel_registerName("setPrototype:");
-public static final int sel_allowsMultipleSelection = sel_registerName("allowsMultipleSelection");
-public static final int sel_setRecentSearches_1 = sel_registerName("setRecentSearches:");
-public static final int sel_setTypingAttributes_1 = sel_registerName("setTypingAttributes:");
-public static final int sel_observeValueForKeyPath_1ofObject_1change_1context_1 = sel_registerName("observeValueForKeyPath:ofObject:change:context:");
-public static final int sel_performDragOperation_1 = sel_registerName("performDragOperation:");
-public static final int sel_processingInstructionWithName_1stringValue_1 = sel_registerName("processingInstructionWithName:stringValue:");
-public static final int sel_initWithKind_1options_1 = sel_registerName("initWithKind:options:");
-public static final int sel_instancesRespondToSelector_1 = sel_registerName("instancesRespondToSelector:");
-public static final int sel_keyEquivalentFont = sel_registerName("keyEquivalentFont");
-public static final int sel_calendarIdentifier = sel_registerName("calendarIdentifier");
-public static final int sel_source = sel_registerName("source");
-public static final int sel_shouldBeTreatedAsInkEvent_1 = sel_registerName("shouldBeTreatedAsInkEvent:");
-public static final int sel_queuePriority = sel_registerName("queuePriority");
-public static final int sel_autoresizesAllColumnsToFit = sel_registerName("autoresizesAllColumnsToFit");
-public static final int sel_outlineView_1shouldCollapseItem_1 = sel_registerName("outlineView:shouldCollapseItem:");
-public static final int sel_dragImage_1at_1offset_1event_1pasteboard_1source_1slideBack_1 = sel_registerName("dragImage:at:offset:event:pasteboard:source:slideBack:");
-public static final int sel_sender = sel_registerName("sender");
-public static final int sel_numberOfColumns = sel_registerName("numberOfColumns");
-public static final int sel_indexPathWithIndex_1 = sel_registerName("indexPathWithIndex:");
-public static final int sel_setPreferredFontNames_1 = sel_registerName("setPreferredFontNames:");
-public static final int sel_windowDidEndSheet_1 = sel_registerName("windowDidEndSheet:");
-public static final int sel_capHeight = sel_registerName("capHeight");
-public static final int sel_matchingFontDescriptorWithMandatoryKeys_1 = sel_registerName("matchingFontDescriptorWithMandatoryKeys:");
-public static final int sel_finalize = sel_registerName("finalize");
-public static final int sel_prepareForDragOperation_1 = sel_registerName("prepareForDragOperation:");
-public static final int sel_setCellAttribute_1to_1 = sel_registerName("setCellAttribute:to:");
-public static final int sel_metadataQuery_1replacementValueForAttribute_1value_1 = sel_registerName("metadataQuery:replacementValueForAttribute:value:");
-public static final int sel_hueComponent = sel_registerName("hueComponent");
+public static final int sel_makeCurrentContext = sel_registerName("makeCurrentContext");
+public static final int sel_makeFirstResponder_ = sel_registerName("makeFirstResponder:");
+public static final int sel_makeKeyAndOrderFront_ = sel_registerName("makeKeyAndOrderFront:");
+public static final int sel_markedRange = sel_registerName("markedRange");
+public static final int sel_markedTextAttributes = sel_registerName("markedTextAttributes");
 public static final int sel_maxValue = sel_registerName("maxValue");
-public static final int sel_soundUnfilteredTypes = sel_registerName("soundUnfilteredTypes");
-public static final int sel_setFileAttributes_1 = sel_registerName("setFileAttributes:");
-public static final int sel_valueLists = sel_registerName("valueLists");
-public static final int sel_breakLock = sel_registerName("breakLock");
-public static final int sel_selectCellWithTag_1 = sel_registerName("selectCellWithTag:");
-public static final int sel_setMovable_1 = sel_registerName("setMovable:");
-public static final int sel_synchronizeFile = sel_registerName("synchronizeFile");
-public static final int sel_setVerticallyResizable_1 = sel_registerName("setVerticallyResizable:");
-public static final int sel_setButtonBordered_1 = sel_registerName("setButtonBordered:");
-public static final int sel_useOptimizedDrawing_1 = sel_registerName("useOptimizedDrawing:");
-public static final int sel_tryLockWhenCondition_1 = sel_registerName("tryLockWhenCondition:");
-public static final int sel_textContainer = sel_registerName("textContainer");
-public static final int sel_setValueListAttributes_1 = sel_registerName("setValueListAttributes:");
-public static final int sel_rangeOfCharacterFromSet_1options_1 = sel_registerName("rangeOfCharacterFromSet:options:");
-public static final int sel_dragFile_1fromRect_1slideBack_1event_1 = sel_registerName("dragFile:fromRect:slideBack:event:");
-public static final int sel_tickMarkPosition = sel_registerName("tickMarkPosition");
-public static final int sel_addRunLoop_1 = sel_registerName("addRunLoop:");
-public static final int sel_dataWithCapacity_1 = sel_registerName("dataWithCapacity:");
-public static final int sel_removeVolatileDomainForName_1 = sel_registerName("removeVolatileDomainForName:");
-public static final int sel_signal = sel_registerName("signal");
-public static final int sel_progressMarks = sel_registerName("progressMarks");
-public static final int sel_unhide_1 = sel_registerName("unhide:");
-public static final int sel_provideNewButtonImage = sel_registerName("provideNewButtonImage");
-public static final int sel_connectionWithRegisteredName_1host_1usingNameServer_1 = sel_registerName("connectionWithRegisteredName:host:usingNameServer:");
-public static final int sel_localizesFormat = sel_registerName("localizesFormat");
-public static final int sel_lineScroll = sel_registerName("lineScroll");
-public static final int sel_initDirectoryWithFileWrappers_1 = sel_registerName("initDirectoryWithFileWrappers:");
-public static final int sel_wantsToInterpretAllKeystrokes = sel_registerName("wantsToInterpretAllKeystrokes");
-public static final int sel_convertPointToBase_1 = sel_registerName("convertPointToBase:");
-public static final int sel_keyWithAppleEventCode_1 = sel_registerName("keyWithAppleEventCode:");
-public static final int sel_loadSuiteWithDictionary_1fromBundle_1 = sel_registerName("loadSuiteWithDictionary:fromBundle:");
-public static final int sel_automaticallyPreparesContent = sel_registerName("automaticallyPreparesContent");
-public static final int sel_cornerRadius = sel_registerName("cornerRadius");
-public static final int sel_sharedScriptExecutionContext = sel_registerName("sharedScriptExecutionContext");
-public static final int sel_setPoolCountHighWaterResolution_1 = sel_registerName("setPoolCountHighWaterResolution:");
-public static final int sel_appendBezierPath_1 = sel_registerName("appendBezierPath:");
-public static final int sel_appleEventClassCode = sel_registerName("appleEventClassCode");
-public static final int sel_initTextCell_1pullsDown_1 = sel_registerName("initTextCell:pullsDown:");
-public static final int sel_numberOfTickMarks = sel_registerName("numberOfTickMarks");
-public static final int sel_setIndependentConversationQueueing_1 = sel_registerName("setIndependentConversationQueueing:");
-public static final int sel_extendPowerOffBy_1 = sel_registerName("extendPowerOffBy:");
-public static final int sel_isCollecting = sel_registerName("isCollecting");
-public static final int sel_canInsert = sel_registerName("canInsert");
-public static final int sel_valuePointerFunctions = sel_registerName("valuePointerFunctions");
-public static final int sel_sizeValue = sel_registerName("sizeValue");
-public static final int sel_openOnEdge_1 = sel_registerName("openOnEdge:");
-public static final int sel_rectOfItemAtIndex_1 = sel_registerName("rectOfItemAtIndex:");
-public static final int sel_booleanForKey_1inTable_1 = sel_registerName("booleanForKey:inTable:");
-public static final int sel_showHelp_1 = sel_registerName("showHelp:");
-public static final int sel_heightTracksTextView = sel_registerName("heightTracksTextView");
-public static final int sel_hasTitleBar = sel_registerName("hasTitleBar");
-public static final int sel_setViewAnimations_1 = sel_registerName("setViewAnimations:");
-public static final int sel_updateSpellingPanelWithGrammarString_1detail_1 = sel_registerName("updateSpellingPanelWithGrammarString:detail:");
-public static final int sel_showsToolbarButton = sel_registerName("showsToolbarButton");
-public static final int sel_environment = sel_registerName("environment");
-public static final int sel_matchesAppleEventCode_1 = sel_registerName("matchesAppleEventCode:");
-public static final int sel_hasPrefix_1 = sel_registerName("hasPrefix:");
-public static final int sel_hasUnappliedChanges = sel_registerName("hasUnappliedChanges");
-public static final int sel_setName_1 = sel_registerName("setName:");
-public static final int sel_isMovableByWindowBackground = sel_registerName("isMovableByWindowBackground");
-public static final int sel_printerNames = sel_registerName("printerNames");
-public static final int sel_initWithDictionary_1 = sel_registerName("initWithDictionary:");
-public static final int sel_stringByStandardizingPath = sel_registerName("stringByStandardizingPath");
-public static final int sel_usesUserKeyEquivalents = sel_registerName("usesUserKeyEquivalents");
-public static final int sel_drawStateImageWithFrame_1inView_1 = sel_registerName("drawStateImageWithFrame:inView:");
-public static final int sel_openUntitledDocumentAndDisplay_1error_1 = sel_registerName("openUntitledDocumentAndDisplay:error:");
-public static final int sel_lastVisibleColumn = sel_registerName("lastVisibleColumn");
-public static final int sel_paste_1 = sel_registerName("paste:");
-public static final int sel_indexOfItemWithRepresentedObject_1 = sel_registerName("indexOfItemWithRepresentedObject:");
-public static final int sel_supportsCommand_1 = sel_registerName("supportsCommand:");
-public static final int sel_scrollPageUp_1 = sel_registerName("scrollPageUp:");
-public static final int sel_draggedImage_1endedAt_1deposited_1 = sel_registerName("draggedImage:endedAt:deposited:");
-public static final int sel_setPositiveInfinitySymbol_1 = sel_registerName("setPositiveInfinitySymbol:");
-public static final int sel_noteFileSystemChanged_1 = sel_registerName("noteFileSystemChanged:");
-public static final int sel_moveRight_1 = sel_registerName("moveRight:");
-public static final int sel_arrowPosition = sel_registerName("arrowPosition");
-public static final int sel_setMenuRepresentation_1 = sel_registerName("setMenuRepresentation:");
-public static final int sel_endLoadInBackground = sel_registerName("endLoadInBackground");
-public static final int sel_smartInsertBeforeStringForString_1replacingRange_1 = sel_registerName("smartInsertBeforeStringForString:replacingRange:");
-public static final int sel_openUntitledDocumentOfType_1display_1 = sel_registerName("openUntitledDocumentOfType:display:");
-public static final int sel_scriptingValueForSpecifier_1 = sel_registerName("scriptingValueForSpecifier:");
-public static final int sel_setShowsSuppressionButton_1 = sel_registerName("setShowsSuppressionButton:");
-public static final int sel_resizeLeftCursor = sel_registerName("resizeLeftCursor");
-public static final int sel_setDefaultCredential_1forProtectionSpace_1 = sel_registerName("setDefaultCredential:forProtectionSpace:");
-public static final int sel_systemTabletID = sel_registerName("systemTabletID");
-public static final int sel_unlock = sel_registerName("unlock");
-public static final int sel_mostCompatibleStringEncoding = sel_registerName("mostCompatibleStringEncoding");
-public static final int sel_glyphName = sel_registerName("glyphName");
-public static final int sel_center = sel_registerName("center");
-public static final int sel_setJobTitle_1 = sel_registerName("setJobTitle:");
-public static final int sel_cancelButtonCell = sel_registerName("cancelButtonCell");
-public static final int sel_namespaceForPrefix_1 = sel_registerName("namespaceForPrefix:");
-public static final int sel_browserWillScroll_1 = sel_registerName("browserWillScroll:");
-public static final int sel_initWithCompoundTypes_1 = sel_registerName("initWithCompoundTypes:");
-public static final int sel_setPaddingCharacter_1 = sel_registerName("setPaddingCharacter:");
-public static final int sel_image_1willLoadRepresentation_1 = sel_registerName("image:willLoadRepresentation:");
-public static final int sel_pasteRuler_1 = sel_registerName("pasteRuler:");
-public static final int sel_drawGlyphsForGlyphRange_1atPoint_1 = sel_registerName("drawGlyphsForGlyphRange:atPoint:");
-public static final int sel_PMPrintSession = sel_registerName("PMPrintSession");
-public static final int sel_setDefaultButtonCell_1 = sel_registerName("setDefaultButtonCell:");
-public static final int sel_printerTypes = sel_registerName("printerTypes");
-public static final int sel_findString_1inBook_1 = sel_registerName("findString:inBook:");
-public static final int sel_executablePath = sel_registerName("executablePath");
-public static final int sel_components_1fromDate_1toDate_1options_1 = sel_registerName("components:fromDate:toDate:options:");
-public static final int sel_displayValuesForRow_1 = sel_registerName("displayValuesForRow:");
-public static final int sel_pageLayout = sel_registerName("pageLayout");
-public static final int sel_resizeFlags = sel_registerName("resizeFlags");
-public static final int sel_DTDNodeWithXMLString_1 = sel_registerName("DTDNodeWithXMLString:");
-public static final int sel_replyToOpenOrPrint_1 = sel_registerName("replyToOpenOrPrint:");
-public static final int sel_insertTab_1 = sel_registerName("insertTab:");
-public static final int sel_documents = sel_registerName("documents");
-public static final int sel_tagForSegment_1 = sel_registerName("tagForSegment:");
-public static final int sel_initForURL_1withContentsOfURL_1ofType_1error_1 = sel_registerName("initForURL:withContentsOfURL:ofType:error:");
-public static final int sel_initWithRoundingMode_1scale_1raiseOnExactness_1raiseOnOverflow_1raiseOnUnderflow_1raiseOnDivideByZero_1 = sel_registerName("initWithRoundingMode:scale:raiseOnExactness:raiseOnOverflow:raiseOnUnderflow:raiseOnDivideByZero:");
-public static final int sel_addIndexes_1 = sel_registerName("addIndexes:");
-public static final int sel_setAttributeRuns_1 = sel_registerName("setAttributeRuns:");
-public static final int sel_splitView_1additionalEffectiveRectOfDividerAtIndex_1 = sel_registerName("splitView:additionalEffectiveRectOfDividerAtIndex:");
-public static final int sel_writeSelectionToPasteboard_1type_1 = sel_registerName("writeSelectionToPasteboard:type:");
-public static final int sel_day = sel_registerName("day");
-public static final int sel_numberOfRowsInTableView_1 = sel_registerName("numberOfRowsInTableView:");
-public static final int sel_insertCompletion_1forPartialWordRange_1movement_1isFinal_1 = sel_registerName("insertCompletion:forPartialWordRange:movement:isFinal:");
-public static final int sel_notPredicateWithSubpredicate_1 = sel_registerName("notPredicateWithSubpredicate:");
-public static final int sel_rootProxyForConnectionWithRegisteredName_1host_1 = sel_registerName("rootProxyForConnectionWithRegisteredName:host:");
-public static final int sel_stopSpeakingAtBoundary_1 = sel_registerName("stopSpeakingAtBoundary:");
-public static final int sel_pathsMatchingExtensions_1 = sel_registerName("pathsMatchingExtensions:");
-public static final int sel_caseInsensitiveCompare_1 = sel_registerName("caseInsensitiveCompare:");
-public static final int sel_labelFontOfSize_1 = sel_registerName("labelFontOfSize:");
-public static final int sel_createDirectoryAtPath_1attributes_1 = sel_registerName("createDirectoryAtPath:attributes:");
-public static final int sel_initListDescriptor = sel_registerName("initListDescriptor");
-public static final int sel_setParagraphSpacing_1 = sel_registerName("setParagraphSpacing:");
-public static final int sel_getColor_1location_1atIndex_1 = sel_registerName("getColor:location:atIndex:");
-public static final int sel_pointerArrayWithOptions_1 = sel_registerName("pointerArrayWithOptions:");
-public static final int sel_guessesForWord_1 = sel_registerName("guessesForWord:");
-public static final int sel_searchTextRectForBounds_1 = sel_registerName("searchTextRectForBounds:");
-public static final int sel_allowsColumnReordering = sel_registerName("allowsColumnReordering");
-public static final int sel_isMainThread = sel_registerName("isMainThread");
-public static final int sel_accessibilityAttributeNames = sel_registerName("accessibilityAttributeNames");
-public static final int sel_saveOptions = sel_registerName("saveOptions");
-public static final int sel_setAutomaticallyPreparesContent_1 = sel_registerName("setAutomaticallyPreparesContent:");
-public static final int sel_setGridColor_1 = sel_registerName("setGridColor:");
-public static final int sel_textAttributesForNegativeInfinity = sel_registerName("textAttributesForNegativeInfinity");
-public static final int sel_decimalDigitCharacterSet = sel_registerName("decimalDigitCharacterSet");
-public static final int sel_removeObserver_1name_1object_1 = sel_registerName("removeObserver:name:object:");
-public static final int sel_columnContentWidthForColumnWidth_1 = sel_registerName("columnContentWidthForColumnWidth:");
-public static final int sel_wraps = sel_registerName("wraps");
-public static final int sel_getIndexes_1maxCount_1inIndexRange_1 = sel_registerName("getIndexes:maxCount:inIndexRange:");
-public static final int sel_doubleAction = sel_registerName("doubleAction");
-public static final int sel_layoutParagraphAtPoint_1 = sel_registerName("layoutParagraphAtPoint:");
-public static final int sel_cacheDisplayInRect_1toBitmapImageRep_1 = sel_registerName("cacheDisplayInRect:toBitmapImageRep:");
-public static final int sel_setUsesItemFromMenu_1 = sel_registerName("setUsesItemFromMenu:");
-public static final int sel_parserError = sel_registerName("parserError");
-public static final int sel_numberOfMajorTickMarks = sel_registerName("numberOfMajorTickMarks");
-public static final int sel_changeFont_1 = sel_registerName("changeFont:");
-public static final int sel_displaysWhenScreenProfileChanges = sel_registerName("displaysWhenScreenProfileChanges");
-public static final int sel_titleBaseWritingDirection = sel_registerName("titleBaseWritingDirection");
-public static final int sel_columnAtPoint_1 = sel_registerName("columnAtPoint:");
-public static final int sel_setAppliesImmediately_1 = sel_registerName("setAppliesImmediately:");
-public static final int sel_addAccessoryController_1 = sel_registerName("addAccessoryController:");
-public static final int sel_setEditable_1 = sel_registerName("setEditable:");
-public static final int sel_moveRulerlineFromLocation_1toLocation_1 = sel_registerName("moveRulerlineFromLocation:toLocation:");
-public static final int sel_runModal = sel_registerName("runModal");
-public static final int sel_selectionShouldChangeInTableView_1 = sel_registerName("selectionShouldChangeInTableView:");
-public static final int sel_dragSelectionWithEvent_1offset_1slideBack_1 = sel_registerName("dragSelectionWithEvent:offset:slideBack:");
-public static final int sel_rootProxy = sel_registerName("rootProxy");
-public static final int sel_brightnessComponent = sel_registerName("brightnessComponent");
-public static final int sel_setLabel_1forSegment_1 = sel_registerName("setLabel:forSegment:");
-public static final int sel_copy = sel_registerName("copy");
-public static final int sel_helpRequested_1 = sel_registerName("helpRequested:");
-public static final int sel_setThreadPriority_1 = sel_registerName("setThreadPriority:");
-public static final int sel_minContentSize = sel_registerName("minContentSize");
-public static final int sel_setShowsProgressPanel_1 = sel_registerName("setShowsProgressPanel:");
-public static final int sel_setMessageText_1 = sel_registerName("setMessageText:");
-public static final int sel_setLayoutAlgorithm_1 = sel_registerName("setLayoutAlgorithm:");
-public static final int sel_setInContext_1 = sel_registerName("setInContext:");
-public static final int sel_resultCount = sel_registerName("resultCount");
-public static final int sel_usesDataSource = sel_registerName("usesDataSource");
-public static final int sel_textLists = sel_registerName("textLists");
-public static final int sel_setSelectedRange_1affinity_1stillSelecting_1 = sel_registerName("setSelectedRange:affinity:stillSelecting:");
-public static final int sel_shouldResolveExternalEntities = sel_registerName("shouldResolveExternalEntities");
-public static final int sel_clientView = sel_registerName("clientView");
-public static final int sel_styleMask = sel_registerName("styleMask");
-public static final int sel_setCurrencyCode_1 = sel_registerName("setCurrencyCode:");
-public static final int sel_methodReturnType = sel_registerName("methodReturnType");
-public static final int sel_dataUsingEncoding_1 = sel_registerName("dataUsingEncoding:");
-public static final int sel_removeTabStop_1 = sel_registerName("removeTabStop:");
-public static final int sel_reloadItem_1reloadChildren_1 = sel_registerName("reloadItem:reloadChildren:");
-public static final int sel_ancestorSharedWithView_1 = sel_registerName("ancestorSharedWithView:");
-public static final int sel_indexLessThanOrEqualToIndex_1 = sel_registerName("indexLessThanOrEqualToIndex:");
-public static final int sel_removeAllActionsWithTarget_1 = sel_registerName("removeAllActionsWithTarget:");
-public static final int sel_subtype = sel_registerName("subtype");
-public static final int sel_imageRectForPaper_1 = sel_registerName("imageRectForPaper:");
-public static final int sel_initWithWindow_1rect_1 = sel_registerName("initWithWindow:rect:");
-public static final int sel_enable = sel_registerName("enable");
-public static final int sel_scanInteger_1 = sel_registerName("scanInteger:");
-public static final int sel_initWithContentsOfURL_1encoding_1error_1 = sel_registerName("initWithContentsOfURL:encoding:error:");
-public static final int sel_removeObjectIdenticalTo_1 = sel_registerName("removeObjectIdenticalTo:");
-public static final int sel_createTexture_1fromView_1internalFormat_1 = sel_registerName("createTexture:fromView:internalFormat:");
-public static final int sel_decimalNumberByRaisingToPower_1withBehavior_1 = sel_registerName("decimalNumberByRaisingToPower:withBehavior:");
-public static final int sel_appendBezierPathWithArcWithCenter_1radius_1startAngle_1endAngle_1 = sel_registerName("appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:");
-public static final int sel_fontPanel_1 = sel_registerName("fontPanel:");
-public static final int sel_predicateWithSubpredicates_1 = sel_registerName("predicateWithSubpredicates:");
-public static final int sel_layoutGlyphsInLayoutManager_1startingAtGlyphIndex_1maxNumberOfLineFragments_1nextGlyphIndex_1 = sel_registerName("layoutGlyphsInLayoutManager:startingAtGlyphIndex:maxNumberOfLineFragments:nextGlyphIndex:");
-public static final int sel_attributes = sel_registerName("attributes");
-public static final int sel_EPSOperationWithView_1insideRect_1toData_1 = sel_registerName("EPSOperationWithView:insideRect:toData:");
-public static final int sel_listOptions = sel_registerName("listOptions");
-public static final int sel_windowWillLoad = sel_registerName("windowWillLoad");
-public static final int sel_alwaysShowsDecimalSeparator = sel_registerName("alwaysShowsDecimalSeparator");
-public static final int sel_replyToApplicationShouldTerminate_1 = sel_registerName("replyToApplicationShouldTerminate:");
-public static final int sel_setThousandSeparator_1 = sel_registerName("setThousandSeparator:");
-public static final int sel_insertObject_1atArrangedObjectIndexPath_1 = sel_registerName("insertObject:atArrangedObjectIndexPath:");
-public static final int sel_cleanUpOperation = sel_registerName("cleanUpOperation");
-public static final int sel_trackMouse_1inRect_1ofView_1untilMouseUp_1 = sel_registerName("trackMouse:inRect:ofView:untilMouseUp:");
-public static final int sel_replaceLayoutManager_1 = sel_registerName("replaceLayoutManager:");
-public static final int sel_isPartialStringValid_1proposedSelectedRange_1originalString_1originalSelectedRange_1errorDescription_1 = sel_registerName("isPartialStringValid:proposedSelectedRange:originalString:originalSelectedRange:errorDescription:");
-public static final int sel_setNegativeFormat_1 = sel_registerName("setNegativeFormat:");
-public static final int sel_copyFont_1 = sel_registerName("copyFont:");
-public static final int sel_outlineView_1sortDescriptorsDidChange_1 = sel_registerName("outlineView:sortDescriptorsDidChange:");
-public static final int sel_stringWithString_1 = sel_registerName("stringWithString:");
-public static final int sel_valueWithUniqueID_1inPropertyWithKey_1 = sel_registerName("valueWithUniqueID:inPropertyWithKey:");
-public static final int sel_setHighlightsBy_1 = sel_registerName("setHighlightsBy:");
-public static final int sel_setContinuousSpellCheckingEnabled_1 = sel_registerName("setContinuousSpellCheckingEnabled:");
-public static final int sel_isMouseCoalescingEnabled = sel_registerName("isMouseCoalescingEnabled");
-public static final int sel_numberOfSelectedColumns = sel_registerName("numberOfSelectedColumns");
-public static final int sel_spellServer_1findMisspelledWordInString_1language_1wordCount_1countOnly_1 = sel_registerName("spellServer:findMisspelledWordInString:language:wordCount:countOnly:");
-public static final int sel_PMPageFormat = sel_registerName("PMPageFormat");
-public static final int sel_insertText_1client_1 = sel_registerName("insertText:client:");
-public static final int sel_numberWithFloat_1 = sel_registerName("numberWithFloat:");
-public static final int sel_compositeToPoint_1fromRect_1operation_1 = sel_registerName("compositeToPoint:fromRect:operation:");
-public static final int sel_numberOfPlanes = sel_registerName("numberOfPlanes");
-public static final int sel_childrenKeyPath = sel_registerName("childrenKeyPath");
-public static final int sel_countForObject_1 = sel_registerName("countForObject:");
-public static final int sel_fontWithName_1matrix_1 = sel_registerName("fontWithName:matrix:");
-public static final int sel_toolbarAllowedItemIdentifiers_1 = sel_registerName("toolbarAllowedItemIdentifiers:");
-public static final int sel_makeDocumentWithContentsOfURL_1ofType_1 = sel_registerName("makeDocumentWithContentsOfURL:ofType:");
-public static final int sel_initWithHTML_1options_1documentAttributes_1 = sel_registerName("initWithHTML:options:documentAttributes:");
-public static final int sel_fileSystemRepresentation = sel_registerName("fileSystemRepresentation");
-public static final int sel_viewAnimations = sel_registerName("viewAnimations");
-public static final int sel_tabletProximity_1 = sel_registerName("tabletProximity:");
-public static final int sel_replacementClassForClass_1 = sel_registerName("replacementClassForClass:");
-public static final int sel_columnWidthForColumnContentWidth_1 = sel_registerName("columnWidthForColumnContentWidth:");
-public static final int sel_undoMenuItemTitle = sel_registerName("undoMenuItemTitle");
-public static final int sel_expressionForAggregate_1 = sel_registerName("expressionForAggregate:");
-public static final int sel_useStoredAccessor = sel_registerName("useStoredAccessor");
-public static final int sel_ensureAttributesAreFixedInRange_1 = sel_registerName("ensureAttributesAreFixedInRange:");
-public static final int sel_stringForType_1 = sel_registerName("stringForType:");
-public static final int sel_setLeaf_1 = sel_registerName("setLeaf:");
-public static final int sel_URLFromPasteboard_1 = sel_registerName("URLFromPasteboard:");
-public static final int sel_initWithURL_1byReference_1 = sel_registerName("initWithURL:byReference:");
-public static final int sel_readToEndOfFileInBackgroundAndNotify = sel_registerName("readToEndOfFileInBackgroundAndNotify");
-public static final int sel_application_1openFileWithoutUI_1 = sel_registerName("application:openFileWithoutUI:");
-public static final int sel_performClick_1 = sel_registerName("performClick:");
-public static final int sel_completes = sel_registerName("completes");
-public static final int sel_setRulersVisible_1 = sel_registerName("setRulersVisible:");
+public static final int sel_menu = sel_registerName("menu");
+public static final int sel_menu_willHighlightItem_ = sel_registerName("menu:willHighlightItem:");
+public static final int sel_menuDidClose_ = sel_registerName("menuDidClose:");
+public static final int sel_menuForEvent_ = sel_registerName("menuForEvent:");
+public static final int sel_menuNeedsUpdate_ = sel_registerName("menuNeedsUpdate:");
+public static final int sel_menuWillOpen_ = sel_registerName("menuWillOpen:");
+public static final int sel_metaKey = sel_registerName("metaKey");
+public static final int sel_minValue = sel_registerName("minValue");
 public static final int sel_minimumSize = sel_registerName("minimumSize");
-public static final int sel_setProperty_1forKey_1inRequest_1 = sel_registerName("setProperty:forKey:inRequest:");
-public static final int sel_isCopyingOperation = sel_registerName("isCopyingOperation");
-public static final int sel_allowsTickMarkValuesOnly = sel_registerName("allowsTickMarkValuesOnly");
-public static final int sel_insertGlyphs_1length_1forStartingGlyphAtIndex_1characterIndex_1 = sel_registerName("insertGlyphs:length:forStartingGlyphAtIndex:characterIndex:");
-public static final int sel_convertFont_1 = sel_registerName("convertFont:");
-public static final int sel_setNegativePrefix_1 = sel_registerName("setNegativePrefix:");
-public static final int sel_dispatch = sel_registerName("dispatch");
-public static final int sel_makeNewConnection_1sender_1 = sel_registerName("makeNewConnection:sender:");
-public static final int sel_writeToFile_1atomically_1encoding_1error_1 = sel_registerName("writeToFile:atomically:encoding:error:");
-public static final int sel_isHiddenOrHasHiddenAncestor = sel_registerName("isHiddenOrHasHiddenAncestor");
-public static final int sel_endEditingFor_1 = sel_registerName("endEditingFor:");
-public static final int sel_acceptConnectionInBackgroundAndNotify = sel_registerName("acceptConnectionInBackgroundAndNotify");
-public static final int sel_setValue_1forHTTPHeaderField_1 = sel_registerName("setValue:forHTTPHeaderField:");
-public static final int sel_intersectSet_1 = sel_registerName("intersectSet:");
-public static final int sel_tabView_1shouldSelectTabViewItem_1 = sel_registerName("tabView:shouldSelectTabViewItem:");
-public static final int sel_mouseDragged_1 = sel_registerName("mouseDragged:");
-public static final int sel_dataFromRange_1documentAttributes_1error_1 = sel_registerName("dataFromRange:documentAttributes:error:");
-public static final int sel_sharedFrameworksPath = sel_registerName("sharedFrameworksPath");
-public static final int sel_tableView_1writeRowsWithIndexes_1toPasteboard_1 = sel_registerName("tableView:writeRowsWithIndexes:toPasteboard:");
-public static final int sel_setWindowFrameForAttachingToRect_1onScreen_1preferredEdge_1popUpSelectedItem_1 = sel_registerName("setWindowFrameForAttachingToRect:onScreen:preferredEdge:popUpSelectedItem:");
-public static final int sel_valueAtIndex_1inPropertyWithKey_1 = sel_registerName("valueAtIndex:inPropertyWithKey:");
-public static final int sel_setDisplaysLinkToolTips_1 = sel_registerName("setDisplaysLinkToolTips:");
-public static final int sel_removeObserver_1forKeyPath_1 = sel_registerName("removeObserver:forKeyPath:");
-public static final int sel_hasAlpha = sel_registerName("hasAlpha");
-public static final int sel_scrollCellToVisibleAtRow_1column_1 = sel_registerName("scrollCellToVisibleAtRow:column:");
-public static final int sel_activateIgnoringOtherApps_1 = sel_registerName("activateIgnoringOtherApps:");
-public static final int sel_getArgumentTypeAtIndex_1 = sel_registerName("getArgumentTypeAtIndex:");
-public static final int sel_textShouldEndEditing_1 = sel_registerName("textShouldEndEditing:");
-public static final int sel_nextEventMatchingMask_1untilDate_1inMode_1dequeue_1 = sel_registerName("nextEventMatchingMask:untilDate:inMode:dequeue:");
-public static final int sel_timeIntervalSince1970 = sel_registerName("timeIntervalSince1970");
-public static final int sel_decimalNumberBySubtracting_1 = sel_registerName("decimalNumberBySubtracting:");
-public static final int sel_sendBeforeDate_1 = sel_registerName("sendBeforeDate:");
-public static final int sel_autohidesScrollers = sel_registerName("autohidesScrollers");
-public static final int sel_controlPointBounds = sel_registerName("controlPointBounds");
-public static final int sel_setMinimumSignificantDigits_1 = sel_registerName("setMinimumSignificantDigits:");
-public static final int sel_setDestination_1allowOverwrite_1 = sel_registerName("setDestination:allowOverwrite:");
-public static final int sel_setTransparent_1 = sel_registerName("setTransparent:");
-public static final int sel_decodeArrayOfObjCType_1count_1at_1 = sel_registerName("decodeArrayOfObjCType:count:at:");
-public static final int sel_isMiniaturized = sel_registerName("isMiniaturized");
-public static final int sel_setAlignment_1 = sel_registerName("setAlignment:");
-public static final int sel_setCornerRadius_1 = sel_registerName("setCornerRadius:");
-public static final int sel_foregroundColor = sel_registerName("foregroundColor");
-public static final int sel_lineFragmentUsedRectForGlyphAtIndex_1effectiveRange_1 = sel_registerName("lineFragmentUsedRectForGlyphAtIndex:effectiveRange:");
-public static final int sel_attributedSubstringFromRange_1 = sel_registerName("attributedSubstringFromRange:");
-public static final int sel_isSubsetOfSet_1 = sel_registerName("isSubsetOfSet:");
-public static final int sel_iconForFileType_1 = sel_registerName("iconForFileType:");
-public static final int sel_readFromURL_1ofType_1 = sel_registerName("readFromURL:ofType:");
-public static final int sel_decodeBytesForKey_1returnedLength_1 = sel_registerName("decodeBytesForKey:returnedLength:");
-public static final int sel_parser_1foundInternalEntityDeclarationWithName_1value_1 = sel_registerName("parser:foundInternalEntityDeclarationWithName:value:");
-public static final int sel_commonPrefixWithString_1options_1 = sel_registerName("commonPrefixWithString:options:");
-public static final int sel_tableView_1setObjectValue_1forTableColumn_1row_1 = sel_registerName("tableView:setObjectValue:forTableColumn:row:");
-public static final int sel_fileWrapperRepresentationOfType_1 = sel_registerName("fileWrapperRepresentationOfType:");
-public static final int sel_representedFilename = sel_registerName("representedFilename");
-public static final int sel_eventWithCGEvent_1 = sel_registerName("eventWithCGEvent:");
-public static final int sel_setFileURL_1 = sel_registerName("setFileURL:");
-public static final int sel_loadWindow = sel_registerName("loadWindow");
-public static final int sel_defaultLineJoinStyle = sel_registerName("defaultLineJoinStyle");
-public static final int sel_backingLocation = sel_registerName("backingLocation");
-public static final int sel_matrix = sel_registerName("matrix");
-public static final int sel_isEqualToTimeZone_1 = sel_registerName("isEqualToTimeZone:");
-public static final int sel_statistics = sel_registerName("statistics");
-public static final int sel_launchAppWithBundleIdentifier_1options_1additionalEventParamDescriptor_1launchIdentifier_1 = sel_registerName("launchAppWithBundleIdentifier:options:additionalEventParamDescriptor:launchIdentifier:");
-public static final int sel_isHorizontal = sel_registerName("isHorizontal");
-public static final int sel_launchPath = sel_registerName("launchPath");
-public static final int sel_setTextAlignment_1 = sel_registerName("setTextAlignment:");
-public static final int sel_initWithBitmapDataPlanes_1pixelsWide_1pixelsHigh_1bitsPerSample_1samplesPerPixel_1hasAlpha_1isPlanar_1colorSpaceName_1bytesPerRow_1bitsPerPixel_1 = sel_registerName("initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bytesPerRow:bitsPerPixel:");
-public static final int sel_setPatternPhase_1 = sel_registerName("setPatternPhase:");
-public static final int sel_mouseEntered_1withFrame_1inView_1 = sel_registerName("mouseEntered:withFrame:inView:");
-public static final int sel_matchingFontDescriptorsWithMandatoryKeys_1 = sel_registerName("matchingFontDescriptorsWithMandatoryKeys:");
-public static final int sel_objectDidEndEditing_1 = sel_registerName("objectDidEndEditing:");
-public static final int sel_setMaximum_1 = sel_registerName("setMaximum:");
-public static final int sel_initWithIndexes_1length_1 = sel_registerName("initWithIndexes:length:");
-public static final int sel_tableView_1shouldShowCellExpansionForTableColumn_1row_1 = sel_registerName("tableView:shouldShowCellExpansionForTableColumn:row:");
-public static final int sel_moveToPoint_1 = sel_registerName("moveToPoint:");
-public static final int sel_setGridStyleMask_1 = sel_registerName("setGridStyleMask:");
-public static final int sel_firstUnlaidGlyphIndex = sel_registerName("firstUnlaidGlyphIndex");
-public static final int sel_isProxy = sel_registerName("isProxy");
-public static final int sel_takeValue_1forKeyPath_1 = sel_registerName("takeValue:forKeyPath:");
-public static final int sel_drawCellAtRow_1column_1 = sel_registerName("drawCellAtRow:column:");
-public static final int sel_setRulerViewClass_1 = sel_registerName("setRulerViewClass:");
-public static final int sel_objectByApplyingXSLT_1arguments_1error_1 = sel_registerName("objectByApplyingXSLT:arguments:error:");
-public static final int sel_setArrowPosition_1 = sel_registerName("setArrowPosition:");
-public static final int sel_setCharacterIndex_1forGlyphAtIndex_1 = sel_registerName("setCharacterIndex:forGlyphAtIndex:");
-public static final int sel_willChangeValueForKey_1withSetMutation_1usingObjects_1 = sel_registerName("willChangeValueForKey:withSetMutation:usingObjects:");
-public static final int sel_setVerticalRulerView_1 = sel_registerName("setVerticalRulerView:");
-public static final int sel_suspendCurrentAppleEvent = sel_registerName("suspendCurrentAppleEvent");
-public static final int sel_drawStatusBarBackgroundInRect_1withHighlight_1 = sel_registerName("drawStatusBarBackgroundInRect:withHighlight:");
-public static final int sel_performClickWithFrame_1inView_1 = sel_registerName("performClickWithFrame:inView:");
-public static final int sel_coveredCharacterSet = sel_registerName("coveredCharacterSet");
-public static final int sel_browser_1numberOfRowsInColumn_1 = sel_registerName("browser:numberOfRowsInColumn:");
-public static final int sel_isLike_1 = sel_registerName("isLike:");
-public static final int sel_blackComponent = sel_registerName("blackComponent");
-public static final int sel_appendBezierPathWithGlyph_1inFont_1 = sel_registerName("appendBezierPathWithGlyph:inFont:");
-public static final int sel_validateMenuItem_1 = sel_registerName("validateMenuItem:");
-public static final int sel_isEqualToIndexSet_1 = sel_registerName("isEqualToIndexSet:");
-public static final int sel_setBezelStyle_1 = sel_registerName("setBezelStyle:");
-public static final int sel_scaleUnitSquareToSize_1 = sel_registerName("scaleUnitSquareToSize:");
-public static final int sel_setStartSubelementIndex_1 = sel_registerName("setStartSubelementIndex:");
-public static final int sel_frameOfInsideOfColumn_1 = sel_registerName("frameOfInsideOfColumn:");
-public static final int sel_setBlocksOtherRecognizers_1 = sel_registerName("setBlocksOtherRecognizers:");
-public static final int sel_setMinSize_1 = sel_registerName("setMinSize:");
-public static final int sel_setEndSubelementIndex_1 = sel_registerName("setEndSubelementIndex:");
-public static final int sel_cStringLength = sel_registerName("cStringLength");
-public static final int sel_writeWithBackupToFile_1ofType_1saveOperation_1 = sel_registerName("writeWithBackupToFile:ofType:saveOperation:");
-public static final int sel_setDefaultButtonTitle_1 = sel_registerName("setDefaultButtonTitle:");
-public static final int sel_setMinContentSize_1 = sel_registerName("setMinContentSize:");
-public static final int sel_setFormattingDictionary_1 = sel_registerName("setFormattingDictionary:");
-public static final int sel_boundingRectForFont = sel_registerName("boundingRectForFont");
-public static final int sel_postsBoundsChangedNotifications = sel_registerName("postsBoundsChangedNotifications");
-public static final int sel_setParagraphs_1 = sel_registerName("setParagraphs:");
-public static final int sel_setShowsControlCharacters_1 = sel_registerName("setShowsControlCharacters:");
-public static final int sel_writeSafelyToURL_1ofType_1forSaveOperation_1error_1 = sel_registerName("writeSafelyToURL:ofType:forSaveOperation:error:");
-public static final int sel_controlLightHighlightColor = sel_registerName("controlLightHighlightColor");
-public static final int sel_objectSpecifier = sel_registerName("objectSpecifier");
-public static final int sel_dictionaryWithContentsOfURL_1 = sel_registerName("dictionaryWithContentsOfURL:");
-public static final int sel_performSelector_1onThread_1withObject_1waitUntilDone_1modes_1 = sel_registerName("performSelector:onThread:withObject:waitUntilDone:modes:");
-public static final int sel_setJobStyleHint_1 = sel_registerName("setJobStyleHint:");
-public static final int sel_sortedArrayUsingFunction_1context_1 = sel_registerName("sortedArrayUsingFunction:context:");
-public static final int sel_setBoundsRect_1forTextBlock_1glyphRange_1 = sel_registerName("setBoundsRect:forTextBlock:glyphRange:");
-public static final int sel_hasShadow = sel_registerName("hasShadow");
-public static final int sel_windowShouldClose_1 = sel_registerName("windowShouldClose:");
-public static final int sel_defaultTokenizingCharacterSet = sel_registerName("defaultTokenizingCharacterSet");
-public static final int sel_isRulerVisible = sel_registerName("isRulerVisible");
-public static final int sel_setSubrowsKeyPath_1 = sel_registerName("setSubrowsKeyPath:");
-public static final int sel_animationDelay = sel_registerName("animationDelay");
-public static final int sel_selectAll_1 = sel_registerName("selectAll:");
-public static final int sel_parser_1foundNotationDeclarationWithName_1publicID_1systemID_1 = sel_registerName("parser:foundNotationDeclarationWithName:publicID:systemID:");
-public static final int sel_readSelectionFromPasteboard_1 = sel_registerName("readSelectionFromPasteboard:");
-public static final int sel_validateAndReturnError_1 = sel_registerName("validateAndReturnError:");
-public static final int sel_setScriptErrorOffendingObjectDescriptor_1 = sel_registerName("setScriptErrorOffendingObjectDescriptor:");
-public static final int sel_makeKeyWindow = sel_registerName("makeKeyWindow");
-public static final int sel_itemAtIndex_1 = sel_registerName("itemAtIndex:");
-public static final int sel_objectAtIndex_1 = sel_registerName("objectAtIndex:");
-public static final int sel_protectionSpace = sel_registerName("protectionSpace");
-public static final int sel_getCString_1 = sel_registerName("getCString:");
-public static final int sel_initSymbolicLinkWithDestination_1 = sel_registerName("initSymbolicLinkWithDestination:");
-public static final int sel_daylightSavingTimeOffset = sel_registerName("daylightSavingTimeOffset");
-public static final int sel_rangeOfTextList_1atIndex_1 = sel_registerName("rangeOfTextList:atIndex:");
-public static final int sel_currentDirectory = sel_registerName("currentDirectory");
-public static final int sel_windowControllerDidLoadNib_1 = sel_registerName("windowControllerDidLoadNib:");
-public static final int sel_setGroupingSize_1 = sel_registerName("setGroupingSize:");
-public static final int sel_subitems = sel_registerName("subitems");
-public static final int sel_initWithFileWrapper_1 = sel_registerName("initWithFileWrapper:");
-public static final int sel_documentVisibleRect = sel_registerName("documentVisibleRect");
-public static final int sel_setCount_1 = sel_registerName("setCount:");
-public static final int sel_setScriptErrorExpectedTypeDescriptor_1 = sel_registerName("setScriptErrorExpectedTypeDescriptor:");
-public static final int sel_setReleasedWhenClosed_1 = sel_registerName("setReleasedWhenClosed:");
-public static final int sel_imageUnfilteredTypes = sel_registerName("imageUnfilteredTypes");
-public static final int sel_writeToFile_1options_1error_1 = sel_registerName("writeToFile:options:error:");
-public static final int sel_controlContentFontOfSize_1 = sel_registerName("controlContentFontOfSize:");
-public static final int sel_insertRow_1withCells_1 = sel_registerName("insertRow:withCells:");
-public static final int sel_temporaryAttributesAtCharacterIndex_1effectiveRange_1 = sel_registerName("temporaryAttributesAtCharacterIndex:effectiveRange:");
-public static final int sel_stepForward_1 = sel_registerName("stepForward:");
-public static final int sel_convertScreenToBase_1 = sel_registerName("convertScreenToBase:");
-public static final int sel_printerWithType_1 = sel_registerName("printerWithType:");
-public static final int sel_setSliderType_1 = sel_registerName("setSliderType:");
-public static final int sel_applicationShouldHandleReopen_1hasVisibleWindows_1 = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
-public static final int sel_selectedTextAttributes = sel_registerName("selectedTextAttributes");
-public static final int sel_setStandardError_1 = sel_registerName("setStandardError:");
-public static final int sel_drawRect_1 = sel_registerName("drawRect:");
-public static final int sel_URLs = sel_registerName("URLs");
-public static final int sel_animationForKey_1 = sel_registerName("animationForKey:");
-public static final int sel_setSubviews_1 = sel_registerName("setSubviews:");
-public static final int sel_setString_1 = sel_registerName("setString:");
-public static final int sel_openFile_1fromImage_1at_1inView_1 = sel_registerName("openFile:fromImage:at:inView:");
-public static final int sel_draggedImage = sel_registerName("draggedImage");
+public static final int sel_minuteOfHour = sel_registerName("minuteOfHour");
+public static final int sel_modifierFlags = sel_registerName("modifierFlags");
+public static final int sel_monthOfYear = sel_registerName("monthOfYear");
+public static final int sel_mouseDown_ = sel_registerName("mouseDown:");
+public static final int sel_mouseDragged_ = sel_registerName("mouseDragged:");
+public static final int sel_mouseEntered_ = sel_registerName("mouseEntered:");
+public static final int sel_mouseExited_ = sel_registerName("mouseExited:");
+public static final int sel_mouseLocation = sel_registerName("mouseLocation");
+public static final int sel_mouseLocationOutsideOfEventStream = sel_registerName("mouseLocationOutsideOfEventStream");
+public static final int sel_mouseMoved_ = sel_registerName("mouseMoved:");
+public static final int sel_mouseUp_ = sel_registerName("mouseUp:");
+public static final int sel_moveColumn_toColumn_ = sel_registerName("moveColumn:toColumn:");
+public static final int sel_moveToPoint_ = sel_registerName("moveToPoint:");
+public static final int sel_moveUp_ = sel_registerName("moveUp:");
+public static final int sel_mutableString = sel_registerName("mutableString");
+public static final int sel_name = sel_registerName("name");
+public static final int sel_nextEventMatchingMask_untilDate_inMode_dequeue_ = sel_registerName("nextEventMatchingMask:untilDate:inMode:dequeue:");
+public static final int sel_nextObject = sel_registerName("nextObject");
+public static final int sel_nextWordFromIndex_forward_ = sel_registerName("nextWordFromIndex:forward:");
+public static final int sel_noteNumberOfRowsChanged = sel_registerName("noteNumberOfRowsChanged");
+public static final int sel_numberOfColumns = sel_registerName("numberOfColumns");
+public static final int sel_numberOfComponents = sel_registerName("numberOfComponents");
 public static final int sel_numberOfGlyphs = sel_registerName("numberOfGlyphs");
-public static final int sel_itemAtRow_1 = sel_registerName("itemAtRow:");
-public static final int sel_drawKnob = sel_registerName("drawKnob");
-public static final int sel_imageRepsWithData_1 = sel_registerName("imageRepsWithData:");
-public static final int sel_dragOperationForDraggingInfo_1type_1 = sel_registerName("dragOperationForDraggingInfo:type:");
-public static final int sel_initWithRTF_1documentAttributes_1 = sel_registerName("initWithRTF:documentAttributes:");
-public static final int sel_pathsForResourcesOfType_1inDirectory_1 = sel_registerName("pathsForResourcesOfType:inDirectory:");
-public static final int sel_fontName = sel_registerName("fontName");
-public static final int sel_layoutManagers = sel_registerName("layoutManagers");
-public static final int sel_error = sel_registerName("error");
-public static final int sel_parentWindow = sel_registerName("parentWindow");
-public static final int sel_registerClass_1 = sel_registerName("registerClass:");
-public static final int sel_hideOtherApplications = sel_registerName("hideOtherApplications");
-public static final int sel_alphaComponent = sel_registerName("alphaComponent");
-public static final int sel_setPrefersColorMatch_1 = sel_registerName("setPrefersColorMatch:");
-public static final int sel_stopAnimation_1 = sel_registerName("stopAnimation:");
-public static final int sel_glyphIndexForCharacterAtIndex_1 = sel_registerName("glyphIndexForCharacterAtIndex:");
-public static final int sel_rulerView_1shouldAddMarker_1 = sel_registerName("rulerView:shouldAddMarker:");
-public static final int sel_initWithFrame_1 = sel_registerName("initWithFrame:");
-public static final int sel_init = sel_registerName("init");
-public static final int sel_selectedColumnEnumerator = sel_registerName("selectedColumnEnumerator");
-public static final int sel_viewWithTag_1 = sel_registerName("viewWithTag:");
-public static final int sel_classForKeyedUnarchiver = sel_registerName("classForKeyedUnarchiver");
-public static final int sel_addRow_1 = sel_registerName("addRow:");
-public static final int sel_contextHelpForObject_1 = sel_registerName("contextHelpForObject:");
-public static final int sel_server = sel_registerName("server");
-public static final int sel_colorUsingColorSpaceName_1device_1 = sel_registerName("colorUsingColorSpaceName:device:");
-public static final int sel_valueTransformerForName_1 = sel_registerName("valueTransformerForName:");
-public static final int sel_soundUnfilteredFileTypes = sel_registerName("soundUnfilteredFileTypes");
-public static final int sel_setSelectedTextAttributes_1 = sel_registerName("setSelectedTextAttributes:");
-public static final int sel_setLeadingOffset_1 = sel_registerName("setLeadingOffset:");
-public static final int sel_scrollToPoint_1 = sel_registerName("scrollToPoint:");
-public static final int sel_lastPathComponent = sel_registerName("lastPathComponent");
-public static final int sel_lossyCString = sel_registerName("lossyCString");
-public static final int sel_registerServicesMenuSendTypes_1returnTypes_1 = sel_registerName("registerServicesMenuSendTypes:returnTypes:");
-public static final int sel_keyDown_1 = sel_registerName("keyDown:");
-public static final int sel_setWidthTracksTextView_1 = sel_registerName("setWidthTracksTextView:");
-public static final int sel_incrementBy_1 = sel_registerName("incrementBy:");
-public static final int sel_moveWordForward_1 = sel_registerName("moveWordForward:");
-public static final int sel_dataWithContentsOfMappedFile_1 = sel_registerName("dataWithContentsOfMappedFile:");
-public static final int sel_socket = sel_registerName("socket");
-public static final int sel_EPSOperationWithView_1insideRect_1toData_1printInfo_1 = sel_registerName("EPSOperationWithView:insideRect:toData:printInfo:");
-public static final int sel_width = sel_registerName("width");
-public static final int sel_capabilityMask = sel_registerName("capabilityMask");
-public static final int sel_setBezeled_1 = sel_registerName("setBezeled:");
-public static final int sel_currentMode = sel_registerName("currentMode");
-public static final int sel_sliderType = sel_registerName("sliderType");
-public static final int sel_fileIsAppendOnly = sel_registerName("fileIsAppendOnly");
-public static final int sel_isAutomaticLinkDetectionEnabled = sel_registerName("isAutomaticLinkDetectionEnabled");
-public static final int sel_setBoundsOrigin_1 = sel_registerName("setBoundsOrigin:");
-public static final int sel_selectionHighlightStyle = sel_registerName("selectionHighlightStyle");
-public static final int sel_registerName_1 = sel_registerName("registerName:");
-public static final int sel_moveWordRightAndModifySelection_1 = sel_registerName("moveWordRightAndModifySelection:");
-public static final int sel_setCharacters_1 = sel_registerName("setCharacters:");
-public static final int sel_setWordFieldStringValue_1 = sel_registerName("setWordFieldStringValue:");
-public static final int sel_reverseObjectEnumerator = sel_registerName("reverseObjectEnumerator");
-public static final int sel_encodeByrefObject_1 = sel_registerName("encodeByrefObject:");
-public static final int sel_defaultDecimalNumberHandler = sel_registerName("defaultDecimalNumberHandler");
-public static final int sel_isEntryAcceptable_1 = sel_registerName("isEntryAcceptable:");
-public static final int sel_orderWindow_1relativeTo_1 = sel_registerName("orderWindow:relativeTo:");
-public static final int sel_writablePasteboardTypes = sel_registerName("writablePasteboardTypes");
-public static final int sel_addTrackingRect_1owner_1userData_1assumeInside_1 = sel_registerName("addTrackingRect:owner:userData:assumeInside:");
-public static final int sel_setPathComponentCells_1 = sel_registerName("setPathComponentCells:");
-public static final int sel_timeZoneWithName_1 = sel_registerName("timeZoneWithName:");
-public static final int sel_setAutosaveTableColumns_1 = sel_registerName("setAutosaveTableColumns:");
-public static final int sel_orPredicateWithSubpredicates_1 = sel_registerName("orPredicateWithSubpredicates:");
-public static final int sel_isEqualToDictionary_1 = sel_registerName("isEqualToDictionary:");
-public static final int sel_bottomMargin = sel_registerName("bottomMargin");
-public static final int sel_initWithYear_1month_1day_1hour_1minute_1second_1timeZone_1 = sel_registerName("initWithYear:month:day:hour:minute:second:timeZone:");
-public static final int sel_scrollColumnsLeftBy_1 = sel_registerName("scrollColumnsLeftBy:");
-public static final int sel_initWithContentsOfURL_1error_1 = sel_registerName("initWithContentsOfURL:error:");
-public static final int sel_setTabViewType_1 = sel_registerName("setTabViewType:");
-public static final int sel_initWithFloat_1 = sel_registerName("initWithFloat:");
-public static final int sel_attributedStringForObjectValue_1withDefaultAttributes_1 = sel_registerName("attributedStringForObjectValue:withDefaultAttributes:");
-public static final int sel_sharedGlyphGenerator = sel_registerName("sharedGlyphGenerator");
-public static final int sel_maximumRangeOfUnit_1 = sel_registerName("maximumRangeOfUnit:");
-public static final int sel_docFormatFromRange_1documentAttributes_1 = sel_registerName("docFormatFromRange:documentAttributes:");
-public static final int sel_initWithBitmapImageRep_1 = sel_registerName("initWithBitmapImageRep:");
-public static final int sel_mnemonic = sel_registerName("mnemonic");
-public static final int sel_prefersColorMatch = sel_registerName("prefersColorMatch");
-public static final int sel_fileSystemAttributesAtPath_1 = sel_registerName("fileSystemAttributesAtPath:");
-public static final int sel_rotateByRadians_1 = sel_registerName("rotateByRadians:");
-public static final int sel_createConversationForConnection_1 = sel_registerName("createConversationForConnection:");
-public static final int sel_setWindow_1 = sel_registerName("setWindow:");
-public static final int sel_addFontDescriptors_1toCollection_1 = sel_registerName("addFontDescriptors:toCollection:");
-public static final int sel_setMark_1 = sel_registerName("setMark:");
-public static final int sel_terminate = sel_registerName("terminate");
-public static final int sel_setTickMarkPosition_1 = sel_registerName("setTickMarkPosition:");
-public static final int sel_setIgnoresMouseEvents_1 = sel_registerName("setIgnoresMouseEvents:");
-public static final int sel_pointerArrayWithStrongObjects = sel_registerName("pointerArrayWithStrongObjects");
-public static final int sel_intersectsHashTable_1 = sel_registerName("intersectsHashTable:");
-public static final int sel_initWithTransform_1 = sel_registerName("initWithTransform:");
-public static final int sel_deviceRGBColorSpace = sel_registerName("deviceRGBColorSpace");
-public static final int sel_currentDiskUsage = sel_registerName("currentDiskUsage");
-public static final int sel_writeToFile_1ofType_1 = sel_registerName("writeToFile:ofType:");
-public static final int sel_unionSet_1 = sel_registerName("unionSet:");
-public static final int sel_bitmapFormat = sel_registerName("bitmapFormat");
-public static final int sel_moveItemAtPath_1toPath_1error_1 = sel_registerName("moveItemAtPath:toPath:error:");
-public static final int sel_tableView = sel_registerName("tableView");
-public static final int sel_performSelectorOnMainThread_1withObject_1waitUntilDone_1modes_1 = sel_registerName("performSelectorOnMainThread:withObject:waitUntilDone:modes:");
-public static final int sel_initAndTestWithTests_1 = sel_registerName("initAndTestWithTests:");
-public static final int sel_setVerticalMotionCanBeginDrag_1 = sel_registerName("setVerticalMotionCanBeginDrag:");
-public static final int sel_documentClassNames = sel_registerName("documentClassNames");
-public static final int sel_setShadow_1 = sel_registerName("setShadow:");
-public static final int sel_beginLineWithGlyphAtIndex_1 = sel_registerName("beginLineWithGlyphAtIndex:");
-public static final int sel_predicateWithSubstitutionVariables_1 = sel_registerName("predicateWithSubstitutionVariables:");
-public static final int sel_EPSOperationWithView_1insideRect_1toPath_1printInfo_1 = sel_registerName("EPSOperationWithView:insideRect:toPath:printInfo:");
-public static final int sel_startSubelementIndex = sel_registerName("startSubelementIndex");
-public static final int sel_sleepUntilDate_1 = sel_registerName("sleepUntilDate:");
-public static final int sel_menuForEvent_1 = sel_registerName("menuForEvent:");
-public static final int sel_disabledControlTextColor = sel_registerName("disabledControlTextColor");
-public static final int sel_addRegularFileWithContents_1preferredFilename_1 = sel_registerName("addRegularFileWithContents:preferredFilename:");
-public static final int sel_setTakesTitleFromPreviousColumn_1 = sel_registerName("setTakesTitleFromPreviousColumn:");
-public static final int sel_removeSelectionIndexes_1 = sel_registerName("removeSelectionIndexes:");
-public static final int sel_resizedColumn = sel_registerName("resizedColumn");
-public static final int sel_host = sel_registerName("host");
-public static final int sel_setDefaultAttachmentScaling_1 = sel_registerName("setDefaultAttachmentScaling:");
-public static final int sel_boundingRectWithSize_1options_1 = sel_registerName("boundingRectWithSize:options:");
-public static final int sel_magentaColor = sel_registerName("magentaColor");
-public static final int sel_performDefaultImplementation = sel_registerName("performDefaultImplementation");
-public static final int sel_getPeriodicDelay_1interval_1 = sel_registerName("getPeriodicDelay:interval:");
-public static final int sel_RTFFromRange_1 = sel_registerName("RTFFromRange:");
-public static final int sel_setStringValue_1 = sel_registerName("setStringValue:");
-public static final int sel_setPaletteLabel_1 = sel_registerName("setPaletteLabel:");
-public static final int sel_years_1months_1days_1hours_1minutes_1seconds_1sinceDate_1 = sel_registerName("years:months:days:hours:minutes:seconds:sinceDate:");
-public static final int sel_initWithFormat_1arguments_1 = sel_registerName("initWithFormat:arguments:");
-public static final int sel_firstUnlaidCharacterIndex = sel_registerName("firstUnlaidCharacterIndex");
-public static final int sel_panelSelectionDidChange_1 = sel_registerName("panelSelectionDidChange:");
-public static final int sel_typesFilterableTo_1 = sel_registerName("typesFilterableTo:");
-public static final int sel_selectPreviousTabViewItem_1 = sel_registerName("selectPreviousTabViewItem:");
-public static final int sel_URLProtocol_1didReceiveResponse_1cacheStoragePolicy_1 = sel_registerName("URLProtocol:didReceiveResponse:cacheStoragePolicy:");
-public static final int sel_loadView = sel_registerName("loadView");
-public static final int sel_setPositiveSuffix_1 = sel_registerName("setPositiveSuffix:");
-public static final int sel_setSizeMode_1 = sel_registerName("setSizeMode:");
-public static final int sel_addValue_1forHTTPHeaderField_1 = sel_registerName("addValue:forHTTPHeaderField:");
-public static final int sel_replacementObjectForPortCoder_1 = sel_registerName("replacementObjectForPortCoder:");
-public static final int sel_cycleToNextInputLanguage_1 = sel_registerName("cycleToNextInputLanguage:");
-public static final int sel_setContentMinSize_1 = sel_registerName("setContentMinSize:");
-public static final int sel_convertWeight_1ofFont_1 = sel_registerName("convertWeight:ofFont:");
-public static final int sel_code = sel_registerName("code");
-public static final int sel_TIFFRepresentationUsingCompression_1factor_1 = sel_registerName("TIFFRepresentationUsingCompression:factor:");
-public static final int sel_setSelector_1 = sel_registerName("setSelector:");
-public static final int sel_URLHandleResourceDidCancelLoading_1 = sel_registerName("URLHandleResourceDidCancelLoading:");
-public static final int sel_setTag_1forSegment_1 = sel_registerName("setTag:forSegment:");
-public static final int sel_viewFrameChanged_1 = sel_registerName("viewFrameChanged:");
-public static final int sel_attachmentCell = sel_registerName("attachmentCell");
-public static final int sel_removeStatusItem_1 = sel_registerName("removeStatusItem:");
-public static final int sel_pathForAuxiliaryExecutable_1 = sel_registerName("pathForAuxiliaryExecutable:");
-public static final int sel_fileURL = sel_registerName("fileURL");
-public static final int sel_drawerShouldOpen_1 = sel_registerName("drawerShouldOpen:");
-public static final int sel_initForWritingWithMutableData_1 = sel_registerName("initForWritingWithMutableData:");
-public static final int sel_content = sel_registerName("content");
-public static final int sel_addSubview_1 = sel_registerName("addSubview:");
-public static final int sel_stringByReplacingOccurrencesOfString_1withString_1 = sel_registerName("stringByReplacingOccurrencesOfString:withString:");
-public static final int sel_stringWithFileSystemRepresentation_1length_1 = sel_registerName("stringWithFileSystemRepresentation:length:");
-public static final int sel_isVerticallyCentered = sel_registerName("isVerticallyCentered");
-public static final int sel_setVerticallyCentered_1 = sel_registerName("setVerticallyCentered:");
-public static final int sel_selectPrevious_1 = sel_registerName("selectPrevious:");
-public static final int sel_addTemporaryAttributes_1forCharacterRange_1 = sel_registerName("addTemporaryAttributes:forCharacterRange:");
-public static final int sel_tabState = sel_registerName("tabState");
-public static final int sel_defaultQueue = sel_registerName("defaultQueue");
-public static final int sel_showsControlCharacters = sel_registerName("showsControlCharacters");
-public static final int sel_indexOfObject_1 = sel_registerName("indexOfObject:");
-public static final int sel_shadow = sel_registerName("shadow");
-public static final int sel_fontMenu_1 = sel_registerName("fontMenu:");
-public static final int sel_movePath_1toPath_1handler_1 = sel_registerName("movePath:toPath:handler:");
-public static final int sel_setDictionary_1 = sel_registerName("setDictionary:");
-public static final int sel_verticalLineScroll = sel_registerName("verticalLineScroll");
-public static final int sel_showsAlpha = sel_registerName("showsAlpha");
-public static final int sel_removeObserver_1 = sel_registerName("removeObserver:");
-public static final int sel_isFieldEditor = sel_registerName("isFieldEditor");
-public static final int sel_fileHandleForWriting = sel_registerName("fileHandleForWriting");
-public static final int sel_contentsAtPath_1 = sel_registerName("contentsAtPath:");
-public static final int sel_writeProperty_1forKey_1 = sel_registerName("writeProperty:forKey:");
-public static final int sel_drawWithRect_1options_1attributes_1 = sel_registerName("drawWithRect:options:attributes:");
-public static final int sel_initWithName_1 = sel_registerName("initWithName:");
-public static final int sel_getFileSystemInfoForPath_1isRemovable_1isWritable_1isUnmountable_1description_1type_1 = sel_registerName("getFileSystemInfoForPath:isRemovable:isWritable:isUnmountable:description:type:");
-public static final int sel_setOpenGLContext_1 = sel_registerName("setOpenGLContext:");
-public static final int sel_hasSubmenu = sel_registerName("hasSubmenu");
-public static final int sel_rangeOfTextTable_1atIndex_1 = sel_registerName("rangeOfTextTable:atIndex:");
-public static final int sel_connection_1willCacheResponse_1 = sel_registerName("connection:willCacheResponse:");
-public static final int sel_automaticallyRearrangesObjects = sel_registerName("automaticallyRearrangesObjects");
-public static final int sel_registerCommandDescription_1 = sel_registerName("registerCommandDescription:");
-public static final int sel_indexOfSelectedItem = sel_registerName("indexOfSelectedItem");
-public static final int sel_underline_1 = sel_registerName("underline:");
-public static final int sel_beginModalSessionForWindow_1relativeToWindow_1 = sel_registerName("beginModalSessionForWindow:relativeToWindow:");
-public static final int sel_initWithData_1options_1documentAttributes_1error_1 = sel_registerName("initWithData:options:documentAttributes:error:");
-public static final int sel_revert_1 = sel_registerName("revert:");
-public static final int sel_displayableSubpredicatesOfPredicate_1 = sel_registerName("displayableSubpredicatesOfPredicate:");
-public static final int sel_dataWithData_1 = sel_registerName("dataWithData:");
-public static final int sel_scaleXBy_1yBy_1 = sel_registerName("scaleXBy:yBy:");
-public static final int sel_decodeBoolForKey_1 = sel_registerName("decodeBoolForKey:");
-public static final int sel_itemTitles = sel_registerName("itemTitles");
-public static final int sel_removeFontDescriptor_1fromCollection_1 = sel_registerName("removeFontDescriptor:fromCollection:");
-public static final int sel_isContinuousSpellCheckingEnabled = sel_registerName("isContinuousSpellCheckingEnabled");
-public static final int sel_paragraphSpacingBeforeGlyphAtIndex_1withProposedLineFragmentRect_1 = sel_registerName("paragraphSpacingBeforeGlyphAtIndex:withProposedLineFragmentRect:");
-public static final int sel_ignoreSpelling_1 = sel_registerName("ignoreSpelling:");
-public static final int sel_crosshairCursor = sel_registerName("crosshairCursor");
-public static final int sel_setSelected_1 = sel_registerName("setSelected:");
-public static final int sel_RTFDFromRange_1 = sel_registerName("RTFDFromRange:");
-public static final int sel_setCanSelectHiddenExtension_1 = sel_registerName("setCanSelectHiddenExtension:");
-public static final int sel_setNestingMode_1 = sel_registerName("setNestingMode:");
-public static final int sel_addItemsWithObjectValues_1 = sel_registerName("addItemsWithObjectValues:");
-public static final int sel_setContentFilters_1 = sel_registerName("setContentFilters:");
-public static final int sel_setAutorepeat_1 = sel_registerName("setAutorepeat:");
-public static final int sel_resizeWithOldSuperviewSize_1 = sel_registerName("resizeWithOldSuperviewSize:");
-public static final int sel_areCursorRectsEnabled = sel_registerName("areCursorRectsEnabled");
-public static final int sel_browser_1selectCellWithString_1inColumn_1 = sel_registerName("browser:selectCellWithString:inColumn:");
-public static final int sel_setLastColumn_1 = sel_registerName("setLastColumn:");
-public static final int sel_isContextHelpModeActive = sel_registerName("isContextHelpModeActive");
-public static final int sel_setTitleColor_1 = sel_registerName("setTitleColor:");
-public static final int sel_initWithBytes_1length_1 = sel_registerName("initWithBytes:length:");
-public static final int sel_animation_1valueForProgress_1 = sel_registerName("animation:valueForProgress:");
-public static final int sel_fillColor = sel_registerName("fillColor");
-public static final int sel_completionsForPartialWordRange_1inString_1language_1inSpellDocumentWithTag_1 = sel_registerName("completionsForPartialWordRange:inString:language:inSpellDocumentWithTag:");
-public static final int sel_typeForContentsOfURL_1error_1 = sel_registerName("typeForContentsOfURL:error:");
-public static final int sel_setShowPanels_1 = sel_registerName("setShowPanels:");
-public static final int sel_outlineView_1dataCellForTableColumn_1item_1 = sel_registerName("outlineView:dataCellForTableColumn:item:");
-public static final int sel_setLineJoinStyle_1 = sel_registerName("setLineJoinStyle:");
-public static final int sel_cancelPerformSelectorsWithTarget_1 = sel_registerName("cancelPerformSelectorsWithTarget:");
-public static final int sel_nextDaylightSavingTimeTransition = sel_registerName("nextDaylightSavingTimeTransition");
-public static final int sel_setEndSubelementIdentifier_1 = sel_registerName("setEndSubelementIdentifier:");
-public static final int sel_channelMapping = sel_registerName("channelMapping");
-public static final int sel_setTitle_1ofColumn_1 = sel_registerName("setTitle:ofColumn:");
-public static final int sel_setHeaderToolTip_1 = sel_registerName("setHeaderToolTip:");
-public static final int sel_initWithChar_1 = sel_registerName("initWithChar:");
-public static final int sel_shouldReportNamespacePrefixes = sel_registerName("shouldReportNamespacePrefixes");
-public static final int sel_decomposedStringWithCompatibilityMapping = sel_registerName("decomposedStringWithCompatibilityMapping");
-public static final int sel_undoActionName = sel_registerName("undoActionName");
-public static final int sel_attachColorList_1 = sel_registerName("attachColorList:");
-public static final int sel_cancelPreviousPerformRequestsWithTarget_1 = sel_registerName("cancelPreviousPerformRequestsWithTarget:");
-public static final int sel_addToolTipRect_1owner_1userData_1 = sel_registerName("addToolTipRect:owner:userData:");
-public static final int sel_isOptionalArgumentWithName_1 = sel_registerName("isOptionalArgumentWithName:");
-public static final int sel_fileHandleForReading = sel_registerName("fileHandleForReading");
-public static final int sel_removeConnection_1fromRunLoop_1forMode_1 = sel_registerName("removeConnection:fromRunLoop:forMode:");
-public static final int sel_controlTextDidBeginEditing_1 = sel_registerName("controlTextDidBeginEditing:");
-public static final int sel_closePath = sel_registerName("closePath");
-public static final int sel_isPlaying = sel_registerName("isPlaying");
-public static final int sel_matrixClass = sel_registerName("matrixClass");
-public static final int sel_doCommandBySelector_1client_1 = sel_registerName("doCommandBySelector:client:");
-public static final int sel_appendBytes_1length_1 = sel_registerName("appendBytes:length:");
-public static final int sel_lightGrayColor = sel_registerName("lightGrayColor");
-public static final int sel_menuRepresentation = sel_registerName("menuRepresentation");
-public static final int sel_dateWithString_1calendarFormat_1 = sel_registerName("dateWithString:calendarFormat:");
-public static final int sel_decodeClassName_1asClassName_1 = sel_registerName("decodeClassName:asClassName:");
-public static final int sel_deleteToBeginningOfParagraph_1 = sel_registerName("deleteToBeginningOfParagraph:");
-public static final int sel_runModalForDirectory_1file_1 = sel_registerName("runModalForDirectory:file:");
-public static final int sel_inverseForRelationshipKey_1 = sel_registerName("inverseForRelationshipKey:");
-public static final int sel_cancelLoadInBackground = sel_registerName("cancelLoadInBackground");
-public static final int sel_setLeftMargin_1 = sel_registerName("setLeftMargin:");
-public static final int sel_tabStopType = sel_registerName("tabStopType");
-public static final int sel_replaceCharactersInRange_1withRTF_1 = sel_registerName("replaceCharactersInRange:withRTF:");
-public static final int sel_drawInRect_1fromRect_1operation_1fraction_1 = sel_registerName("drawInRect:fromRect:operation:fraction:");
-public static final int sel_sound = sel_registerName("sound");
-public static final int sel_localizedRecoverySuggestion = sel_registerName("localizedRecoverySuggestion");
-public static final int sel_getInputStream_1outputStream_1 = sel_registerName("getInputStream:outputStream:");
-public static final int sel_defaultType = sel_registerName("defaultType");
-public static final int sel_sharedFontPanel = sel_registerName("sharedFontPanel");
-public static final int sel_fixParagraphStyleAttributeInRange_1 = sel_registerName("fixParagraphStyleAttributeInRange:");
-public static final int sel_textColor = sel_registerName("textColor");
-public static final int sel_noteFileSystemChanged = sel_registerName("noteFileSystemChanged");
-public static final int sel_setObject_1forKey_1 = sel_registerName("setObject:forKey:");
-public static final int sel_drawAtPoint_1 = sel_registerName("drawAtPoint:");
-public static final int sel_tableView_1shouldSelectTableColumn_1 = sel_registerName("tableView:shouldSelectTableColumn:");
-public static final int sel_deleteWordBackward_1 = sel_registerName("deleteWordBackward:");
-public static final int sel_pipe = sel_registerName("pipe");
-public static final int sel_resetStandardUserDefaults = sel_registerName("resetStandardUserDefaults");
-public static final int sel_orderFrontSpacingPanel_1 = sel_registerName("orderFrontSpacingPanel:");
-public static final int sel_setUsesFontPanel_1 = sel_registerName("setUsesFontPanel:");
-public static final int sel_saveToURL_1ofType_1forSaveOperation_1delegate_1didSaveSelector_1contextInfo_1 = sel_registerName("saveToURL:ofType:forSaveOperation:delegate:didSaveSelector:contextInfo:");
-public static final int sel_linkPath_1toPath_1handler_1 = sel_registerName("linkPath:toPath:handler:");
-public static final int sel_addTimeInterval_1 = sel_registerName("addTimeInterval:");
-public static final int sel_formattingDictionary = sel_registerName("formattingDictionary");
-public static final int sel_ignoresMultiClick = sel_registerName("ignoresMultiClick");
-public static final int sel_encodeValuesOfObjCTypes_1 = sel_registerName("encodeValuesOfObjCTypes:");
-public static final int sel_indexAtPosition_1 = sel_registerName("indexAtPosition:");
-public static final int sel_autoresizesSubviews = sel_registerName("autoresizesSubviews");
-public static final int sel_takesTitleFromPreviousColumn = sel_registerName("takesTitleFromPreviousColumn");
-public static final int sel_titlePosition = sel_registerName("titlePosition");
-public static final int sel_currentAppleEvent = sel_registerName("currentAppleEvent");
-public static final int sel_valueForDimension_1 = sel_registerName("valueForDimension:");
-public static final int sel_printDocumentWithSettings_1showPrintPanel_1delegate_1didPrintSelector_1contextInfo_1 = sel_registerName("printDocumentWithSettings:showPrintPanel:delegate:didPrintSelector:contextInfo:");
-public static final int sel_isZoomable = sel_registerName("isZoomable");
-public static final int sel_setNeedsDisplay = sel_registerName("setNeedsDisplay");
-public static final int sel_initWithColors_1 = sel_registerName("initWithColors:");
-public static final int sel_isSubclassOfClass_1 = sel_registerName("isSubclassOfClass:");
-public static final int sel_adobeRGB1998ColorSpace = sel_registerName("adobeRGB1998ColorSpace");
-public static final int sel_textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1 = sel_registerName("textView:willChangeSelectionFromCharacterRange:toCharacterRange:");
-public static final int sel_useAllLigatures_1 = sel_registerName("useAllLigatures:");
-public static final int sel_setFrameUsingName_1force_1 = sel_registerName("setFrameUsingName:force:");
-public static final int sel_percentSymbol = sel_registerName("percentSymbol");
-public static final int sel_addRepresentations_1 = sel_registerName("addRepresentations:");
-public static final int sel_writeEPSInsideRect_1toPasteboard_1 = sel_registerName("writeEPSInsideRect:toPasteboard:");
-public static final int sel_systemFontSize = sel_registerName("systemFontSize");
-public static final int sel_canRemoveAllRows = sel_registerName("canRemoveAllRows");
-public static final int sel_endLineWithGlyphRange_1 = sel_registerName("endLineWithGlyphRange:");
-public static final int sel_maxItemSize = sel_registerName("maxItemSize");
-public static final int sel_setImageScaling_1forSegment_1 = sel_registerName("setImageScaling:forSegment:");
-public static final int sel_reloadDefaultFontFamilies = sel_registerName("reloadDefaultFontFamilies");
-public static final int sel_removeRow_1 = sel_registerName("removeRow:");
-public static final int sel_contentSize = sel_registerName("contentSize");
-public static final int sel_setValueTransformer_1forName_1 = sel_registerName("setValueTransformer:forName:");
-public static final int sel_defaultCStringEncoding = sel_registerName("defaultCStringEncoding");
-public static final int sel_setMaxNumberOfRows_1 = sel_registerName("setMaxNumberOfRows:");
-public static final int sel_continueWithoutCredentialForAuthenticationChallenge_1 = sel_registerName("continueWithoutCredentialForAuthenticationChallenge:");
-public static final int sel_encodeArrayOfObjCType_1count_1at_1 = sel_registerName("encodeArrayOfObjCType:count:at:");
-public static final int sel_tabStops = sel_registerName("tabStops");
-public static final int sel_altIncrementValue = sel_registerName("altIncrementValue");
-public static final int sel_removeAttribute_1range_1 = sel_registerName("removeAttribute:range:");
-public static final int sel_rightExpressionAttributeType = sel_registerName("rightExpressionAttributeType");
-public static final int sel_setAutoresizesAllColumnsToFit_1 = sel_registerName("setAutoresizesAllColumnsToFit:");
-public static final int sel_removeAllToolTips = sel_registerName("removeAllToolTips");
-public static final int sel_setNotANumberSymbol_1 = sel_registerName("setNotANumberSymbol:");
-public static final int sel_setMinWidth_1 = sel_registerName("setMinWidth:");
-public static final int sel_setDefaultTimeZone_1 = sel_registerName("setDefaultTimeZone:");
-public static final int sel_setTabStops_1 = sel_registerName("setTabStops:");
-public static final int sel_textView_1draggedCell_1inRect_1event_1 = sel_registerName("textView:draggedCell:inRect:event:");
-public static final int sel_PDFOperationWithView_1insideRect_1toData_1 = sel_registerName("PDFOperationWithView:insideRect:toData:");
-public static final int sel_outlineView_1selectionIndexesForProposedSelection_1 = sel_registerName("outlineView:selectionIndexesForProposedSelection:");
-public static final int sel_initWithContentsOfURL_1 = sel_registerName("initWithContentsOfURL:");
-public static final int sel_setBidiProcessingEnabled_1 = sel_registerName("setBidiProcessingEnabled:");
-public static final int sel_selectToMark_1 = sel_registerName("selectToMark:");
-public static final int sel_newlineCharacterSet = sel_registerName("newlineCharacterSet");
-public static final int sel_accessibilitySetOverrideValue_1forAttribute_1 = sel_registerName("accessibilitySetOverrideValue:forAttribute:");
-public static final int sel_setPostsFrameChangedNotifications_1 = sel_registerName("setPostsFrameChangedNotifications:");
-public static final int sel_cellPrototype = sel_registerName("cellPrototype");
-public static final int sel_unmarkText = sel_registerName("unmarkText");
-public static final int sel_displayValuesKeyPath = sel_registerName("displayValuesKeyPath");
-public static final int sel_orderFrontStylesPanel_1 = sel_registerName("orderFrontStylesPanel:");
-public static final int sel_getBuffer_1length_1 = sel_registerName("getBuffer:length:");
-public static final int sel_calcDrawInfo_1 = sel_registerName("calcDrawInfo:");
-public static final int sel_initWithUTF8String_1 = sel_registerName("initWithUTF8String:");
-public static final int sel_deselectAllCells = sel_registerName("deselectAllCells");
-public static final int sel_checkGrammarOfString_1startingAt_1language_1wrap_1inSpellDocumentWithTag_1details_1 = sel_registerName("checkGrammarOfString:startingAt:language:wrap:inSpellDocumentWithTag:details:");
-public static final int sel_poolCountHighWaterResolution = sel_registerName("poolCountHighWaterResolution");
-public static final int sel_canInitWithData_1 = sel_registerName("canInitWithData:");
-public static final int sel_setHasVerticalScroller_1 = sel_registerName("setHasVerticalScroller:");
-public static final int sel_flushHostCache = sel_registerName("flushHostCache");
-public static final int sel_toolbarDefaultItemIdentifiers_1 = sel_registerName("toolbarDefaultItemIdentifiers:");
-public static final int sel_setSearchButtonCell_1 = sel_registerName("setSearchButtonCell:");
-public static final int sel_defaultButtonCell = sel_registerName("defaultButtonCell");
-public static final int sel_sizeLastColumnToFit = sel_registerName("sizeLastColumnToFit");
-public static final int sel_addColumn = sel_registerName("addColumn");
-public static final int sel_failureResponse = sel_registerName("failureResponse");
-public static final int sel_insertTabIgnoringFieldEditor_1 = sel_registerName("insertTabIgnoringFieldEditor:");
-public static final int sel_locationForGlyphAtIndex_1 = sel_registerName("locationForGlyphAtIndex:");
-public static final int sel_insertContainerBreak_1 = sel_registerName("insertContainerBreak:");
-public static final int sel_setAutosizesCells_1 = sel_registerName("setAutosizesCells:");
-public static final int sel_isEditable = sel_registerName("isEditable");
-public static final int sel_path = sel_registerName("path");
-public static final int sel_setStringValue_1resolvingEntities_1 = sel_registerName("setStringValue:resolvingEntities:");
-public static final int sel_readFileContentsType_1toFile_1 = sel_registerName("readFileContentsType:toFile:");
-public static final int sel_fileExtensionHidden = sel_registerName("fileExtensionHidden");
-public static final int sel_setTextureImageToPixelBuffer_1colorBuffer_1 = sel_registerName("setTextureImageToPixelBuffer:colorBuffer:");
-public static final int sel_setFilename_1 = sel_registerName("setFilename:");
-public static final int sel_callStackReturnAddresses = sel_registerName("callStackReturnAddresses");
-public static final int sel_blocksOtherRecognizers = sel_registerName("blocksOtherRecognizers");
-public static final int sel_pixelBuffer = sel_registerName("pixelBuffer");
-public static final int sel_initWithStartingColor_1endingColor_1 = sel_registerName("initWithStartingColor:endingColor:");
-public static final int sel_indexOfObjectIdenticalTo_1inRange_1 = sel_registerName("indexOfObjectIdenticalTo:inRange:");
-public static final int sel_duration = sel_registerName("duration");
-public static final int sel_matchForPredicate_1 = sel_registerName("matchForPredicate:");
-public static final int sel_windowDidMiniaturize_1 = sel_registerName("windowDidMiniaturize:");
-public static final int sel_drawWithFrame_1inView_1characterIndex_1layoutManager_1 = sel_registerName("drawWithFrame:inView:characterIndex:layoutManager:");
-public static final int sel_setTwoDigitStartDate_1 = sel_registerName("setTwoDigitStartDate:");
-public static final int sel_selectTextAtRow_1column_1 = sel_registerName("selectTextAtRow:column:");
-public static final int sel_splitView_1shouldHideDividerAtIndex_1 = sel_registerName("splitView:shouldHideDividerAtIndex:");
-public static final int sel_isExcludedFromWindowsMenu = sel_registerName("isExcludedFromWindowsMenu");
-public static final int sel_earlierDate_1 = sel_registerName("earlierDate:");
-public static final int sel_initWithLeftExpressions_1rightExpressionAttributeType_1modifier_1operators_1options_1 = sel_registerName("initWithLeftExpressions:rightExpressionAttributeType:modifier:operators:options:");
-public static final int sel_minItemSize = sel_registerName("minItemSize");
-public static final int sel_setSearchMenuTemplate_1 = sel_registerName("setSearchMenuTemplate:");
-public static final int sel_rightMouseUp_1 = sel_registerName("rightMouseUp:");
-public static final int sel_stopSpeaking_1 = sel_registerName("stopSpeaking:");
-public static final int sel_getObjectValue_1forString_1errorDescription_1 = sel_registerName("getObjectValue:forString:errorDescription:");
-public static final int sel_unarchiver_1didDecodeObject_1 = sel_registerName("unarchiver:didDecodeObject:");
-public static final int sel_endSpecifier = sel_registerName("endSpecifier");
-public static final int sel_ascending = sel_registerName("ascending");
-public static final int sel_sharedCoercionHandler = sel_registerName("sharedCoercionHandler");
-public static final int sel_textAttributesForPositiveInfinity = sel_registerName("textAttributesForPositiveInfinity");
-public static final int sel_isEqualToData_1 = sel_registerName("isEqualToData:");
-public static final int sel_setHighlightMode_1 = sel_registerName("setHighlightMode:");
-public static final int sel_valueWithNonretainedObject_1 = sel_registerName("valueWithNonretainedObject:");
-public static final int sel_textAttributesForNotANumber = sel_registerName("textAttributesForNotANumber");
-public static final int sel_getCFRunLoop = sel_registerName("getCFRunLoop");
-public static final int sel_invalidateGlyphsForCharacterRange_1changeInLength_1actualCharacterRange_1 = sel_registerName("invalidateGlyphsForCharacterRange:changeInLength:actualCharacterRange:");
-public static final int sel_cachedResponse = sel_registerName("cachedResponse");
-public static final int sel_containerIsRangeContainerObject = sel_registerName("containerIsRangeContainerObject");
-public static final int sel_setLanguage_1 = sel_registerName("setLanguage:");
-public static final int sel_loadNibFile_1externalNameTable_1withZone_1 = sel_registerName("loadNibFile:externalNameTable:withZone:");
-public static final int sel_offsetInFile = sel_registerName("offsetInFile");
-public static final int sel_initWithRulerView_1markerLocation_1image_1imageOrigin_1 = sel_registerName("initWithRulerView:markerLocation:image:imageOrigin:");
-public static final int sel_commandDescriptionWithAppleEventClass_1andAppleEventCode_1 = sel_registerName("commandDescriptionWithAppleEventClass:andAppleEventCode:");
-public static final int sel_detachDrawingThread_1toTarget_1withObject_1 = sel_registerName("detachDrawingThread:toTarget:withObject:");
-public static final int sel_outlineView_1shouldShowCellExpansionForTableColumn_1item_1 = sel_registerName("outlineView:shouldShowCellExpansionForTableColumn:item:");
-public static final int sel_catalogNameComponent = sel_registerName("catalogNameComponent");
-public static final int sel_monthSymbols = sel_registerName("monthSymbols");
-public static final int sel_invalidateShadow = sel_registerName("invalidateShadow");
-public static final int sel_waitUntilDate_1 = sel_registerName("waitUntilDate:");
-public static final int sel_languageLevel = sel_registerName("languageLevel");
-public static final int sel_XMLData = sel_registerName("XMLData");
-public static final int sel_textView_1shouldChangeTextInRanges_1replacementStrings_1 = sel_registerName("textView:shouldChangeTextInRanges:replacementStrings:");
-public static final int sel_initWithPointerFunctions_1 = sel_registerName("initWithPointerFunctions:");
-public static final int sel_initWithTextureTarget_1textureInternalFormat_1textureMaxMipMapLevel_1pixelsWide_1pixelsHigh_1 = sel_registerName("initWithTextureTarget:textureInternalFormat:textureMaxMipMapLevel:pixelsWide:pixelsHigh:");
-public static final int sel_classForClassName_1 = sel_registerName("classForClassName:");
-public static final int sel_decodeInt64ForKey_1 = sel_registerName("decodeInt64ForKey:");
-public static final int sel_stringWithSavedFrame = sel_registerName("stringWithSavedFrame");
-public static final int sel_writeRTFDToFile_1atomically_1 = sel_registerName("writeRTFDToFile:atomically:");
-public static final int sel_initWithLocal_1connection_1 = sel_registerName("initWithLocal:connection:");
-public static final int sel_sendBeforeDate_1msgid_1components_1from_1reserved_1 = sel_registerName("sendBeforeDate:msgid:components:from:reserved:");
-public static final int sel_playsEveryFrame = sel_registerName("playsEveryFrame");
-public static final int sel_prependTransform_1 = sel_registerName("prependTransform:");
-public static final int sel_setUsesWeakReadAndWriteBarriers_1 = sel_registerName("setUsesWeakReadAndWriteBarriers:");
-public static final int sel_isContinuous = sel_registerName("isContinuous");
-public static final int sel_andPredicateWithSubpredicates_1 = sel_registerName("andPredicateWithSubpredicates:");
-public static final int sel_cookieWithProperties_1 = sel_registerName("cookieWithProperties:");
-public static final int sel_builtInPlugInsPath = sel_registerName("builtInPlugInsPath");
-public static final int sel_performSelector_1onThread_1withObject_1waitUntilDone_1 = sel_registerName("performSelector:onThread:withObject:waitUntilDone:");
-public static final int sel_sharedDocumentController = sel_registerName("sharedDocumentController");
-public static final int sel_setNeedsSizing_1 = sel_registerName("setNeedsSizing:");
-public static final int sel_selectorForCommand_1 = sel_registerName("selectorForCommand:");
-public static final int sel_displayIfNeededInRectIgnoringOpacity_1 = sel_registerName("displayIfNeededInRectIgnoringOpacity:");
-public static final int sel_draggingPasteboard = sel_registerName("draggingPasteboard");
-public static final int sel_unscriptRange_1 = sel_registerName("unscriptRange:");
-public static final int sel_launchApplication_1 = sel_registerName("launchApplication:");
-public static final int sel_inputClientBecomeActive_1 = sel_registerName("inputClientBecomeActive:");
-public static final int sel_getFirstUnlaidCharacterIndex_1glyphIndex_1 = sel_registerName("getFirstUnlaidCharacterIndex:glyphIndex:");
-public static final int sel_initWithContentsOfURL_1options_1error_1 = sel_registerName("initWithContentsOfURL:options:error:");
-public static final int sel_createSymbolicLinkAtPath_1withDestinationPath_1error_1 = sel_registerName("createSymbolicLinkAtPath:withDestinationPath:error:");
-public static final int sel_accessibilityAttributeValue_1forParameter_1 = sel_registerName("accessibilityAttributeValue:forParameter:");
-public static final int sel_setPlaceholderAttributedString_1 = sel_registerName("setPlaceholderAttributedString:");
-public static final int sel_initWithIndex_1 = sel_registerName("initWithIndex:");
-public static final int sel_readFromURL_1ofType_1error_1 = sel_registerName("readFromURL:ofType:error:");
-public static final int sel_preferredFilename = sel_registerName("preferredFilename");
-public static final int sel_smartInsertDeleteEnabled = sel_registerName("smartInsertDeleteEnabled");
-public static final int sel_horizontalLineScroll = sel_registerName("horizontalLineScroll");
-public static final int sel_doDoubleClick_1 = sel_registerName("doDoubleClick:");
-public static final int sel_fontDescriptorWithFace_1 = sel_registerName("fontDescriptorWithFace:");
-public static final int sel_pointerArrayWithPointerFunctions_1 = sel_registerName("pointerArrayWithPointerFunctions:");
-public static final int sel_defaultDate = sel_registerName("defaultDate");
-public static final int sel_typesetterBehavior = sel_registerName("typesetterBehavior");
-public static final int sel_setAllowsNonContiguousLayout_1 = sel_registerName("setAllowsNonContiguousLayout:");
-public static final int sel_control_1didFailToFormatString_1errorDescription_1 = sel_registerName("control:didFailToFormatString:errorDescription:");
-public static final int sel_isBaseFont = sel_registerName("isBaseFont");
-public static final int sel_removeDescriptorWithKeyword_1 = sel_registerName("removeDescriptorWithKeyword:");
-public static final int sel_substringFromIndex_1 = sel_registerName("substringFromIndex:");
-public static final int sel_componentsFromLocaleIdentifier_1 = sel_registerName("componentsFromLocaleIdentifier:");
-public static final int sel_setUsesFeedbackWindow_1 = sel_registerName("setUsesFeedbackWindow:");
-public static final int sel_setAnimates_1 = sel_registerName("setAnimates:");
-public static final int sel_initWithDomain_1code_1userInfo_1 = sel_registerName("initWithDomain:code:userInfo:");
-public static final int sel_setContentView_1 = sel_registerName("setContentView:");
-public static final int sel_allowedFileTypes = sel_registerName("allowedFileTypes");
-public static final int sel_leftExpressions = sel_registerName("leftExpressions");
-public static final int sel_isStandalone = sel_registerName("isStandalone");
-public static final int sel_floatForKey_1inTable_1 = sel_registerName("floatForKey:inTable:");
-public static final int sel_notANumber = sel_registerName("notANumber");
-public static final int sel_updateFromPMPrintSettings = sel_registerName("updateFromPMPrintSettings");
-public static final int sel_wantsToTrackMouse = sel_registerName("wantsToTrackMouse");
-public static final int sel_initWithName_1reason_1userInfo_1 = sel_registerName("initWithName:reason:userInfo:");
-public static final int sel_prepareOpenGL = sel_registerName("prepareOpenGL");
-public static final int sel_setAttributedStringForNil_1 = sel_registerName("setAttributedStringForNil:");
-public static final int sel_sizeToFit = sel_registerName("sizeToFit");
-public static final int sel_setSortDescriptorPrototype_1 = sel_registerName("setSortDescriptorPrototype:");
-public static final int sel_canHide = sel_registerName("canHide");
-public static final int sel_replacementObjectForArchiver_1 = sel_registerName("replacementObjectForArchiver:");
-public static final int sel_purpleColor = sel_registerName("purpleColor");
-public static final int sel_setProperty_1forKey_1 = sel_registerName("setProperty:forKey:");
-public static final int sel_separatorItem = sel_registerName("separatorItem");
-public static final int sel_loadedCellAtRow_1column_1 = sel_registerName("loadedCellAtRow:column:");
-public static final int sel_containerSpecifier = sel_registerName("containerSpecifier");
-public static final int sel_draggingSourceOperationMaskForLocal_1 = sel_registerName("draggingSourceOperationMaskForLocal:");
-public static final int sel_willPresentError_1 = sel_registerName("willPresentError:");
-public static final int sel_strikethroughGlyphRange_1strikethroughType_1lineFragmentRect_1lineFragmentGlyphRange_1containerOrigin_1 = sel_registerName("strikethroughGlyphRange:strikethroughType:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:");
-public static final int sel_elementWithName_1stringValue_1 = sel_registerName("elementWithName:stringValue:");
-public static final int sel_unsignedCharValue = sel_registerName("unsignedCharValue");
-public static final int sel_rangeOfComposedCharacterSequencesForRange_1 = sel_registerName("rangeOfComposedCharacterSequencesForRange:");
-public static final int sel_activate_1 = sel_registerName("activate:");
-public static final int sel_controlView = sel_registerName("controlView");
-public static final int sel_cachePolicy = sel_registerName("cachePolicy");
-public static final int sel_fontAttributesInRange_1 = sel_registerName("fontAttributesInRange:");
-public static final int sel_setPreservesSelection_1 = sel_registerName("setPreservesSelection:");
-public static final int sel_unscript_1 = sel_registerName("unscript:");
-public static final int sel_deltaZ = sel_registerName("deltaZ");
-public static final int sel_connection_1handleRequest_1 = sel_registerName("connection:handleRequest:");
-public static final int sel_caseSensitive = sel_registerName("caseSensitive");
-public static final int sel_tabViewItemAtPoint_1 = sel_registerName("tabViewItemAtPoint:");
-public static final int sel_setTextAttributesForNegativeValues_1 = sel_registerName("setTextAttributesForNegativeValues:");
-public static final int sel_underlineGlyphRange_1underlineType_1lineFragmentRect_1lineFragmentGlyphRange_1containerOrigin_1 = sel_registerName("underlineGlyphRange:underlineType:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:");
-public static final int sel_classForCoder = sel_registerName("classForCoder");
-public static final int sel_setContent_1 = sel_registerName("setContent:");
-public static final int sel_getLineStart_1end_1contentsEnd_1forRange_1 = sel_registerName("getLineStart:end:contentsEnd:forRange:");
-public static final int sel_removeRowsAtIndexes_1includeSubrows_1 = sel_registerName("removeRowsAtIndexes:includeSubrows:");
-public static final int sel_tokenFieldCell_1styleForRepresentedObject_1 = sel_registerName("tokenFieldCell:styleForRepresentedObject:");
-public static final int sel_setToolTip_1 = sel_registerName("setToolTip:");
-public static final int sel_titleHeight = sel_registerName("titleHeight");
-public static final int sel_setShowsStateBy_1 = sel_registerName("setShowsStateBy:");
-public static final int sel_URLWithString_1relativeToURL_1 = sel_registerName("URLWithString:relativeToURL:");
-public static final int sel_fileSystemRepresentationWithPath_1 = sel_registerName("fileSystemRepresentationWithPath:");
-public static final int sel_setRate_1 = sel_registerName("setRate:");
-public static final int sel_extraLineFragmentTextContainer = sel_registerName("extraLineFragmentTextContainer");
-public static final int sel_insertObjects_1atArrangedObjectIndexes_1 = sel_registerName("insertObjects:atArrangedObjectIndexes:");
-public static final int sel_fontDescriptorWithSymbolicTraits_1 = sel_registerName("fontDescriptorWithSymbolicTraits:");
-public static final int sel_topMargin = sel_registerName("topMargin");
-public static final int sel_tokenField_1representedObjectForEditingString_1 = sel_registerName("tokenField:representedObjectForEditingString:");
-public static final int sel_drawInsertionPointInRect_1color_1turnedOn_1 = sel_registerName("drawInsertionPointInRect:color:turnedOn:");
-public static final int sel_fontNamed_1hasTraits_1 = sel_registerName("fontNamed:hasTraits:");
-public static final int sel_revertToSavedFromFile_1ofType_1 = sel_registerName("revertToSavedFromFile:ofType:");
-public static final int sel_cString = sel_registerName("cString");
-public static final int sel_markerForItemNumber_1 = sel_registerName("markerForItemNumber:");
-public static final int sel_mapTableWithWeakToStrongObjects = sel_registerName("mapTableWithWeakToStrongObjects");
-public static final int sel_autosaveExpandedItems = sel_registerName("autosaveExpandedItems");
-public static final int sel_setMiterLimit_1 = sel_registerName("setMiterLimit:");
-public static final int sel_indentationLevel = sel_registerName("indentationLevel");
-public static final int sel_fileHandleForUpdatingAtPath_1 = sel_registerName("fileHandleForUpdatingAtPath:");
-public static final int sel_fontWithDescriptor_1textTransform_1 = sel_registerName("fontWithDescriptor:textTransform:");
-public static final int sel_selectLine_1 = sel_registerName("selectLine:");
-public static final int sel_deleteForward_1 = sel_registerName("deleteForward:");
-public static final int sel_getAdvancements_1forPackedGlyphs_1length_1 = sel_registerName("getAdvancements:forPackedGlyphs:length:");
-public static final int sel_usesRuler = sel_registerName("usesRuler");
-public static final int sel_performClose_1 = sel_registerName("performClose:");
-public static final int sel_trackRect = sel_registerName("trackRect");
-public static final int sel_setFont_1 = sel_registerName("setFont:");
-public static final int sel_conformsToProtocol_1 = sel_registerName("conformsToProtocol:");
-public static final int sel_appendBezierPathWithPoints_1count_1 = sel_registerName("appendBezierPathWithPoints:count:");
-public static final int sel_defaultLineHeightForFont_1 = sel_registerName("defaultLineHeightForFont:");
-public static final int sel_mouse_1inRect_1 = sel_registerName("mouse:inRect:");
-public static final int sel_portCoderWithReceivePort_1sendPort_1components_1 = sel_registerName("portCoderWithReceivePort:sendPort:components:");
-public static final int sel_inputClientDisabled_1 = sel_registerName("inputClientDisabled:");
-public static final int sel_widthForSegment_1 = sel_registerName("widthForSegment:");
-public static final int sel_performSelector_1 = sel_registerName("performSelector:");
-public static final int sel_recalculateKeyViewLoop = sel_registerName("recalculateKeyViewLoop");
-public static final int sel_initWithDrawSelector_1delegate_1 = sel_registerName("initWithDrawSelector:delegate:");
-public static final int sel_breakUndoCoalescing = sel_registerName("breakUndoCoalescing");
-public static final int sel_font = sel_registerName("font");
-public static final int sel_fontDescriptorWithSize_1 = sel_registerName("fontDescriptorWithSize:");
-public static final int sel_insertItemWithTitle_1atIndex_1 = sel_registerName("insertItemWithTitle:atIndex:");
-public static final int sel_contentAspectRatio = sel_registerName("contentAspectRatio");
-public static final int sel_currentHandler = sel_registerName("currentHandler");
-public static final int sel_sharedAppleEventManager = sel_registerName("sharedAppleEventManager");
-public static final int sel_pathForResource_1ofType_1 = sel_registerName("pathForResource:ofType:");
-public static final int sel_initWithRequest_1cachedResponse_1client_1 = sel_registerName("initWithRequest:cachedResponse:client:");
-public static final int sel_isTitled = sel_registerName("isTitled");
-public static final int sel_drawerWillOpen_1 = sel_registerName("drawerWillOpen:");
-public static final int sel_screenFont = sel_registerName("screenFont");
-public static final int sel_principalClass = sel_registerName("principalClass");
-public static final int sel_pathControl_1willDisplayOpenPanel_1 = sel_registerName("pathControl:willDisplayOpenPanel:");
-public static final int sel_setGroupingSeparator_1 = sel_registerName("setGroupingSeparator:");
-public static final int sel_fontWithDescriptor_1size_1 = sel_registerName("fontWithDescriptor:size:");
-public static final int sel_glyphInfoWithCharacterIdentifier_1collection_1baseString_1 = sel_registerName("glyphInfoWithCharacterIdentifier:collection:baseString:");
-public static final int sel_movieUnfilteredFileTypes = sel_registerName("movieUnfilteredFileTypes");
-public static final int sel_portList = sel_registerName("portList");
-public static final int sel_tokenField_1readFromPasteboard_1 = sel_registerName("tokenField:readFromPasteboard:");
-public static final int sel_setEndSpecifier_1 = sel_registerName("setEndSpecifier:");
-public static final int sel_textView_1willDisplayToolTip_1forCharacterAtIndex_1 = sel_registerName("textView:willDisplayToolTip:forCharacterAtIndex:");
-public static final int sel_applicationIconImage = sel_registerName("applicationIconImage");
-public static final int sel_target = sel_registerName("target");
-public static final int sel_replaceGlyphAtIndex_1withGlyph_1 = sel_registerName("replaceGlyphAtIndex:withGlyph:");
-public static final int sel_borderColorForEdge_1 = sel_registerName("borderColorForEdge:");
-public static final int sel_timeIntervalSinceDate_1 = sel_registerName("timeIntervalSinceDate:");
-public static final int sel_pathsForResourcesOfType_1inDirectory_1forLocalization_1 = sel_registerName("pathsForResourcesOfType:inDirectory:forLocalization:");
-public static final int sel_bitmapData = sel_registerName("bitmapData");
-public static final int sel_redComponent = sel_registerName("redComponent");
+public static final int sel_numberOfItems = sel_registerName("numberOfItems");
+public static final int sel_numberOfRows = sel_registerName("numberOfRows");
+public static final int sel_numberOfRowsInTableView_ = sel_registerName("numberOfRowsInTableView:");
+public static final int sel_numberOfSelectedRows = sel_registerName("numberOfSelectedRows");
 public static final int sel_numberOfVisibleItems = sel_registerName("numberOfVisibleItems");
-public static final int sel_selectCell_1 = sel_registerName("selectCell:");
-public static final int sel_applicationWillHide_1 = sel_registerName("applicationWillHide:");
-public static final int sel_characterIsMember_1 = sel_registerName("characterIsMember:");
-public static final int sel_setArrowsPosition_1 = sel_registerName("setArrowsPosition:");
-public static final int sel_minusSign = sel_registerName("minusSign");
-public static final int sel_canSpawnSeparateThread = sel_registerName("canSpawnSeparateThread");
-public static final int sel_setContinuous_1 = sel_registerName("setContinuous:");
-public static final int sel_addSymbolicLinkWithDestination_1preferredFilename_1 = sel_registerName("addSymbolicLinkWithDestination:preferredFilename:");
-public static final int sel_destinationOfSymbolicLinkAtPath_1error_1 = sel_registerName("destinationOfSymbolicLinkAtPath:error:");
-public static final int sel_runUntilDate_1 = sel_registerName("runUntilDate:");
-public static final int sel_stringByAbbreviatingWithTildeInPath = sel_registerName("stringByAbbreviatingWithTildeInPath");
-public static final int sel_drawerWillResizeContents_1toSize_1 = sel_registerName("drawerWillResizeContents:toSize:");
-public static final int sel_imageRectForBounds_1 = sel_registerName("imageRectForBounds:");
-public static final int sel_indexGreaterThanIndex_1 = sel_registerName("indexGreaterThanIndex:");
-public static final int sel_setSelectionFrom_1to_1anchor_1highlight_1 = sel_registerName("setSelectionFrom:to:anchor:highlight:");
-public static final int sel_unsignedIntegerValue = sel_registerName("unsignedIntegerValue");
-public static final int sel_focusView = sel_registerName("focusView");
-public static final int sel_longCharacterIsMember_1 = sel_registerName("longCharacterIsMember:");
-public static final int sel_groupingSeparator = sel_registerName("groupingSeparator");
-public static final int sel_depthLimit = sel_registerName("depthLimit");
-public static final int sel_attributesAtIndex_1longestEffectiveRange_1inRange_1 = sel_registerName("attributesAtIndex:longestEffectiveRange:inRange:");
-public static final int sel_setAcceptsArrowKeys_1 = sel_registerName("setAcceptsArrowKeys:");
-public static final int sel_isGreaterThanOrEqualTo_1 = sel_registerName("isGreaterThanOrEqualTo:");
-public static final int sel_maxContentSize = sel_registerName("maxContentSize");
-public static final int sel_setParentWindow_1 = sel_registerName("setParentWindow:");
-public static final int sel_importsGraphics = sel_registerName("importsGraphics");
-public static final int sel_setPaddingPosition_1 = sel_registerName("setPaddingPosition:");
-public static final int sel_yearOfCommonEra = sel_registerName("yearOfCommonEra");
-public static final int sel_cells = sel_registerName("cells");
-public static final int sel_cyanComponent = sel_registerName("cyanComponent");
-public static final int sel_documentClassForType_1 = sel_registerName("documentClassForType:");
-public static final int sel_setSelectionHighlightStyle_1 = sel_registerName("setSelectionHighlightStyle:");
-public static final int sel_addWindowController_1 = sel_registerName("addWindowController:");
-public static final int sel_initWithXMLString_1error_1 = sel_registerName("initWithXMLString:error:");
-public static final int sel_authenticateComponents_1withData_1 = sel_registerName("authenticateComponents:withData:");
-public static final int sel_traitsOfFont_1 = sel_registerName("traitsOfFont:");
-public static final int sel_timeIntervalSinceReferenceDate = sel_registerName("timeIntervalSinceReferenceDate");
-public static final int sel_orderFrontCharacterPalette_1 = sel_registerName("orderFrontCharacterPalette:");
-public static final int sel_setServicesProvider_1 = sel_registerName("setServicesProvider:");
-public static final int sel_setMessage_1 = sel_registerName("setMessage:");
-public static final int sel_msgid = sel_registerName("msgid");
-public static final int sel_beginUndoGrouping = sel_registerName("beginUndoGrouping");
-public static final int sel_RTFDFromRange_1documentAttributes_1 = sel_registerName("RTFDFromRange:documentAttributes:");
-public static final int sel_selectedItem = sel_registerName("selectedItem");
-public static final int sel_addTabStop_1 = sel_registerName("addTabStop:");
-public static final int sel_scrollRect_1by_1 = sel_registerName("scrollRect:by:");
-public static final int sel_icon = sel_registerName("icon");
-public static final int sel_setValue_1forUndefinedKey_1 = sel_registerName("setValue:forUndefinedKey:");
-public static final int sel_decodeFloatForKey_1 = sel_registerName("decodeFloatForKey:");
-public static final int sel_commentURL = sel_registerName("commentURL");
-public static final int sel_shortStandaloneMonthSymbols = sel_registerName("shortStandaloneMonthSymbols");
-public static final int sel_browser_1titleOfColumn_1 = sel_registerName("browser:titleOfColumn:");
-public static final int sel_exit = sel_registerName("exit");
-public static final int sel_deselectAll_1 = sel_registerName("deselectAll:");
-public static final int sel_canRemove = sel_registerName("canRemove");
-public static final int sel_proxyType = sel_registerName("proxyType");
-public static final int sel_shouldCloseDocument = sel_registerName("shouldCloseDocument");
-public static final int sel_setMinimumLineHeight_1 = sel_registerName("setMinimumLineHeight:");
-public static final int sel_grayColor = sel_registerName("grayColor");
-public static final int sel_suspend = sel_registerName("suspend");
-public static final int sel_printJobTitle = sel_registerName("printJobTitle");
-public static final int sel_fileHandleWithStandardOutput = sel_registerName("fileHandleWithStandardOutput");
-public static final int sel_objCType = sel_registerName("objCType");
-public static final int sel_maximumIntegerDigits = sel_registerName("maximumIntegerDigits");
-public static final int sel_initWithKey_1ascending_1 = sel_registerName("initWithKey:ascending:");
-public static final int sel_paramDescriptorForKeyword_1 = sel_registerName("paramDescriptorForKeyword:");
-public static final int sel_cookiesForURL_1 = sel_registerName("cookiesForURL:");
-public static final int sel_currentTextContainer = sel_registerName("currentTextContainer");
-public static final int sel_removeAllCachedResponses = sel_registerName("removeAllCachedResponses");
-public static final int sel_setAllHTTPHeaderFields_1 = sel_registerName("setAllHTTPHeaderFields:");
-public static final int sel_setShortQuarterSymbols_1 = sel_registerName("setShortQuarterSymbols:");
-public static final int sel_removeItemWithObjectValue_1 = sel_registerName("removeItemWithObjectValue:");
-public static final int sel_reloadColumn_1 = sel_registerName("reloadColumn:");
-public static final int sel_initWithData_1 = sel_registerName("initWithData:");
-public static final int sel_textDidEndEditing_1 = sel_registerName("textDidEndEditing:");
-public static final int sel_descriptorForKeyword_1 = sel_registerName("descriptorForKeyword:");
-public static final int sel_gState = sel_registerName("gState");
-public static final int sel_setCellClass_1 = sel_registerName("setCellClass:");
-public static final int sel_requestUserAttention_1 = sel_registerName("requestUserAttention:");
-public static final int sel_disableUndoRegistration = sel_registerName("disableUndoRegistration");
-public static final int sel_currencySymbol = sel_registerName("currencySymbol");
-public static final int sel_defaultWritingDirectionForLanguage_1 = sel_registerName("defaultWritingDirectionForLanguage:");
-public static final int sel_selectedCellInColumn_1 = sel_registerName("selectedCellInColumn:");
-public static final int sel_spellServer_1didForgetWord_1inLanguage_1 = sel_registerName("spellServer:didForgetWord:inLanguage:");
-public static final int sel_initWithType_1error_1 = sel_registerName("initWithType:error:");
-public static final int sel_editedRow = sel_registerName("editedRow");
-public static final int sel_expressionForUnionSet_1with_1 = sel_registerName("expressionForUnionSet:with:");
-public static final int sel_verticalMotionCanBeginDrag = sel_registerName("verticalMotionCanBeginDrag");
-public static final int sel_selectNextKeyView_1 = sel_registerName("selectNextKeyView:");
-public static final int sel_lowercaseString = sel_registerName("lowercaseString");
-public static final int sel_intercellSpacing = sel_registerName("intercellSpacing");
-public static final int sel_selectedItemIdentifier = sel_registerName("selectedItemIdentifier");
-public static final int sel_getIndexes_1 = sel_registerName("getIndexes:");
-public static final int sel_contentRect = sel_registerName("contentRect");
-public static final int sel_addObjects_1 = sel_registerName("addObjects:");
-public static final int sel_selectedRowIndexes = sel_registerName("selectedRowIndexes");
-public static final int sel_setSecond_1 = sel_registerName("setSecond:");
-public static final int sel_setIgnoresMultiClick_1 = sel_registerName("setIgnoresMultiClick:");
-public static final int sel_hasMemberInPlane_1 = sel_registerName("hasMemberInPlane:");
-public static final int sel_setClientView_1 = sel_registerName("setClientView:");
-public static final int sel_setInitialFirstResponder_1 = sel_registerName("setInitialFirstResponder:");
-public static final int sel_defaultAnimationForKey_1 = sel_registerName("defaultAnimationForKey:");
-public static final int sel_systemTimeZone = sel_registerName("systemTimeZone");
-public static final int sel_pageSizeForPaper_1 = sel_registerName("pageSizeForPaper:");
-public static final int sel_windowBackgroundColor = sel_registerName("windowBackgroundColor");
-public static final int sel_prepareGState = sel_registerName("prepareGState");
-public static final int sel_willSetLineFragmentRect_1forGlyphRange_1usedRect_1baselineOffset_1 = sel_registerName("willSetLineFragmentRect:forGlyphRange:usedRect:baselineOffset:");
-public static final int sel_setScriptingProperties_1 = sel_registerName("setScriptingProperties:");
-public static final int sel_initWithScrollView_1orientation_1 = sel_registerName("initWithScrollView:orientation:");
-public static final int sel_canBecomeVisibleWithoutLogin = sel_registerName("canBecomeVisibleWithoutLogin");
-public static final int sel_scrollLineDown_1 = sel_registerName("scrollLineDown:");
-public static final int sel_setServicesMenu_1 = sel_registerName("setServicesMenu:");
-public static final int sel_appleEventCode = sel_registerName("appleEventCode");
-public static final int sel_replaceObjectsInRange_1withObjectsFromArray_1range_1 = sel_registerName("replaceObjectsInRange:withObjectsFromArray:range:");
-public static final int sel_autosizesCells = sel_registerName("autosizesCells");
-public static final int sel_tableView_1toolTipForCell_1rect_1tableColumn_1row_1mouseLocation_1 = sel_registerName("tableView:toolTipForCell:rect:tableColumn:row:mouseLocation:");
-public static final int sel_dateWithYear_1month_1day_1hour_1minute_1second_1timeZone_1 = sel_registerName("dateWithYear:month:day:hour:minute:second:timeZone:");
-public static final int sel_windowWillResize_1toSize_1 = sel_registerName("windowWillResize:toSize:");
-public static final int sel_initWithUnsignedChar_1 = sel_registerName("initWithUnsignedChar:");
-public static final int sel_suiteForAppleEventCode_1 = sel_registerName("suiteForAppleEventCode:");
-public static final int sel_setTrailingOffset_1 = sel_registerName("setTrailingOffset:");
-public static final int sel_canBecomeKeyWindow = sel_registerName("canBecomeKeyWindow");
-public static final int sel_setAnimationBlockingMode_1 = sel_registerName("setAnimationBlockingMode:");
-public static final int sel_formUnionWithCharacterSet_1 = sel_registerName("formUnionWithCharacterSet:");
-public static final int sel_typeForArgumentWithName_1 = sel_registerName("typeForArgumentWithName:");
-public static final int sel_setFileName_1 = sel_registerName("setFileName:");
-public static final int sel_createSymbolicLinkAtPath_1pathContent_1 = sel_registerName("createSymbolicLinkAtPath:pathContent:");
-public static final int sel_undoMenuTitleForUndoActionName_1 = sel_registerName("undoMenuTitleForUndoActionName:");
-public static final int sel_dateStyle = sel_registerName("dateStyle");
-public static final int sel_currentContext = sel_registerName("currentContext");
-public static final int sel_dequeueNotificationsMatching_1coalesceMask_1 = sel_registerName("dequeueNotificationsMatching:coalesceMask:");
-public static final int sel_thousandSeparator = sel_registerName("thousandSeparator");
-public static final int sel_writeData_1 = sel_registerName("writeData:");
-public static final int sel_selectedTag = sel_registerName("selectedTag");
-public static final int sel_drawWithRect_1options_1 = sel_registerName("drawWithRect:options:");
-public static final int sel_canonicalLocaleIdentifierFromString_1 = sel_registerName("canonicalLocaleIdentifierFromString:");
-public static final int sel_convertFontTraits_1 = sel_registerName("convertFontTraits:");
-public static final int sel_itemAdded_1 = sel_registerName("itemAdded:");
-public static final int sel_scriptErrorString = sel_registerName("scriptErrorString");
-public static final int sel_submenuAction_1 = sel_registerName("submenuAction:");
-public static final int sel_initWithType_1subpredicates_1 = sel_registerName("initWithType:subpredicates:");
-public static final int sel_subpathsOfDirectoryAtPath_1error_1 = sel_registerName("subpathsOfDirectoryAtPath:error:");
-public static final int sel_becomesKeyOnlyIfNeeded = sel_registerName("becomesKeyOnlyIfNeeded");
-public static final int sel_displayAllColumns = sel_registerName("displayAllColumns");
-public static final int sel_indexOfItemWithSubmenu_1 = sel_registerName("indexOfItemWithSubmenu:");
-public static final int sel_runModalSavePanelForSaveOperation_1delegate_1didSaveSelector_1contextInfo_1 = sel_registerName("runModalSavePanelForSaveOperation:delegate:didSaveSelector:contextInfo:");
-public static final int sel_setCollectionBehavior_1 = sel_registerName("setCollectionBehavior:");
-public static final int sel_boundingRectWithSize_1options_1attributes_1 = sel_registerName("boundingRectWithSize:options:attributes:");
-public static final int sel_valueForAttribute_1 = sel_registerName("valueForAttribute:");
-public static final int sel_attributedStringForNotANumber = sel_registerName("attributedStringForNotANumber");
-public static final int sel_indicesOfObjectsByEvaluatingObjectSpecifier_1 = sel_registerName("indicesOfObjectsByEvaluatingObjectSpecifier:");
-public static final int sel_initWithPath_1 = sel_registerName("initWithPath:");
-public static final int sel_doCommandBySelector_1 = sel_registerName("doCommandBySelector:");
-public static final int sel_numberWithChar_1 = sel_registerName("numberWithChar:");
-public static final int sel_setAllowsMixedState_1 = sel_registerName("setAllowsMixedState:");
-public static final int sel_abortEditing = sel_registerName("abortEditing");
-public static final int sel_context = sel_registerName("context");
-public static final int sel_drawerShouldClose_1 = sel_registerName("drawerShouldClose:");
-public static final int sel_tabViewDidChangeNumberOfTabViewItems_1 = sel_registerName("tabViewDidChangeNumberOfTabViewItems:");
-public static final int sel_focusRingType = sel_registerName("focusRingType");
-public static final int sel_copyScriptingValue_1forKey_1withProperties_1 = sel_registerName("copyScriptingValue:forKey:withProperties:");
-public static final int sel_acceptsFirstMouse_1 = sel_registerName("acceptsFirstMouse:");
-public static final int sel_initWithPosition_1objectSpecifier_1 = sel_registerName("initWithPosition:objectSpecifier:");
-public static final int sel_selectionRangeForProposedRange_1granularity_1 = sel_registerName("selectionRangeForProposedRange:granularity:");
-public static final int sel_isNotEqualTo_1 = sel_registerName("isNotEqualTo:");
-public static final int sel_encodeRootObject_1 = sel_registerName("encodeRootObject:");
-public static final int sel_hasSuffix_1 = sel_registerName("hasSuffix:");
-public static final int sel_initWithFontAttributes_1 = sel_registerName("initWithFontAttributes:");
-public static final int sel_initWithRTFDFileWrapper_1documentAttributes_1 = sel_registerName("initWithRTFDFileWrapper:documentAttributes:");
-public static final int sel_miniwindowImage = sel_registerName("miniwindowImage");
-public static final int sel_developmentLocalization = sel_registerName("developmentLocalization");
-public static final int sel_localizedSummaryItems = sel_registerName("localizedSummaryItems");
-public static final int sel_intValue = sel_registerName("intValue");
-public static final int sel_setReturnValue_1 = sel_registerName("setReturnValue:");
-public static final int sel_selectedMenuItemColor = sel_registerName("selectedMenuItemColor");
-public static final int sel_editColumn_1row_1withEvent_1select_1 = sel_registerName("editColumn:row:withEvent:select:");
-public static final int sel_descriptionWithCalendarFormat_1timeZone_1locale_1 = sel_registerName("descriptionWithCalendarFormat:timeZone:locale:");
-public static final int sel_itemHeight = sel_registerName("itemHeight");
-public static final int sel_application_1openFiles_1 = sel_registerName("application:openFiles:");
-public static final int sel_window = sel_registerName("window");
-public static final int sel_setShortStandaloneMonthSymbols_1 = sel_registerName("setShortStandaloneMonthSymbols:");
-public static final int sel_setTag_1 = sel_registerName("setTag:");
-public static final int sel_ignoredWordsInSpellDocumentWithTag_1 = sel_registerName("ignoredWordsInSpellDocumentWithTag:");
-public static final int sel_preferredLocalizationsFromArray_1 = sel_registerName("preferredLocalizationsFromArray:");
-public static final int sel_intersectsIndexesInRange_1 = sel_registerName("intersectsIndexesInRange:");
-public static final int sel_scanLongLong_1 = sel_registerName("scanLongLong:");
-public static final int sel_characterSetWithContentsOfFile_1 = sel_registerName("characterSetWithContentsOfFile:");
-public static final int sel_elementWithName_1children_1attributes_1 = sel_registerName("elementWithName:children:attributes:");
-public static final int sel_removeItem_1 = sel_registerName("removeItem:");
-public static final int sel_classForKeyedArchiver = sel_registerName("classForKeyedArchiver");
-public static final int sel_initWithString_1locale_1 = sel_registerName("initWithString:locale:");
-public static final int sel_initWithData_1options_1error_1 = sel_registerName("initWithData:options:error:");
-public static final int sel_setIsPaneSplitter_1 = sel_registerName("setIsPaneSplitter:");
-public static final int sel_URLHandle_1resourceDataDidBecomeAvailable_1 = sel_registerName("URLHandle:resourceDataDidBecomeAvailable:");
-public static final int sel_systemDefaultPortNameServer = sel_registerName("systemDefaultPortNameServer");
-public static final int sel_controlTextDidEndEditing_1 = sel_registerName("controlTextDidEndEditing:");
-public static final int sel_commandDescription = sel_registerName("commandDescription");
-public static final int sel_collapseItem_1 = sel_registerName("collapseItem:");
-public static final int sel_setAutoresizesOutlineColumn_1 = sel_registerName("setAutoresizesOutlineColumn:");
-public static final int sel_isSubsetOfHashTable_1 = sel_registerName("isSubsetOfHashTable:");
-public static final int sel_discardEventsMatchingMask_1beforeEvent_1 = sel_registerName("discardEventsMatchingMask:beforeEvent:");
-public static final int sel_highlightSelectionInClipRect_1 = sel_registerName("highlightSelectionInClipRect:");
-public static final int sel_decodeSizeForKey_1 = sel_registerName("decodeSizeForKey:");
-public static final int sel_decimalNumberByRaisingToPower_1 = sel_registerName("decimalNumberByRaisingToPower:");
-public static final int sel_canBecomeMainWindow = sel_registerName("canBecomeMainWindow");
-public static final int sel_setMenuItem_1 = sel_registerName("setMenuItem:");
-public static final int sel_contentRectForFrameRect_1styleMask_1 = sel_registerName("contentRectForFrameRect:styleMask:");
-public static final int sel_clearGLContext = sel_registerName("clearGLContext");
-public static final int sel_setFileType_1 = sel_registerName("setFileType:");
-public static final int sel_expressionForIntersectSet_1with_1 = sel_registerName("expressionForIntersectSet:with:");
-public static final int sel_sharedHelpManager = sel_registerName("sharedHelpManager");
-public static final int sel_setMiniwindowTitle_1 = sel_registerName("setMiniwindowTitle:");
-public static final int sel_fontDescriptorWithName_1size_1 = sel_registerName("fontDescriptorWithName:size:");
-public static final int sel_cookies = sel_registerName("cookies");
-public static final int sel_detachNewThreadSelector_1toTarget_1withObject_1 = sel_registerName("detachNewThreadSelector:toTarget:withObject:");
-public static final int sel_needsPanelToBecomeKey = sel_registerName("needsPanelToBecomeKey");
-public static final int sel_retainArguments = sel_registerName("retainArguments");
-public static final int sel_textStorageWillProcessEditing_1 = sel_registerName("textStorageWillProcessEditing:");
-public static final int sel_location = sel_registerName("location");
-public static final int sel_shouldChangeTextInRange_1replacementString_1 = sel_registerName("shouldChangeTextInRange:replacementString:");
-public static final int sel_textView_1doubleClickedOnCell_1inRect_1 = sel_registerName("textView:doubleClickedOnCell:inRect:");
-public static final int sel_validateVisibleItems = sel_registerName("validateVisibleItems");
-public static final int sel_isOneway = sel_registerName("isOneway");
-public static final int sel_zone = sel_registerName("zone");
-public static final int sel_titleAlignment = sel_registerName("titleAlignment");
-public static final int sel_localNameForName_1 = sel_registerName("localNameForName:");
-public static final int sel_loopMode = sel_registerName("loopMode");
-public static final int sel_setFocusRingType_1 = sel_registerName("setFocusRingType:");
-public static final int sel_stringForKey_1 = sel_registerName("stringForKey:");
-public static final int sel_initWithDomain_1type_1name_1 = sel_registerName("initWithDomain:type:name:");
-public static final int sel_animationDidEnd_1 = sel_registerName("animationDidEnd:");
-public static final int sel_addSubview_1positioned_1relativeTo_1 = sel_registerName("addSubview:positioned:relativeTo:");
-public static final int sel_removeObjects_1 = sel_registerName("removeObjects:");
-public static final int sel_graphicsContextWithBitmapImageRep_1 = sel_registerName("graphicsContextWithBitmapImageRep:");
-public static final int sel_isDescendantOf_1 = sel_registerName("isDescendantOf:");
-public static final int sel_tableView_1nextTypeSelectMatchFromRow_1toRow_1forString_1 = sel_registerName("tableView:nextTypeSelectMatchFromRow:toRow:forString:");
-public static final int sel_initWithRequest_1delegate_1startImmediately_1 = sel_registerName("initWithRequest:delegate:startImmediately:");
-public static final int sel_reservedThicknessForMarkers = sel_registerName("reservedThicknessForMarkers");
-public static final int sel_movieRect = sel_registerName("movieRect");
-public static final int sel_portForName_1host_1 = sel_registerName("portForName:host:");
-public static final int sel_tabView_1willSelectTabViewItem_1 = sel_registerName("tabView:willSelectTabViewItem:");
-public static final int sel_isOneShot = sel_registerName("isOneShot");
-public static final int sel_usesThreadedAnimation = sel_registerName("usesThreadedAnimation");
-public static final int sel_shortStandaloneQuarterSymbols = sel_registerName("shortStandaloneQuarterSymbols");
-public static final int sel_browser_1validateDrop_1proposedRow_1column_1dropOperation_1 = sel_registerName("browser:validateDrop:proposedRow:column:dropOperation:");
-public static final int sel_setLineSpacing_1 = sel_registerName("setLineSpacing:");
-public static final int sel_indexOfItemWithTitle_1 = sel_registerName("indexOfItemWithTitle:");
-public static final int sel_subrowsKeyPath = sel_registerName("subrowsKeyPath");
-public static final int sel_showsResizeIndicator = sel_registerName("showsResizeIndicator");
-public static final int sel_setState_1 = sel_registerName("setState:");
-public static final int sel_fileAttributesAtPath_1traverseLink_1 = sel_registerName("fileAttributesAtPath:traverseLink:");
-public static final int sel_setHorizontal_1 = sel_registerName("setHorizontal:");
-public static final int sel_windowDidExpose_1 = sel_registerName("windowDidExpose:");
-public static final int sel_systemID = sel_registerName("systemID");
-public static final int sel_turnOffKerning_1 = sel_registerName("turnOffKerning:");
-public static final int sel_stringByReplacingPercentEscapesUsingEncoding_1 = sel_registerName("stringByReplacingPercentEscapesUsingEncoding:");
-public static final int sel_control_1textView_1completions_1forPartialWordRange_1indexOfSelectedItem_1 = sel_registerName("control:textView:completions:forPartialWordRange:indexOfSelectedItem:");
-public static final int sel_selectLastTabViewItem_1 = sel_registerName("selectLastTabViewItem:");
-public static final int sel_setKeyEquivalentFont_1 = sel_registerName("setKeyEquivalentFont:");
-public static final int sel_invalidateCursorRectsForView_1 = sel_registerName("invalidateCursorRectsForView:");
-public static final int sel_selectTextAtIndex_1 = sel_registerName("selectTextAtIndex:");
-public static final int sel_showPools = sel_registerName("showPools");
-public static final int sel_setPlaysSelectionOnly_1 = sel_registerName("setPlaysSelectionOnly:");
-public static final int sel_note = sel_registerName("note");
-public static final int sel_setDrawsCellBackground_1 = sel_registerName("setDrawsCellBackground:");
-public static final int sel_layoutCharactersInRange_1forLayoutManager_1maximumNumberOfLineFragments_1 = sel_registerName("layoutCharactersInRange:forLayoutManager:maximumNumberOfLineFragments:");
-public static final int sel_lengthOfBytesUsingEncoding_1 = sel_registerName("lengthOfBytesUsingEncoding:");
-public static final int sel_columnResizingType = sel_registerName("columnResizingType");
-public static final int sel_paragraphSeparatorGlyphRange = sel_registerName("paragraphSeparatorGlyphRange");
-public static final int sel_floatValue = sel_registerName("floatValue");
-public static final int sel_setRoundingIncrement_1 = sel_registerName("setRoundingIncrement:");
-public static final int sel_dateFromString_1 = sel_registerName("dateFromString:");
-public static final int sel_panel_1shouldShowFilename_1 = sel_registerName("panel:shouldShowFilename:");
-public static final int sel_isEqualToDate_1 = sel_registerName("isEqualToDate:");
-public static final int sel_drawWithFrame_1inView_1characterIndex_1 = sel_registerName("drawWithFrame:inView:characterIndex:");
-public static final int sel_initWithInteger_1 = sel_registerName("initWithInteger:");
-public static final int sel_CGImage = sel_registerName("CGImage");
-public static final int sel_endDocument = sel_registerName("endDocument");
-public static final int sel_removeFile = sel_registerName("removeFile");
-public static final int sel_splitView_1shouldCollapseSubview_1forDoubleClickOnDividerAtIndex_1 = sel_registerName("splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:");
-public static final int sel_setDefaultMiterLimit_1 = sel_registerName("setDefaultMiterLimit:");
-public static final int sel_keyCode = sel_registerName("keyCode");
-public static final int sel_raise_1format_1 = sel_registerName("raise:format:");
-public static final int sel_cellSize = sel_registerName("cellSize");
-public static final int sel_runModalForWindow_1 = sel_registerName("runModalForWindow:");
-public static final int sel_colorListNamed_1 = sel_registerName("colorListNamed:");
-public static final int sel_detachColorList_1 = sel_registerName("detachColorList:");
-public static final int sel_postEvent_1atStart_1 = sel_registerName("postEvent:atStart:");
-public static final int sel_setMaximumFractionDigits_1 = sel_registerName("setMaximumFractionDigits:");
-public static final int sel_setVolatileDomain_1forName_1 = sel_registerName("setVolatileDomain:forName:");
-public static final int sel_imageInterpolation = sel_registerName("imageInterpolation");
-public static final int sel_setTitlePosition_1 = sel_registerName("setTitlePosition:");
-public static final int sel_leadingOffset = sel_registerName("leadingOffset");
-public static final int sel_invokeWithTarget_1 = sel_registerName("invokeWithTarget:");
-public static final int sel_negativeFormat = sel_registerName("negativeFormat");
-public static final int sel_windowController = sel_registerName("windowController");
-public static final int sel_setVerticalPageScroll_1 = sel_registerName("setVerticalPageScroll:");
-public static final int sel_applicationDidUpdate_1 = sel_registerName("applicationDidUpdate:");
-public static final int sel_valueForProperty_1 = sel_registerName("valueForProperty:");
-public static final int sel_tokenField_1hasMenuForRepresentedObject_1 = sel_registerName("tokenField:hasMenuForRepresentedObject:");
-public static final int sel_resolveClassMethod_1 = sel_registerName("resolveClassMethod:");
-public static final int sel_setAutomaticQuoteSubstitutionEnabled_1 = sel_registerName("setAutomaticQuoteSubstitutionEnabled:");
-public static final int sel_ordinalityOfUnit_1inUnit_1forDate_1 = sel_registerName("ordinalityOfUnit:inUnit:forDate:");
-public static final int sel_initWithHost_1port_1protocol_1realm_1authenticationMethod_1 = sel_registerName("initWithHost:port:protocol:realm:authenticationMethod:");
-public static final int sel_timeIntervalSinceNow = sel_registerName("timeIntervalSinceNow");
-public static final int sel_showFindIndicatorForRange_1 = sel_registerName("showFindIndicatorForRange:");
-public static final int sel_drawLabel_1inRect_1 = sel_registerName("drawLabel:inRect:");
-public static final int sel_startQuery = sel_registerName("startQuery");
-public static final int sel_initWithNibNamed_1bundle_1 = sel_registerName("initWithNibNamed:bundle:");
-public static final int sel_firstResponder = sel_registerName("firstResponder");
-public static final int sel_windowWillMove_1 = sel_registerName("windowWillMove:");
-public static final int sel_dictionaryForKey_1 = sel_registerName("dictionaryForKey:");
-public static final int sel_decodeValueOfObjCType_1at_1 = sel_registerName("decodeValueOfObjCType:at:");
-public static final int sel_activeApplication = sel_registerName("activeApplication");
-public static final int sel_initWithUnsignedLongLong_1 = sel_registerName("initWithUnsignedLongLong:");
-public static final int sel_decimalNumberWithString_1 = sel_registerName("decimalNumberWithString:");
-public static final int sel_replaceTextStorage_1 = sel_registerName("replaceTextStorage:");
-public static final int sel_relativePosition = sel_registerName("relativePosition");
-public static final int sel_objectValueOfSelectedItem = sel_registerName("objectValueOfSelectedItem");
-public static final int sel_timeInterval = sel_registerName("timeInterval");
-public static final int sel_getBytes_1range_1 = sel_registerName("getBytes:range:");
-public static final int sel_initWithViewAnimations_1 = sel_registerName("initWithViewAnimations:");
-public static final int sel_setHorizontalRulerView_1 = sel_registerName("setHorizontalRulerView:");
-public static final int sel_keyPathsForValuesAffectingPreview = sel_registerName("keyPathsForValuesAffectingPreview");
-public static final int sel_setWithObjects_1count_1 = sel_registerName("setWithObjects:count:");
-public static final int sel_bitsPerSample = sel_registerName("bitsPerSample");
-public static final int sel_dayOfYear = sel_registerName("dayOfYear");
-public static final int sel_maximumFractionDigits = sel_registerName("maximumFractionDigits");
-public static final int sel_isSelectionByRect = sel_registerName("isSelectionByRect");
-public static final int sel_getRed_1green_1blue_1alpha_1 = sel_registerName("getRed:green:blue:alpha:");
-public static final int sel_glyphIsEncoded_1 = sel_registerName("glyphIsEncoded:");
-public static final int sel_setStartSubelementIdentifier_1 = sel_registerName("setStartSubelementIdentifier:");
-public static final int sel_connection_1didFailWithError_1 = sel_registerName("connection:didFailWithError:");
-public static final int sel_parser_1foundExternalEntityDeclarationWithName_1publicID_1systemID_1 = sel_registerName("parser:foundExternalEntityDeclarationWithName:publicID:systemID:");
-public static final int sel_outlineView_1shouldTypeSelectForEvent_1withCurrentSearchString_1 = sel_registerName("outlineView:shouldTypeSelectForEvent:withCurrentSearchString:");
-public static final int sel_lowerBaseline_1 = sel_registerName("lowerBaseline:");
-public static final int sel_outlineView_1willDisplayCell_1forTableColumn_1item_1 = sel_registerName("outlineView:willDisplayCell:forTableColumn:item:");
-public static final int sel_notificationWithName_1object_1userInfo_1 = sel_registerName("notificationWithName:object:userInfo:");
-public static final int sel_setMaxConcurrentOperationCount_1 = sel_registerName("setMaxConcurrentOperationCount:");
-public static final int sel_closeSpellDocumentWithTag_1 = sel_registerName("closeSpellDocumentWithTag:");
-public static final int sel_popUpStatusItemMenu_1 = sel_registerName("popUpStatusItemMenu:");
-public static final int sel_itemPrototype = sel_registerName("itemPrototype");
-public static final int sel_commandName = sel_registerName("commandName");
-public static final int sel_setTextAttributesForZero_1 = sel_registerName("setTextAttributesForZero:");
-public static final int sel_dateFromComponents_1 = sel_registerName("dateFromComponents:");
-public static final int sel_outlineViewColumnDidResize_1 = sel_registerName("outlineViewColumnDidResize:");
-public static final int sel_setTailIndent_1 = sel_registerName("setTailIndent:");
-public static final int sel_setRowTemplates_1 = sel_registerName("setRowTemplates:");
-public static final int sel_objectsForXQuery_1constants_1error_1 = sel_registerName("objectsForXQuery:constants:error:");
-public static final int sel_mutableCopyWithZone_1 = sel_registerName("mutableCopyWithZone:");
-public static final int sel_initWithItemIdentifier_1 = sel_registerName("initWithItemIdentifier:");
-public static final int sel_minuteOfHour = sel_registerName("minuteOfHour");
-public static final int sel_setAutosavingDelay_1 = sel_registerName("setAutosavingDelay:");
-public static final int sel_nextKeyView = sel_registerName("nextKeyView");
-public static final int sel_orderFront_1 = sel_registerName("orderFront:");
-public static final int sel_encodeValueOfObjCType_1at_1 = sel_registerName("encodeValueOfObjCType:at:");
-public static final int sel_mode = sel_registerName("mode");
-public static final int sel_appleEventWithEventClass_1eventID_1targetDescriptor_1returnID_1transactionID_1 = sel_registerName("appleEventWithEventClass:eventID:targetDescriptor:returnID:transactionID:");
-public static final int sel_stringByDeletingPathExtension = sel_registerName("stringByDeletingPathExtension");
-public static final int sel_standardOutput = sel_registerName("standardOutput");
-public static final int sel_enumCodeValue = sel_registerName("enumCodeValue");
-public static final int sel_setResourceData_1 = sel_registerName("setResourceData:");
-public static final int sel_convertRectFromBase_1 = sel_registerName("convertRectFromBase:");
-public static final int sel_initWithContentRect_1styleMask_1backing_1defer_1screen_1 = sel_registerName("initWithContentRect:styleMask:backing:defer:screen:");
-public static final int sel_autoenablesItems = sel_registerName("autoenablesItems");
-public static final int sel_textContainerForGlyphAtIndex_1effectiveRange_1withoutAdditionalLayout_1 = sel_registerName("textContainerForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:");
-public static final int sel_QTMovie = sel_registerName("QTMovie");
-public static final int sel_addObserver_1selector_1name_1object_1suspensionBehavior_1 = sel_registerName("addObserver:selector:name:object:suspensionBehavior:");
-public static final int sel_getArgument_1atIndex_1 = sel_registerName("getArgument:atIndex:");
-public static final int sel_replaceChildAtIndex_1withNode_1 = sel_registerName("replaceChildAtIndex:withNode:");
-public static final int sel_beginForDirectory_1file_1types_1modelessDelegate_1didEndSelector_1contextInfo_1 = sel_registerName("beginForDirectory:file:types:modelessDelegate:didEndSelector:contextInfo:");
-public static final int sel_supportsMode_1 = sel_registerName("supportsMode:");
-public static final int sel_openFile_1 = sel_registerName("openFile:");
-public static final int sel_zero = sel_registerName("zero");
-public static final int sel_compositingFilter = sel_registerName("compositingFilter");
-public static final int sel_fileGroupOwnerAccountID = sel_registerName("fileGroupOwnerAccountID");
-public static final int sel_tokenField_1writeRepresentedObjects_1toPasteboard_1 = sel_registerName("tokenField:writeRepresentedObjects:toPasteboard:");
-public static final int sel_tabViewType = sel_registerName("tabViewType");
-public static final int sel_drawSortIndicatorWithFrame_1inView_1ascending_1priority_1 = sel_registerName("drawSortIndicatorWithFrame:inView:ascending:priority:");
-public static final int sel_spellCheckerDocumentTag = sel_registerName("spellCheckerDocumentTag");
-public static final int sel_updateFromPMPageFormat = sel_registerName("updateFromPMPageFormat");
-public static final int sel_colorSyncProfile = sel_registerName("colorSyncProfile");
-public static final int sel_flushBufferedKeyEvents = sel_registerName("flushBufferedKeyEvents");
-public static final int sel_removeAllObjects = sel_registerName("removeAllObjects");
-public static final int sel_selectItemWithTitle_1 = sel_registerName("selectItemWithTitle:");
-public static final int sel_textContainers = sel_registerName("textContainers");
-public static final int sel_isHorizontallyResizable = sel_registerName("isHorizontallyResizable");
-public static final int sel_selectionIndexPaths = sel_registerName("selectionIndexPaths");
-public static final int sel_setString_1forType_1 = sel_registerName("setString:forType:");
-public static final int sel_setWraps_1 = sel_registerName("setWraps:");
-public static final int sel_dataCell = sel_registerName("dataCell");
-public static final int sel_addPointer_1 = sel_registerName("addPointer:");
-public static final int sel_invalidate = sel_registerName("invalidate");
-public static final int sel_draggingImageForRowsWithIndexes_1inColumn_1withEvent_1offset_1 = sel_registerName("draggingImageForRowsWithIndexes:inColumn:withEvent:offset:");
-public static final int sel_horizontalEdgePadding = sel_registerName("horizontalEdgePadding");
-public static final int sel_view = sel_registerName("view");
-public static final int sel_showsPrintPanel = sel_registerName("showsPrintPanel");
-public static final int sel_hyphenationFactor = sel_registerName("hyphenationFactor");
-public static final int sel_setAcceptsGlyphInfo_1 = sel_registerName("setAcceptsGlyphInfo:");
-public static final int sel_formatWidth = sel_registerName("formatWidth");
-public static final int sel_stringByAppendingFormat_1 = sel_registerName("stringByAppendingFormat:");
-public static final int sel_documentForFileName_1 = sel_registerName("documentForFileName:");
-public static final int sel_outlineView_1nextTypeSelectMatchFromItem_1toItem_1forString_1 = sel_registerName("outlineView:nextTypeSelectMatchFromItem:toItem:forString:");
-public static final int sel_isItemExpanded_1 = sel_registerName("isItemExpanded:");
-public static final int sel_playbackDeviceIdentifier = sel_registerName("playbackDeviceIdentifier");
-public static final int sel_addButtonWithTitle_1 = sel_registerName("addButtonWithTitle:");
-public static final int sel_lowercaseLetterCharacterSet = sel_registerName("lowercaseLetterCharacterSet");
-public static final int sel_netService_1didNotResolve_1 = sel_registerName("netService:didNotResolve:");
-public static final int sel_copiesOnScroll = sel_registerName("copiesOnScroll");
-public static final int sel_unarchiver_1willReplaceObject_1withObject_1 = sel_registerName("unarchiver:willReplaceObject:withObject:");
-public static final int sel_setHasShadow_1 = sel_registerName("setHasShadow:");
-public static final int sel_addObserver_1selector_1name_1object_1 = sel_registerName("addObserver:selector:name:object:");
-public static final int sel_setDouble_1forKey_1 = sel_registerName("setDouble:forKey:");
-public static final int sel_positionOfGlyph_1struckOverRect_1metricsExist_1 = sel_registerName("positionOfGlyph:struckOverRect:metricsExist:");
-public static final int sel_sharedInstance = sel_registerName("sharedInstance");
-public static final int sel_setPaperSize_1 = sel_registerName("setPaperSize:");
-public static final int sel_data1 = sel_registerName("data1");
-public static final int sel_applicationWillBecomeActive_1 = sel_registerName("applicationWillBecomeActive:");
-public static final int sel_URLProtocol_1cachedResponseIsValid_1 = sel_registerName("URLProtocol:cachedResponseIsValid:");
-public static final int sel_mouseDown_1 = sel_registerName("mouseDown:");
-public static final int sel_setVeryShortStandaloneWeekdaySymbols_1 = sel_registerName("setVeryShortStandaloneWeekdaySymbols:");
-public static final int sel_setUsesStrongWriteBarrier_1 = sel_registerName("setUsesStrongWriteBarrier:");
-public static final int sel_second = sel_registerName("second");
-public static final int sel_predicateWithLeftExpression_1rightExpression_1modifier_1type_1options_1 = sel_registerName("predicateWithLeftExpression:rightExpression:modifier:type:options:");
-public static final int sel_setFloatingPanel_1 = sel_registerName("setFloatingPanel:");
-public static final int sel_parser_1didEndElement_1namespaceURI_1qualifiedName_1 = sel_registerName("parser:didEndElement:namespaceURI:qualifiedName:");
-public static final int sel_handlePortMessage_1 = sel_registerName("handlePortMessage:");
-public static final int sel_filteredSetUsingPredicate_1 = sel_registerName("filteredSetUsingPredicate:");
-public static final int sel_setLocalizedKeyDictionary_1 = sel_registerName("setLocalizedKeyDictionary:");
-public static final int sel_drawCellInside_1 = sel_registerName("drawCellInside:");
-public static final int sel_browserDidScroll_1 = sel_registerName("browserDidScroll:");
-public static final int sel_isDirectory = sel_registerName("isDirectory");
-public static final int sel_setEnvironment_1 = sel_registerName("setEnvironment:");
-public static final int sel_persistence = sel_registerName("persistence");
-public static final int sel_backingType = sel_registerName("backingType");
-public static final int sel_orderedDocuments = sel_registerName("orderedDocuments");
-public static final int sel_windowWillUseStandardFrame_1defaultFrame_1 = sel_registerName("windowWillUseStandardFrame:defaultFrame:");
-public static final int sel_toggleTraditionalCharacterShape_1 = sel_registerName("toggleTraditionalCharacterShape:");
-public static final int sel_fractionOfDistanceThroughGlyphForPoint_1 = sel_registerName("fractionOfDistanceThroughGlyphForPoint:");
-public static final int sel_netServiceWillPublish_1 = sel_registerName("netServiceWillPublish:");
-public static final int sel_drawInRect_1relativeCenterPosition_1 = sel_registerName("drawInRect:relativeCenterPosition:");
-public static final int sel_setShowsAlpha_1 = sel_registerName("setShowsAlpha:");
-public static final int sel_canDragRowsWithIndexes_1inColumn_1withEvent_1 = sel_registerName("canDragRowsWithIndexes:inColumn:withEvent:");
-public static final int sel_start = sel_registerName("start");
-public static final int sel_imageRectInRuler = sel_registerName("imageRectInRuler");
-public static final int sel_TXTRecordData = sel_registerName("TXTRecordData");
-public static final int sel_groupingLevel = sel_registerName("groupingLevel");
-public static final int sel_response = sel_registerName("response");
-public static final int sel_insertionIndex = sel_registerName("insertionIndex");
-public static final int sel_cancelPreviousPerformRequestsWithTarget_1selector_1object_1 = sel_registerName("cancelPreviousPerformRequestsWithTarget:selector:object:");
-public static final int sel_itemWithTitle_1 = sel_registerName("itemWithTitle:");
-public static final int sel_insertRow_1 = sel_registerName("insertRow:");
-public static final int sel_mutableChildNodes = sel_registerName("mutableChildNodes");
-public static final int sel_removeAllPoints = sel_registerName("removeAllPoints");
-public static final int sel_searchForRegistrationDomains = sel_registerName("searchForRegistrationDomains");
-public static final int sel_replacementObjectForCoder_1 = sel_registerName("replacementObjectForCoder:");
-public static final int sel_tangentialPressure = sel_registerName("tangentialPressure");
-public static final int sel_setMaxDate_1 = sel_registerName("setMaxDate:");
-public static final int sel_performMnemonic_1 = sel_registerName("performMnemonic:");
-public static final int sel_maximumRecentDocumentCount = sel_registerName("maximumRecentDocumentCount");
-public static final int sel_stringsByAppendingPaths_1 = sel_registerName("stringsByAppendingPaths:");
-public static final int sel_localTimeZone = sel_registerName("localTimeZone");
-public static final int sel_draggingLocation = sel_registerName("draggingLocation");
-public static final int sel_searchForAllDomains = sel_registerName("searchForAllDomains");
-public static final int sel_attributedStringWithAttachment_1 = sel_registerName("attributedStringWithAttachment:");
-public static final int sel_initWithContentsOfURL_1byReference_1 = sel_registerName("initWithContentsOfURL:byReference:");
-public static final int sel_exchangeObjectAtIndex_1withObjectAtIndex_1 = sel_registerName("exchangeObjectAtIndex:withObjectAtIndex:");
-public static final int sel_draw = sel_registerName("draw");
-public static final int sel_fileIsImmutable = sel_registerName("fileIsImmutable");
-public static final int sel_tokenField_1styleForRepresentedObject_1 = sel_registerName("tokenField:styleForRepresentedObject:");
-public static final int sel_setAutorecalculatesContentBorderThickness_1forEdge_1 = sel_registerName("setAutorecalculatesContentBorderThickness:forEdge:");
-public static final int sel_firstRectForCharacterRange_1actualRange_1 = sel_registerName("firstRectForCharacterRange:actualRange:");
-public static final int sel_targetForAction_1to_1from_1 = sel_registerName("targetForAction:to:from:");
-public static final int sel_setShouldCloseDocument_1 = sel_registerName("setShouldCloseDocument:");
-public static final int sel_originOffset = sel_registerName("originOffset");
-public static final int sel_sharedSupportPath = sel_registerName("sharedSupportPath");
-public static final int sel_disableScreenUpdatesUntilFlush = sel_registerName("disableScreenUpdatesUntilFlush");
-public static final int sel_setShortStandaloneQuarterSymbols_1 = sel_registerName("setShortStandaloneQuarterSymbols:");
-public static final int sel_filenames = sel_registerName("filenames");
-public static final int sel_numberOfItemsInComboBox_1 = sel_registerName("numberOfItemsInComboBox:");
-public static final int sel_hasBytesAvailable = sel_registerName("hasBytesAvailable");
-public static final int sel_currentConversation = sel_registerName("currentConversation");
-public static final int sel_setAllowsEditingTextAttributes_1 = sel_registerName("setAllowsEditingTextAttributes:");
-public static final int sel_initWithName_1stringValue_1 = sel_registerName("initWithName:stringValue:");
-public static final int sel_tableViewColumnDidResize_1 = sel_registerName("tableViewColumnDidResize:");
-public static final int sel_knowsPageRange_1 = sel_registerName("knowsPageRange:");
-public static final int sel_uppercaseLetterCharacterSet = sel_registerName("uppercaseLetterCharacterSet");
-public static final int sel_capitalizedLetterCharacterSet = sel_registerName("capitalizedLetterCharacterSet");
-public static final int sel_main = sel_registerName("main");
-public static final int sel_genericRGBColorSpace = sel_registerName("genericRGBColorSpace");
-public static final int sel_clearsFilterPredicateOnInsertion = sel_registerName("clearsFilterPredicateOnInsertion");
-public static final int sel_paragraphs = sel_registerName("paragraphs");
-public static final int sel_setJobDisposition_1 = sel_registerName("setJobDisposition:");
-public static final int sel_setContainerClassDescription_1 = sel_registerName("setContainerClassDescription:");
-public static final int sel_stringWithContentsOfURL_1 = sel_registerName("stringWithContentsOfURL:");
-public static final int sel_setTrackingMode_1 = sel_registerName("setTrackingMode:");
-public static final int sel_canCloseDocumentWithDelegate_1shouldCloseSelector_1contextInfo_1 = sel_registerName("canCloseDocumentWithDelegate:shouldCloseSelector:contextInfo:");
-public static final int sel_usesItemFromMenu = sel_registerName("usesItemFromMenu");
-public static final int sel_shortValue = sel_registerName("shortValue");
-public static final int sel_readDataOfLength_1 = sel_registerName("readDataOfLength:");
-public static final int sel_descriptorWithDescriptorType_1data_1 = sel_registerName("descriptorWithDescriptorType:data:");
-public static final int sel_setCanRemoveAllRows_1 = sel_registerName("setCanRemoveAllRows:");
-public static final int sel_defaultCenter = sel_registerName("defaultCenter");
-public static final int sel_scriptingIsGreaterThan_1 = sel_registerName("scriptingIsGreaterThan:");
-public static final int sel_splitView_1constrainSplitPosition_1ofSubviewAt_1 = sel_registerName("splitView:constrainSplitPosition:ofSubviewAt:");
-public static final int sel_setTokenStyle_1 = sel_registerName("setTokenStyle:");
-public static final int sel_initWithContentRect_1styleMask_1backing_1defer_1 = sel_registerName("initWithContentRect:styleMask:backing:defer:");
-public static final int sel_insertTabViewItem_1atIndex_1 = sel_registerName("insertTabViewItem:atIndex:");
-public static final int sel_rowForDisplayValue_1 = sel_registerName("rowForDisplayValue:");
-public static final int sel_isDrawingToScreen = sel_registerName("isDrawingToScreen");
-public static final int sel_encodeRect_1 = sel_registerName("encodeRect:");
-public static final int sel_controlDarkShadowColor = sel_registerName("controlDarkShadowColor");
-public static final int sel_maxDate = sel_registerName("maxDate");
-public static final int sel_lock = sel_registerName("lock");
-public static final int sel_resetSystemTimeZone = sel_registerName("resetSystemTimeZone");
-public static final int sel_coerceValue_1toClass_1 = sel_registerName("coerceValue:toClass:");
-public static final int sel_qdPort = sel_registerName("qdPort");
-public static final int sel_resultAtIndex_1 = sel_registerName("resultAtIndex:");
-public static final int sel_descriptorWithBoolean_1 = sel_registerName("descriptorWithBoolean:");
-public static final int sel_markedRange = sel_registerName("markedRange");
-public static final int sel_colorWithCalibratedHue_1saturation_1brightness_1alpha_1 = sel_registerName("colorWithCalibratedHue:saturation:brightness:alpha:");
-public static final int sel_setSharedPrintInfo_1 = sel_registerName("setSharedPrintInfo:");
-public static final int sel_setBorderColor_1 = sel_registerName("setBorderColor:");
-public static final int sel_parser_1foundCharacters_1 = sel_registerName("parser:foundCharacters:");
-public static final int sel_preferredPasteboardTypeFromArray_1restrictedToTypesFromArray_1 = sel_registerName("preferredPasteboardTypeFromArray:restrictedToTypesFromArray:");
-public static final int sel_resume = sel_registerName("resume");
-public static final int sel_iconForFiles_1 = sel_registerName("iconForFiles:");
-public static final int sel_drawKeyEquivalentWithFrame_1inView_1 = sel_registerName("drawKeyEquivalentWithFrame:inView:");
-public static final int sel_boxType = sel_registerName("boxType");
-public static final int sel_initWithContainerClassDescription_1containerSpecifier_1key_1name_1 = sel_registerName("initWithContainerClassDescription:containerSpecifier:key:name:");
-public static final int sel_setFill = sel_registerName("setFill");
-public static final int sel_setParagraphGlyphRange_1separatorGlyphRange_1 = sel_registerName("setParagraphGlyphRange:separatorGlyphRange:");
-public static final int sel_copyWithZone_1 = sel_registerName("copyWithZone:");
-public static final int sel_self = sel_registerName("self");
-public static final int sel_reservedSpaceLength = sel_registerName("reservedSpaceLength");
-public static final int sel_unsignedIntValue = sel_registerName("unsignedIntValue");
-public static final int sel_URLHandleResourceDidFinishLoading_1 = sel_registerName("URLHandleResourceDidFinishLoading:");
-public static final int sel_menuWillOpen_1 = sel_registerName("menuWillOpen:");
-public static final int sel_menuWillClose_1 = sel_registerName("menuWillClose:");
-public static final int sel_pointerArrayWithWeakObjects = sel_registerName("pointerArrayWithWeakObjects");
-public static final int sel_fetchPredicate = sel_registerName("fetchPredicate");
-public static final int sel_pathToColumn_1 = sel_registerName("pathToColumn:");
-public static final int sel_columnWithIdentifier_1 = sel_registerName("columnWithIdentifier:");
-public static final int sel_setShouldCreateUI_1 = sel_registerName("setShouldCreateUI:");
-public static final int sel_getGlyphs_1range_1 = sel_registerName("getGlyphs:range:");
-public static final int sel_returnID = sel_registerName("returnID");
-public static final int sel_miterLimit = sel_registerName("miterLimit");
-public static final int sel_hidesEmptyCells = sel_registerName("hidesEmptyCells");
-public static final int sel_userSpaceScaleFactor = sel_registerName("userSpaceScaleFactor");
-public static final int sel_xHeight = sel_registerName("xHeight");
-public static final int sel_decimalNumberByMultiplyingBy_1withBehavior_1 = sel_registerName("decimalNumberByMultiplyingBy:withBehavior:");
-public static final int sel_reloadData = sel_registerName("reloadData");
-public static final int sel_setShortWeekdaySymbols_1 = sel_registerName("setShortWeekdaySymbols:");
-public static final int sel_containsIndexesInRange_1 = sel_registerName("containsIndexesInRange:");
-public static final int sel_colorWithDeviceRed_1green_1blue_1alpha_1 = sel_registerName("colorWithDeviceRed:green:blue:alpha:");
-public static final int sel_screenFontWithRenderingMode_1 = sel_registerName("screenFontWithRenderingMode:");
-public static final int sel_suggestedFilename = sel_registerName("suggestedFilename");
-public static final int sel_fileNameExtensionForType_1saveOperation_1 = sel_registerName("fileNameExtensionForType:saveOperation:");
-public static final int sel_labelFontSize = sel_registerName("labelFontSize");
-public static final int sel_setAlphaValue_1 = sel_registerName("setAlphaValue:");
+public static final int sel_numberWithBool_ = sel_registerName("numberWithBool:");
+public static final int sel_numberWithInt_ = sel_registerName("numberWithInt:");
+public static final int sel_object = sel_registerName("object");
+public static final int sel_objectAtIndex_ = sel_registerName("objectAtIndex:");
+public static final int sel_objectEnumerator = sel_registerName("objectEnumerator");
+public static final int sel_objectForInfoDictionaryKey_ = sel_registerName("objectForInfoDictionaryKey:");
+public static final int sel_objectForKey_ = sel_registerName("objectForKey:");
+public static final int sel_openFile_withApplication_ = sel_registerName("openFile:withApplication:");
 public static final int sel_openGLContext = sel_registerName("openGLContext");
-public static final int sel_scriptingIsLessThan_1 = sel_registerName("scriptingIsLessThan:");
-public static final int sel_keysSortedByValueUsingSelector_1 = sel_registerName("keysSortedByValueUsingSelector:");
-public static final int sel_control_1didFailToValidatePartialString_1errorDescription_1 = sel_registerName("control:didFailToValidatePartialString:errorDescription:");
-public static final int sel_offStateImage = sel_registerName("offStateImage");
-public static final int sel_bidiProcessingEnabled = sel_registerName("bidiProcessingEnabled");
-public static final int sel_isKeyWindow = sel_registerName("isKeyWindow");
-public static final int sel_initWithIconRef_1 = sel_registerName("initWithIconRef:");
-public static final int sel_changeCurrentDirectoryPath_1 = sel_registerName("changeCurrentDirectoryPath:");
-public static final int sel_textView = sel_registerName("textView");
-public static final int sel_localizedStringForStatusCode_1 = sel_registerName("localizedStringForStatusCode:");
-public static final int sel_setWantsLayer_1 = sel_registerName("setWantsLayer:");
-public static final int sel_positivePrefix = sel_registerName("positivePrefix");
-public static final int sel_setDefaultFlatness_1 = sel_registerName("setDefaultFlatness:");
-public static final int sel_addChild_1 = sel_registerName("addChild:");
-public static final int sel_parser_1foundAttributeDeclarationWithName_1forElement_1type_1defaultValue_1 = sel_registerName("parser:foundAttributeDeclarationWithName:forElement:type:defaultValue:");
-public static final int sel_scannerWithString_1 = sel_registerName("scannerWithString:");
-public static final int sel_removeFileWrapper_1 = sel_registerName("removeFileWrapper:");
-public static final int sel_setTitleWidth_1 = sel_registerName("setTitleWidth:");
-public static final int sel_setTabKeyTraversesCells_1 = sel_registerName("setTabKeyTraversesCells:");
-public static final int sel_glyphRangeForBoundingRect_1inTextContainer_1 = sel_registerName("glyphRangeForBoundingRect:inTextContainer:");
-public static final int sel_fileHandleForWritingAtPath_1 = sel_registerName("fileHandleForWritingAtPath:");
-public static final int sel_initWithContainerClassDescription_1containerSpecifier_1key_1 = sel_registerName("initWithContainerClassDescription:containerSpecifier:key:");
-public static final int sel_fontAttributes = sel_registerName("fontAttributes");
-public static final int sel_reviewUnsavedDocumentsWithAlertTitle_1cancellable_1delegate_1didReviewAllSelector_1contextInfo_1 = sel_registerName("reviewUnsavedDocumentsWithAlertTitle:cancellable:delegate:didReviewAllSelector:contextInfo:");
-public static final int sel_minWidth = sel_registerName("minWidth");
-public static final int sel_getLineFragmentInsertionPointsForCharacterAtIndex_1alternatePositions_1inDisplayOrder_1positions_1characterIndexes_1 = sel_registerName("getLineFragmentInsertionPointsForCharacterAtIndex:alternatePositions:inDisplayOrder:positions:characterIndexes:");
-public static final int sel_finishDecoding = sel_registerName("finishDecoding");
-public static final int sel_currentContextDrawingToScreen = sel_registerName("currentContextDrawingToScreen");
-public static final int sel_setKeyEquivalent_1 = sel_registerName("setKeyEquivalent:");
-public static final int sel_smartInsertForString_1replacingRange_1beforeString_1afterString_1 = sel_registerName("smartInsertForString:replacingRange:beforeString:afterString:");
-public static final int sel_useStandardKerning_1 = sel_registerName("useStandardKerning:");
-public static final int sel_sharedSystemTypesetter = sel_registerName("sharedSystemTypesetter");
-public static final int sel_setDatePickerMode_1 = sel_registerName("setDatePickerMode:");
-public static final int sel_encodePoint_1forKey_1 = sel_registerName("encodePoint:forKey:");
-public static final int sel_colorSpace = sel_registerName("colorSpace");
-public static final int sel_pasteboardByFilteringTypesInPasteboard_1 = sel_registerName("pasteboardByFilteringTypesInPasteboard:");
-public static final int sel_sendDoubleAction = sel_registerName("sendDoubleAction");
-public static final int sel_isColumnSelected_1 = sel_registerName("isColumnSelected:");
-public static final int sel_unarchiveObjectWithFile_1 = sel_registerName("unarchiveObjectWithFile:");
-public static final int sel_usesEPSOnResolutionMismatch = sel_registerName("usesEPSOnResolutionMismatch");
-public static final int sel_encodeBycopyObject_1 = sel_registerName("encodeBycopyObject:");
-public static final int sel_removeAttributeForName_1 = sel_registerName("removeAttributeForName:");
-public static final int sel_keyCell = sel_registerName("keyCell");
-public static final int sel_allocWithZone_1 = sel_registerName("allocWithZone:");
-public static final int sel_getCompression_1factor_1 = sel_registerName("getCompression:factor:");
-public static final int sel_insertValue_1inPropertyWithKey_1 = sel_registerName("insertValue:inPropertyWithKey:");
-public static final int sel_drawAtPoint_1withAttributes_1 = sel_registerName("drawAtPoint:withAttributes:");
-public static final int sel_isTrue = sel_registerName("isTrue");
-public static final int sel_expectedContentLength = sel_registerName("expectedContentLength");
-public static final int sel_setTitle_1 = sel_registerName("setTitle:");
-public static final int sel_connection_1didReceiveAuthenticationChallenge_1 = sel_registerName("connection:didReceiveAuthenticationChallenge:");
-public static final int sel_isEnabledForSegment_1 = sel_registerName("isEnabledForSegment:");
-public static final int sel_speechSynthesizer_1willSpeakPhoneme_1 = sel_registerName("speechSynthesizer:willSpeakPhoneme:");
-public static final int sel_setShowsStateColumn_1 = sel_registerName("setShowsStateColumn:");
-public static final int sel_requiredFileType = sel_registerName("requiredFileType");
-public static final int sel_convertRect_1fromView_1 = sel_registerName("convertRect:fromView:");
-public static final int sel_visibleFrame = sel_registerName("visibleFrame");
-public static final int sel_concludeDragOperation_1 = sel_registerName("concludeDragOperation:");
-public static final int sel_minimumFractionDigits = sel_registerName("minimumFractionDigits");
-public static final int sel_reopenDocumentForURL_1withContentsOfURL_1error_1 = sel_registerName("reopenDocumentForURL:withContentsOfURL:error:");
-public static final int sel_roundingMode = sel_registerName("roundingMode");
-public static final int sel_colorWithCatalogName_1colorName_1 = sel_registerName("colorWithCatalogName:colorName:");
-public static final int sel_setWithSet_1 = sel_registerName("setWithSet:");
-public static final int sel_fileManager_1willProcessPath_1 = sel_registerName("fileManager:willProcessPath:");
-public static final int sel_setSuspended_1 = sel_registerName("setSuspended:");
-public static final int sel_currentInputManager = sel_registerName("currentInputManager");
-public static final int sel_operatingSystemVersionString = sel_registerName("operatingSystemVersionString");
-public static final int sel_resetBytesInRange_1 = sel_registerName("resetBytesInRange:");
-public static final int sel_sizeForKey_1inTable_1 = sel_registerName("sizeForKey:inTable:");
-public static final int sel_setFloat_1forKey_1 = sel_registerName("setFloat:forKey:");
-public static final int sel_enableUndoRegistration = sel_registerName("enableUndoRegistration");
-public static final int sel_initWithCGImage_1 = sel_registerName("initWithCGImage:");
-public static final int sel_initWithCIImage_1 = sel_registerName("initWithCIImage:");
-public static final int sel_addCharactersInRange_1 = sel_registerName("addCharactersInRange:");
-public static final int sel_initWithRect_1options_1owner_1userInfo_1 = sel_registerName("initWithRect:options:owner:userInfo:");
-public static final int sel_incrementalLoadFromData_1complete_1 = sel_registerName("incrementalLoadFromData:complete:");
-public static final int sel_tableView_1acceptDrop_1row_1dropOperation_1 = sel_registerName("tableView:acceptDrop:row:dropOperation:");
-public static final int sel_classNamed_1 = sel_registerName("classNamed:");
-public static final int sel_setIndeterminate_1 = sel_registerName("setIndeterminate:");
-public static final int sel_normalizeAdjacentTextNodesPreservingCDATA_1 = sel_registerName("normalizeAdjacentTextNodesPreservingCDATA:");
-public static final int sel_validateUserInterfaceItem_1 = sel_registerName("validateUserInterfaceItem:");
-public static final int sel_setPlaysEveryFrame_1 = sel_registerName("setPlaysEveryFrame:");
-public static final int sel_isCompiled = sel_registerName("isCompiled");
-public static final int sel_tokenFieldCell_1editingStringForRepresentedObject_1 = sel_registerName("tokenFieldCell:editingStringForRepresentedObject:");
-public static final int sel_tableView_1isGroupRow_1 = sel_registerName("tableView:isGroupRow:");
-public static final int sel_orderFrontLinkPanel_1 = sel_registerName("orderFrontLinkPanel:");
-public static final int sel_alphaControlAddedOrRemoved_1 = sel_registerName("alphaControlAddedOrRemoved:");
-public static final int sel_setShadowColor_1 = sel_registerName("setShadowColor:");
-public static final int sel_canBecomeKeyView = sel_registerName("canBecomeKeyView");
-public static final int sel_addTimer_1forMode_1 = sel_registerName("addTimer:forMode:");
-public static final int sel_clickedColumn = sel_registerName("clickedColumn");
-public static final int sel_initWithName_1URI_1 = sel_registerName("initWithName:URI:");
-public static final int sel_saveDocument_1 = sel_registerName("saveDocument:");
-public static final int sel_observationInfo = sel_registerName("observationInfo");
-public static final int sel_readFromURL_1options_1documentAttributes_1error_1 = sel_registerName("readFromURL:options:documentAttributes:error:");
-public static final int sel_addClient_1 = sel_registerName("addClient:");
-public static final int sel_appleEventForSuspensionID_1 = sel_registerName("appleEventForSuspensionID:");
-public static final int sel_setGeneratesCalendarDates_1 = sel_registerName("setGeneratesCalendarDates:");
-public static final int sel_tableView_1sortDescriptorsDidChange_1 = sel_registerName("tableView:sortDescriptorsDidChange:");
-public static final int sel_predicateFormat = sel_registerName("predicateFormat");
-public static final int sel_windowShouldZoom_1toFrame_1 = sel_registerName("windowShouldZoom:toFrame:");
-public static final int sel_usesFontPanel = sel_registerName("usesFontPanel");
-public static final int sel_encodeNXObject_1 = sel_registerName("encodeNXObject:");
-public static final int sel_colorAtX_1y_1 = sel_registerName("colorAtX:y:");
-public static final int sel_publishWithOptions_1 = sel_registerName("publishWithOptions:");
-public static final int sel_allHTTPHeaderFields = sel_registerName("allHTTPHeaderFields");
-public static final int sel_registerPort_1name_1 = sel_registerName("registerPort:name:");
-public static final int sel_lineFragmentUsedRectForGlyphAtIndex_1effectiveRange_1withoutAdditionalLayout_1 = sel_registerName("lineFragmentUsedRectForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:");
-public static final int sel_hour = sel_registerName("hour");
-public static final int sel_setTextLists_1 = sel_registerName("setTextLists:");
-public static final int sel_maximumAdvancement = sel_registerName("maximumAdvancement");
-public static final int sel_setHighlightedItemIndex_1 = sel_registerName("setHighlightedItemIndex:");
-public static final int sel_initWithMemoryCapacity_1diskCapacity_1diskPath_1 = sel_registerName("initWithMemoryCapacity:diskCapacity:diskPath:");
-public static final int sel_setDocumentContentKind_1 = sel_registerName("setDocumentContentKind:");
-public static final int sel_updateDragTypeRegistration = sel_registerName("updateDragTypeRegistration");
-public static final int sel_deviceDescription = sel_registerName("deviceDescription");
-public static final int sel_setMiniwindowImage_1 = sel_registerName("setMiniwindowImage:");
-public static final int sel_sharedTypesetter = sel_registerName("sharedTypesetter");
-public static final int sel_deleteToEndOfLine_1 = sel_registerName("deleteToEndOfLine:");
-public static final int sel_setState_1atRow_1column_1 = sel_registerName("setState:atRow:column:");
-public static final int sel_validModesForFontPanel_1 = sel_registerName("validModesForFontPanel:");
-public static final int sel_currentCalendar = sel_registerName("currentCalendar");
-public static final int sel_selectionIndexPath = sel_registerName("selectionIndexPath");
-public static final int sel_setTextFont_1 = sel_registerName("setTextFont:");
-public static final int sel_password = sel_registerName("password");
-public static final int sel_words = sel_registerName("words");
-public static final int sel_status = sel_registerName("status");
-public static final int sel_typingAttributes = sel_registerName("typingAttributes");
-public static final int sel_handleTakeValue_1forUnboundKey_1 = sel_registerName("handleTakeValue:forUnboundKey:");
-public static final int sel_image_1didLoadRepresentation_1withStatus_1 = sel_registerName("image:didLoadRepresentation:withStatus:");
-public static final int sel_setBitsPerSample_1 = sel_registerName("setBitsPerSample:");
-public static final int sel_sortSubviewsUsingFunction_1context_1 = sel_registerName("sortSubviewsUsingFunction:context:");
-public static final int sel_initWithProtocolFamily_1socketType_1protocol_1socket_1 = sel_registerName("initWithProtocolFamily:socketType:protocol:socket:");
-public static final int sel_numberOfItemsInMenu_1 = sel_registerName("numberOfItemsInMenu:");
-public static final int sel_numberWithUnsignedShort_1 = sel_registerName("numberWithUnsignedShort:");
-public static final int sel_textView_1menu_1forEvent_1atIndex_1 = sel_registerName("textView:menu:forEvent:atIndex:");
-public static final int sel_arrowCursor = sel_registerName("arrowCursor");
-public static final int sel_abbreviation = sel_registerName("abbreviation");
-public static final int sel_moveDown_1 = sel_registerName("moveDown:");
-public static final int sel_activateContextHelpMode_1 = sel_registerName("activateContextHelpMode:");
-public static final int sel_properties = sel_registerName("properties");
-public static final int sel_setObject_1forProperty_1error_1 = sel_registerName("setObject:forProperty:error:");
-public static final int sel_setAutodisplay_1 = sel_registerName("setAutodisplay:");
-public static final int sel_locationInWindow = sel_registerName("locationInWindow");
-public static final int sel_layoutManager = sel_registerName("layoutManager");
-public static final int sel_hyphenCharacterForGlyphAtIndex_1 = sel_registerName("hyphenCharacterForGlyphAtIndex:");
-public static final int sel_play = sel_registerName("play");
-public static final int sel_compositeToPoint_1fromRect_1operation_1fraction_1 = sel_registerName("compositeToPoint:fromRect:operation:fraction:");
-public static final int sel_cellBackgroundColor = sel_registerName("cellBackgroundColor");
-public static final int sel_shouldAntialias = sel_registerName("shouldAntialias");
-public static final int sel_windowWillReturnFieldEditor_1toObject_1 = sel_registerName("windowWillReturnFieldEditor:toObject:");
-public static final int sel_setValuesForKeysWithDictionary_1 = sel_registerName("setValuesForKeysWithDictionary:");
-public static final int sel_drawsGrid = sel_registerName("drawsGrid");
-public static final int sel_patternPhase = sel_registerName("patternPhase");
-public static final int sel_setFrame_1 = sel_registerName("setFrame:");
-public static final int sel_roundingIncrement = sel_registerName("roundingIncrement");
-public static final int sel_adjustScroll_1 = sel_registerName("adjustScroll:");
-public static final int sel_alertShowHelp_1 = sel_registerName("alertShowHelp:");
-public static final int sel_animate_1 = sel_registerName("animate:");
-public static final int sel_tabletID = sel_registerName("tabletID");
-public static final int sel_selectedRowEnumerator = sel_registerName("selectedRowEnumerator");
-public static final int sel_XMLString = sel_registerName("XMLString");
-public static final int sel_setWarningValue_1 = sel_registerName("setWarningValue:");
-public static final int sel_tableView_1validateDrop_1proposedRow_1proposedDropOperation_1 = sel_registerName("tableView:validateDrop:proposedRow:proposedDropOperation:");
-public static final int sel_checkSpelling_1 = sel_registerName("checkSpelling:");
-public static final int sel_setFormattingStringsFilename_1 = sel_registerName("setFormattingStringsFilename:");
-public static final int sel_displayIfNeeded = sel_registerName("displayIfNeeded");
-public static final int sel_localizedName = sel_registerName("localizedName");
-public static final int sel_isEqualToSet_1 = sel_registerName("isEqualToSet:");
-public static final int sel_initWithBytesNoCopy_1length_1encoding_1freeWhenDone_1 = sel_registerName("initWithBytesNoCopy:length:encoding:freeWhenDone:");
-public static final int sel_reloadPredicate = sel_registerName("reloadPredicate");
-public static final int sel_setNumberOfMajorTickMarks_1 = sel_registerName("setNumberOfMajorTickMarks:");
-public static final int sel_defaultPlaceholderForMarker_1withBinding_1 = sel_registerName("defaultPlaceholderForMarker:withBinding:");
-public static final int sel_encodeDataObject_1 = sel_registerName("encodeDataObject:");
-public static final int sel_writeToURL_1ofType_1 = sel_registerName("writeToURL:ofType:");
-public static final int sel_createContext = sel_registerName("createContext");
-public static final int sel_verticalScroller = sel_registerName("verticalScroller");
-public static final int sel_setShowsInvisibleCharacters_1 = sel_registerName("setShowsInvisibleCharacters:");
-public static final int sel_encodeConditionalObject_1forKey_1 = sel_registerName("encodeConditionalObject:forKey:");
-public static final int sel_isEqualTo_1 = sel_registerName("isEqualTo:");
-public static final int sel_translateXBy_1yBy_1 = sel_registerName("translateXBy:yBy:");
-public static final int sel_customizationPaletteIsRunning = sel_registerName("customizationPaletteIsRunning");
-public static final int sel_dictionaryWithDictionary_1 = sel_registerName("dictionaryWithDictionary:");
-public static final int sel_drawMarkersInRect_1 = sel_registerName("drawMarkersInRect:");
-public static final int sel_centerSelectionInVisibleArea_1 = sel_registerName("centerSelectionInVisibleArea:");
-public static final int sel_stringByAppendingString_1 = sel_registerName("stringByAppendingString:");
-public static final int sel_flushWindowIfNeeded = sel_registerName("flushWindowIfNeeded");
-public static final int sel_lockFocusOnRepresentation_1 = sel_registerName("lockFocusOnRepresentation:");
-public static final int sel_setNotShownAttribute_1forGlyphAtIndex_1 = sel_registerName("setNotShownAttribute:forGlyphAtIndex:");
-public static final int sel_currentReplyAppleEvent = sel_registerName("currentReplyAppleEvent");
-public static final int sel_setTitleAlignment_1 = sel_registerName("setTitleAlignment:");
-public static final int sel_removeSuiteNamed_1 = sel_registerName("removeSuiteNamed:");
-public static final int sel_capitalizedString = sel_registerName("capitalizedString");
-public static final int sel_typeFromFileExtension_1 = sel_registerName("typeFromFileExtension:");
-public static final int sel_allowsImageEditing = sel_registerName("allowsImageEditing");
-public static final int sel_loosenKerning_1 = sel_registerName("loosenKerning:");
-public static final int sel_decomposableCharacterSet = sel_registerName("decomposableCharacterSet");
-public static final int sel_subdataWithRange_1 = sel_registerName("subdataWithRange:");
-public static final int sel_attachPopUpWithFrame_1inView_1 = sel_registerName("attachPopUpWithFrame:inView:");
-public static final int sel_setColumnResizingType_1 = sel_registerName("setColumnResizingType:");
-public static final int sel_genericCMYKColorSpace = sel_registerName("genericCMYKColorSpace");
-public static final int sel_actionForControlCharacterAtIndex_1 = sel_registerName("actionForControlCharacterAtIndex:");
-public static final int sel_documentRect = sel_registerName("documentRect");
-public static final int sel_dataWithContentsOfFile_1 = sel_registerName("dataWithContentsOfFile:");
-public static final int sel_localizedDescriptionForType_1 = sel_registerName("localizedDescriptionForType:");
-public static final int sel_increment = sel_registerName("increment");
-public static final int sel_deleteToEndOfParagraph_1 = sel_registerName("deleteToEndOfParagraph:");
-public static final int sel_exceptionWithName_1reason_1userInfo_1 = sel_registerName("exceptionWithName:reason:userInfo:");
-public static final int sel_postscriptName = sel_registerName("postscriptName");
-public static final int sel_setPreferredFilename_1 = sel_registerName("setPreferredFilename:");
-public static final int sel_setPostsBoundsChangedNotifications_1 = sel_registerName("setPostsBoundsChangedNotifications:");
-public static final int sel_decimalNumberHandlerWithRoundingMode_1scale_1raiseOnExactness_1raiseOnOverflow_1raiseOnUnderflow_1raiseOnDivideByZero_1 = sel_registerName("decimalNumberHandlerWithRoundingMode:scale:raiseOnExactness:raiseOnOverflow:raiseOnUnderflow:raiseOnDivideByZero:");
-public static final int sel_openDocumentWithContentsOfFile_1display_1 = sel_registerName("openDocumentWithContentsOfFile:display:");
-public static final int sel_objectForInfoDictionaryKey_1 = sel_registerName("objectForInfoDictionaryKey:");
-public static final int sel_setFrameOrigin_1 = sel_registerName("setFrameOrigin:");
-public static final int sel_pathControl_1willPopUpMenu_1 = sel_registerName("pathControl:willPopUpMenu:");
-public static final int sel_lineWidth = sel_registerName("lineWidth");
-public static final int sel_poseAsClass_1 = sel_registerName("poseAsClass:");
-public static final int sel_selectPreviousKeyView_1 = sel_registerName("selectPreviousKeyView:");
-public static final int sel_isKey_1inTable_1 = sel_registerName("isKey:inTable:");
-public static final int sel_isZoomed = sel_registerName("isZoomed");
-public static final int sel_setCompletionDelay_1 = sel_registerName("setCompletionDelay:");
-public static final int sel_mainMenu = sel_registerName("mainMenu");
-public static final int sel_scrollView = sel_registerName("scrollView");
-public static final int sel_dividerColor = sel_registerName("dividerColor");
-public static final int sel_requestModes = sel_registerName("requestModes");
-public static final int sel_setShowsResizeIndicator_1 = sel_registerName("setShowsResizeIndicator:");
-public static final int sel_setScrollable_1 = sel_registerName("setScrollable:");
-public static final int sel_setLineScroll_1 = sel_registerName("setLineScroll:");
-public static final int sel_resolvePrefixForNamespaceURI_1 = sel_registerName("resolvePrefixForNamespaceURI:");
-public static final int sel_bind_1toObject_1withKeyPath_1options_1 = sel_registerName("bind:toObject:withKeyPath:options:");
-public static final int sel_alignCenter_1 = sel_registerName("alignCenter:");
-public static final int sel_addTemporaryAttribute_1value_1forCharacterRange_1 = sel_registerName("addTemporaryAttribute:value:forCharacterRange:");
-public static final int sel_expressionForConstantValue_1 = sel_registerName("expressionForConstantValue:");
-public static final int sel_initWithContentSize_1preferredEdge_1 = sel_registerName("initWithContentSize:preferredEdge:");
-public static final int sel_setAccessoryView_1 = sel_registerName("setAccessoryView:");
-public static final int sel_setContentWidth_1type_1 = sel_registerName("setContentWidth:type:");
-public static final int sel_searchMenuTemplate = sel_registerName("searchMenuTemplate");
-public static final int sel_imageRepClassForType_1 = sel_registerName("imageRepClassForType:");
-public static final int sel_decimalValue = sel_registerName("decimalValue");
-public static final int sel_protocolSpecificInformation = sel_registerName("protocolSpecificInformation");
-public static final int sel_statusBar = sel_registerName("statusBar");
-public static final int sel_setTimeZone_1 = sel_registerName("setTimeZone:");
-public static final int sel_setWidth_1forSegment_1 = sel_registerName("setWidth:forSegment:");
-public static final int sel_objectIsForcedForKey_1inDomain_1 = sel_registerName("objectIsForcedForKey:inDomain:");
-public static final int sel_evaluationErrorSpecifier = sel_registerName("evaluationErrorSpecifier");
-public static final int sel_application_1openFile_1 = sel_registerName("application:openFile:");
-public static final int sel_changeDocumentBackgroundColor_1 = sel_registerName("changeDocumentBackgroundColor:");
-public static final int sel_volatileDomainNames = sel_registerName("volatileDomainNames");
-public static final int sel_changeInLength = sel_registerName("changeInLength");
-public static final int sel_autoresizingMask = sel_registerName("autoresizingMask");
-public static final int sel_setRepresentedObject_1 = sel_registerName("setRepresentedObject:");
-public static final int sel_isUndoRegistrationEnabled = sel_registerName("isUndoRegistrationEnabled");
-public static final int sel_alertWithError_1 = sel_registerName("alertWithError:");
-public static final int sel_saturationComponent = sel_registerName("saturationComponent");
-public static final int sel_spellServer_1didLearnWord_1inLanguage_1 = sel_registerName("spellServer:didLearnWord:inLanguage:");
-public static final int sel_performActionWithHighlightingForItemAtIndex_1 = sel_registerName("performActionWithHighlightingForItemAtIndex:");
-public static final int sel_loadSuitesFromBundle_1 = sel_registerName("loadSuitesFromBundle:");
-public static final int sel_firstTextView = sel_registerName("firstTextView");
-public static final int sel_targetForAction_1 = sel_registerName("targetForAction:");
-public static final int sel_enterExitEventWithType_1location_1modifierFlags_1timestamp_1windowNumber_1context_1eventNumber_1trackingNumber_1userData_1 = sel_registerName("enterExitEventWithType:location:modifierFlags:timestamp:windowNumber:context:eventNumber:trackingNumber:userData:");
-public static final int sel_setHelpAnchor_1 = sel_registerName("setHelpAnchor:");
-public static final int sel_printerWithName_1 = sel_registerName("printerWithName:");
-public static final int sel_boundingBoxForControlGlyphAtIndex_1forTextContainer_1proposedLineFragment_1glyphPosition_1characterIndex_1 = sel_registerName("boundingBoxForControlGlyphAtIndex:forTextContainer:proposedLineFragment:glyphPosition:characterIndex:");
-public static final int sel_initWithBytesNoCopy_1length_1freeWhenDone_1 = sel_registerName("initWithBytesNoCopy:length:freeWhenDone:");
-public static final int sel_getRow_1column_1ofCell_1 = sel_registerName("getRow:column:ofCell:");
-public static final int sel_smartDeleteRangeForProposedRange_1 = sel_registerName("smartDeleteRangeForProposedRange:");
-public static final int sel_getHue_1saturation_1brightness_1alpha_1 = sel_registerName("getHue:saturation:brightness:alpha:");
-public static final int sel_automaticallyNotifiesObserversForKey_1 = sel_registerName("automaticallyNotifiesObserversForKey:");
-public static final int sel_setAllowsImageEditing_1 = sel_registerName("setAllowsImageEditing:");
-public static final int sel_draggingUpdated_1 = sel_registerName("draggingUpdated:");
-public static final int sel_insertRowAtIndex_1withType_1asSubrowOfRow_1animate_1 = sel_registerName("insertRowAtIndex:withType:asSubrowOfRow:animate:");
-public static final int sel_getRectsExposedDuringLiveResize_1count_1 = sel_registerName("getRectsExposedDuringLiveResize:count:");
-public static final int sel_usesSignificantDigits = sel_registerName("usesSignificantDigits");
-public static final int sel_numberOfVirtualScreens = sel_registerName("numberOfVirtualScreens");
-public static final int sel_sendSynchronousRequest_1returningResponse_1error_1 = sel_registerName("sendSynchronousRequest:returningResponse:error:");
-public static final int sel_setBecomesKeyOnlyIfNeeded_1 = sel_registerName("setBecomesKeyOnlyIfNeeded:");
-public static final int sel_autorecalculatesKeyViewLoop = sel_registerName("autorecalculatesKeyViewLoop");
-public static final int sel_decodeDataObject = sel_registerName("decodeDataObject");
-public static final int sel_setOriginOffset_1 = sel_registerName("setOriginOffset:");
-public static final int sel_pointingDeviceSerialNumber = sel_registerName("pointingDeviceSerialNumber");
-public static final int sel_drawSegment_1inFrame_1withView_1 = sel_registerName("drawSegment:inFrame:withView:");
-public static final int sel_close = sel_registerName("close");
-public static final int sel_setAlignmentRect_1 = sel_registerName("setAlignmentRect:");
-public static final int sel_paragraphSeparatorCharacterRange = sel_registerName("paragraphSeparatorCharacterRange");
-public static final int sel_measurementUnits = sel_registerName("measurementUnits");
-public static final int sel_setUsesEPSOnResolutionMismatch_1 = sel_registerName("setUsesEPSOnResolutionMismatch:");
-public static final int sel_setLineFragmentPadding_1 = sel_registerName("setLineFragmentPadding:");
-public static final int sel_setLastComponentOfFileName_1 = sel_registerName("setLastComponentOfFileName:");
-public static final int sel_initWithSuiteName_1commandName_1dictionary_1 = sel_registerName("initWithSuiteName:commandName:dictionary:");
-public static final int sel_initWithContent_1 = sel_registerName("initWithContent:");
-public static final int sel_provideNewView_1 = sel_registerName("provideNewView:");
-public static final int sel_pathComponentCells = sel_registerName("pathComponentCells");
-public static final int sel_instanceMethodForSelector_1 = sel_registerName("instanceMethodForSelector:");
-public static final int sel_layoutManagerDidInvalidateLayout_1 = sel_registerName("layoutManagerDidInvalidateLayout:");
-public static final int sel_helpAnchor = sel_registerName("helpAnchor");
-public static final int sel_URLProtocol_1wasRedirectedToRequest_1redirectResponse_1 = sel_registerName("URLProtocol:wasRedirectedToRequest:redirectResponse:");
-public static final int sel_setIsVisible_1 = sel_registerName("setIsVisible:");
-public static final int sel_browser_1sizeToFitWidthOfColumn_1 = sel_registerName("browser:sizeToFitWidthOfColumn:");
-public static final int sel_handleFailureInMethod_1object_1file_1lineNumber_1description_1 = sel_registerName("handleFailureInMethod:object:file:lineNumber:description:");
-public static final int sel_serializedRepresentation = sel_registerName("serializedRepresentation");
-public static final int sel_replaceTextContainer_1 = sel_registerName("replaceTextContainer:");
-public static final int sel_speechSynthesizer_1willSpeakWord_1ofString_1 = sel_registerName("speechSynthesizer:willSpeakWord:ofString:");
-public static final int sel_startSpeaking_1 = sel_registerName("startSpeaking:");
-public static final int sel_setHyphenationFactor_1 = sel_registerName("setHyphenationFactor:");
-public static final int sel_retain = sel_registerName("retain");
-public static final int sel_insertItem_1atIndex_1 = sel_registerName("insertItem:atIndex:");
-public static final int sel_sortWithSortDescriptors_1recursively_1 = sel_registerName("sortWithSortDescriptors:recursively:");
-public static final int sel_selectTabViewItem_1 = sel_registerName("selectTabViewItem:");
-public static final int sel_clipRect_1 = sel_registerName("clipRect:");
-public static final int sel_close_1 = sel_registerName("close:");
-public static final int sel_didAddSubview_1 = sel_registerName("didAddSubview:");
-public static final int sel_markedTextSelectionChanged_1client_1 = sel_registerName("markedTextSelectionChanged:client:");
-public static final int sel_registerLanguage_1byVendor_1 = sel_registerName("registerLanguage:byVendor:");
-public static final int sel_removeClient_1 = sel_registerName("removeClient:");
-public static final int sel_setSendsWholeSearchString_1 = sel_registerName("setSendsWholeSearchString:");
-public static final int sel_localName = sel_registerName("localName");
-public static final int sel_setSelectedSegment_1 = sel_registerName("setSelectedSegment:");
-public static final int sel_setLineHeightMultiple_1 = sel_registerName("setLineHeightMultiple:");
-public static final int sel_setCanCreateDirectories_1 = sel_registerName("setCanCreateDirectories:");
-public static final int sel_setCookieAcceptPolicy_1 = sel_registerName("setCookieAcceptPolicy:");
-public static final int sel_convertFont_1toHaveTrait_1 = sel_registerName("convertFont:toHaveTrait:");
-public static final int sel_headerCell = sel_registerName("headerCell");
-public static final int sel_maximumDecimalNumber = sel_registerName("maximumDecimalNumber");
-public static final int sel_browser_1isColumnValid_1 = sel_registerName("browser:isColumnValid:");
-public static final int sel_tableViewSelectionIsChanging_1 = sel_registerName("tableViewSelectionIsChanging:");
-public static final int sel_setNotificationBatchingInterval_1 = sel_registerName("setNotificationBatchingInterval:");
-public static final int sel_isLeaf = sel_registerName("isLeaf");
-public static final int sel_valuesForAttributes_1 = sel_registerName("valuesForAttributes:");
-public static final int sel_removeTemporaryAttribute_1forCharacterRange_1 = sel_registerName("removeTemporaryAttribute:forCharacterRange:");
-public static final int sel_pixelsWide = sel_registerName("pixelsWide");
-public static final int sel_orderFrontStandardAboutPanel_1 = sel_registerName("orderFrontStandardAboutPanel:");
-public static final int sel_beginSheetModalForWindow_1modalDelegate_1didEndSelector_1contextInfo_1 = sel_registerName("beginSheetModalForWindow:modalDelegate:didEndSelector:contextInfo:");
-public static final int sel_setToolTip_1forSegment_1 = sel_registerName("setToolTip:forSegment:");
-public static final int sel_canonicalXMLStringPreservingComments_1 = sel_registerName("canonicalXMLStringPreservingComments:");
-public static final int sel_orderFrontListPanel_1 = sel_registerName("orderFrontListPanel:");
-public static final int sel_setIsMiniaturized_1 = sel_registerName("setIsMiniaturized:");
-public static final int sel_download_1didReceiveDataOfLength_1 = sel_registerName("download:didReceiveDataOfLength:");
-public static final int sel_layoutManager_1didCompleteLayoutForTextContainer_1atEnd_1 = sel_registerName("layoutManager:didCompleteLayoutForTextContainer:atEnd:");
-public static final int sel_standardWindowButton_1forStyleMask_1 = sel_registerName("standardWindowButton:forStyleMask:");
-public static final int sel_writeToURL_1atomically_1 = sel_registerName("writeToURL:atomically:");
-public static final int sel_useStandardLigatures_1 = sel_registerName("useStandardLigatures:");
-public static final int sel_currentRunLoop = sel_registerName("currentRunLoop");
-public static final int sel_setExtraLineFragmentRect_1usedRect_1textContainer_1 = sel_registerName("setExtraLineFragmentRect:usedRect:textContainer:");
-public static final int sel_rootElement = sel_registerName("rootElement");
-public static final int sel_setContentViewMargins_1 = sel_registerName("setContentViewMargins:");
-public static final int sel_cancelPerformSelector_1target_1argument_1 = sel_registerName("cancelPerformSelector:target:argument:");
-public static final int sel_outputFormat = sel_registerName("outputFormat");
-public static final int sel_arrayWithContentsOfFile_1 = sel_registerName("arrayWithContentsOfFile:");
-public static final int sel_applicationWillFinishLaunching_1 = sel_registerName("applicationWillFinishLaunching:");
-public static final int sel_prefixForName_1 = sel_registerName("prefixForName:");
-public static final int sel_decimalNumberByDividingBy_1 = sel_registerName("decimalNumberByDividingBy:");
-public static final int sel_mouseUpOnCharacterIndex_1atCoordinate_1withModifier_1client_1 = sel_registerName("mouseUpOnCharacterIndex:atCoordinate:withModifier:client:");
-public static final int sel_defaultVoice = sel_registerName("defaultVoice");
-public static final int sel_operand = sel_registerName("operand");
-public static final int sel_moveToEndOfLine_1 = sel_registerName("moveToEndOfLine:");
-public static final int sel_addEntry_1 = sel_registerName("addEntry:");
-public static final int sel_scaleBy_1 = sel_registerName("scaleBy:");
-public static final int sel_setMnemonicLocation_1 = sel_registerName("setMnemonicLocation:");
-public static final int sel_dateWithCalendarFormat_1timeZone_1 = sel_registerName("dateWithCalendarFormat:timeZone:");
-public static final int sel_setUsesFontLeading_1 = sel_registerName("setUsesFontLeading:");
-public static final int sel_CIContext = sel_registerName("CIContext");
-public static final int sel_isDaylightSavingTime = sel_registerName("isDaylightSavingTime");
-public static final int sel_setShowsBorderOnlyWhileMouseInside_1 = sel_registerName("setShowsBorderOnlyWhileMouseInside:");
-public static final int sel_isSetOnMouseEntered = sel_registerName("isSetOnMouseEntered");
-public static final int sel_stringFromDate_1 = sel_registerName("stringFromDate:");
-public static final int sel_deselectColumn_1 = sel_registerName("deselectColumn:");
-public static final int sel_requestHeaderFieldsWithCookies_1 = sel_registerName("requestHeaderFieldsWithCookies:");
-public static final int sel_outlineViewColumnDidMove_1 = sel_registerName("outlineViewColumnDidMove:");
-public static final int sel_fileExtensionsFromType_1 = sel_registerName("fileExtensionsFromType:");
-public static final int sel_setUsesScreenFonts_1 = sel_registerName("setUsesScreenFonts:");
-public static final int sel_commandDescriptionsInSuite_1 = sel_registerName("commandDescriptionsInSuite:");
-public static final int sel_notShownAttributeForGlyphAtIndex_1 = sel_registerName("notShownAttributeForGlyphAtIndex:");
-public static final int sel_isRunning = sel_registerName("isRunning");
-public static final int sel_sharedPrintInfo = sel_registerName("sharedPrintInfo");
-public static final int sel_isValid = sel_registerName("isValid");
-public static final int sel_handleFailureInFunction_1file_1lineNumber_1description_1 = sel_registerName("handleFailureInFunction:file:lineNumber:description:");
-public static final int sel_localizedRecoveryOptions = sel_registerName("localizedRecoveryOptions");
-public static final int sel_establishConnection = sel_registerName("establishConnection");
-public static final int sel_isMainWindow = sel_registerName("isMainWindow");
-public static final int sel_setDrawsBackground_1 = sel_registerName("setDrawsBackground:");
-public static final int sel_intAttribute_1forGlyphAtIndex_1 = sel_registerName("intAttribute:forGlyphAtIndex:");
-public static final int sel_shadowColor = sel_registerName("shadowColor");
-public static final int sel_keyEquivalentModifierMask = sel_registerName("keyEquivalentModifierMask");
-public static final int sel_textStorageDidProcessEditing_1 = sel_registerName("textStorageDidProcessEditing:");
-public static final int sel_setType_1 = sel_registerName("setType:");
-public static final int sel_previousSibling = sel_registerName("previousSibling");
-public static final int sel_dateByAddingYears_1months_1days_1hours_1minutes_1seconds_1 = sel_registerName("dateByAddingYears:months:days:hours:minutes:seconds:");
-public static final int sel_setMinimum_1 = sel_registerName("setMinimum:");
-public static final int sel_columnAutoresizingStyle = sel_registerName("columnAutoresizingStyle");
-public static final int sel_convertPointFromBase_1 = sel_registerName("convertPointFromBase:");
-public static final int sel_layout = sel_registerName("layout");
-public static final int sel_textStorage = sel_registerName("textStorage");
-public static final int sel_values = sel_registerName("values");
-public static final int sel_RTFFromRange_1documentAttributes_1 = sel_registerName("RTFFromRange:documentAttributes:");
-public static final int sel_isMiniaturizable = sel_registerName("isMiniaturizable");
-public static final int sel_opaqueAncestor = sel_registerName("opaqueAncestor");
-public static final int sel_notationName = sel_registerName("notationName");
-public static final int sel_setBaseWritingDirection_1range_1 = sel_registerName("setBaseWritingDirection:range:");
-public static final int sel_setManagedObjectContext_1 = sel_registerName("setManagedObjectContext:");
-public static final int sel_patternImage = sel_registerName("patternImage");
-public static final int sel_windowDidResize_1 = sel_registerName("windowDidResize:");
-public static final int sel_setFieldEditor_1 = sel_registerName("setFieldEditor:");
-public static final int sel_initWithContainerClassDescription_1containerSpecifier_1key_1relativePosition_1baseSpecifier_1 = sel_registerName("initWithContainerClassDescription:containerSpecifier:key:relativePosition:baseSpecifier:");
-public static final int sel_setMainMenu_1 = sel_registerName("setMainMenu:");
-public static final int sel_setObjectZone_1 = sel_registerName("setObjectZone:");
-public static final int sel_localizedDescription = sel_registerName("localizedDescription");
-public static final int sel_setImageScaling_1 = sel_registerName("setImageScaling:");
-public static final int sel_moveToBeginningOfLine_1 = sel_registerName("moveToBeginningOfLine:");
-public static final int sel_transposeWords_1 = sel_registerName("transposeWords:");
-public static final int sel_protocol = sel_registerName("protocol");
-public static final int sel_isHorizontallyCentered = sel_registerName("isHorizontallyCentered");
-public static final int sel_invert = sel_registerName("invert");
-public static final int sel_isEqualToValue_1 = sel_registerName("isEqualToValue:");
-public static final int sel_registerName_1withNameServer_1 = sel_registerName("registerName:withNameServer:");
-public static final int sel_writeToURL_1ofType_1error_1 = sel_registerName("writeToURL:ofType:error:");
-public static final int sel_rangeForUserTextChange = sel_registerName("rangeForUserTextChange");
-public static final int sel_configurePersistentStoreCoordinatorForURL_1ofType_1error_1 = sel_registerName("configurePersistentStoreCoordinatorForURL:ofType:error:");
-public static final int sel_setShouldAntialias_1 = sel_registerName("setShouldAntialias:");
-public static final int sel_alignmentRect = sel_registerName("alignmentRect");
-public static final int sel_zoom_1 = sel_registerName("zoom:");
-public static final int sel_rate = sel_registerName("rate");
-public static final int sel_maxVisibleColumns = sel_registerName("maxVisibleColumns");
-public static final int sel_splitViewDidResizeSubviews_1 = sel_registerName("splitViewDidResizeSubviews:");
-public static final int sel_maxWidth = sel_registerName("maxWidth");
-public static final int sel_setData_1 = sel_registerName("setData:");
-public static final int sel_isVisible = sel_registerName("isVisible");
-public static final int sel_isSelected = sel_registerName("isSelected");
-public static final int sel_rulerView_1shouldRemoveMarker_1 = sel_registerName("rulerView:shouldRemoveMarker:");
-public static final int sel_setURL_1 = sel_registerName("setURL:");
-public static final int sel_drawTitle_1withFrame_1inView_1 = sel_registerName("drawTitle:withFrame:inView:");
-public static final int sel_usesWeakReadAndWriteBarriers = sel_registerName("usesWeakReadAndWriteBarriers");
-public static final int sel_elementDeclarationForName_1 = sel_registerName("elementDeclarationForName:");
-public static final int sel_setOneShot_1 = sel_registerName("setOneShot:");
-public static final int sel_shouldProcessNamespaces = sel_registerName("shouldProcessNamespaces");
-public static final int sel_isEqualToArray_1 = sel_registerName("isEqualToArray:");
-public static final int sel_XMLStringWithOptions_1 = sel_registerName("XMLStringWithOptions:");
-public static final int sel_initFileURLWithPath_1isDirectory_1 = sel_registerName("initFileURLWithPath:isDirectory:");
-public static final int sel_datePickerElements = sel_registerName("datePickerElements");
-public static final int sel_willChange_1valuesAtIndexes_1forKey_1 = sel_registerName("willChange:valuesAtIndexes:forKey:");
-public static final int sel_setSelected_1forSegment_1 = sel_registerName("setSelected:forSegment:");
-public static final int sel_initWithFormat_1shareContext_1 = sel_registerName("initWithFormat:shareContext:");
-public static final int sel_browser_1shouldSizeColumn_1forUserResize_1toWidth_1 = sel_registerName("browser:shouldSizeColumn:forUserResize:toWidth:");
-public static final int sel_indexSetWithIndexesInRange_1 = sel_registerName("indexSetWithIndexesInRange:");
-public static final int sel_netServiceBrowser_1didFindService_1moreComing_1 = sel_registerName("netServiceBrowser:didFindService:moreComing:");
-public static final int sel_keyUp_1 = sel_registerName("keyUp:");
-public static final int sel_pageHeader = sel_registerName("pageHeader");
-public static final int sel_isCancelled = sel_registerName("isCancelled");
-public static final int sel_segmentStyle = sel_registerName("segmentStyle");
-public static final int sel_imageRepWithContentsOfURL_1 = sel_registerName("imageRepWithContentsOfURL:");
-public static final int sel_initWithNibName_1bundle_1 = sel_registerName("initWithNibName:bundle:");
-public static final int sel_removeObserver_1fromObjectsAtIndexes_1forKeyPath_1 = sel_registerName("removeObserver:fromObjectsAtIndexes:forKeyPath:");
-public static final int sel_setFetchPredicate_1 = sel_registerName("setFetchPredicate:");
-public static final int sel_compare_1options_1range_1 = sel_registerName("compare:options:range:");
-public static final int sel_validateVisibleColumns = sel_registerName("validateVisibleColumns");
-public static final int sel_initWithCGColorSpace_1 = sel_registerName("initWithCGColorSpace:");
-public static final int sel_mountNewRemovableMedia = sel_registerName("mountNewRemovableMedia");
-public static final int sel_compare_1options_1range_1locale_1 = sel_registerName("compare:options:range:locale:");
-public static final int sel_setTopMargin_1 = sel_registerName("setTopMargin:");
-public static final int sel_maximumLengthOfBytesUsingEncoding_1 = sel_registerName("maximumLengthOfBytesUsingEncoding:");
-public static final int sel_colorWithAlphaComponent_1 = sel_registerName("colorWithAlphaComponent:");
-public static final int sel_appendBezierPathWithRoundedRect_1xRadius_1yRadius_1 = sel_registerName("appendBezierPathWithRoundedRect:xRadius:yRadius:");
-public static final int sel_autosavedContentsFileURL = sel_registerName("autosavedContentsFileURL");
-public static final int sel_markedTextAttributes = sel_registerName("markedTextAttributes");
-public static final int sel_predicateWithValue_1 = sel_registerName("predicateWithValue:");
-public static final int sel_makeFirstResponder_1 = sel_registerName("makeFirstResponder:");
-public static final int sel_alternateTitle = sel_registerName("alternateTitle");
-public static final int sel_attribute = sel_registerName("attribute");
-public static final int sel_decodeIntegerForKey_1 = sel_registerName("decodeIntegerForKey:");
-public static final int sel_setSeparatesColumns_1 = sel_registerName("setSeparatesColumns:");
-public static final int sel_imageRepsWithContentsOfURL_1 = sel_registerName("imageRepsWithContentsOfURL:");
-public static final int sel_isPlanar = sel_registerName("isPlanar");
-public static final int sel_download_1didReceiveAuthenticationChallenge_1 = sel_registerName("download:didReceiveAuthenticationChallenge:");
-public static final int sel_startingRow = sel_registerName("startingRow");
-public static final int sel_evaluateWithObject_1substitutionVariables_1 = sel_registerName("evaluateWithObject:substitutionVariables:");
-public static final int sel_initWithRTFD_1documentAttributes_1 = sel_registerName("initWithRTFD:documentAttributes:");
-public static final int sel_ensureLayoutForTextContainer_1 = sel_registerName("ensureLayoutForTextContainer:");
-public static final int sel_runModalForWindow_1relativeToWindow_1 = sel_registerName("runModalForWindow:relativeToWindow:");
-public static final int sel_isResizable = sel_registerName("isResizable");
-public static final int sel_isSymbolicLink = sel_registerName("isSymbolicLink");
-public static final int sel_containsIndexes_1 = sel_registerName("containsIndexes:");
-public static final int sel_splitView_1constrainMaxCoordinate_1ofSubviewAt_1 = sel_registerName("splitView:constrainMaxCoordinate:ofSubviewAt:");
-public static final int sel_setImportsGraphics_1 = sel_registerName("setImportsGraphics:");
-public static final int sel_action = sel_registerName("action");
-public static final int sel_noteNumberOfItemsChanged = sel_registerName("noteNumberOfItemsChanged");
-public static final int sel_drawBackgroundInClipRect_1 = sel_registerName("drawBackgroundInClipRect:");
-public static final int sel_booleanValue = sel_registerName("booleanValue");
-public static final int sel_printInfo = sel_registerName("printInfo");
-public static final int sel_performSelector_1withObject_1afterDelay_1 = sel_registerName("performSelector:withObject:afterDelay:");
-public static final int sel_boundingRectForGlyphRange_1inTextContainer_1 = sel_registerName("boundingRectForGlyphRange:inTextContainer:");
-public static final int sel_currencyCode = sel_registerName("currencyCode");
-public static final int sel_splitView_1canCollapseSubview_1 = sel_registerName("splitView:canCollapseSubview:");
-public static final int sel_hide = sel_registerName("hide");
-public static final int sel_setMonth_1 = sel_registerName("setMonth:");
-public static final int sel_dataFromTXTRecordDictionary_1 = sel_registerName("dataFromTXTRecordDictionary:");
-public static final int sel_rulerView_1didAddMarker_1 = sel_registerName("rulerView:didAddMarker:");
-public static final int sel_deleteBackward_1 = sel_registerName("deleteBackward:");
-public static final int sel_setMaximumLineHeight_1 = sel_registerName("setMaximumLineHeight:");
+public static final int sel_openPanel = sel_registerName("openPanel");
+public static final int sel_openURL_ = sel_registerName("openURL:");
+public static final int sel_openURLs_withAppBundleIdentifier_options_additionalEventParamDescriptor_launchIdentifiers_ = sel_registerName("openURLs:withAppBundleIdentifier:options:additionalEventParamDescriptor:launchIdentifiers:");
+public static final int sel_options = sel_registerName("options");
+public static final int sel_orderFront_ = sel_registerName("orderFront:");
+public static final int sel_orderFrontRegardless = sel_registerName("orderFrontRegardless");
+public static final int sel_orderFrontStandardAboutPanel_ = sel_registerName("orderFrontStandardAboutPanel:");
+public static final int sel_orderOut_ = sel_registerName("orderOut:");
 public static final int sel_orderedWindows = sel_registerName("orderedWindows");
-public static final int sel_standaloneWeekdaySymbols = sel_registerName("standaloneWeekdaySymbols");
-public static final int sel_isAttached = sel_registerName("isAttached");
+public static final int sel_otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_ = sel_registerName("otherEventWithType:location:modifierFlags:timestamp:windowNumber:context:subtype:data1:data2:");
+public static final int sel_otherMouseDown_ = sel_registerName("otherMouseDown:");
+public static final int sel_otherMouseDragged_ = sel_registerName("otherMouseDragged:");
+public static final int sel_otherMouseUp_ = sel_registerName("otherMouseUp:");
+public static final int sel_outlineView_child_ofItem_ = sel_registerName("outlineView:child:ofItem:");
+public static final int sel_outlineView_isItemExpandable_ = sel_registerName("outlineView:isItemExpandable:");
+public static final int sel_outlineView_numberOfChildrenOfItem_ = sel_registerName("outlineView:numberOfChildrenOfItem:");
+public static final int sel_outlineView_objectValueForTableColumn_byItem_ = sel_registerName("outlineView:objectValueForTableColumn:byItem:");
+public static final int sel_outlineView_setObjectValue_forTableColumn_byItem_ = sel_registerName("outlineView:setObjectValue:forTableColumn:byItem:");
+public static final int sel_outlineView_shouldCollapseItem_ = sel_registerName("outlineView:shouldCollapseItem:");
+public static final int sel_outlineView_shouldExpandItem_ = sel_registerName("outlineView:shouldExpandItem:");
+public static final int sel_outlineView_willDisplayCell_forTableColumn_item_ = sel_registerName("outlineView:willDisplayCell:forTableColumn:item:");
+public static final int sel_outlineViewSelectionDidChange_ = sel_registerName("outlineViewSelectionDidChange:");
+public static final int sel_pageDown_ = sel_registerName("pageDown:");
+public static final int sel_pageTitle = sel_registerName("pageTitle");
+public static final int sel_pageUp_ = sel_registerName("pageUp:");
+public static final int sel_panelConvertFont_ = sel_registerName("panelConvertFont:");
+public static final int sel_paperSize = sel_registerName("paperSize");
+public static final int sel_paragraphs = sel_registerName("paragraphs");
+public static final int sel_paste_ = sel_registerName("paste:");
+public static final int sel_pasteboardWithName_ = sel_registerName("pasteboardWithName:");
+public static final int sel_performSelectorOnMainThread_withObject_waitUntilDone_ = sel_registerName("performSelectorOnMainThread:withObject:waitUntilDone:");
+public static final int sel_pixelsHigh = sel_registerName("pixelsHigh");
+public static final int sel_pixelsWide = sel_registerName("pixelsWide");
+public static final int sel_pointSize = sel_registerName("pointSize");
+public static final int sel_pointValue = sel_registerName("pointValue");
+public static final int sel_pointingHandCursor = sel_registerName("pointingHandCursor");
+public static final int sel_popUpContextMenu_withEvent_forView_ = sel_registerName("popUpContextMenu:withEvent:forView:");
+public static final int sel_prependTransform_ = sel_registerName("prependTransform:");
+public static final int sel_preventDefault = sel_registerName("preventDefault");
+public static final int sel_printDocumentView = sel_registerName("printDocumentView");
+public static final int sel_printOperationWithPrintInfo_ = sel_registerName("printOperationWithPrintInfo:");
+public static final int sel_printOperationWithView_printInfo_ = sel_registerName("printOperationWithView:printInfo:");
+public static final int sel_printPanel = sel_registerName("printPanel");
+public static final int sel_printer = sel_registerName("printer");
+public static final int sel_printerNames = sel_registerName("printerNames");
+public static final int sel_printerWithName_ = sel_registerName("printerWithName:");
+public static final int sel_propertyListForType_ = sel_registerName("propertyListForType:");
+public static final int sel_recentSearches = sel_registerName("recentSearches");
+public static final int sel_rectOfRow_ = sel_registerName("rectOfRow:");
+public static final int sel_redComponent = sel_registerName("redComponent");
+public static final int sel_release = sel_registerName("release");
+public static final int sel_reload_ = sel_registerName("reload:");
+public static final int sel_reloadData = sel_registerName("reloadData");
+public static final int sel_reloadItem_ = sel_registerName("reloadItem:");
+public static final int sel_reloadItem_reloadChildren_ = sel_registerName("reloadItem:reloadChildren:");
+public static final int sel_removeAllItems = sel_registerName("removeAllItems");
+public static final int sel_removeAllPoints = sel_registerName("removeAllPoints");
+public static final int sel_removeFromSuperview = sel_registerName("removeFromSuperview");
+public static final int sel_removeItem_ = sel_registerName("removeItem:");
+public static final int sel_removeItemAtIndex_ = sel_registerName("removeItemAtIndex:");
+public static final int sel_removeItemAtPath_error_ = sel_registerName("removeItemAtPath:error:");
+public static final int sel_removeObserver_ = sel_registerName("removeObserver:");
+public static final int sel_removeStatusItem_ = sel_registerName("removeStatusItem:");
+public static final int sel_removeTabViewItem_ = sel_registerName("removeTabViewItem:");
+public static final int sel_removeTableColumn_ = sel_registerName("removeTableColumn:");
+public static final int sel_removeTemporaryAttribute_forCharacterRange_ = sel_registerName("removeTemporaryAttribute:forCharacterRange:");
+public static final int sel_replaceCharactersInRange_withString_ = sel_registerName("replaceCharactersInRange:withString:");
+public static final int sel_representation = sel_registerName("representation");
+public static final int sel_request = sel_registerName("request");
+public static final int sel_requestWithURL_ = sel_registerName("requestWithURL:");
+public static final int sel_resignFirstResponder = sel_registerName("resignFirstResponder");
+public static final int sel_resizeDownCursor = sel_registerName("resizeDownCursor");
+public static final int sel_resizeLeftCursor = sel_registerName("resizeLeftCursor");
 public static final int sel_resizeLeftRightCursor = sel_registerName("resizeLeftRightCursor");
-public static final int sel_methodSignature = sel_registerName("methodSignature");
-public static final int sel_setDiskCapacity_1 = sel_registerName("setDiskCapacity:");
-public static final int sel_lineFragmentRectForGlyphAtIndex_1effectiveRange_1withoutAdditionalLayout_1 = sel_registerName("lineFragmentRectForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:");
+public static final int sel_resizeRightCursor = sel_registerName("resizeRightCursor");
+public static final int sel_resizeUpCursor = sel_registerName("resizeUpCursor");
+public static final int sel_resizeUpDownCursor = sel_registerName("resizeUpDownCursor");
+public static final int sel_resizingMask = sel_registerName("resizingMask");
+public static final int sel_respondsToSelector_ = sel_registerName("respondsToSelector:");
+public static final int sel_restoreGraphicsState = sel_registerName("restoreGraphicsState");
+public static final int sel_retain = sel_registerName("retain");
+public static final int sel_retainCount = sel_registerName("retainCount");
+public static final int sel_rightMouseDown_ = sel_registerName("rightMouseDown:");
+public static final int sel_rightMouseDragged_ = sel_registerName("rightMouseDragged:");
+public static final int sel_rightMouseUp_ = sel_registerName("rightMouseUp:");
+public static final int sel_rotateByDegrees_ = sel_registerName("rotateByDegrees:");
+public static final int sel_rowAtPoint_ = sel_registerName("rowAtPoint:");
+public static final int sel_rowForItem_ = sel_registerName("rowForItem:");
+public static final int sel_rowHeight = sel_registerName("rowHeight");
+public static final int sel_run = sel_registerName("run");
+public static final int sel_runModal = sel_registerName("runModal");
+public static final int sel_runModalForWindow_ = sel_registerName("runModalForWindow:");
+public static final int sel_runModalWithPrintInfo_ = sel_registerName("runModalWithPrintInfo:");
+public static final int sel_runMode_beforeDate_ = sel_registerName("runMode:beforeDate:");
+public static final int sel_runOperation = sel_registerName("runOperation");
+public static final int sel_samplesPerPixel = sel_registerName("samplesPerPixel");
+public static final int sel_saveGraphicsState = sel_registerName("saveGraphicsState");
+public static final int sel_savePanel = sel_registerName("savePanel");
+public static final int sel_scaleXBy_yBy_ = sel_registerName("scaleXBy:yBy:");
+public static final int sel_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_ = sel_registerName("scheduledTimerWithTimeInterval:target:selector:userInfo:repeats:");
 public static final int sel_screen = sel_registerName("screen");
-public static final int sel_windowNumber = sel_registerName("windowNumber");
-public static final int sel_selectSegmentWithTag_1 = sel_registerName("selectSegmentWithTag:");
-public static final int sel_availableFontFamilies = sel_registerName("availableFontFamilies");
-public static final int sel_superclass = sel_registerName("superclass");
-public static final int sel_registeredImageRepClasses = sel_registerName("registeredImageRepClasses");
-public static final int sel_needsSizing = sel_registerName("needsSizing");
-public static final int sel_setUsesAlternatingRowBackgroundColors_1 = sel_registerName("setUsesAlternatingRowBackgroundColors:");
-public static final int sel_getBitmapDataPlanes_1 = sel_registerName("getBitmapDataPlanes:");
-public static final int sel_fontWithFamily_1traits_1weight_1size_1 = sel_registerName("fontWithFamily:traits:weight:size:");
-public static final int sel_borderColor = sel_registerName("borderColor");
-public static final int sel_colorUsingColorSpace_1 = sel_registerName("colorUsingColorSpace:");
-public static final int sel_propertyForKey_1 = sel_registerName("propertyForKey:");
-public static final int sel_setPublicID_1 = sel_registerName("setPublicID:");
-public static final int sel_forwardInvocation_1 = sel_registerName("forwardInvocation:");
-public static final int sel_deleteToBeginningOfLine_1 = sel_registerName("deleteToBeginningOfLine:");
-public static final int sel_hasNonContiguousLayout = sel_registerName("hasNonContiguousLayout");
-public static final int sel_getObjects_1 = sel_registerName("getObjects:");
-public static final int sel_clearRecentDocuments_1 = sel_registerName("clearRecentDocuments:");
-public static final int sel_paletteFontOfSize_1 = sel_registerName("paletteFontOfSize:");
-public static final int sel_rightMargin = sel_registerName("rightMargin");
-public static final int sel_browser_1createRowsForColumn_1inMatrix_1 = sel_registerName("browser:createRowsForColumn:inMatrix:");
-public static final int sel_removeItemAtPath_1error_1 = sel_registerName("removeItemAtPath:error:");
-public static final int sel_getRectsBeingDrawn_1count_1 = sel_registerName("getRectsBeingDrawn:count:");
-public static final int sel_numberWithUnsignedInt_1 = sel_registerName("numberWithUnsignedInt:");
-public static final int sel_complete_1 = sel_registerName("complete:");
-public static final int sel_synchronizeTitleAndSelectedItem = sel_registerName("synchronizeTitleAndSelectedItem");
-public static final int sel_archiverData = sel_registerName("archiverData");
-public static final int sel_selectNextTabViewItem_1 = sel_registerName("selectNextTabViewItem:");
-public static final int sel_displayNameForType_1 = sel_registerName("displayNameForType:");
-public static final int sel_defaultNameServerPortNumber = sel_registerName("defaultNameServerPortNumber");
-public static final int sel_setFireDate_1 = sel_registerName("setFireDate:");
-public static final int sel_selectFirstTabViewItem_1 = sel_registerName("selectFirstTabViewItem:");
-public static final int sel_setRightMargin_1 = sel_registerName("setRightMargin:");
-public static final int sel_menuView = sel_registerName("menuView");
-public static final int sel_removeObjectsFromIndices_1numIndices_1 = sel_registerName("removeObjectsFromIndices:numIndices:");
-public static final int sel_tabKeyTraversesCells = sel_registerName("tabKeyTraversesCells");
-public static final int sel_initToBuffer_1capacity_1 = sel_registerName("initToBuffer:capacity:");
-public static final int sel_endPage = sel_registerName("endPage");
-public static final int sel_setTextAttributesForNotANumber_1 = sel_registerName("setTextAttributesForNotANumber:");
-public static final int sel_makeNextSegmentKey = sel_registerName("makeNextSegmentKey");
-public static final int sel_addAttributes_1range_1 = sel_registerName("addAttributes:range:");
-public static final int sel_lineFragmentPadding = sel_registerName("lineFragmentPadding");
-public static final int sel_showController_1adjustingSize_1 = sel_registerName("showController:adjustingSize:");
-public static final int sel_glyphInfoWithGlyphName_1forFont_1baseString_1 = sel_registerName("glyphInfoWithGlyphName:forFont:baseString:");
-public static final int sel_initWithCondition_1 = sel_registerName("initWithCondition:");
-public static final int sel_handleMachMessage_1 = sel_registerName("handleMachMessage:");
-public static final int sel_setFontMenu_1 = sel_registerName("setFontMenu:");
-public static final int sel_invocationWithMethodSignature_1 = sel_registerName("invocationWithMethodSignature:");
-public static final int sel_textAttributesForPositiveValues = sel_registerName("textAttributesForPositiveValues");
-public static final int sel_decodePointForKey_1 = sel_registerName("decodePointForKey:");
-public static final int sel_doubleForKey_1 = sel_registerName("doubleForKey:");
-public static final int sel_application_1willPresentError_1 = sel_registerName("application:willPresentError:");
-public static final int sel_setFloatingPointFormat_1left_1right_1 = sel_registerName("setFloatingPointFormat:left:right:");
-public static final int sel_loadColumnZero = sel_registerName("loadColumnZero");
-public static final int sel_availableFonts = sel_registerName("availableFonts");
-public static final int sel_drawUnderlineForGlyphRange_1underlineType_1baselineOffset_1lineFragmentRect_1lineFragmentGlyphRange_1containerOrigin_1 = sel_registerName("drawUnderlineForGlyphRange:underlineType:baselineOffset:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:");
-public static final int sel_highlightedTableColumn = sel_registerName("highlightedTableColumn");
-public static final int sel_removeObjectsInRange_1 = sel_registerName("removeObjectsInRange:");
-public static final int sel_rectForKey_1inTable_1 = sel_registerName("rectForKey:inTable:");
-public static final int sel_canStoreColor = sel_registerName("canStoreColor");
-public static final int sel_windowWillMiniaturize_1 = sel_registerName("windowWillMiniaturize:");
-public static final int sel_documentForWindow_1 = sel_registerName("documentForWindow:");
-public static final int sel_setAttributedStringForNotANumber_1 = sel_registerName("setAttributedStringForNotANumber:");
-public static final int sel_rangeOfString_1options_1range_1 = sel_registerName("rangeOfString:options:range:");
-public static final int sel_pause = sel_registerName("pause");
-public static final int sel_continueTracking_1at_1inView_1 = sel_registerName("continueTracking:at:inView:");
-public static final int sel_servicesProvider = sel_registerName("servicesProvider");
-public static final int sel_setIgnoredWords_1inSpellDocumentWithTag_1 = sel_registerName("setIgnoredWords:inSpellDocumentWithTag:");
-public static final int sel_clear_1 = sel_registerName("clear:");
-public static final int sel_readFromData_1options_1documentAttributes_1error_1 = sel_registerName("readFromData:options:documentAttributes:error:");
-public static final int sel_columnNumber = sel_registerName("columnNumber");
-public static final int sel_components = sel_registerName("components");
-public static final int sel_image = sel_registerName("image");
-public static final int sel_setDisplayMode_1 = sel_registerName("setDisplayMode:");
-public static final int sel_insertParagraphSeparator_1 = sel_registerName("insertParagraphSeparator:");
-public static final int sel_setPaperName_1 = sel_registerName("setPaperName:");
-public static final int sel_defaultFormatterBehavior = sel_registerName("defaultFormatterBehavior");
-public static final int sel_timeZoneWithAbbreviation_1 = sel_registerName("timeZoneWithAbbreviation:");
-public static final int sel_setHighlighted_1 = sel_registerName("setHighlighted:");
-public static final int sel_addFileWithPath_1 = sel_registerName("addFileWithPath:");
-public static final int sel_allowsDocumentBackgroundColorChange = sel_registerName("allowsDocumentBackgroundColorChange");
-public static final int sel_initWithURL_1documentAttributes_1 = sel_registerName("initWithURL:documentAttributes:");
-public static final int sel_allowsUndo = sel_registerName("allowsUndo");
-public static final int sel_localeIdentifierFromComponents_1 = sel_registerName("localeIdentifierFromComponents:");
-public static final int sel_allowsNonContiguousLayout = sel_registerName("allowsNonContiguousLayout");
-public static final int sel_arrayWithArray_1 = sel_registerName("arrayWithArray:");
-public static final int sel_setCompositingOperation_1 = sel_registerName("setCompositingOperation:");
-public static final int sel_netServiceBrowserDidStopSearch_1 = sel_registerName("netServiceBrowserDidStopSearch:");
-public static final int sel_setHorizontalEdgePadding_1 = sel_registerName("setHorizontalEdgePadding:");
-public static final int sel_accessibilityActionDescription_1 = sel_registerName("accessibilityActionDescription:");
-public static final int sel_localizedKeyDictionary = sel_registerName("localizedKeyDictionary");
-public static final int sel_initWithColorSyncProfile_1 = sel_registerName("initWithColorSyncProfile:");
-public static final int sel_displayedCommandsTitle = sel_registerName("displayedCommandsTitle");
-public static final int sel_flatness = sel_registerName("flatness");
-public static final int sel_localizations = sel_registerName("localizations");
-public static final int sel_mountedRemovableMedia = sel_registerName("mountedRemovableMedia");
-public static final int sel_topAutoreleasePoolCount = sel_registerName("topAutoreleasePoolCount");
-public static final int sel_postsFrameChangedNotifications = sel_registerName("postsFrameChangedNotifications");
-public static final int sel_performZoom_1 = sel_registerName("performZoom:");
-public static final int sel_moveBackward_1 = sel_registerName("moveBackward:");
-public static final int sel_verticalPageScroll = sel_registerName("verticalPageScroll");
-public static final int sel_setToolTip_1forCell_1 = sel_registerName("setToolTip:forCell:");
-public static final int sel_layoutManagerOwnsFirstResponderInWindow_1 = sel_registerName("layoutManagerOwnsFirstResponderInWindow:");
-public static final int sel_jobStyleHint = sel_registerName("jobStyleHint");
-public static final int sel_selectionIndexes = sel_registerName("selectionIndexes");
-public static final int sel_segmentCount = sel_registerName("segmentCount");
-public static final int sel_accessibilityIsIgnored = sel_registerName("accessibilityIsIgnored");
-public static final int sel_hasUnautosavedChanges = sel_registerName("hasUnautosavedChanges");
-public static final int sel_deactivate = sel_registerName("deactivate");
-public static final int sel_setSelectionIndexPaths_1 = sel_registerName("setSelectionIndexPaths:");
-public static final int sel_pathForSoundResource_1 = sel_registerName("pathForSoundResource:");
-public static final int sel_setUsesRuler_1 = sel_registerName("setUsesRuler:");
-public static final int sel_takeSelectedTabViewItemFromSender_1 = sel_registerName("takeSelectedTabViewItemFromSender:");
-public static final int sel_writeToFile_1ofType_1originalFile_1saveOperation_1 = sel_registerName("writeToFile:ofType:originalFile:saveOperation:");
-public static final int sel_numberWithLong_1 = sel_registerName("numberWithLong:");
-public static final int sel_interiorBackgroundStyle = sel_registerName("interiorBackgroundStyle");
-public static final int sel_insertionPointColor = sel_registerName("insertionPointColor");
-public static final int sel_prompt = sel_registerName("prompt");
-public static final int sel_finishLaunching = sel_registerName("finishLaunching");
-public static final int sel_addTextContainer_1 = sel_registerName("addTextContainer:");
-public static final int sel_setAutosavedContentsFileURL_1 = sel_registerName("setAutosavedContentsFileURL:");
-public static final int sel_initWithFrame_1textContainer_1 = sel_registerName("initWithFrame:textContainer:");
-public static final int sel_clearColor = sel_registerName("clearColor");
-public static final int sel_insertText_1 = sel_registerName("insertText:");
-public static final int sel_sendAction = sel_registerName("sendAction");
-public static final int sel_innerRect = sel_registerName("innerRect");
-public static final int sel_pointerFunctions = sel_registerName("pointerFunctions");
-public static final int sel_key = sel_registerName("key");
-public static final int sel_comboBoxSelectionDidChange_1 = sel_registerName("comboBoxSelectionDidChange:");
-public static final int sel_hasMarkedText = sel_registerName("hasMarkedText");
-public static final int sel_setDefaultLineCapStyle_1 = sel_registerName("setDefaultLineCapStyle:");
-public static final int sel_stringListForKey_1inTable_1 = sel_registerName("stringListForKey:inTable:");
-public static final int sel_defaultConnection = sel_registerName("defaultConnection");
-public static final int sel_pathContentOfSymbolicLinkAtPath_1 = sel_registerName("pathContentOfSymbolicLinkAtPath:");
-public static final int sel_stringWithContentsOfFile_1encoding_1error_1 = sel_registerName("stringWithContentsOfFile:encoding:error:");
-public static final int sel_detachSubmenu = sel_registerName("detachSubmenu");
-public static final int sel_isSecure = sel_registerName("isSecure");
-public static final int sel_movie = sel_registerName("movie");
-public static final int sel_outlineViewItemWillExpand_1 = sel_registerName("outlineViewItemWillExpand:");
-public static final int sel_sharedScriptSuiteRegistry = sel_registerName("sharedScriptSuiteRegistry");
-public static final int sel_removeCharactersInString_1 = sel_registerName("removeCharactersInString:");
-public static final int sel_setLocation_1withAdvancements_1forStartOfGlyphRange_1 = sel_registerName("setLocation:withAdvancements:forStartOfGlyphRange:");
-public static final int sel_moveDownAndModifySelection_1 = sel_registerName("moveDownAndModifySelection:");
-public static final int sel_fileAttributesToWriteToURL_1ofType_1forSaveOperation_1originalContentsURL_1error_1 = sel_registerName("fileAttributesToWriteToURL:ofType:forSaveOperation:originalContentsURL:error:");
-public static final int sel_classDescriptionForKey_1 = sel_registerName("classDescriptionForKey:");
-public static final int sel_addRequestMode_1 = sel_registerName("addRequestMode:");
-public static final int sel_setPullsDown_1 = sel_registerName("setPullsDown:");
-public static final int sel_setItemHeight_1 = sel_registerName("setItemHeight:");
-public static final int sel_printerFont = sel_registerName("printerFont");
-public static final int sel_linkTextAttributes = sel_registerName("linkTextAttributes");
-public static final int sel_state = sel_registerName("state");
-public static final int sel_shouldCloseWindowController_1delegate_1shouldCloseSelector_1contextInfo_1 = sel_registerName("shouldCloseWindowController:delegate:shouldCloseSelector:contextInfo:");
-public static final int sel_addIndex_1 = sel_registerName("addIndex:");
-public static final int sel_setChildSpecifier_1 = sel_registerName("setChildSpecifier:");
-public static final int sel_toolbarDidRemoveItem_1 = sel_registerName("toolbarDidRemoveItem:");
-public static final int sel_displayName = sel_registerName("displayName");
-public static final int sel_setInsertionPointColor_1 = sel_registerName("setInsertionPointColor:");
-public static final int sel_bezierPathByReversingPath = sel_registerName("bezierPathByReversingPath");
-public static final int sel_connection_1didReceiveData_1 = sel_registerName("connection:didReceiveData:");
-public static final int sel_eraSymbols = sel_registerName("eraSymbols");
-public static final int sel_removeObjectsForKeys_1 = sel_registerName("removeObjectsForKeys:");
-public static final int sel_subrowIndexesForRow_1 = sel_registerName("subrowIndexesForRow:");
-public static final int sel_increaseLengthBy_1 = sel_registerName("increaseLengthBy:");
-public static final int sel_viewDidEndLiveResize = sel_registerName("viewDidEndLiveResize");
-public static final int sel_encodeBool_1forKey_1 = sel_registerName("encodeBool:forKey:");
-public static final int sel_handleQueryWithUnboundKey_1 = sel_registerName("handleQueryWithUnboundKey:");
-public static final int sel_elementsForName_1 = sel_registerName("elementsForName:");
-public static final int sel_cascadeTopLeftFromPoint_1 = sel_registerName("cascadeTopLeftFromPoint:");
-public static final int sel_linkItemAtPath_1toPath_1error_1 = sel_registerName("linkItemAtPath:toPath:error:");
-public static final int sel_frameSizeForContentSize_1hasHorizontalScroller_1hasVerticalScroller_1borderType_1 = sel_registerName("frameSizeForContentSize:hasHorizontalScroller:hasVerticalScroller:borderType:");
-public static final int sel_initWithString_1attributes_1 = sel_registerName("initWithString:attributes:");
-public static final int sel_readFromData_1options_1documentAttributes_1 = sel_registerName("readFromData:options:documentAttributes:");
-public static final int sel_setAlpha_1 = sel_registerName("setAlpha:");
-public static final int sel_hash = sel_registerName("hash");
-public static final int sel_rangeForUserParagraphAttributeChange = sel_registerName("rangeForUserParagraphAttributeChange");
-public static final int sel_initWithData_1encoding_1 = sel_registerName("initWithData:encoding:");
-public static final int sel_newScriptingObjectOfClass_1forValueForKey_1withContentsValue_1properties_1 = sel_registerName("newScriptingObjectOfClass:forValueForKey:withContentsValue:properties:");
-public static final int sel_pageDown_1 = sel_registerName("pageDown:");
-public static final int sel_hasCloseBox = sel_registerName("hasCloseBox");
-public static final int sel_standardizedURL = sel_registerName("standardizedURL");
-public static final int sel_setAttributes_1range_1 = sel_registerName("setAttributes:range:");
-public static final int sel_setControlSize_1 = sel_registerName("setControlSize:");
-public static final int sel_revertToInitialValues_1 = sel_registerName("revertToInitialValues:");
-public static final int sel_setIntAttribute_1value_1forGlyphAtIndex_1 = sel_registerName("setIntAttribute:value:forGlyphAtIndex:");
-public static final int sel_stopTracking_1at_1inView_1mouseIsUp_1 = sel_registerName("stopTracking:at:inView:mouseIsUp:");
-public static final int sel_setParamDescriptor_1forKeyword_1 = sel_registerName("setParamDescriptor:forKeyword:");
-public static final int sel_textShouldBeginEditing_1 = sel_registerName("textShouldBeginEditing:");
-public static final int sel_applicationDidHide_1 = sel_registerName("applicationDidHide:");
-public static final int sel_beginSheetWithPrintInfo_1modalForWindow_1delegate_1didEndSelector_1contextInfo_1 = sel_registerName("beginSheetWithPrintInfo:modalForWindow:delegate:didEndSelector:contextInfo:");
-public static final int sel_shiftIndexesStartingAtIndex_1by_1 = sel_registerName("shiftIndexesStartingAtIndex:by:");
-public static final int sel_getStreamsToHost_1port_1inputStream_1outputStream_1 = sel_registerName("getStreamsToHost:port:inputStream:outputStream:");
-public static final int sel_attributesOfFileSystemForPath_1error_1 = sel_registerName("attributesOfFileSystemForPath:error:");
-public static final int sel_setTemporaryAttributes_1forCharacterRange_1 = sel_registerName("setTemporaryAttributes:forCharacterRange:");
-public static final int sel_checkSpellingOfString_1startingAt_1language_1wrap_1inSpellDocumentWithTag_1wordCount_1 = sel_registerName("checkSpellingOfString:startingAt:language:wrap:inSpellDocumentWithTag:wordCount:");
-public static final int sel_insertChild_1atIndex_1 = sel_registerName("insertChild:atIndex:");
-public static final int sel_defaultManager = sel_registerName("defaultManager");
-public static final int sel_invocation = sel_registerName("invocation");
-public static final int sel_setMinValue_1 = sel_registerName("setMinValue:");
-public static final int sel_decodeSize = sel_registerName("decodeSize");
-public static final int sel_replaceObject_1withObject_1 = sel_registerName("replaceObject:withObject:");
-public static final int sel_descriptionWithLocale_1 = sel_registerName("descriptionWithLocale:");
-public static final int sel_setSharingType_1 = sel_registerName("setSharingType:");
-public static final int sel_isLenient = sel_registerName("isLenient");
-public static final int sel_decimalNumberWithString_1locale_1 = sel_registerName("decimalNumberWithString:locale:");
-public static final int sel_allowedTypes = sel_registerName("allowedTypes");
-public static final int sel_superscript_1 = sel_registerName("superscript:");
-public static final int sel_initWithContentsOfFile_1encoding_1error_1 = sel_registerName("initWithContentsOfFile:encoding:error:");
-public static final int sel_windowsMenu = sel_registerName("windowsMenu");
-public static final int sel_performSelector_1target_1argument_1order_1modes_1 = sel_registerName("performSelector:target:argument:order:modes:");
-public static final int sel_unscheduleFromRunLoop_1forMode_1 = sel_registerName("unscheduleFromRunLoop:forMode:");
-public static final int sel_evaluatedArguments = sel_registerName("evaluatedArguments");
-public static final int sel_encodeSize_1forKey_1 = sel_registerName("encodeSize:forKey:");
-public static final int sel_sendBeforeDate_1components_1from_1reserved_1 = sel_registerName("sendBeforeDate:components:from:reserved:");
-public static final int sel_containerSize = sel_registerName("containerSize");
+public static final int sel_screens = sel_registerName("screens");
+public static final int sel_scrollColumnToVisible_ = sel_registerName("scrollColumnToVisible:");
+public static final int sel_scrollRangeToVisible_ = sel_registerName("scrollRangeToVisible:");
+public static final int sel_scrollRectToVisible_ = sel_registerName("scrollRectToVisible:");
+public static final int sel_scrollRowToVisible_ = sel_registerName("scrollRowToVisible:");
+public static final int sel_scrollToPoint_ = sel_registerName("scrollToPoint:");
+public static final int sel_scrollWheel_ = sel_registerName("scrollWheel:");
+public static final int sel_scrollerWidth = sel_registerName("scrollerWidth");
+public static final int sel_secondOfMinute = sel_registerName("secondOfMinute");
+public static final int sel_secondarySelectedControlColor = sel_registerName("secondarySelectedControlColor");
+public static final int sel_selectAll_ = sel_registerName("selectAll:");
+public static final int sel_selectItem_ = sel_registerName("selectItem:");
+public static final int sel_selectItemAtIndex_ = sel_registerName("selectItemAtIndex:");
+public static final int sel_selectRow_byExtendingSelection_ = sel_registerName("selectRow:byExtendingSelection:");
+public static final int sel_selectRowIndexes_byExtendingSelection_ = sel_registerName("selectRowIndexes:byExtendingSelection:");
+public static final int sel_selectTabViewItemAtIndex_ = sel_registerName("selectTabViewItemAtIndex:");
+public static final int sel_selectedRange = sel_registerName("selectedRange");
+public static final int sel_selectedRow = sel_registerName("selectedRow");
+public static final int sel_selectedRowIndexes = sel_registerName("selectedRowIndexes");
+public static final int sel_selectedTabViewItem = sel_registerName("selectedTabViewItem");
+public static final int sel_selectedTextBackgroundColor = sel_registerName("selectedTextBackgroundColor");
 public static final int sel_selectedTextColor = sel_registerName("selectedTextColor");
-public static final int sel_getGlyphsInRange_1glyphs_1characterIndexes_1glyphInscriptions_1elasticBits_1 = sel_registerName("getGlyphsInRange:glyphs:characterIndexes:glyphInscriptions:elasticBits:");
-public static final int sel_curveToPoint_1controlPoint1_1controlPoint2_1 = sel_registerName("curveToPoint:controlPoint1:controlPoint2:");
-public static final int sel_mutableBytes = sel_registerName("mutableBytes");
-public static final int sel_rangeOfUnit_1inUnit_1forDate_1 = sel_registerName("rangeOfUnit:inUnit:forDate:");
-public static final int sel_allowsNaturalLanguage = sel_registerName("allowsNaturalLanguage");
-public static final int sel_mouseLocation = sel_registerName("mouseLocation");
-public static final int sel_selectCellAtRow_1column_1 = sel_registerName("selectCellAtRow:column:");
-public static final int sel_toggleBaseWritingDirection_1 = sel_registerName("toggleBaseWritingDirection:");
-public static final int sel_maximum = sel_registerName("maximum");
-public static final int sel_initWithFocusedViewRect_1 = sel_registerName("initWithFocusedViewRect:");
-public static final int sel_thickness = sel_registerName("thickness");
-public static final int sel_setImageOrigin_1 = sel_registerName("setImageOrigin:");
-public static final int sel_color = sel_registerName("color");
-public static final int sel_capitalizeWord_1 = sel_registerName("capitalizeWord:");
-public static final int sel_imageRepClassForData_1 = sel_registerName("imageRepClassForData:");
-public static final int sel_outlineTableColumn = sel_registerName("outlineTableColumn");
-public static final int sel_runModalWithPrintInfo_1 = sel_registerName("runModalWithPrintInfo:");
-public static final int sel_flushCachedData = sel_registerName("flushCachedData");
-public static final int sel_exitFullScreenModeWithOptions_1 = sel_registerName("exitFullScreenModeWithOptions:");
-public static final int sel_alertStyle = sel_registerName("alertStyle");
-public static final int sel_runModalPageLayoutWithPrintInfo_1delegate_1didRunSelector_1contextInfo_1 = sel_registerName("runModalPageLayoutWithPrintInfo:delegate:didRunSelector:contextInfo:");
-public static final int sel_setDisplayedWhenStopped_1 = sel_registerName("setDisplayedWhenStopped:");
-public static final int sel_drawBackgroundWithFrame_1inView_1characterRange_1layoutManager_1 = sel_registerName("drawBackgroundWithFrame:inView:characterRange:layoutManager:");
-public static final int sel_addObject_1 = sel_registerName("addObject:");
-public static final int sel_dragPromisedFilesOfTypes_1fromRect_1source_1slideBack_1event_1 = sel_registerName("dragPromisedFilesOfTypes:fromRect:source:slideBack:event:");
-public static final int sel_samplesPerPixel = sel_registerName("samplesPerPixel");
-public static final int sel_negativePrefix = sel_registerName("negativePrefix");
-public static final int sel_initialKey = sel_registerName("initialKey");
-public static final int sel_orderFrontColorPanel_1 = sel_registerName("orderFrontColorPanel:");
-public static final int sel_hasLearnedWord_1 = sel_registerName("hasLearnedWord:");
-public static final int sel_setLineFragmentRect_1forGlyphRange_1usedRect_1baselineOffset_1 = sel_registerName("setLineFragmentRect:forGlyphRange:usedRect:baselineOffset:");
-public static final int sel_setHidesOnDeactivate_1 = sel_registerName("setHidesOnDeactivate:");
-public static final int sel_setMsgid_1 = sel_registerName("setMsgid:");
-public static final int sel_elementCount = sel_registerName("elementCount");
-public static final int sel_dateWithString_1 = sel_registerName("dateWithString:");
-public static final int sel_rangeOfTextBlock_1atIndex_1 = sel_registerName("rangeOfTextBlock:atIndex:");
-public static final int sel_setMenuItemCell_1forItemAtIndex_1 = sel_registerName("setMenuItemCell:forItemAtIndex:");
-public static final int sel_defaultTimeZone = sel_registerName("defaultTimeZone");
-public static final int sel_gotoBeginning_1 = sel_registerName("gotoBeginning:");
-public static final int sel_setDrawsOutsideLineFragment_1forGlyphAtIndex_1 = sel_registerName("setDrawsOutsideLineFragment:forGlyphAtIndex:");
-public static final int sel_characterCollection = sel_registerName("characterCollection");
-public static final int sel_getValues_1forParameter_1 = sel_registerName("getValues:forParameter:");
-public static final int sel_removeColumn_1 = sel_registerName("removeColumn:");
-public static final int sel_descender = sel_registerName("descender");
-public static final int sel_fragment = sel_registerName("fragment");
-public static final int sel_setSelectionByRect_1 = sel_registerName("setSelectionByRect:");
-public static final int sel_colorWithColorSpace_1components_1count_1 = sel_registerName("colorWithColorSpace:components:count:");
-public static final int sel_windingRule = sel_registerName("windingRule");
-public static final int sel_insertColumn_1 = sel_registerName("insertColumn:");
-public static final int sel_resumeWithSuspensionID_1 = sel_registerName("resumeWithSuspensionID:");
-public static final int sel_seekToEndOfFile = sel_registerName("seekToEndOfFile");
-public static final int sel_initWithTarget_1connection_1 = sel_registerName("initWithTarget:connection:");
-public static final int sel_symbolCharacterSet = sel_registerName("symbolCharacterSet");
-public static final int sel_filterPredicate = sel_registerName("filterPredicate");
-public static final int sel_setAutoenablesItems_1 = sel_registerName("setAutoenablesItems:");
-public static final int sel_printShowingPrintPanel_1 = sel_registerName("printShowingPrintPanel:");
-public static final int sel_pathForResource_1ofType_1inDirectory_1forLocalization_1 = sel_registerName("pathForResource:ofType:inDirectory:forLocalization:");
-public static final int sel_objectByApplyingXSLTAtURL_1arguments_1error_1 = sel_registerName("objectByApplyingXSLTAtURL:arguments:error:");
-public static final int sel_setHidesEmptyCells_1 = sel_registerName("setHidesEmptyCells:");
-public static final int sel_date = sel_registerName("date");
-public static final int sel_writeToFile_1atomically_1 = sel_registerName("writeToFile:atomically:");
-public static final int sel_locale = sel_registerName("locale");
-public static final int sel_localizedKeyTable = sel_registerName("localizedKeyTable");
-public static final int sel_absoluteURL = sel_registerName("absoluteURL");
-public static final int sel_bundleWithPath_1 = sel_registerName("bundleWithPath:");
-public static final int sel_setHeaderCell_1 = sel_registerName("setHeaderCell:");
-public static final int sel_setAutoresizesSubviews_1 = sel_registerName("setAutoresizesSubviews:");
-public static final int sel_URI = sel_registerName("URI");
-public static final int sel_controlBackgroundColor = sel_registerName("controlBackgroundColor");
-public static final int sel_displayNameAtPath_1 = sel_registerName("displayNameAtPath:");
-public static final int sel_decodePortObject = sel_registerName("decodePortObject");
-public static final int sel_alpha = sel_registerName("alpha");
-public static final int sel_initWithLeftExpression_1rightExpression_1customSelector_1 = sel_registerName("initWithLeftExpression:rightExpression:customSelector:");
-public static final int sel_secondaryGroupingSize = sel_registerName("secondaryGroupingSize");
-public static final int sel_connectionDidFinishLoading_1 = sel_registerName("connectionDidFinishLoading:");
-public static final int sel_localObjects = sel_registerName("localObjects");
-public static final int sel_enableKeyEquivalentForDefaultButtonCell = sel_registerName("enableKeyEquivalentForDefaultButtonCell");
-public static final int sel_drawKnobSlotInRect_1highlight_1 = sel_registerName("drawKnobSlotInRect:highlight:");
-public static final int sel_dateWithString_1calendarFormat_1locale_1 = sel_registerName("dateWithString:calendarFormat:locale:");
-public static final int sel_stop = sel_registerName("stop");
-public static final int sel_appendBezierPathWithOvalInRect_1 = sel_registerName("appendBezierPathWithOvalInRect:");
-public static final int sel_componentsSeparatedByCharactersInSet_1 = sel_registerName("componentsSeparatedByCharactersInSet:");
-public static final int sel_tightenKerning_1 = sel_registerName("tightenKerning:");
-public static final int sel_verticalRulerView = sel_registerName("verticalRulerView");
-public static final int sel_setImageAlignment_1 = sel_registerName("setImageAlignment:");
-public static final int sel_removeFrameUsingName_1 = sel_registerName("removeFrameUsingName:");
-public static final int sel_insertColor_1key_1atIndex_1 = sel_registerName("insertColor:key:atIndex:");
-public static final int sel_terminate_1 = sel_registerName("terminate:");
-public static final int sel_textContainerChangedTextView_1 = sel_registerName("textContainerChangedTextView:");
-public static final int sel_removeFileAtPath_1handler_1 = sel_registerName("removeFileAtPath:handler:");
-public static final int sel_splitViewWillResizeSubviews_1 = sel_registerName("splitViewWillResizeSubviews:");
-public static final int sel_windowDidBecomeMain_1 = sel_registerName("windowDidBecomeMain:");
-public static final int sel_cellBaselineOffset = sel_registerName("cellBaselineOffset");
-public static final int sel_addEntriesFromDictionary_1 = sel_registerName("addEntriesFromDictionary:");
-public static final int sel_setOnStateImage_1 = sel_registerName("setOnStateImage:");
-public static final int sel_colorWithCIColor_1 = sel_registerName("colorWithCIColor:");
-public static final int sel_getCyan_1magenta_1yellow_1black_1alpha_1 = sel_registerName("getCyan:magenta:yellow:black:alpha:");
-public static final int sel_symbolicTraits = sel_registerName("symbolicTraits");
-public static final int sel_stringByAppendingPathExtension_1 = sel_registerName("stringByAppendingPathExtension:");
-public static final int sel_horizontalScroller = sel_registerName("horizontalScroller");
-public static final int sel_setInitialValue_1 = sel_registerName("setInitialValue:");
-public static final int sel_sizeForPaperName_1 = sel_registerName("sizeForPaperName:");
-public static final int sel_CGLContextObj = sel_registerName("CGLContextObj");
-public static final int sel_elementWithName_1 = sel_registerName("elementWithName:");
-public static final int sel_fileManager_1shouldMoveItemAtPath_1toPath_1 = sel_registerName("fileManager:shouldMoveItemAtPath:toPath:");
-public static final int sel_richTextSource = sel_registerName("richTextSource");
-public static final int sel_unregisterDraggedTypes = sel_registerName("unregisterDraggedTypes");
-public static final int sel_absoluteString = sel_registerName("absoluteString");
-public static final int sel_spellingPanel = sel_registerName("spellingPanel");
-public static final int sel_launchedApplications = sel_registerName("launchedApplications");
-public static final int sel_initWithContentsOfFile_1byReference_1 = sel_registerName("initWithContentsOfFile:byReference:");
-public static final int sel_setLoaded_1 = sel_registerName("setLoaded:");
-public static final int sel_setWindowFrameAutosaveName_1 = sel_registerName("setWindowFrameAutosaveName:");
-public static final int sel_initOrTestWithTests_1 = sel_registerName("initOrTestWithTests:");
-public static final int sel_drawsBackground = sel_registerName("drawsBackground");
-public static final int sel_numberWithDouble_1 = sel_registerName("numberWithDouble:");
-public static final int sel_textView_1writeCell_1atIndex_1toPasteboard_1type_1 = sel_registerName("textView:writeCell:atIndex:toPasteboard:type:");
-public static final int sel_defaultMiterLimit = sel_registerName("defaultMiterLimit");
-public static final int sel_containsObject_1 = sel_registerName("containsObject:");
-public static final int sel_headerTextColor = sel_registerName("headerTextColor");
-public static final int sel_textView_1doCommandBySelector_1 = sel_registerName("textView:doCommandBySelector:");
-public static final int sel_drawBorderAndBackgroundWithFrame_1inView_1 = sel_registerName("drawBorderAndBackgroundWithFrame:inView:");
-public static final int sel_quarterSymbols = sel_registerName("quarterSymbols");
-public static final int sel_setContainerSize_1 = sel_registerName("setContainerSize:");
-public static final int sel_sortUsingSelector_1 = sel_registerName("sortUsingSelector:");
-public static final int sel_setKey_1 = sel_registerName("setKey:");
-public static final int sel_headerView = sel_registerName("headerView");
-public static final int sel_isRegularFile = sel_registerName("isRegularFile");
-public static final int sel_userData = sel_registerName("userData");
-public static final int sel_documentCursor = sel_registerName("documentCursor");
-public static final int sel_textEncodingName = sel_registerName("textEncodingName");
-public static final int sel_performActionForItemAtIndex_1 = sel_registerName("performActionForItemAtIndex:");
-public static final int sel_isCaseInsensitiveLike_1 = sel_registerName("isCaseInsensitiveLike:");
-public static final int sel_isEditing = sel_registerName("isEditing");
-public static final int sel_selectFile_1inFileViewerRootedAtPath_1 = sel_registerName("selectFile:inFileViewerRootedAtPath:");
-public static final int sel_messageFontOfSize_1 = sel_registerName("messageFontOfSize:");
-public static final int sel_independentConversationQueueing = sel_registerName("independentConversationQueueing");
-public static final int sel_initWithCoder_1 = sel_registerName("initWithCoder:");
-public static final int sel_rangesForUserParagraphAttributeChange = sel_registerName("rangesForUserParagraphAttributeChange");
-public static final int sel_removeTrackingArea_1 = sel_registerName("removeTrackingArea:");
-public static final int sel_glyphGenerator = sel_registerName("glyphGenerator");
-public static final int sel_extraLineFragmentUsedRect = sel_registerName("extraLineFragmentUsedRect");
-public static final int sel_isButtonBordered = sel_registerName("isButtonBordered");
-public static final int sel_setDefaultFormatterBehavior_1 = sel_registerName("setDefaultFormatterBehavior:");
-public static final int sel_didChange_1valuesAtIndexes_1forKey_1 = sel_registerName("didChange:valuesAtIndexes:forKey:");
-public static final int sel_timeoutInterval = sel_registerName("timeoutInterval");
-public static final int sel_initialValues = sel_registerName("initialValues");
-public static final int sel_getRow_1column_1forPoint_1 = sel_registerName("getRow:column:forPoint:");
-public static final int sel_tabletPoint_1 = sel_registerName("tabletPoint:");
-public static final int sel_setAutorecalculatesKeyViewLoop_1 = sel_registerName("setAutorecalculatesKeyViewLoop:");
-public static final int sel_identifier = sel_registerName("identifier");
-public static final int sel_scheduleInRunLoop_1forMode_1 = sel_registerName("scheduleInRunLoop:forMode:");
-public static final int sel_baseURL = sel_registerName("baseURL");
-public static final int sel_initWithURL_1 = sel_registerName("initWithURL:");
-public static final int sel_setBackgroundColors_1 = sel_registerName("setBackgroundColors:");
-public static final int sel_addTableColumn_1 = sel_registerName("addTableColumn:");
-public static final int sel_fontDescriptorWithFontAttributes_1 = sel_registerName("fontDescriptorWithFontAttributes:");
-public static final int sel_dataCellForRow_1 = sel_registerName("dataCellForRow:");
-public static final int sel_speechSynthesizer_1didEncounterErrorAtIndex_1ofString_1message_1 = sel_registerName("speechSynthesizer:didEncounterErrorAtIndex:ofString:message:");
-public static final int sel_recoveryAttempter = sel_registerName("recoveryAttempter");
-public static final int sel_alignJustified_1 = sel_registerName("alignJustified:");
-public static final int sel_setCompression_1factor_1 = sel_registerName("setCompression:factor:");
-public static final int sel_elementsForLocalName_1URI_1 = sel_registerName("elementsForLocalName:URI:");
-public static final int sel_deviceGrayColorSpace = sel_registerName("deviceGrayColorSpace");
-public static final int sel_scheduledTimerWithTimeInterval_1target_1selector_1userInfo_1repeats_1 = sel_registerName("scheduledTimerWithTimeInterval:target:selector:userInfo:repeats:");
-public static final int sel_runModalSession_1 = sel_registerName("runModalSession:");
-public static final int sel_awakeFromNib = sel_registerName("awakeFromNib");
-public static final int sel_connectionWithReceivePort_1sendPort_1 = sel_registerName("connectionWithReceivePort:sendPort:");
-public static final int sel_outlineView_1validateDrop_1proposedItem_1proposedChildIndex_1 = sel_registerName("outlineView:validateDrop:proposedItem:proposedChildIndex:");
-public static final int sel_remove_1 = sel_registerName("remove:");
-public static final int sel_setTimeInterval_1 = sel_registerName("setTimeInterval:");
-public static final int sel_splitView_1effectiveRect_1forDrawnRect_1ofDividerAtIndex_1 = sel_registerName("splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:");
-public static final int sel_setUpGState = sel_registerName("setUpGState");
-public static final int sel_initWithResponse_1data_1 = sel_registerName("initWithResponse:data:");
-public static final int sel_notificationCenter = sel_registerName("notificationCenter");
-public static final int sel_setAlternateImage_1 = sel_registerName("setAlternateImage:");
-public static final int sel_mainWindow = sel_registerName("mainWindow");
-public static final int sel_substringWithRange_1 = sel_registerName("substringWithRange:");
-public static final int sel_forgetWord_1 = sel_registerName("forgetWord:");
-public static final int sel_shouldCascadeWindows = sel_registerName("shouldCascadeWindows");
-public static final int sel_updateScroller = sel_registerName("updateScroller");
-public static final int sel_currentDirectoryPath = sel_registerName("currentDirectoryPath");
-public static final int sel_isPartialStringValidationEnabled = sel_registerName("isPartialStringValidationEnabled");
-public static final int sel_splitView_1constrainMinCoordinate_1ofSubviewAt_1 = sel_registerName("splitView:constrainMinCoordinate:ofSubviewAt:");
-public static final int sel_drawWithFrame_1inView_1 = sel_registerName("drawWithFrame:inView:");
-public static final int sel_encodingScheme = sel_registerName("encodingScheme");
-public static final int sel_namespaceWithName_1stringValue_1 = sel_registerName("namespaceWithName:stringValue:");
-public static final int sel_initWithLongLong_1 = sel_registerName("initWithLongLong:");
-public static final int sel_processIdentifier = sel_registerName("processIdentifier");
-public static final int sel_setSubmenu_1forItem_1 = sel_registerName("setSubmenu:forItem:");
-public static final int sel_textAttributesForNil = sel_registerName("textAttributesForNil");
-public static final int sel_lockWithPath_1 = sel_registerName("lockWithPath:");
-public static final int sel_removeFromSuperviewWithoutNeedingDisplay = sel_registerName("removeFromSuperviewWithoutNeedingDisplay");
-public static final int sel_cut_1 = sel_registerName("cut:");
-public static final int sel_nullDescriptor = sel_registerName("nullDescriptor");
-public static final int sel_menuFormRepresentation = sel_registerName("menuFormRepresentation");
-public static final int sel_removeObjectsAtIndexes_1 = sel_registerName("removeObjectsAtIndexes:");
-public static final int sel_initWithSource_1 = sel_registerName("initWithSource:");
-public static final int sel_acceptsGlyphInfo = sel_registerName("acceptsGlyphInfo");
-public static final int sel_borderType = sel_registerName("borderType");
-public static final int sel_initWithResumeData_1delegate_1path_1 = sel_registerName("initWithResumeData:delegate:path:");
-public static final int sel_attachedMenu = sel_registerName("attachedMenu");
-public static final int sel_stopAnimation = sel_registerName("stopAnimation");
-public static final int sel_setDoubleAction_1 = sel_registerName("setDoubleAction:");
-public static final int sel_returnType = sel_registerName("returnType");
-public static final int sel_fontDescriptorsInCollection_1 = sel_registerName("fontDescriptorsInCollection:");
-public static final int sel_setMeasurementUnits_1 = sel_registerName("setMeasurementUnits:");
-public static final int sel_baseWritingDirection = sel_registerName("baseWritingDirection");
-public static final int sel_currentPoint = sel_registerName("currentPoint");
-public static final int sel_initRemoteWithTCPPort_1host_1 = sel_registerName("initRemoteWithTCPPort:host:");
-public static final int sel_entityDeclarationForName_1 = sel_registerName("entityDeclarationForName:");
-public static final int sel_evaluate = sel_registerName("evaluate");
-public static final int sel_browser_1draggingImageForRowsWithIndexes_1inColumn_1withEvent_1offset_1 = sel_registerName("browser:draggingImageForRowsWithIndexes:inColumn:withEvent:offset:");
-public static final int sel_turnOffLigatures_1 = sel_registerName("turnOffLigatures:");
-public static final int sel_setTitleWithMnemonic_1 = sel_registerName("setTitleWithMnemonic:");
-public static final int sel_deepestScreen = sel_registerName("deepestScreen");
-public static final int sel_connection_1shouldMakeNewConnection_1 = sel_registerName("connection:shouldMakeNewConnection:");
-public static final int sel_selectionShouldChangeInOutlineView_1 = sel_registerName("selectionShouldChangeInOutlineView:");
-public static final int sel_preservesSelection = sel_registerName("preservesSelection");
-public static final int sel_preparePageLayout_1 = sel_registerName("preparePageLayout:");
-public static final int sel_setOpaque_1 = sel_registerName("setOpaque:");
-public static final int sel_insertObject_1atIndex_1 = sel_registerName("insertObject:atIndex:");
-public static final int sel_isActive = sel_registerName("isActive");
-public static final int sel_drawStrikethroughForGlyphRange_1strikethroughType_1baselineOffset_1lineFragmentRect_1lineFragmentGlyphRange_1containerOrigin_1 = sel_registerName("drawStrikethroughForGlyphRange:strikethroughType:baselineOffset:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:");
-public static final int sel_insertObject_1atArrangedObjectIndex_1 = sel_registerName("insertObject:atArrangedObjectIndex:");
-public static final int sel_initWithCStringNoCopy_1length_1freeWhenDone_1 = sel_registerName("initWithCStringNoCopy:length:freeWhenDone:");
-public static final int sel_previousKeyView = sel_registerName("previousKeyView");
-public static final int sel_performMiniaturize_1 = sel_registerName("performMiniaturize:");
-public static final int sel_decimalNumberWithDecimal_1 = sel_registerName("decimalNumberWithDecimal:");
-public static final int sel_autosaveTableColumns = sel_registerName("autosaveTableColumns");
-public static final int sel_baselineOffsetInLayoutManager_1glyphIndex_1 = sel_registerName("baselineOffsetInLayoutManager:glyphIndex:");
-public static final int sel_keyViewSelectionDirection = sel_registerName("keyViewSelectionDirection");
-public static final int sel_encodeBytes_1length_1 = sel_registerName("encodeBytes:length:");
-public static final int sel_fileManager_1shouldProceedAfterError_1copyingItemAtPath_1toPath_1 = sel_registerName("fileManager:shouldProceedAfterError:copyingItemAtPath:toPath:");
-public static final int sel_menuNeedsUpdate_1 = sel_registerName("menuNeedsUpdate:");
-public static final int sel_paragraphSpacingAfterGlyphAtIndex_1withProposedLineFragmentRect_1 = sel_registerName("paragraphSpacingAfterGlyphAtIndex:withProposedLineFragmentRect:");
-public static final int sel_synchronize = sel_registerName("synchronize");
-public static final int sel_lockFocus = sel_registerName("lockFocus");
-public static final int sel_toggleSmartInsertDelete_1 = sel_registerName("toggleSmartInsertDelete:");
-public static final int sel_setMenu_1forSegment_1 = sel_registerName("setMenu:forSegment:");
-public static final int sel_removeParamDescriptorWithKeyword_1 = sel_registerName("removeParamDescriptorWithKeyword:");
-public static final int sel_applicationShouldOpenUntitledFile_1 = sel_registerName("applicationShouldOpenUntitledFile:");
-public static final int sel_DTD = sel_registerName("DTD");
-public static final int sel_cancelTracking = sel_registerName("cancelTracking");
-public static final int sel_fileSystemNumber = sel_registerName("fileSystemNumber");
-public static final int sel_setLevel_1 = sel_registerName("setLevel:");
-public static final int sel_setRequiredFileType_1 = sel_registerName("setRequiredFileType:");
-public static final int sel_presentError_1 = sel_registerName("presentError:");
-public static final int sel_allowsUserCustomization = sel_registerName("allowsUserCustomization");
-public static final int sel_childrenKeyPathForNode_1 = sel_registerName("childrenKeyPathForNode:");
-public static final int sel_setYear_1 = sel_registerName("setYear:");
-public static final int sel_movieController = sel_registerName("movieController");
-public static final int sel_unsignedLongValue = sel_registerName("unsignedLongValue");
-public static final int sel_hashTableWithOptions_1 = sel_registerName("hashTableWithOptions:");
-public static final int sel_setVerticalAlignment_1 = sel_registerName("setVerticalAlignment:");
-public static final int sel_cycleToNextInputServerInLanguage_1 = sel_registerName("cycleToNextInputServerInLanguage:");
-public static final int sel_sendAction_1to_1from_1 = sel_registerName("sendAction:to:from:");
-public static final int sel_numberFromString_1 = sel_registerName("numberFromString:");
-public static final int sel_setUndoManager_1 = sel_registerName("setUndoManager:");
-public static final int sel_imageDimsWhenDisabled = sel_registerName("imageDimsWhenDisabled");
-public static final int sel_autosavingFileType = sel_registerName("autosavingFileType");
-public static final int sel_unsignedLongLongValue = sel_registerName("unsignedLongLongValue");
-public static final int sel_initImageCell_1 = sel_registerName("initImageCell:");
-public static final int sel_invalidateDisplayForCharacterRange_1 = sel_registerName("invalidateDisplayForCharacterRange:");
-public static final int sel_setMaxContentSize_1 = sel_registerName("setMaxContentSize:");
-public static final int sel_outlineView_1isItemExpandable_1 = sel_registerName("outlineView:isItemExpandable:");
-public static final int sel_initWithUser_1password_1persistence_1 = sel_registerName("initWithUser:password:persistence:");
-public static final int sel_setBackgroundFilters_1 = sel_registerName("setBackgroundFilters:");
-public static final int sel_setAllowsDocumentBackgroundColorChange_1 = sel_registerName("setAllowsDocumentBackgroundColorChange:");
-public static final int sel_decodeNXObject = sel_registerName("decodeNXObject");
-public static final int sel_setMaximumSignificantDigits_1 = sel_registerName("setMaximumSignificantDigits:");
-public static final int sel_URLsFromRunningOpenPanel = sel_registerName("URLsFromRunningOpenPanel");
-public static final int sel_removeChildWindow_1 = sel_registerName("removeChildWindow:");
-public static final int sel_removeObjectForKey_1 = sel_registerName("removeObjectForKey:");
-public static final int sel_setCellSize_1 = sel_registerName("setCellSize:");
-public static final int sel_getParagraphStart_1end_1contentsEnd_1forRange_1 = sel_registerName("getParagraphStart:end:contentsEnd:forRange:");
-public static final int sel_connectionWithRequest_1delegate_1 = sel_registerName("connectionWithRequest:delegate:");
-public static final int sel_setNotShownAttribute_1forGlyphRange_1 = sel_registerName("setNotShownAttribute:forGlyphRange:");
-public static final int sel_collapsesBorders = sel_registerName("collapsesBorders");
-public static final int sel_setNegativeInfinitySymbol_1 = sel_registerName("setNegativeInfinitySymbol:");
-public static final int sel_initWithKind_1 = sel_registerName("initWithKind:");
-public static final int sel_appleEventCodeForArgumentWithName_1 = sel_registerName("appleEventCodeForArgumentWithName:");
-public static final int sel_moveUp_1 = sel_registerName("moveUp:");
-public static final int sel_initWithTextAlignment_1location_1options_1 = sel_registerName("initWithTextAlignment:location:options:");
-public static final int sel_systemVersion = sel_registerName("systemVersion");
-public static final int sel_numberOfItemsInComboBoxCell_1 = sel_registerName("numberOfItemsInComboBoxCell:");
-public static final int sel_readableTypes = sel_registerName("readableTypes");
-public static final int sel_setDraggingSourceOperationMask_1forLocal_1 = sel_registerName("setDraggingSourceOperationMask:forLocal:");
-public static final int sel_insertLineBreak_1 = sel_registerName("insertLineBreak:");
-public static final int sel_inLiveResize = sel_registerName("inLiveResize");
-public static final int sel_setCanHide_1 = sel_registerName("setCanHide:");
-public static final int sel_nextResponder = sel_registerName("nextResponder");
-public static final int sel_scrollClipView_1toPoint_1 = sel_registerName("scrollClipView:toPoint:");
-public static final int sel_positiveFormat = sel_registerName("positiveFormat");
-public static final int sel_redoMenuItemTitle = sel_registerName("redoMenuItemTitle");
-public static final int sel_addIndexesInRange_1 = sel_registerName("addIndexesInRange:");
-public static final int sel_lockBeforeDate_1 = sel_registerName("lockBeforeDate:");
-public static final int sel_unlockWithCondition_1 = sel_registerName("unlockWithCondition:");
-public static final int sel_nextWordFromIndex_1forward_1 = sel_registerName("nextWordFromIndex:forward:");
-public static final int sel_waitUntilAllOperationsAreFinished = sel_registerName("waitUntilAllOperationsAreFinished");
-public static final int sel_drawRow_1clipRect_1 = sel_registerName("drawRow:clipRect:");
-public static final int sel_setPartialStringValidationEnabled_1 = sel_registerName("setPartialStringValidationEnabled:");
-public static final int sel_methodSignatureForSelector_1 = sel_registerName("methodSignatureForSelector:");
-public static final int sel_setSecondaryGroupingSize_1 = sel_registerName("setSecondaryGroupingSize:");
-public static final int sel_criteriaForRow_1 = sel_registerName("criteriaForRow:");
-public static final int sel_setShadowBlurRadius_1 = sel_registerName("setShadowBlurRadius:");
-public static final int sel_expressionForFunction_1selectorName_1arguments_1 = sel_registerName("expressionForFunction:selectorName:arguments:");
-public static final int sel_initWithWindowNibName_1 = sel_registerName("initWithWindowNibName:");
-public static final int sel_selectItemWithTag_1 = sel_registerName("selectItemWithTag:");
-public static final int sel_characterIndexForPoint_1 = sel_registerName("characterIndexForPoint:");
-public static final int sel_validate = sel_registerName("validate");
-public static final int sel_setHorizontalPageScroll_1 = sel_registerName("setHorizontalPageScroll:");
-public static final int sel_localizedColorNameComponent = sel_registerName("localizedColorNameComponent");
-public static final int sel_setVoice_1 = sel_registerName("setVoice:");
-public static final int sel_setCachedSeparately_1 = sel_registerName("setCachedSeparately:");
-public static final int sel_frameRectForContentRect_1 = sel_registerName("frameRectForContentRect:");
-public static final int sel_bezelStyle = sel_registerName("bezelStyle");
-public static final int sel_setDecimalSeparator_1 = sel_registerName("setDecimalSeparator:");
-public static final int sel_conversationIdentifier = sel_registerName("conversationIdentifier");
-public static final int sel_setPrompt_1 = sel_registerName("setPrompt:");
-public static final int sel_setShowsFirstResponder_1 = sel_registerName("setShowsFirstResponder:");
-public static final int sel_setRootObject_1 = sel_registerName("setRootObject:");
-public static final int sel_menuBarVisible = sel_registerName("menuBarVisible");
-public static final int sel_netServiceBrowser_1didRemoveDomain_1moreComing_1 = sel_registerName("netServiceBrowser:didRemoveDomain:moreComing:");
-public static final int sel_threadPriority = sel_registerName("threadPriority");
-public static final int sel_countKeyPath = sel_registerName("countKeyPath");
-public static final int sel_runCustomizationPalette_1 = sel_registerName("runCustomizationPalette:");
-public static final int sel_fileHandleWithStandardError = sel_registerName("fileHandleWithStandardError");
-public static final int sel_documentContentKind = sel_registerName("documentContentKind");
-public static final int sel_view_1stringForToolTip_1point_1userData_1 = sel_registerName("view:stringForToolTip:point:userData:");
-public static final int sel_nameFieldLabel = sel_registerName("nameFieldLabel");
-public static final int sel_miniaturizeAll_1 = sel_registerName("miniaturizeAll:");
-public static final int sel_initWithRepresentedObject_1 = sel_registerName("initWithRepresentedObject:");
-public static final int sel_runOperation = sel_registerName("runOperation");
-public static final int sel_drawBackgroundForBlock_1withFrame_1inView_1characterRange_1layoutManager_1 = sel_registerName("drawBackgroundForBlock:withFrame:inView:characterRange:layoutManager:");
-public static final int sel_localizedInfoDictionary = sel_registerName("localizedInfoDictionary");
-public static final int sel_scanFloat_1 = sel_registerName("scanFloat:");
-public static final int sel_scanHexDouble_1 = sel_registerName("scanHexDouble:");
-public static final int sel_continueSpeaking = sel_registerName("continueSpeaking");
-public static final int sel_attachedMenuView = sel_registerName("attachedMenuView");
-public static final int sel_wantsToHandleMouseEvents = sel_registerName("wantsToHandleMouseEvents");
-public static final int sel_attemptRecoveryFromError_1optionIndex_1 = sel_registerName("attemptRecoveryFromError:optionIndex:");
-public static final int sel_window_1shouldDragDocumentWithEvent_1from_1withPasteboard_1 = sel_registerName("window:shouldDragDocumentWithEvent:from:withPasteboard:");
-public static final int sel_mouseEntered_1 = sel_registerName("mouseEntered:");
-public static final int sel_setNameFieldLabel_1 = sel_registerName("setNameFieldLabel:");
-public static final int sel_setIndentationPerLevel_1 = sel_registerName("setIndentationPerLevel:");
-public static final int sel_setMinColumnWidth_1 = sel_registerName("setMinColumnWidth:");
-public static final int sel_classNameForClass_1 = sel_registerName("classNameForClass:");
-public static final int sel_runLoopModes = sel_registerName("runLoopModes");
-public static final int sel_pullsDown = sel_registerName("pullsDown");
-public static final int sel_setOutlineTableColumn_1 = sel_registerName("setOutlineTableColumn:");
-public static final int sel_windowDidLoad = sel_registerName("windowDidLoad");
-public static final int sel_read_1maxLength_1 = sel_registerName("read:maxLength:");
-public static final int sel_removeItemAtIndex_1 = sel_registerName("removeItemAtIndex:");
-public static final int sel_initWithColor_1 = sel_registerName("initWithColor:");
-public static final int sel_compare_1options_1 = sel_registerName("compare:options:");
-public static final int sel_removeTableColumn_1 = sel_registerName("removeTableColumn:");
-public static final int sel_isRedoing = sel_registerName("isRedoing");
-public static final int sel_setTitleWithRepresentedFilename_1 = sel_registerName("setTitleWithRepresentedFilename:");
-public static final int sel_setDirectory_1 = sel_registerName("setDirectory:");
-public static final int sel_makeDocumentWithContentsOfURL_1ofType_1error_1 = sel_registerName("makeDocumentWithContentsOfURL:ofType:error:");
-public static final int sel_isSelectedForSegment_1 = sel_registerName("isSelectedForSegment:");
-public static final int sel_month = sel_registerName("month");
-public static final int sel_addRow = sel_registerName("addRow");
-public static final int sel_layoutOptions = sel_registerName("layoutOptions");
-public static final int sel_maxNumberOfRows = sel_registerName("maxNumberOfRows");
+public static final int sel_sendAction_to_ = sel_registerName("sendAction:to:");
+public static final int sel_sendEvent_ = sel_registerName("sendEvent:");
+public static final int sel_separatorItem = sel_registerName("separatorItem");
+public static final int sel_set = sel_registerName("set");
+public static final int sel_setAcceptsMouseMovedEvents_ = sel_registerName("setAcceptsMouseMovedEvents:");
+public static final int sel_setAction_ = sel_registerName("setAction:");
+public static final int sel_setAlertStyle_ = sel_registerName("setAlertStyle:");
+public static final int sel_setAlignment_ = sel_registerName("setAlignment:");
+public static final int sel_setAllowsMixedState_ = sel_registerName("setAllowsMixedState:");
+public static final int sel_setAllowsMultipleSelection_ = sel_registerName("setAllowsMultipleSelection:");
+public static final int sel_setAlphaValue_ = sel_registerName("setAlphaValue:");
+public static final int sel_setApplicationNameForUserAgent_ = sel_registerName("setApplicationNameForUserAgent:");
+public static final int sel_setAttributedStringValue_ = sel_registerName("setAttributedStringValue:");
+public static final int sel_setAttributedTitle_ = sel_registerName("setAttributedTitle:");
+public static final int sel_setAutoenablesItems_ = sel_registerName("setAutoenablesItems:");
+public static final int sel_setAutohidesScrollers_ = sel_registerName("setAutohidesScrollers:");
+public static final int sel_setAutoresizesOutlineColumn_ = sel_registerName("setAutoresizesOutlineColumn:");
+public static final int sel_setAutoresizesSubviews_ = sel_registerName("setAutoresizesSubviews:");
+public static final int sel_setAutoresizingMask_ = sel_registerName("setAutoresizingMask:");
+public static final int sel_setAutosaveExpandedItems_ = sel_registerName("setAutosaveExpandedItems:");
+public static final int sel_setBackgroundColor_ = sel_registerName("setBackgroundColor:");
+public static final int sel_setBezelStyle_ = sel_registerName("setBezelStyle:");
+public static final int sel_setBorderType_ = sel_registerName("setBorderType:");
+public static final int sel_setBorderWidth_ = sel_registerName("setBorderWidth:");
+public static final int sel_setBordered_ = sel_registerName("setBordered:");
+public static final int sel_setBoxType_ = sel_registerName("setBoxType:");
+public static final int sel_setButtonType_ = sel_registerName("setButtonType:");
+public static final int sel_setCacheMode_ = sel_registerName("setCacheMode:");
+public static final int sel_setCanChooseDirectories_ = sel_registerName("setCanChooseDirectories:");
+public static final int sel_setCanChooseFiles_ = sel_registerName("setCanChooseFiles:");
+public static final int sel_setClip = sel_registerName("setClip");
+public static final int sel_setColor_ = sel_registerName("setColor:");
+public static final int sel_setCompositingOperation_ = sel_registerName("setCompositingOperation:");
+public static final int sel_setContainerSize_ = sel_registerName("setContainerSize:");
+public static final int sel_setContentView_ = sel_registerName("setContentView:");
+public static final int sel_setContentViewMargins_ = sel_registerName("setContentViewMargins:");
+public static final int sel_setCurrentContext_ = sel_registerName("setCurrentContext:");
+public static final int sel_setCurrentOperation_ = sel_registerName("setCurrentOperation:");
+public static final int sel_setData_forType_ = sel_registerName("setData:forType:");
+public static final int sel_setDataCell_ = sel_registerName("setDataCell:");
+public static final int sel_setDataSource_ = sel_registerName("setDataSource:");
+public static final int sel_setDatePickerElements_ = sel_registerName("setDatePickerElements:");
+public static final int sel_setDatePickerStyle_ = sel_registerName("setDatePickerStyle:");
+public static final int sel_setDateValue_ = sel_registerName("setDateValue:");
+public static final int sel_setDefaultFlatness_ = sel_registerName("setDefaultFlatness:");
+public static final int sel_setDelegate_ = sel_registerName("setDelegate:");
+public static final int sel_setDestination_allowOverwrite_ = sel_registerName("setDestination:allowOverwrite:");
+public static final int sel_setDirectory_ = sel_registerName("setDirectory:");
+public static final int sel_setDocumentView_ = sel_registerName("setDocumentView:");
+public static final int sel_setDoubleAction_ = sel_registerName("setDoubleAction:");
+public static final int sel_setDoubleValue_ = sel_registerName("setDoubleValue:");
+public static final int sel_setDownloadDelegate_ = sel_registerName("setDownloadDelegate:");
+public static final int sel_setDrawsBackground_ = sel_registerName("setDrawsBackground:");
+public static final int sel_setEditable_ = sel_registerName("setEditable:");
+public static final int sel_setEnabled_ = sel_registerName("setEnabled:");
+public static final int sel_setFill = sel_registerName("setFill");
+public static final int sel_setFireDate_ = sel_registerName("setFireDate:");
+public static final int sel_setFirstLineHeadIndent_ = sel_registerName("setFirstLineHeadIndent:");
+public static final int sel_setFloatValue_knobProportion_ = sel_registerName("setFloatValue:knobProportion:");
+public static final int sel_setFocusRingType_ = sel_registerName("setFocusRingType:");
+public static final int sel_setFont_ = sel_registerName("setFont:");
+public static final int sel_setFrame_ = sel_registerName("setFrame:");
+public static final int sel_setFrame_display_ = sel_registerName("setFrame:display:");
+public static final int sel_setFrameLoadDelegate_ = sel_registerName("setFrameLoadDelegate:");
+public static final int sel_setFrameOrigin_ = sel_registerName("setFrameOrigin:");
+public static final int sel_setFrameSize_ = sel_registerName("setFrameSize:");
+public static final int sel_setHasHorizontalScroller_ = sel_registerName("setHasHorizontalScroller:");
+public static final int sel_setHasShadow_ = sel_registerName("setHasShadow:");
+public static final int sel_setHasVerticalScroller_ = sel_registerName("setHasVerticalScroller:");
+public static final int sel_setHeaderCell_ = sel_registerName("setHeaderCell:");
+public static final int sel_setHeaderView_ = sel_registerName("setHeaderView:");
+public static final int sel_setHidden_ = sel_registerName("setHidden:");
+public static final int sel_setHiddenUntilMouseMoves_ = sel_registerName("setHiddenUntilMouseMoves:");
+public static final int sel_setHighlightMode_ = sel_registerName("setHighlightMode:");
+public static final int sel_setHorizontalScroller_ = sel_registerName("setHorizontalScroller:");
+public static final int sel_setHorizontallyResizable_ = sel_registerName("setHorizontallyResizable:");
+public static final int sel_setImage_ = sel_registerName("setImage:");
+public static final int sel_setImageAlignment_ = sel_registerName("setImageAlignment:");
+public static final int sel_setImageInterpolation_ = sel_registerName("setImageInterpolation:");
+public static final int sel_setImagePosition_ = sel_registerName("setImagePosition:");
+public static final int sel_setImageScaling_ = sel_registerName("setImageScaling:");
+public static final int sel_setIncrement_ = sel_registerName("setIncrement:");
+public static final int sel_setIndentationPerLevel_ = sel_registerName("setIndentationPerLevel:");
+public static final int sel_setIndeterminate_ = sel_registerName("setIndeterminate:");
+public static final int sel_setJavaEnabled_ = sel_registerName("setJavaEnabled:");
+public static final int sel_setJobDisposition_ = sel_registerName("setJobDisposition:");
+public static final int sel_setJobTitle_ = sel_registerName("setJobTitle:");
+public static final int sel_setKeyEquivalent_ = sel_registerName("setKeyEquivalent:");
+public static final int sel_setKeyEquivalentModifierMask_ = sel_registerName("setKeyEquivalentModifierMask:");
+public static final int sel_setLabel_ = sel_registerName("setLabel:");
+public static final int sel_setLeaf_ = sel_registerName("setLeaf:");
+public static final int sel_setLength_ = sel_registerName("setLength:");
+public static final int sel_setLevel_ = sel_registerName("setLevel:");
+public static final int sel_setLineCapStyle_ = sel_registerName("setLineCapStyle:");
+public static final int sel_setLineDash_count_phase_ = sel_registerName("setLineDash:count:phase:");
+public static final int sel_setLineFragmentPadding_ = sel_registerName("setLineFragmentPadding:");
+public static final int sel_setLineFragmentRect_forGlyphRange_usedRect_ = sel_registerName("setLineFragmentRect:forGlyphRange:usedRect:");
+public static final int sel_setLineJoinStyle_ = sel_registerName("setLineJoinStyle:");
+public static final int sel_setLineSpacing_ = sel_registerName("setLineSpacing:");
+public static final int sel_setLineWidth_ = sel_registerName("setLineWidth:");
+public static final int sel_setMarkedText_selectedRange_ = sel_registerName("setMarkedText:selectedRange:");
+public static final int sel_setMaxSize_ = sel_registerName("setMaxSize:");
+public static final int sel_setMaxValue_ = sel_registerName("setMaxValue:");
+public static final int sel_setMenu_ = sel_registerName("setMenu:");
+public static final int sel_setMinSize_ = sel_registerName("setMinSize:");
+public static final int sel_setMinValue_ = sel_registerName("setMinValue:");
+public static final int sel_setMinWidth_ = sel_registerName("setMinWidth:");
+public static final int sel_setMiterLimit_ = sel_registerName("setMiterLimit:");
+public static final int sel_setNeedsDisplay_ = sel_registerName("setNeedsDisplay:");
+public static final int sel_setNeedsDisplayInRect_ = sel_registerName("setNeedsDisplayInRect:");
+public static final int sel_setNumberOfVisibleItems_ = sel_registerName("setNumberOfVisibleItems:");
+public static final int sel_setObject_forKey_ = sel_registerName("setObject:forKey:");
+public static final int sel_setOnMouseEntered_ = sel_registerName("setOnMouseEntered:");
+public static final int sel_setOpaque_ = sel_registerName("setOpaque:");
+public static final int sel_setOptions_ = sel_registerName("setOptions:");
+public static final int sel_setOutlineTableColumn_ = sel_registerName("setOutlineTableColumn:");
+public static final int sel_setPanelFont_isMultiple_ = sel_registerName("setPanelFont:isMultiple:");
+public static final int sel_setPatternPhase_ = sel_registerName("setPatternPhase:");
+public static final int sel_setPixelFormat_ = sel_registerName("setPixelFormat:");
+public static final int sel_setPolicyDelegate_ = sel_registerName("setPolicyDelegate:");
+public static final int sel_setPrinter_ = sel_registerName("setPrinter:");
+public static final int sel_setPropertyList_forType_ = sel_registerName("setPropertyList:forType:");
+public static final int sel_setPullsDown_ = sel_registerName("setPullsDown:");
+public static final int sel_setResizingMask_ = sel_registerName("setResizingMask:");
+public static final int sel_setResourceLoadDelegate_ = sel_registerName("setResourceLoadDelegate:");
+public static final int sel_setRichText_ = sel_registerName("setRichText:");
+public static final int sel_setSelectable_ = sel_registerName("setSelectable:");
+public static final int sel_setSelectedRange_ = sel_registerName("setSelectedRange:");
+public static final int sel_setShouldAntialias_ = sel_registerName("setShouldAntialias:");
+public static final int sel_setShowsPrintPanel_ = sel_registerName("setShowsPrintPanel:");
+public static final int sel_setShowsProgressPanel_ = sel_registerName("setShowsProgressPanel:");
+public static final int sel_setSize_ = sel_registerName("setSize:");
+public static final int sel_setState_ = sel_registerName("setState:");
+public static final int sel_setString_ = sel_registerName("setString:");
+public static final int sel_setString_forType_ = sel_registerName("setString:forType:");
+public static final int sel_setStroke = sel_registerName("setStroke");
+public static final int sel_setSubmenu_ = sel_registerName("setSubmenu:");
+public static final int sel_setTabViewType_ = sel_registerName("setTabViewType:");
+public static final int sel_setTarget_ = sel_registerName("setTarget:");
+public static final int sel_setTextColor_ = sel_registerName("setTextColor:");
+public static final int sel_setTitle_ = sel_registerName("setTitle:");
+public static final int sel_setTitleFont_ = sel_registerName("setTitleFont:");
+public static final int sel_setTitlePosition_ = sel_registerName("setTitlePosition:");
+public static final int sel_setToolTip_ = sel_registerName("setToolTip:");
+public static final int sel_setTransformStruct_ = sel_registerName("setTransformStruct:");
+public static final int sel_setUIDelegate_ = sel_registerName("setUIDelegate:");
+public static final int sel_setURL_ = sel_registerName("setURL:");
 public static final int sel_setUpPrintOperationDefaultValues = sel_registerName("setUpPrintOperationDefaultValues");
-public static final int sel_initByReferencingURL_1 = sel_registerName("initByReferencingURL:");
-public static final int sel_class = sel_registerName("class");
-public static final int sel_setFrameAutosaveName_1 = sel_registerName("setFrameAutosaveName:");
-public static final int sel_fileWrapperFromRange_1documentAttributes_1error_1 = sel_registerName("fileWrapperFromRange:documentAttributes:error:");
-public static final int sel_int32Value = sel_registerName("int32Value");
-public static final int sel_setControlView_1 = sel_registerName("setControlView:");
-public static final int sel_setCharacterEncoding_1 = sel_registerName("setCharacterEncoding:");
-public static final int sel_disableFlushWindow = sel_registerName("disableFlushWindow");
-public static final int sel_insertString_1atIndex_1 = sel_registerName("insertString:atIndex:");
-public static final int sel_childNodes = sel_registerName("childNodes");
-public static final int sel_rangeContainerObject = sel_registerName("rangeContainerObject");
-public static final int sel_kind = sel_registerName("kind");
-public static final int sel_title = sel_registerName("title");
-public static final int sel_bundleWithIdentifier_1 = sel_registerName("bundleWithIdentifier:");
-public static final int sel_initWithMovie_1 = sel_registerName("initWithMovie:");
-public static final int sel_unionHashTable_1 = sel_registerName("unionHashTable:");
-public static final int sel_setStartSpecifier_1 = sel_registerName("setStartSpecifier:");
-public static final int sel_browser_1nextTypeSelectMatchFromRow_1toRow_1inColumn_1forString_1 = sel_registerName("browser:nextTypeSelectMatchFromRow:toRow:inColumn:forString:");
-public static final int sel_tokenFieldCell_1representedObjectForEditingString_1 = sel_registerName("tokenFieldCell:representedObjectForEditingString:");
-public static final int sel_initWithContentsOfFile_1 = sel_registerName("initWithContentsOfFile:");
-public static final int sel_dataWithContentsOfURL_1 = sel_registerName("dataWithContentsOfURL:");
-public static final int sel_firstWeekday = sel_registerName("firstWeekday");
-public static final int sel_setInitialValues_1 = sel_registerName("setInitialValues:");
-public static final int sel_setIntegerValue_1 = sel_registerName("setIntegerValue:");
-public static final int sel_calcSize = sel_registerName("calcSize");
-public static final int sel_setTokenizingCharacterSet_1 = sel_registerName("setTokenizingCharacterSet:");
-public static final int sel_setRepresentedFilename_1 = sel_registerName("setRepresentedFilename:");
-public static final int sel_colorSpaceName = sel_registerName("colorSpaceName");
-public static final int sel_setLineBreakMode_1 = sel_registerName("setLineBreakMode:");
-public static final int sel_appliesImmediately = sel_registerName("appliesImmediately");
-public static final int sel_classDescriptionWithAppleEventCode_1 = sel_registerName("classDescriptionWithAppleEventCode:");
-public static final int sel_eventRef = sel_registerName("eventRef");
-public static final int sel_textAttributesForZero = sel_registerName("textAttributesForZero");
-public static final int sel_setAutosavesConfiguration_1 = sel_registerName("setAutosavesConfiguration:");
-public static final int sel_countOfIndexesInRange_1 = sel_registerName("countOfIndexesInRange:");
-public static final int sel_count = sel_registerName("count");
-public static final int sel_initWithSuiteName_1className_1dictionary_1 = sel_registerName("initWithSuiteName:className:dictionary:");
-public static final int sel_isReleasedWhenClosed = sel_registerName("isReleasedWhenClosed");
-public static final int sel_windowWithWindowNumber_1 = sel_registerName("windowWithWindowNumber:");
-public static final int sel_removeNamespaceForPrefix_1 = sel_registerName("removeNamespaceForPrefix:");
-public static final int sel_documentWithRootElement_1 = sel_registerName("documentWithRootElement:");
-public static final int sel_pageFooter = sel_registerName("pageFooter");
-public static final int sel_initWithOptions_1capacity_1 = sel_registerName("initWithOptions:capacity:");
-public static final int sel_insertBacktab_1 = sel_registerName("insertBacktab:");
-public static final int sel_changeWindowsItem_1title_1filename_1 = sel_registerName("changeWindowsItem:title:filename:");
-public static final int sel_changeCount = sel_registerName("changeCount");
-public static final int sel_paragraphCharacterRange = sel_registerName("paragraphCharacterRange");
-public static final int sel_currentProgress = sel_registerName("currentProgress");
-public static final int sel_parser_1didStartMappingPrefix_1toURI_1 = sel_registerName("parser:didStartMappingPrefix:toURI:");
-public static final int sel_setFormatWidth_1 = sel_registerName("setFormatWidth:");
-public static final int sel_cancelAllOperations = sel_registerName("cancelAllOperations");
-public static final int sel_beginLoadInBackground = sel_registerName("beginLoadInBackground");
-public static final int sel_draggedDistance = sel_registerName("draggedDistance");
-public static final int sel_setIndex_1 = sel_registerName("setIndex:");
-public static final int sel_initWithScheme_1host_1path_1 = sel_registerName("initWithScheme:host:path:");
-public static final int sel_toolTipForCell_1 = sel_registerName("toolTipForCell:");
-public static final int sel_predicateForRow_1 = sel_registerName("predicateForRow:");
-public static final int sel_predefinedEntityDeclarationForName_1 = sel_registerName("predefinedEntityDeclarationForName:");
-public static final int sel_replacePointerAtIndex_1withPointer_1 = sel_registerName("replacePointerAtIndex:withPointer:");
-public static final int sel_fileURLWithPath_1 = sel_registerName("fileURLWithPath:");
-public static final int sel_currentDocument = sel_registerName("currentDocument");
-public static final int sel_shouldDrawInsertionPoint = sel_registerName("shouldDrawInsertionPoint");
-public static final int sel_saveAllDocuments_1 = sel_registerName("saveAllDocuments:");
-public static final int sel_windowControllerWillLoadNib_1 = sel_registerName("windowControllerWillLoadNib:");
-public static final int sel_closeAllDocumentsWithDelegate_1didCloseAllSelector_1contextInfo_1 = sel_registerName("closeAllDocumentsWithDelegate:didCloseAllSelector:contextInfo:");
-public static final int sel_tableView_1heightOfRow_1 = sel_registerName("tableView:heightOfRow:");
-public static final int sel_postNotificationName_1object_1userInfo_1options_1 = sel_registerName("postNotificationName:object:userInfo:options:");
-public static final int sel_imageTypes = sel_registerName("imageTypes");
-public static final int sel_setPreferredBackingLocation_1 = sel_registerName("setPreferredBackingLocation:");
-public static final int sel_netServiceDidPublish_1 = sel_registerName("netServiceDidPublish:");
-public static final int sel_diskCapacity = sel_registerName("diskCapacity");
-public static final int sel_initWithString_1calendarFormat_1locale_1 = sel_registerName("initWithString:calendarFormat:locale:");
-public static final int sel_preferredEdge = sel_registerName("preferredEdge");
-public static final int sel_comboBoxCell_1indexOfItemWithStringValue_1 = sel_registerName("comboBoxCell:indexOfItemWithStringValue:");
-public static final int sel_replaceCharactersInRange_1withString_1 = sel_registerName("replaceCharactersInRange:withString:");
-public static final int sel_initWithTimeIntervalSinceReferenceDate_1 = sel_registerName("initWithTimeIntervalSinceReferenceDate:");
-public static final int sel_secondsFromGMT = sel_registerName("secondsFromGMT");
-public static final int sel_hasOrderedToManyRelationshipForKey_1 = sel_registerName("hasOrderedToManyRelationshipForKey:");
-public static final int sel_resignFirstResponder = sel_registerName("resignFirstResponder");
-public static final int sel_netServiceDidStop_1 = sel_registerName("netServiceDidStop:");
-public static final int sel_absoluteY = sel_registerName("absoluteY");
-public static final int sel_beginModalSessionForWindow_1 = sel_registerName("beginModalSessionForWindow:");
-public static final int sel_alignment = sel_registerName("alignment");
-public static final int sel_setCharactersToBeSkipped_1 = sel_registerName("setCharactersToBeSkipped:");
-public static final int sel_requestWithURL_1cachePolicy_1timeoutInterval_1 = sel_registerName("requestWithURL:cachePolicy:timeoutInterval:");
-public static final int sel_ruler = sel_registerName("ruler");
-public static final int sel_isSetOnMouseExited = sel_registerName("isSetOnMouseExited");
-public static final int sel_setRemovable_1 = sel_registerName("setRemovable:");
-public static final int sel_draggingSource = sel_registerName("draggingSource");
-public static final int sel_textView_1clickedOnLink_1 = sel_registerName("textView:clickedOnLink:");
-public static final int sel_canBeVisibleOnAllSpaces = sel_registerName("canBeVisibleOnAllSpaces");
-public static final int sel_setBadgeLabel_1 = sel_registerName("setBadgeLabel:");
-public static final int sel_parser_1foundUnparsedEntityDeclarationWithName_1publicID_1systemID_1notationName_1 = sel_registerName("parser:foundUnparsedEntityDeclarationWithName:publicID:systemID:notationName:");
-public static final int sel_operations = sel_registerName("operations");
-public static final int sel_setInteger_1forKey_1 = sel_registerName("setInteger:forKey:");
-public static final int sel_otherMouseUp_1 = sel_registerName("otherMouseUp:");
-public static final int sel_drawImageWithFrame_1inView_1 = sel_registerName("drawImageWithFrame:inView:");
-public static final int sel_getPixel_1atX_1y_1 = sel_registerName("getPixel:atX:y:");
-public static final int sel_standardError = sel_registerName("standardError");
-public static final int sel_setLabel_1 = sel_registerName("setLabel:");
-public static final int sel_initWithUnsignedInt_1 = sel_registerName("initWithUnsignedInt:");
-public static final int sel_isFinished = sel_registerName("isFinished");
-public static final int sel_drawSwatchInRect_1 = sel_registerName("drawSwatchInRect:");
-public static final int sel_descriptorAtIndex_1 = sel_registerName("descriptorAtIndex:");
-public static final int sel_cachedHandleForURL_1 = sel_registerName("cachedHandleForURL:");
-public static final int sel_classCode = sel_registerName("classCode");
-public static final int sel_resolvesAliases = sel_registerName("resolvesAliases");
-public static final int sel_textTypes = sel_registerName("textTypes");
-public static final int sel_invalidateTextContainerOrigin = sel_registerName("invalidateTextContainerOrigin");
-public static final int sel_document = sel_registerName("document");
-public static final int sel_interiorBackgroundStyleForSegment_1 = sel_registerName("interiorBackgroundStyleForSegment:");
-public static final int sel_transformedValue_1 = sel_registerName("transformedValue:");
-public static final int sel_substringToIndex_1 = sel_registerName("substringToIndex:");
-public static final int sel_addDocument_1 = sel_registerName("addDocument:");
-public static final int sel_numberWithInteger_1 = sel_registerName("numberWithInteger:");
-public static final int sel_setBoundsRotation_1 = sel_registerName("setBoundsRotation:");
-public static final int sel_convertFont_1toFace_1 = sel_registerName("convertFont:toFace:");
-public static final int sel_updateInsertionPointStateAndRestartTimer_1 = sel_registerName("updateInsertionPointStateAndRestartTimer:");
-public static final int sel_tryToPerform_1with_1 = sel_registerName("tryToPerform:with:");
-public static final int sel_defaultLineHeightForFont = sel_registerName("defaultLineHeightForFont");
-public static final int sel_scriptingIsEqualTo_1 = sel_registerName("scriptingIsEqualTo:");
-public static final int sel_setDoubleValue_1 = sel_registerName("setDoubleValue:");
-public static final int sel_AMSymbol = sel_registerName("AMSymbol");
-public static final int sel_valueWraps = sel_registerName("valueWraps");
-public static final int sel_allCredentials = sel_registerName("allCredentials");
-public static final int sel_editingDelegate = sel_registerName("editingDelegate");
-public static final int sel_maintainsInactiveSelection = sel_registerName("maintainsInactiveSelection");
-public static final int sel_policyDelegate = sel_registerName("policyDelegate");
-public static final int sel_preferences = sel_registerName("preferences");
-public static final int sel_registerViewClass_1representationClass_1forMIMEType_1 = sel_registerName("registerViewClass:representationClass:forMIMEType:");
-public static final int sel_setHostWindow_1 = sel_registerName("setHostWindow:");
-public static final int sel_hostWindow = sel_registerName("hostWindow");
-public static final int sel_searchFor_1direction_1caseSensitive_1wrap_1 = sel_registerName("searchFor:direction:caseSensitive:wrap:");
-public static final int sel_initWithFrame_1frameName_1groupName_1 = sel_registerName("initWithFrame:frameName:groupName:");
-public static final int sel_canGoBack = sel_registerName("canGoBack");
-public static final int sel_setFrameLoadDelegate_1 = sel_registerName("setFrameLoadDelegate:");
-public static final int sel_takeStringURLFrom_1 = sel_registerName("takeStringURLFrom:");
-public static final int sel_registerURLSchemeAsLocal_1 = sel_registerName("registerURLSchemeAsLocal:");
-public static final int sel_stringByEvaluatingJavaScriptFromString_1 = sel_registerName("stringByEvaluatingJavaScriptFromString:");
-public static final int sel_replaceSelectionWithMarkupString_1 = sel_registerName("replaceSelectionWithMarkupString:");
-public static final int sel_setPreferences_1 = sel_registerName("setPreferences:");
-public static final int sel_customUserAgent = sel_registerName("customUserAgent");
-public static final int sel_mainFrame = sel_registerName("mainFrame");
-public static final int sel_goToBackForwardItem_1 = sel_registerName("goToBackForwardItem:");
-public static final int sel_pasteboardTypesForElement_1 = sel_registerName("pasteboardTypesForElement:");
-public static final int sel_applyStyle_1 = sel_registerName("applyStyle:");
-public static final int sel_setResourceLoadDelegate_1 = sel_registerName("setResourceLoadDelegate:");
-public static final int sel_moveToBeginningOfSentenceAndModifySelection_1 = sel_registerName("moveToBeginningOfSentenceAndModifySelection:");
-public static final int sel_replaceSelectionWithArchive_1 = sel_registerName("replaceSelectionWithArchive:");
-public static final int sel_userAgentForURL_1 = sel_registerName("userAgentForURL:");
-public static final int sel_frameLoadDelegate = sel_registerName("frameLoadDelegate");
-public static final int sel_windowScriptObject = sel_registerName("windowScriptObject");
-public static final int sel_removeDragCaret = sel_registerName("removeDragCaret");
-public static final int sel_editableDOMRangeForPoint_1 = sel_registerName("editableDOMRangeForPoint:");
-public static final int sel_moveToEndOfSentence_1 = sel_registerName("moveToEndOfSentence:");
-public static final int sel_preferencesIdentifier = sel_registerName("preferencesIdentifier");
-public static final int sel_setPolicyDelegate_1 = sel_registerName("setPolicyDelegate:");
-public static final int sel_goBack = sel_registerName("goBack");
-public static final int sel_downloadDelegate = sel_registerName("downloadDelegate");
-public static final int sel_canShowMIMEType_1 = sel_registerName("canShowMIMEType:");
-public static final int sel_elementAtPoint_1 = sel_registerName("elementAtPoint:");
-public static final int sel_groupName = sel_registerName("groupName");
-public static final int sel_selectedFrame = sel_registerName("selectedFrame");
-public static final int sel_setMIMETypesShownAsHTML_1 = sel_registerName("setMIMETypesShownAsHTML:");
-public static final int sel_goForward = sel_registerName("goForward");
-public static final int sel_makeTextStandardSize_1 = sel_registerName("makeTextStandardSize:");
-public static final int sel_setMainFrameURL_1 = sel_registerName("setMainFrameURL:");
-public static final int sel_pasteboardTypesForSelection = sel_registerName("pasteboardTypesForSelection");
-public static final int sel_customTextEncodingName = sel_registerName("customTextEncodingName");
-public static final int sel_MIMETypesShownAsHTML = sel_registerName("MIMETypesShownAsHTML");
-public static final int sel_replaceSelectionWithText_1 = sel_registerName("replaceSelectionWithText:");
-public static final int sel_setTextSizeMultiplier_1 = sel_registerName("setTextSizeMultiplier:");
-public static final int sel_stopLoading_1 = sel_registerName("stopLoading:");
-public static final int sel_goBack_1 = sel_registerName("goBack:");
-public static final int sel_canMakeTextStandardSize = sel_registerName("canMakeTextStandardSize");
-public static final int sel_setCustomUserAgent_1 = sel_registerName("setCustomUserAgent:");
-public static final int sel_moveDragCaretToPoint_1 = sel_registerName("moveDragCaretToPoint:");
-public static final int sel_makeTextSmaller_1 = sel_registerName("makeTextSmaller:");
-public static final int sel_moveToBeginningOfSentence_1 = sel_registerName("moveToBeginningOfSentence:");
-public static final int sel_reload_1 = sel_registerName("reload:");
-public static final int sel_typingStyle = sel_registerName("typingStyle");
-public static final int sel_setShouldCloseWithWindow_1 = sel_registerName("setShouldCloseWithWindow:");
-public static final int sel_setMediaStyle_1 = sel_registerName("setMediaStyle:");
-public static final int sel_canMakeTextLarger = sel_registerName("canMakeTextLarger");
-public static final int sel_textSizeMultiplier = sel_registerName("textSizeMultiplier");
-public static final int sel_shouldCloseWithWindow = sel_registerName("shouldCloseWithWindow");
-public static final int sel_setPreferencesIdentifier_1 = sel_registerName("setPreferencesIdentifier:");
-public static final int sel_setApplicationNameForUserAgent_1 = sel_registerName("setApplicationNameForUserAgent:");
-public static final int sel_mainFrameURL = sel_registerName("mainFrameURL");
-public static final int sel_goForward_1 = sel_registerName("goForward:");
-public static final int sel_selectedDOMRange = sel_registerName("selectedDOMRange");
-public static final int sel_setDownloadDelegate_1 = sel_registerName("setDownloadDelegate:");
-public static final int sel_setEditingDelegate_1 = sel_registerName("setEditingDelegate:");
-public static final int sel_setUIDelegate_1 = sel_registerName("setUIDelegate:");
-public static final int sel_mainFrameTitle = sel_registerName("mainFrameTitle");
-public static final int sel_setSelectedDOMRange_1affinity_1 = sel_registerName("setSelectedDOMRange:affinity:");
-public static final int sel_setTypingStyle_1 = sel_registerName("setTypingStyle:");
-public static final int sel_backForwardList = sel_registerName("backForwardList");
-public static final int sel_deleteSelection = sel_registerName("deleteSelection");
-public static final int sel_canGoForward = sel_registerName("canGoForward");
-public static final int sel_styleDeclarationWithText_1 = sel_registerName("styleDeclarationWithText:");
-public static final int sel_moveToEndOfSentenceAndModifySelection_1 = sel_registerName("moveToEndOfSentenceAndModifySelection:");
-public static final int sel_replaceSelectionWithNode_1 = sel_registerName("replaceSelectionWithNode:");
-public static final int sel_URLTitleFromPasteboard_1 = sel_registerName("URLTitleFromPasteboard:");
-public static final int sel_UIDelegate = sel_registerName("UIDelegate");
-public static final int sel_setMaintainsBackForwardList_1 = sel_registerName("setMaintainsBackForwardList:");
-public static final int sel_mainFrameIcon = sel_registerName("mainFrameIcon");
-public static final int sel_setGroupName_1 = sel_registerName("setGroupName:");
-public static final int sel_canMakeTextSmaller = sel_registerName("canMakeTextSmaller");
-public static final int sel_applicationNameForUserAgent = sel_registerName("applicationNameForUserAgent");
-public static final int sel_supportsTextEncoding = sel_registerName("supportsTextEncoding");
-public static final int sel_canShowMIMETypeAsHTML_1 = sel_registerName("canShowMIMETypeAsHTML:");
-public static final int sel_mediaStyle = sel_registerName("mediaStyle");
-public static final int sel_makeTextLarger_1 = sel_registerName("makeTextLarger:");
-public static final int sel_writeElement_1withPasteboardTypes_1toPasteboard_1 = sel_registerName("writeElement:withPasteboardTypes:toPasteboard:");
-public static final int sel_estimatedProgress = sel_registerName("estimatedProgress");
-public static final int sel_setCustomTextEncodingName_1 = sel_registerName("setCustomTextEncodingName:");
-public static final int sel_mainFrameDocument = sel_registerName("mainFrameDocument");
-public static final int sel_isLoading = sel_registerName("isLoading");
-public static final int sel_selectSentence_1 = sel_registerName("selectSentence:");
-public static final int sel_computedStyleForElement_1pseudoElement_1 = sel_registerName("computedStyleForElement:pseudoElement:");
-public static final int sel_writeSelectionWithPasteboardTypes_1toPasteboard_1 = sel_registerName("writeSelectionWithPasteboardTypes:toPasteboard:");
-public static final int sel_resourceLoadDelegate = sel_registerName("resourceLoadDelegate");
-public static final int sel_reload = sel_registerName("reload");
-public static final int sel_loadAlternateHTMLString_1baseURL_1forUnreachableURL_1 = sel_registerName("loadAlternateHTMLString:baseURL:forUnreachableURL:");
-public static final int sel_loadHTMLString_1baseURL_1 = sel_registerName("loadHTMLString:baseURL:");
-public static final int sel_loadArchive_1 = sel_registerName("loadArchive:");
-public static final int sel_webView = sel_registerName("webView");
-public static final int sel_provisionalDataSource = sel_registerName("provisionalDataSource");
-public static final int sel_findFrameNamed_1 = sel_registerName("findFrameNamed:");
-public static final int sel_DOMDocument = sel_registerName("DOMDocument");
-public static final int sel_frameView = sel_registerName("frameView");
-public static final int sel_globalContext = sel_registerName("globalContext");
-public static final int sel_windowObject = sel_registerName("windowObject");
-public static final int sel_childFrames = sel_registerName("childFrames");
-public static final int sel_loadData_1MIMEType_1textEncodingName_1baseURL_1 = sel_registerName("loadData:MIMEType:textEncodingName:baseURL:");
-public static final int sel_initWithName_1webFrameView_1webView_1 = sel_registerName("initWithName:webFrameView:webView:");
-public static final int sel_frameElement = sel_registerName("frameElement");
-public static final int sel_loadRequest_1 = sel_registerName("loadRequest:");
-public static final int sel_parentFrame = sel_registerName("parentFrame");
-public static final int sel_representation = sel_registerName("representation");
-public static final int sel_documentSource = sel_registerName("documentSource");
-public static final int sel_webView_1didChangeLocationWithinPageForFrame_1 = sel_registerName("webView:didChangeLocationWithinPageForFrame:");
-public static final int sel_webView_1didFailProvisionalLoadWithError_1forFrame_1 = sel_registerName("webView:didFailProvisionalLoadWithError:forFrame:");
-public static final int sel_webView_1didFinishLoadForFrame_1 = sel_registerName("webView:didFinishLoadForFrame:");
-public static final int sel_webView_1didReceiveTitle_1forFrame_1 = sel_registerName("webView:didReceiveTitle:forFrame:");
-public static final int sel_webView_1didStartProvisionalLoadForFrame_1 = sel_registerName("webView:didStartProvisionalLoadForFrame:");
-public static final int sel_webView_1didCommitLoadForFrame_1 = sel_registerName("webView:didCommitLoadForFrame:");
-public static final int sel_webView_1resource_1didFinishLoadingFromDataSource_1 = sel_registerName("webView:resource:didFinishLoadingFromDataSource:");
-public static final int sel_webView_1resource_1didFailLoadingWithError_1fromDataSource_1 = sel_registerName("webView:resource:didFailLoadingWithError:fromDataSource:");
-public static final int sel_webView_1identifierForInitialRequest_1fromDataSource_1 = sel_registerName("webView:identifierForInitialRequest:fromDataSource:");
-public static final int sel_webView_1resource_1willSendRequest_1redirectResponse_1fromDataSource_1 = sel_registerName("webView:resource:willSendRequest:redirectResponse:fromDataSource:");
-public static final int sel_webView_1createWebViewWithRequest_1 = sel_registerName("webView:createWebViewWithRequest:");
-public static final int sel_webViewShow_1 = sel_registerName("webViewShow:");
-public static final int sel_webView_1setFrame_1 = sel_registerName("webView:setFrame:");
-public static final int sel_webViewClose_1 = sel_registerName("webViewClose:");
-public static final int sel_webView_1contextMenuItemsForElement_1defaultMenuItems_1 = sel_registerName("webView:contextMenuItemsForElement:defaultMenuItems:");
-public static final int sel_webView_1setStatusBarVisible_1 = sel_registerName("webView:setStatusBarVisible:");
-public static final int sel_webView_1setResizable_1 = sel_registerName("webView:setResizable:");
-public static final int sel_webView_1setToolbarsVisible_1 = sel_registerName("webView:setToolbarsVisible:");
-public static final int sel_webView_1setStatusText_1 = sel_registerName("webView:setStatusText:");
-public static final int sel_webViewFocus_1 = sel_registerName("webViewFocus:");
-public static final int sel_webViewUnfocus_1 = sel_registerName("webViewUnfocus:");
-public static final int sel_webView_1runJavaScriptAlertPanelWithMessage_1 = sel_registerName("webView:runJavaScriptAlertPanelWithMessage:");
-public static final int sel_webView_1runJavaScriptConfirmPanelWithMessage_1 = sel_registerName("webView:runJavaScriptConfirmPanelWithMessage:");
-public static final int sel_webView_1runOpenPanelForFileButtonWithResultListener_1 = sel_registerName("webView:runOpenPanelForFileButtonWithResultListener:");
-public static final int sel_webView_1mouseDidMoveOverElement_1modifierFlags_1 = sel_registerName("webView:mouseDidMoveOverElement:modifierFlags:");
-public static final int sel_webView_1printFrameView_1 = sel_registerName("webView:printFrameView:");
-public static final int sel_webView_1decidePolicyForMIMEType_1request_1frame_1decisionListener_1 = sel_registerName("webView:decidePolicyForMIMEType:request:frame:decisionListener:");
-public static final int sel_webView_1decidePolicyForNewWindowAction_1request_1newFrameName_1decisionListener_1 = sel_registerName("webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:");
-public static final int sel_webView_1unableToImplementPolicyWithError_1frame_1 = sel_registerName("webView:unableToImplementPolicyWithError:frame:");
-public static final int sel_webView_1decidePolicyForNavigationAction_1request_1frame_1decisionListener_1 = sel_registerName("webView:decidePolicyForNavigationAction:request:frame:decisionListener::");
+public static final int sel_setUsesAlternatingRowBackgroundColors_ = sel_registerName("setUsesAlternatingRowBackgroundColors:");
+public static final int sel_setUsesThreadedAnimation_ = sel_registerName("setUsesThreadedAnimation:");
+public static final int sel_setValue_forKey_ = sel_registerName("setValue:forKey:");
+public static final int sel_setValueWraps_ = sel_registerName("setValueWraps:");
+public static final int sel_setVerticalScroller_ = sel_registerName("setVerticalScroller:");
+public static final int sel_setView_ = sel_registerName("setView:");
+public static final int sel_setWidth_ = sel_registerName("setWidth:");
+public static final int sel_setWidthTracksTextView_ = sel_registerName("setWidthTracksTextView:");
+public static final int sel_setWindingRule_ = sel_registerName("setWindingRule:");
+public static final int sel_setWorksWhenModal_ = sel_registerName("setWorksWhenModal:");
+public static final int sel_setWraps_ = sel_registerName("setWraps:");
+public static final int sel_sharedApplication = sel_registerName("sharedApplication");
+public static final int sel_sharedColorPanel = sel_registerName("sharedColorPanel");
+public static final int sel_sharedFontManager = sel_registerName("sharedFontManager");
+public static final int sel_sharedFontPanel = sel_registerName("sharedFontPanel");
+public static final int sel_sharedHTTPCookieStorage = sel_registerName("sharedHTTPCookieStorage");
+public static final int sel_sharedPrintInfo = sel_registerName("sharedPrintInfo");
+public static final int sel_sharedWorkspace = sel_registerName("sharedWorkspace");
+public static final int sel_shiftKey = sel_registerName("shiftKey");
+public static final int sel_size = sel_registerName("size");
+public static final int sel_sizeToFit = sel_registerName("sizeToFit");
+public static final int sel_sizeValue = sel_registerName("sizeValue");
+public static final int sel_skipDescendents = sel_registerName("skipDescendents");
+public static final int sel_sortIndicatorRectForBounds_ = sel_registerName("sortIndicatorRectForBounds:");
 public static final int sel_standardPreferences = sel_registerName("standardPreferences");
-public static final int sel_setJavaEnabled_1 = sel_registerName("setJavaEnabled:");
+public static final int sel_startAnimation_ = sel_registerName("startAnimation:");
+public static final int sel_state = sel_registerName("state");
+public static final int sel_statusItemWithLength_ = sel_registerName("statusItemWithLength:");
+public static final int sel_stop_ = sel_registerName("stop:");
+public static final int sel_stopLoading_ = sel_registerName("stopLoading:");
+public static final int sel_string = sel_registerName("string");
+public static final int sel_stringByAddingPercentEscapesUsingEncoding_ = sel_registerName("stringByAddingPercentEscapesUsingEncoding:");
+public static final int sel_stringByAppendingPathComponent_ = sel_registerName("stringByAppendingPathComponent:");
+public static final int sel_stringByDeletingPathExtension = sel_registerName("stringByDeletingPathExtension");
+public static final int sel_stringByEvaluatingJavaScriptFromString_ = sel_registerName("stringByEvaluatingJavaScriptFromString:");
+public static final int sel_stringByReplacingOccurrencesOfString_withString_ = sel_registerName("stringByReplacingOccurrencesOfString:withString:");
+public static final int sel_stringForType_ = sel_registerName("stringForType:");
+public static final int sel_stringWithCharacters_length_ = sel_registerName("stringWithCharacters:length:");
+public static final int sel_stroke = sel_registerName("stroke");
+public static final int sel_strokeRect_ = sel_registerName("strokeRect:");
+public static final int sel_styleMask = sel_registerName("styleMask");
+public static final int sel_submenu = sel_registerName("submenu");
+public static final int sel_subviews = sel_registerName("subviews");
+public static final int sel_superclass = sel_registerName("superclass");
+public static final int sel_superview = sel_registerName("superview");
+public static final int sel_systemFontOfSize_ = sel_registerName("systemFontOfSize:");
+public static final int sel_systemFontSize = sel_registerName("systemFontSize");
+public static final int sel_systemStatusBar = sel_registerName("systemStatusBar");
+public static final int sel_systemVersion = sel_registerName("systemVersion");
+public static final int sel_tabView_willSelectTabViewItem_ = sel_registerName("tabView:willSelectTabViewItem:");
+public static final int sel_tabViewItemAtPoint_ = sel_registerName("tabViewItemAtPoint:");
+public static final int sel_tableView_objectValueForTableColumn_row_ = sel_registerName("tableView:objectValueForTableColumn:row:");
+public static final int sel_tableView_setObjectValue_forTableColumn_row_ = sel_registerName("tableView:setObjectValue:forTableColumn:row:");
+public static final int sel_tableView_shouldEditTableColumn_row_ = sel_registerName("tableView:shouldEditTableColumn:row:");
+public static final int sel_tableView_willDisplayCell_forTableColumn_row_ = sel_registerName("tableView:willDisplayCell:forTableColumn:row:");
+public static final int sel_tableViewSelectionDidChange_ = sel_registerName("tableViewSelectionDidChange:");
+public static final int sel_target = sel_registerName("target");
+public static final int sel_terminate_ = sel_registerName("terminate:");
+public static final int sel_textBackgroundColor = sel_registerName("textBackgroundColor");
+public static final int sel_textColor = sel_registerName("textColor");
+public static final int sel_textContainer = sel_registerName("textContainer");
+public static final int sel_textDidChange_ = sel_registerName("textDidChange:");
+public static final int sel_textStorage = sel_registerName("textStorage");
+public static final int sel_textView_clickedOnLink_atIndex_ = sel_registerName("textView:clickedOnLink:atIndex:");
+public static final int sel_textView_willChangeSelectionFromCharacterRange_toCharacterRange_ = sel_registerName("textView:willChangeSelectionFromCharacterRange:toCharacterRange:");
+public static final int sel_textViewDidChangeSelection_ = sel_registerName("textViewDidChangeSelection:");
+public static final int sel_tile = sel_registerName("tile");
+public static final int sel_timeZone = sel_registerName("timeZone");
+public static final int sel_title = sel_registerName("title");
+public static final int sel_titleOfSelectedItem = sel_registerName("titleOfSelectedItem");
+public static final int sel_transform = sel_registerName("transform");
+public static final int sel_transformPoint_ = sel_registerName("transformPoint:");
+public static final int sel_transformSize_ = sel_registerName("transformSize:");
+public static final int sel_transformStruct = sel_registerName("transformStruct");
+public static final int sel_transformUsingAffineTransform_ = sel_registerName("transformUsingAffineTransform:");
+public static final int sel_translateXBy_yBy_ = sel_registerName("translateXBy:yBy:");
+public static final int sel_type = sel_registerName("type");
+public static final int sel_types = sel_registerName("types");
+public static final int sel_typesetter = sel_registerName("typesetter");
+public static final int sel_unarchiveObjectWithData_ = sel_registerName("unarchiveObjectWithData:");
+public static final int sel_unhideAllApplications_ = sel_registerName("unhideAllApplications:");
+public static final int sel_unmarkText = sel_registerName("unmarkText");
 public static final int sel_use = sel_registerName("use");
-public static final int sel_download = sel_registerName("download");
-public static final int sel_ignore = sel_registerName("ignore");
-public static final int sel_pageTitle = sel_registerName("pageTitle");
+public static final int sel_usedRectForTextContainer_ = sel_registerName("usedRectForTextContainer:");
+public static final int sel_userInfo = sel_registerName("userInfo");
+public static final int sel_usesAlternatingRowBackgroundColors = sel_registerName("usesAlternatingRowBackgroundColors");
+public static final int sel_validAttributesForMarkedText = sel_registerName("validAttributesForMarkedText");
+public static final int sel_valueForKey_ = sel_registerName("valueForKey:");
+public static final int sel_valueWithPoint_ = sel_registerName("valueWithPoint:");
+public static final int sel_valueWithRange_ = sel_registerName("valueWithRange:");
+public static final int sel_valueWithRect_ = sel_registerName("valueWithRect:");
+public static final int sel_valueWithSize_ = sel_registerName("valueWithSize:");
+public static final int sel_visibleFrame = sel_registerName("visibleFrame");
+public static final int sel_visibleRect = sel_registerName("visibleRect");
+public static final int sel_wantsToHandleMouseEvents = sel_registerName("wantsToHandleMouseEvents");
 public static final int sel_webFrame = sel_registerName("webFrame");
-public static final int sel_chooseFilename_1 = sel_registerName("chooseFilename:");
-public static final int sel_addEventListener_1listener_1useCapture_1 = sel_registerName("addEventListener:listener:useCapture:");
-public static final int sel_handleEvent_1 = sel_registerName("handleEvent:");
-public static final int sel_cancelable = sel_registerName("cancelable");
-public static final int sel_timeStamp = sel_registerName("timeStamp");
-public static final int sel_initEvent_1_1_1 = sel_registerName("initEvent:::");
-public static final int sel_bubbles = sel_registerName("bubbles");
-public static final int sel_stopPropagation = sel_registerName("stopPropagation");
-public static final int sel_initEvent_1canBubbleArg_1cancelableArg_1 = sel_registerName("initEvent:canBubbleArg:cancelableArg:");
-public static final int sel_eventPhase = sel_registerName("eventPhase");
-public static final int sel_currentTarget = sel_registerName("currentTarget");
-public static final int sel_preventDefault = sel_registerName("preventDefault");
-public static final int sel_screenX = sel_registerName("screenX");
-public static final int sel_initMouseEvent_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1 = sel_registerName("initMouseEvent:::::::::::::::");
-public static final int sel_clientY = sel_registerName("clientY");
-public static final int sel_charCode = sel_registerName("charCode");
-public static final int sel_relatedTarget = sel_registerName("relatedTarget");
-public static final int sel_button = sel_registerName("button");
-public static final int sel_clientX = sel_registerName("clientX");
-public static final int sel_initMouseEvent_1canBubble_1cancelable_1view_1detail_1screenX_1screenY_1clientX_1clientY_1ctrlKey_1altKey_1shiftKey_1metaKey_1button_1relatedTarget_1 = sel_registerName("initMouseEvent:canBubble:cancelable:view:detail:screenX:screenY:clientX:clientY:ctrlKey:altKey:shiftKey:metaKey:button:relatedTarget:");
-public static final int sel_shiftKey = sel_registerName("shiftKey");
-public static final int sel_ctrlKey = sel_registerName("ctrlKey");
-public static final int sel_metaKey = sel_registerName("metaKey");
-public static final int sel_altKey = sel_registerName("altKey");
-public static final int sel_keyLocation = sel_registerName("keyLocation");
-public static final int sel_getModifierState_1 = sel_registerName("getModifierState:");
-public static final int sel_screenY = sel_registerName("screenY");
-public static final int sel_detail = sel_registerName("detail");
-public static final int sel_handleNotification_1 = sel_registerName("handleNotification:");
-public static final int sel_setAllowsScrolling_1 = sel_registerName("setAllowsScrolling:");
-public static final int sel_allowsScrolling = sel_registerName("allowsScrolling");
-public static final int sel_printDocumentView = sel_registerName("printDocumentView");
-public static final int sel_documentViewShouldHandlePrint = sel_registerName("documentViewShouldHandlePrint");
-public static final int sel_printOperationWithPrintInfo_1 = sel_registerName("printOperationWithPrintInfo:");
-public static final int sel_canPrintHeadersAndFooters = sel_registerName("canPrintHeadersAndFooters");
+public static final int sel_webView_contextMenuItemsForElement_defaultMenuItems_ = sel_registerName("webView:contextMenuItemsForElement:defaultMenuItems:");
+public static final int sel_webView_createWebViewWithRequest_ = sel_registerName("webView:createWebViewWithRequest:");
+public static final int sel_webView_decidePolicyForMIMEType_request_frame_decisionListener_ = sel_registerName("webView:decidePolicyForMIMEType:request:frame:decisionListener:");
+public static final int sel_webView_decidePolicyForNavigationAction_request_frame_decisionListener_ = sel_registerName("webView:decidePolicyForNavigationAction:request:frame:decisionListener:");
+public static final int sel_webView_decidePolicyForNewWindowAction_request_newFrameName_decisionListener_ = sel_registerName("webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:");
+public static final int sel_webView_didChangeLocationWithinPageForFrame_ = sel_registerName("webView:didChangeLocationWithinPageForFrame:");
+public static final int sel_webView_didCommitLoadForFrame_ = sel_registerName("webView:didCommitLoadForFrame:");
+public static final int sel_webView_didFailProvisionalLoadWithError_forFrame_ = sel_registerName("webView:didFailProvisionalLoadWithError:forFrame:");
+public static final int sel_webView_didFinishLoadForFrame_ = sel_registerName("webView:didFinishLoadForFrame:");
+public static final int sel_webView_didReceiveTitle_forFrame_ = sel_registerName("webView:didReceiveTitle:forFrame:");
+public static final int sel_webView_didStartProvisionalLoadForFrame_ = sel_registerName("webView:didStartProvisionalLoadForFrame:");
+public static final int sel_webView_identifierForInitialRequest_fromDataSource_ = sel_registerName("webView:identifierForInitialRequest:fromDataSource:");
+public static final int sel_webView_mouseDidMoveOverElement_modifierFlags_ = sel_registerName("webView:mouseDidMoveOverElement:modifierFlags:");
+public static final int sel_webView_printFrameView_ = sel_registerName("webView:printFrameView:");
+public static final int sel_webView_resource_didFailLoadingWithError_fromDataSource_ = sel_registerName("webView:resource:didFailLoadingWithError:fromDataSource:");
+public static final int sel_webView_resource_didFinishLoadingFromDataSource_ = sel_registerName("webView:resource:didFinishLoadingFromDataSource:");
+public static final int sel_webView_resource_willSendRequest_redirectResponse_fromDataSource_ = sel_registerName("webView:resource:willSendRequest:redirectResponse:fromDataSource:");
+public static final int sel_webView_runJavaScriptAlertPanelWithMessage_ = sel_registerName("webView:runJavaScriptAlertPanelWithMessage:");
+public static final int sel_webView_runJavaScriptConfirmPanelWithMessage_ = sel_registerName("webView:runJavaScriptConfirmPanelWithMessage:");
+public static final int sel_webView_runOpenPanelForFileButtonWithResultListener_ = sel_registerName("webView:runOpenPanelForFileButtonWithResultListener:");
+public static final int sel_webView_setFrame_ = sel_registerName("webView:setFrame:");
+public static final int sel_webView_setResizable_ = sel_registerName("webView:setResizable:");
+public static final int sel_webView_setStatusBarVisible_ = sel_registerName("webView:setStatusBarVisible:");
+public static final int sel_webView_setStatusText_ = sel_registerName("webView:setStatusText:");
+public static final int sel_webView_setToolbarsVisible_ = sel_registerName("webView:setToolbarsVisible:");
+public static final int sel_webView_unableToImplementPolicyWithError_frame_ = sel_registerName("webView:unableToImplementPolicyWithError:frame:");
+public static final int sel_webViewClose_ = sel_registerName("webViewClose:");
+public static final int sel_webViewFocus_ = sel_registerName("webViewFocus:");
+public static final int sel_webViewShow_ = sel_registerName("webViewShow:");
+public static final int sel_webViewUnfocus_ = sel_registerName("webViewUnfocus:");
 public static final int sel_wheelDelta = sel_registerName("wheelDelta");
+public static final int sel_width = sel_registerName("width");
+public static final int sel_window = sel_registerName("window");
+public static final int sel_windowBackgroundColor = sel_registerName("windowBackgroundColor");
+public static final int sel_windowDidBecomeKey_ = sel_registerName("windowDidBecomeKey:");
+public static final int sel_windowDidMove_ = sel_registerName("windowDidMove:");
+public static final int sel_windowDidResignKey_ = sel_registerName("windowDidResignKey:");
+public static final int sel_windowDidResize_ = sel_registerName("windowDidResize:");
+public static final int sel_windowFrameColor = sel_registerName("windowFrameColor");
+public static final int sel_windowFrameTextColor = sel_registerName("windowFrameTextColor");
+public static final int sel_windowNumber = sel_registerName("windowNumber");
+public static final int sel_windowShouldClose_ = sel_registerName("windowShouldClose:");
+public static final int sel_windowWillClose_ = sel_registerName("windowWillClose:");
+public static final int sel_windows = sel_registerName("windows");
+public static final int sel_worksWhenModal = sel_registerName("worksWhenModal");
+public static final int sel_wraps = sel_registerName("wraps");
+public static final int sel_yearOfCommonEra = sel_registerName("yearOfCommonEra");
 
 /** Constants */
 public static final int NSAWTEventType = 16;
@@ -9014,1438 +2840,176 @@ public static final int WebViewInsertActionDropped = 2;
 public static final int WebViewInsertActionPasted = 1;
 public static final int WebViewInsertActionTyped = 0;
 
-
 /** Globals */
-//public static final native int NSAbortModalException();
-//public static final native int NSAbortPrintingException();
-//public static final native int NSAccessibilityAllowedValuesAttribute();
-//public static final native int NSAccessibilityApplicationActivatedNotification();
-//public static final native int NSAccessibilityApplicationDeactivatedNotification();
-//public static final native int NSAccessibilityApplicationHiddenNotification();
-//public static final native int NSAccessibilityApplicationRole();
-//public static final native int NSAccessibilityApplicationShownNotification();
-//public static final native int NSAccessibilityAscendingSortDirectionValue();
-//public static final native int NSAccessibilityAttachmentTextAttribute();
-//public static final native int NSAccessibilityAttributedStringForRangeParameterizedAttribute();
-//public static final native int NSAccessibilityBackgroundColorTextAttribute();
-//public static final native int NSAccessibilityBoundsForRangeParameterizedAttribute();
-//public static final native int NSAccessibilityBrowserRole();
-//public static final native int NSAccessibilityBusyIndicatorRole();
-//public static final native int NSAccessibilityButtonRole();
-//public static final native int NSAccessibilityCancelAction();
-//public static final native int NSAccessibilityCancelButtonAttribute();
-//public static final native int NSAccessibilityCenterTabStopMarkerTypeValue();
-//public static final native int NSAccessibilityCentimetersUnitValue();
-//public static final native int NSAccessibilityCheckBoxRole();
-//public static final native int NSAccessibilityChildrenAttribute();
-//public static final native int NSAccessibilityClearButtonAttribute();
-//public static final native int NSAccessibilityCloseButtonAttribute();
-//public static final native int NSAccessibilityCloseButtonSubrole();
-//public static final native int NSAccessibilityColorWellRole();
-//public static final native int NSAccessibilityColumnCountAttribute();
-//public static final native int NSAccessibilityColumnRole();
-//public static final native int NSAccessibilityColumnTitlesAttribute();
-//public static final native int NSAccessibilityColumnsAttribute();
-//public static final native int NSAccessibilityComboBoxRole();
-//public static final native int NSAccessibilityConfirmAction();
-//public static final native int NSAccessibilityContentsAttribute();
-//public static final native int NSAccessibilityCreatedNotification();
-//public static final native int NSAccessibilityDecimalTabStopMarkerTypeValue();
-//public static final native int NSAccessibilityDecrementAction();
-//public static final native int NSAccessibilityDecrementArrowSubrole();
-//public static final native int NSAccessibilityDecrementButtonAttribute();
-//public static final native int NSAccessibilityDecrementPageSubrole();
-//public static final native int NSAccessibilityDefaultButtonAttribute();
-//public static final native int NSAccessibilityDeleteAction();
-//public static final native int NSAccessibilityDescendingSortDirectionValue();
-//public static final native int NSAccessibilityDescriptionAttribute();
-//public static final native int NSAccessibilityDialogSubrole();
-//public static final native int NSAccessibilityDisclosedByRowAttribute();
-//public static final native int NSAccessibilityDisclosedRowsAttribute();
-//public static final native int NSAccessibilityDisclosingAttribute();
-//public static final native int NSAccessibilityDisclosureLevelAttribute();
-//public static final native int NSAccessibilityDisclosureTriangleRole();
-//public static final native int NSAccessibilityDocumentAttribute();
-//public static final native int NSAccessibilityDrawerCreatedNotification();
-//public static final native int NSAccessibilityDrawerRole();
-//public static final native int NSAccessibilityEditedAttribute();
-//public static final native int NSAccessibilityEnabledAttribute();
-//public static final native int NSAccessibilityErrorCodeExceptionInfo();
-//public static final native int NSAccessibilityException();
-//public static final native int NSAccessibilityExpandedAttribute();
-//public static final native int NSAccessibilityFilenameAttribute();
-//public static final native int NSAccessibilityFirstLineIndentMarkerTypeValue();
-//public static final native int NSAccessibilityFloatingWindowSubrole();
-//public static final native int NSAccessibilityFocusedAttribute();
-//public static final native int NSAccessibilityFocusedUIElementAttribute();
-//public static final native int NSAccessibilityFocusedUIElementChangedNotification();
-//public static final native int NSAccessibilityFocusedWindowAttribute();
-//public static final native int NSAccessibilityFocusedWindowChangedNotification();
-//public static final native int NSAccessibilityFontFamilyKey();
-//public static final native int NSAccessibilityFontNameKey();
-//public static final native int NSAccessibilityFontSizeKey();
-//public static final native int NSAccessibilityFontTextAttribute();
-//public static final native int NSAccessibilityForegroundColorTextAttribute();
-//public static final native int NSAccessibilityFrontmostAttribute();
-//public static final native int NSAccessibilityGridRole();
-//public static final native int NSAccessibilityGroupRole();
-//public static final native int NSAccessibilityGrowAreaAttribute();
-//public static final native int NSAccessibilityGrowAreaRole();
-//public static final native int NSAccessibilityHeadIndentMarkerTypeValue();
-//public static final native int NSAccessibilityHeaderAttribute();
-//public static final native int NSAccessibilityHelpAttribute();
-//public static final native int NSAccessibilityHelpTagCreatedNotification();
-//public static final native int NSAccessibilityHelpTagRole();
-//public static final native int NSAccessibilityHiddenAttribute();
-//public static final native int NSAccessibilityHorizontalOrientationValue();
-//public static final native int NSAccessibilityHorizontalScrollBarAttribute();
-//public static final native int NSAccessibilityImageRole();
-//public static final native int NSAccessibilityInchesUnitValue();
-//public static final native int NSAccessibilityIncrementAction();
-//public static final native int NSAccessibilityIncrementArrowSubrole();
-//public static final native int NSAccessibilityIncrementButtonAttribute();
-//public static final native int NSAccessibilityIncrementPageSubrole();
-//public static final native int NSAccessibilityIncrementorRole();
-//public static final native int NSAccessibilityIndexAttribute();
-//public static final native int NSAccessibilityInsertionPointLineNumberAttribute();
-//public static final native int NSAccessibilityLabelUIElementsAttribute();
-//public static final native int NSAccessibilityLabelValueAttribute();
-//public static final native int NSAccessibilityLeftTabStopMarkerTypeValue();
-//public static final native int NSAccessibilityLineForIndexParameterizedAttribute();
-//public static final native int NSAccessibilityLinkRole();
-//public static final native int NSAccessibilityLinkTextAttribute();
-//public static final native int NSAccessibilityLinkedUIElementsAttribute();
-//public static final native int NSAccessibilityListRole();
-//public static final native int NSAccessibilityMainAttribute();
-//public static final native int NSAccessibilityMainWindowAttribute();
-//public static final native int NSAccessibilityMainWindowChangedNotification();
-//public static final native int NSAccessibilityMarkerGroupUIElementAttribute();
-//public static final native int NSAccessibilityMarkerTypeAttribute();
-//public static final native int NSAccessibilityMarkerTypeDescriptionAttribute();
-//public static final native int NSAccessibilityMarkerUIElementsAttribute();
-//public static final native int NSAccessibilityMarkerValuesAttribute();
-//public static final native int NSAccessibilityMatteContentUIElementAttribute();
-//public static final native int NSAccessibilityMatteHoleAttribute();
-//public static final native int NSAccessibilityMatteRole();
-//public static final native int NSAccessibilityMaxValueAttribute();
-//public static final native int NSAccessibilityMenuBarAttribute();
-//public static final native int NSAccessibilityMenuBarRole();
-//public static final native int NSAccessibilityMenuButtonRole();
-//public static final native int NSAccessibilityMenuItemRole();
-//public static final native int NSAccessibilityMenuRole();
-//public static final native int NSAccessibilityMinValueAttribute();
-//public static final native int NSAccessibilityMinimizeButtonAttribute();
-//public static final native int NSAccessibilityMinimizeButtonSubrole();
-//public static final native int NSAccessibilityMinimizedAttribute();
-//public static final native int NSAccessibilityMisspelledTextAttribute();
-//public static final native int NSAccessibilityModalAttribute();
-//public static final native int NSAccessibilityMovedNotification();
-//public static final native int NSAccessibilityNextContentsAttribute();
-//public static final native int NSAccessibilityNumberOfCharactersAttribute();
-//public static final native int NSAccessibilityOrderedByRowAttribute();
-//public static final native int NSAccessibilityOrientationAttribute();
-//public static final native int NSAccessibilityOutlineRole();
-//public static final native int NSAccessibilityOutlineRowSubrole();
-//public static final native int NSAccessibilityOverflowButtonAttribute();
-//public static final native int NSAccessibilityParentAttribute();
-//public static final native int NSAccessibilityPicasUnitValue();
-//public static final native int NSAccessibilityPickAction();
-//public static final native int NSAccessibilityPointsUnitValue();
-//public static final native int NSAccessibilityPopUpButtonRole();
 public static final native int NSAccessibilityPositionAttribute();
-//public static final native int NSAccessibilityPressAction();
-//public static final native int NSAccessibilityPreviousContentsAttribute();
-//public static final native int NSAccessibilityProgressIndicatorRole();
-//public static final native int NSAccessibilityProxyAttribute();
-//public static final native int NSAccessibilityRTFForRangeParameterizedAttribute();
-//public static final native int NSAccessibilityRadioButtonRole();
-//public static final native int NSAccessibilityRadioGroupRole();
-//public static final native int NSAccessibilityRaiseAction();
-//public static final native int NSAccessibilityRangeForIndexParameterizedAttribute();
-//public static final native int NSAccessibilityRangeForLineParameterizedAttribute();
-//public static final native int NSAccessibilityRangeForPositionParameterizedAttribute();
-//public static final native int NSAccessibilityResizedNotification();
-//public static final native int NSAccessibilityRightTabStopMarkerTypeValue();
-//public static final native int NSAccessibilityRoleAttribute();
-//public static final native int NSAccessibilityRoleDescriptionAttribute();
-//public static final native int NSAccessibilityRowCountAttribute();
-//public static final native int NSAccessibilityRowCountChangedNotification();
-//public static final native int NSAccessibilityRowRole();
-//public static final native int NSAccessibilityRowsAttribute();
-//public static final native int NSAccessibilityRulerMarkerRole();
-//public static final native int NSAccessibilityRulerRole();
-//public static final native int NSAccessibilityScrollAreaRole();
-//public static final native int NSAccessibilityScrollBarRole();
-//public static final native int NSAccessibilitySearchButtonAttribute();
-//public static final native int NSAccessibilitySearchFieldSubrole();
-//public static final native int NSAccessibilitySearchMenuAttribute();
-//public static final native int NSAccessibilitySecureTextFieldSubrole();
-//public static final native int NSAccessibilitySelectedAttribute();
-//public static final native int NSAccessibilitySelectedChildrenAttribute();
-//public static final native int NSAccessibilitySelectedChildrenChangedNotification();
-//public static final native int NSAccessibilitySelectedColumnsAttribute();
-//public static final native int NSAccessibilitySelectedColumnsChangedNotification();
-//public static final native int NSAccessibilitySelectedRowsAttribute();
-//public static final native int NSAccessibilitySelectedRowsChangedNotification();
-//public static final native int NSAccessibilitySelectedTextAttribute();
-//public static final native int NSAccessibilitySelectedTextChangedNotification();
-//public static final native int NSAccessibilitySelectedTextRangeAttribute();
-//public static final native int NSAccessibilitySelectedTextRangesAttribute();
-//public static final native int NSAccessibilityServesAsTitleForUIElementsAttribute();
-//public static final native int NSAccessibilityShadowTextAttribute();
-//public static final native int NSAccessibilitySharedCharacterRangeAttribute();
-//public static final native int NSAccessibilitySharedTextUIElementsAttribute();
-//public static final native int NSAccessibilitySheetCreatedNotification();
-//public static final native int NSAccessibilitySheetRole();
-//public static final native int NSAccessibilityShowMenuAction();
-//public static final native int NSAccessibilityShownMenuAttribute();
+public static final NSString NSAccessibilityPositionAttribute = new NSString(NSAccessibilityPositionAttribute());
 public static final native int NSAccessibilitySizeAttribute();
-//public static final native int NSAccessibilitySliderRole();
-//public static final native int NSAccessibilitySortButtonRole();
-//public static final native int NSAccessibilitySortDirectionAttribute();
-//public static final native int NSAccessibilitySplitGroupRole();
-//public static final native int NSAccessibilitySplitterRole();
-//public static final native int NSAccessibilitySplittersAttribute();
-//public static final native int NSAccessibilityStandardWindowSubrole();
-//public static final native int NSAccessibilityStaticTextRole();
-//public static final native int NSAccessibilityStrikethroughColorTextAttribute();
-//public static final native int NSAccessibilityStrikethroughTextAttribute();
-//public static final native int NSAccessibilityStringForRangeParameterizedAttribute();
-//public static final native int NSAccessibilityStyleRangeForIndexParameterizedAttribute();
-//public static final native int NSAccessibilitySubroleAttribute();
-//public static final native int NSAccessibilitySuperscriptTextAttribute();
-//public static final native int NSAccessibilitySystemDialogSubrole();
-//public static final native int NSAccessibilitySystemFloatingWindowSubrole();
-//public static final native int NSAccessibilitySystemWideRole();
-//public static final native int NSAccessibilityTabGroupRole();
-//public static final native int NSAccessibilityTableRole();
-//public static final native int NSAccessibilityTableRowSubrole();
-//public static final native int NSAccessibilityTabsAttribute();
-//public static final native int NSAccessibilityTailIndentMarkerTypeValue();
-//public static final native int NSAccessibilityTextAreaRole();
-//public static final native int NSAccessibilityTextAttachmentSubrole();
-//public static final native int NSAccessibilityTextFieldRole();
-//public static final native int NSAccessibilityTextLinkSubrole();
-//public static final native int NSAccessibilityTimelineSubrole();
-//public static final native int NSAccessibilityTitleAttribute();
-//public static final native int NSAccessibilityTitleChangedNotification();
-//public static final native int NSAccessibilityTitleUIElementAttribute();
-//public static final native int NSAccessibilityToolbarButtonAttribute();
-//public static final native int NSAccessibilityToolbarButtonSubrole();
-//public static final native int NSAccessibilityToolbarRole();
-//public static final native int NSAccessibilityTopLevelUIElementAttribute();
-//public static final native int NSAccessibilityUIElementDestroyedNotification();
-//public static final native int NSAccessibilityURLAttribute();
-//public static final native int NSAccessibilityUnderlineColorTextAttribute();
-//public static final native int NSAccessibilityUnderlineTextAttribute();
-//public static final native int NSAccessibilityUnitDescriptionAttribute();
-//public static final native int NSAccessibilityUnitsAttribute();
-//public static final native int NSAccessibilityUnknownMarkerTypeValue();
-//public static final native int NSAccessibilityUnknownRole();
-//public static final native int NSAccessibilityUnknownSortDirectionValue();
-//public static final native int NSAccessibilityUnknownSubrole();
-//public static final native int NSAccessibilityUnknownUnitValue();
-//public static final native int NSAccessibilityValueAttribute();
-//public static final native int NSAccessibilityValueChangedNotification();
-//public static final native int NSAccessibilityValueDescriptionAttribute();
-//public static final native int NSAccessibilityValueIndicatorRole();
-//public static final native int NSAccessibilityVerticalOrientationValue();
-//public static final native int NSAccessibilityVerticalScrollBarAttribute();
-//public static final native int NSAccessibilityVisibleCharacterRangeAttribute();
-//public static final native int NSAccessibilityVisibleChildrenAttribute();
-//public static final native int NSAccessibilityVisibleColumnsAttribute();
-//public static final native int NSAccessibilityVisibleNameKey();
-//public static final native int NSAccessibilityVisibleRowsAttribute();
-//public static final native int NSAccessibilityWindowAttribute();
-//public static final native int NSAccessibilityWindowCreatedNotification();
-//public static final native int NSAccessibilityWindowDeminiaturizedNotification();
-//public static final native int NSAccessibilityWindowMiniaturizedNotification();
-//public static final native int NSAccessibilityWindowMovedNotification();
-//public static final native int NSAccessibilityWindowResizedNotification();
-//public static final native int NSAccessibilityWindowRole();
-//public static final native int NSAccessibilityWindowsAttribute();
-//public static final native int NSAccessibilityZoomButtonAttribute();
-//public static final native int NSAccessibilityZoomButtonSubrole();
-//public static final native int NSAlignmentBinding();
-//public static final native int NSAllRomanInputSourcesLocaleIdentifier();
-//public static final native int NSAllowsEditingMultipleValuesSelectionBindingOption();
-//public static final native int NSAllowsNullArgumentBindingOption();
-//public static final native int NSAlternateImageBinding();
-//public static final native int NSAlternateTitleBinding();
-//public static final native int NSAlwaysPresentsApplicationModalAlertsBindingOption();
-//public static final native int NSAnimateBinding();
-//public static final native int NSAnimationDelayBinding();
-//public static final native int NSAnimationProgressMark();
-//public static final native int NSAnimationProgressMarkNotification();
-//public static final native int NSAnimationTriggerOrderIn();
-//public static final native int NSAnimationTriggerOrderOut();
-//public static final native int NSAntialiasThresholdChangedNotification();
-//public static final native int NSApp();
-//public static final native int NSAppKitIgnoredException();
-//public static final native int NSAppKitVersionNumber();
-//public static final native int NSAppKitVirtualMemoryException();
-//public static final native int NSApplicationDidBecomeActiveNotification();
-//public static final native int NSApplicationDidChangeScreenParametersNotification();
-//public static final native int NSApplicationDidFinishLaunchingNotification();
-//public static final native int NSApplicationDidHideNotification();
-//public static final native int NSApplicationDidResignActiveNotification();
-//public static final native int NSApplicationDidUnhideNotification();
-//public static final native int NSApplicationDidUpdateNotification();
-//public static final native int NSApplicationFileType();
-//public static final native int NSApplicationWillBecomeActiveNotification();
-//public static final native int NSApplicationWillFinishLaunchingNotification();
-//public static final native int NSApplicationWillHideNotification();
-//public static final native int NSApplicationWillResignActiveNotification();
-//public static final native int NSApplicationWillTerminateNotification();
-//public static final native int NSApplicationWillUnhideNotification();
-//public static final native int NSApplicationWillUpdateNotification();
-//public static final native int NSArgumentBinding();
-//public static final native int NSAttachmentAttributeName();
-//public static final native int NSAttributedStringBinding();
-//public static final native int NSAuthorDocumentAttribute();
-public static final NSString NSBackgroundColorAttributeName = new NSString(OS.NSBackgroundColorAttributeName());
+public static final NSString NSAccessibilitySizeAttribute = new NSString(NSAccessibilitySizeAttribute());
 public static final native int NSBackgroundColorAttributeName();
-//public static final native int NSBackgroundColorDocumentAttribute();
-//public static final native int NSBadBitmapParametersException();
-//public static final native int NSBadComparisonException();
-//public static final native int NSBadRTFColorTableException();
-//public static final native int NSBadRTFDirectiveException();
-//public static final native int NSBadRTFFontTableException();
-//public static final native int NSBadRTFStyleSheetException();
-//public static final native int NSBaseURLDocumentOption();
+public static final NSString NSBackgroundColorAttributeName = new NSString(NSBackgroundColorAttributeName());
 public static final native int NSBaselineOffsetAttributeName();
-//public static final native int NSBlack();
-//public static final native int NSBottomMarginDocumentAttribute();
-//public static final native int NSBrowserColumnConfigurationDidChangeNotification();
-//public static final native int NSBrowserIllegalDelegateException();
-//public static final native int NSCalibratedBlackColorSpace();
-public static final NSString NSCalibratedRGBColorSpace = new NSString(NSCalibratedRGBColorSpace());
+public static final NSString NSBaselineOffsetAttributeName = new NSString(NSBaselineOffsetAttributeName());
 public static final native int NSCalibratedRGBColorSpace();
-//public static final native int NSCalibratedWhiteColorSpace();
-//public static final native int NSCharacterEncodingDocumentAttribute();
-//public static final native int NSCharacterEncodingDocumentOption();
-//public static final native int NSCharacterShapeAttributeName();
-//public static final native int NSCocoaVersionDocumentAttribute();
-//public static final native int NSColorListDidChangeNotification();
-//public static final native int NSColorListIOException();
-//public static final native int NSColorListNotEditableException();
-//public static final native int NSColorPanelColorDidChangeNotification();
-//public static final native int NSColorPboardType();
-//public static final native int NSComboBoxSelectionDidChangeNotification();
-//public static final native int NSComboBoxSelectionIsChangingNotification();
-//public static final native int NSComboBoxWillDismissNotification();
-//public static final native int NSComboBoxWillPopUpNotification();
-//public static final native int NSCommentDocumentAttribute();
-//public static final native int NSCompanyDocumentAttribute();
-//public static final native int NSConditionallySetsEditableBindingOption();
-//public static final native int NSConditionallySetsEnabledBindingOption();
-//public static final native int NSConditionallySetsHiddenBindingOption();
-//public static final native int NSContentArrayBinding();
-//public static final native int NSContentArrayForMultipleSelectionBinding();
-//public static final native int NSContentBinding();
-//public static final native int NSContentDictionaryBinding();
-//public static final native int NSContentHeightBinding();
-//public static final native int NSContentObjectBinding();
-//public static final native int NSContentObjectsBinding();
-//public static final native int NSContentPlacementTagBindingOption();
-//public static final native int NSContentSetBinding();
-//public static final native int NSContentValuesBinding();
-//public static final native int NSContentWidthBinding();
-//public static final native int NSContextHelpModeDidActivateNotification();
-//public static final native int NSContextHelpModeDidDeactivateNotification();
-//public static final native int NSContinuouslyUpdatesValueBindingOption();
-//public static final native int NSControlTextDidBeginEditingNotification();
-//public static final native int NSControlTextDidChangeNotification();
-//public static final native int NSControlTextDidEndEditingNotification();
-//public static final native int NSControlTintDidChangeNotification();
-//public static final native int NSConvertedDocumentAttribute();
-//public static final native int NSCopyrightDocumentAttribute();
-//public static final native int NSCreatesSortDescriptorBindingOption();
-//public static final native int NSCreationTimeDocumentAttribute();
-//public static final native int NSCriticalValueBinding();
-//public static final native int NSCursorAttributeName();
-//public static final native int NSCustomColorSpace();
-//public static final native int NSDarkGray();
-//public static final native int NSDataBinding();
-//public static final native int NSDefaultAttributesDocumentOption();
-//public static final native int NSDefaultTabIntervalDocumentAttribute();
-//public static final native int NSDeletesObjectsOnRemoveBindingsOption();
-//public static final native int NSDeviceBitsPerSample();
-//public static final native int NSDeviceBlackColorSpace();
-//public static final native int NSDeviceCMYKColorSpace();
-//public static final native int NSDeviceColorSpaceName();
-//public static final native int NSDeviceIsPrinter();
-//public static final native int NSDeviceIsScreen();
+public static final NSString NSCalibratedRGBColorSpace = new NSString(NSCalibratedRGBColorSpace());
 public static final native int NSDeviceRGBColorSpace();
+public static final NSString NSDeviceRGBColorSpace = new NSString(NSDeviceRGBColorSpace());
 public static final native int NSDeviceResolution();
-//public static final native int NSDeviceSize();
-//public static final native int NSDeviceWhiteColorSpace();
-//public static final native int NSDirectoryFileType();
-//public static final native int NSDisplayNameBindingOption();
-//public static final native int NSDisplayPatternBindingOption();
-//public static final native int NSDisplayPatternTitleBinding();
-//public static final native int NSDisplayPatternValueBinding();
-//public static final native int NSDocFormatTextDocumentType();
-//public static final native int NSDocumentEditedBinding();
-//public static final native int NSDocumentTypeDocumentAttribute();
-//public static final native int NSDocumentTypeDocumentOption();
-//public static final native int NSDoubleClickArgumentBinding();
-//public static final native int NSDoubleClickTargetBinding();
-//public static final native int NSDragPboard();
-//public static final native int NSDraggingException();
-//public static final native int NSDrawerDidCloseNotification();
-//public static final native int NSDrawerDidOpenNotification();
-//public static final native int NSDrawerWillCloseNotification();
-//public static final native int NSDrawerWillOpenNotification();
-//public static final native int NSEditableBinding();
-//public static final native int NSEditorDocumentAttribute();
-//public static final native int NSEnabledBinding();
-//public static final native int NSEventTrackingRunLoopMode();
-//public static final native int NSExcludedElementsDocumentAttribute();
-//public static final native int NSExcludedKeysBinding();
-//public static final native int NSExpansionAttributeName();
-//public static final native int NSFileContentsPboardType();
-public static final NSString NSFilenamesPboardType = new NSString(NSFilenamesPboardType());
+public static final NSString NSDeviceResolution = new NSString(NSDeviceResolution());
 public static final native int NSFilenamesPboardType();
-//public static final native int NSFilesPromisePboardType();
-//public static final native int NSFilesystemFileType();
-//public static final native int NSFilterPredicateBinding();
-//public static final native int NSFindPanelCaseInsensitiveSearch();
-//public static final native int NSFindPanelSearchOptionsPboardType();
-//public static final native int NSFindPanelSubstringMatch();
-//public static final native int NSFindPboard();
+public static final NSString NSFilenamesPboardType = new NSString(NSFilenamesPboardType());
 public static final native int NSFontAttributeName();
-//public static final native int NSFontBinding();
-//public static final native int NSFontBoldBinding();
-//public static final native int NSFontCascadeListAttribute();
-//public static final native int NSFontCharacterSetAttribute();
-//public static final native int NSFontFaceAttribute();
-//public static final native int NSFontFamilyAttribute();
-//public static final native int NSFontFamilyNameBinding();
-//public static final native int NSFontFeatureSelectorIdentifierKey();
-//public static final native int NSFontFeatureSettingsAttribute();
-//public static final native int NSFontFeatureTypeIdentifierKey();
-//public static final native int NSFontFixedAdvanceAttribute();
-//public static final native int NSFontIdentityMatrix();
-//public static final native int NSFontItalicBinding();
-//public static final native int NSFontMatrixAttribute();
-//public static final native int NSFontNameAttribute();
-//public static final native int NSFontNameBinding();
-//public static final native int NSFontPboard();
-//public static final native int NSFontPboardType();
-//public static final native int NSFontSetChangedNotification();
-//public static final native int NSFontSizeAttribute();
-//public static final native int NSFontSizeBinding();
-//public static final native int NSFontSlantTrait();
-//public static final native int NSFontSymbolicTrait();
-//public static final native int NSFontTraitsAttribute();
-//public static final native int NSFontUnavailableException();
-//public static final native int NSFontVariationAttribute();
-//public static final native int NSFontVariationAxisDefaultValueKey();
-//public static final native int NSFontVariationAxisIdentifierKey();
-//public static final native int NSFontVariationAxisMaximumValueKey();
-//public static final native int NSFontVariationAxisMinimumValueKey();
-//public static final native int NSFontVariationAxisNameKey();
-//public static final native int NSFontVisibleNameAttribute();
-//public static final native int NSFontWeightTrait();
-//public static final native int NSFontWidthTrait();
+public static final NSString NSFontAttributeName = new NSString(NSFontAttributeName());
 public static final native int NSForegroundColorAttributeName();
-//public static final native int NSFullScreenModeAllScreens();
-//public static final native int NSFullScreenModeSetting();
-//public static final native int NSFullScreenModeWindowLevel();
-//public static final native int NSGeneralPboard();
-//public static final native int NSGlyphInfoAttributeName();
-//public static final native int NSGraphicsContextDestinationAttributeName();
-//public static final native int NSGraphicsContextPDFFormat();
-//public static final native int NSGraphicsContextPSFormat();
-//public static final native int NSGraphicsContextRepresentationFormatAttributeName();
-//public static final native int NSHTMLPboardType();
-//public static final native int NSHTMLTextDocumentType();
-//public static final native int NSHandlesContentAsCompoundValueBindingOption();
-//public static final native int NSHeaderTitleBinding();
-//public static final native int NSHiddenBinding();
-//public static final native int NSHyphenationFactorDocumentAttribute();
-//public static final native int NSIllegalSelectorException();
-//public static final native int NSImageBinding();
-//public static final native int NSImageCacheException();
-//public static final native int NSImageColorSyncProfileData();
-//public static final native int NSImageCompressionFactor();
-//public static final native int NSImageCompressionMethod();
-//public static final native int NSImageCurrentFrame();
-//public static final native int NSImageCurrentFrameDuration();
-//public static final native int NSImageDitherTransparency();
-//public static final native int NSImageEXIFData();
-//public static final native int NSImageFallbackBackgroundColor();
-//public static final native int NSImageFrameCount();
-//public static final native int NSImageGamma();
-//public static final native int NSImageInterlaced();
-//public static final native int NSImageLoopCount();
-//public static final native int NSImageNameActionTemplate();
-//public static final native int NSImageNameAddTemplate();
-//public static final native int NSImageNameAdvanced();
-//public static final native int NSImageNameBluetoothTemplate();
-//public static final native int NSImageNameBonjour();
-//public static final native int NSImageNameColorPanel();
-//public static final native int NSImageNameColumnViewTemplate();
-//public static final native int NSImageNameComputer();
-//public static final native int NSImageNameDotMac();
-//public static final native int NSImageNameEnterFullScreenTemplate();
-//public static final native int NSImageNameEveryone();
-//public static final native int NSImageNameExitFullScreenTemplate();
-//public static final native int NSImageNameFlowViewTemplate();
-//public static final native int NSImageNameFolderBurnable();
-//public static final native int NSImageNameFolderSmart();
-//public static final native int NSImageNameFollowLinkFreestandingTemplate();
-//public static final native int NSImageNameFontPanel();
-//public static final native int NSImageNameGoLeftTemplate();
-//public static final native int NSImageNameGoRightTemplate();
-//public static final native int NSImageNameIChatTheaterTemplate();
-//public static final native int NSImageNameIconViewTemplate();
-//public static final native int NSImageNameInfo();
-//public static final native int NSImageNameInvalidDataFreestandingTemplate();
-//public static final native int NSImageNameLeftFacingTriangleTemplate();
-//public static final native int NSImageNameListViewTemplate();
-//public static final native int NSImageNameLockLockedTemplate();
-//public static final native int NSImageNameLockUnlockedTemplate();
-//public static final native int NSImageNameMultipleDocuments();
-//public static final native int NSImageNameNetwork();
-//public static final native int NSImageNamePathTemplate();
-//public static final native int NSImageNamePreferencesGeneral();
-//public static final native int NSImageNameQuickLookTemplate();
-//public static final native int NSImageNameRefreshFreestandingTemplate();
-//public static final native int NSImageNameRefreshTemplate();
-//public static final native int NSImageNameRemoveTemplate();
-//public static final native int NSImageNameRevealFreestandingTemplate();
-//public static final native int NSImageNameRightFacingTriangleTemplate();
-//public static final native int NSImageNameSlideshowTemplate();
-//public static final native int NSImageNameSmartBadgeTemplate();
-//public static final native int NSImageNameStopProgressFreestandingTemplate();
-//public static final native int NSImageNameStopProgressTemplate();
-//public static final native int NSImageNameUser();
-//public static final native int NSImageNameUserAccounts();
-//public static final native int NSImageNameUserGroup();
-//public static final native int NSImageProgressive();
-//public static final native int NSImageRGBColorTable();
-//public static final native int NSImageRepRegistryDidChangeNotification();
-//public static final native int NSIncludedKeysBinding();
-//public static final native int NSInitialKeyBinding();
-//public static final native int NSInitialValueBinding();
-//public static final native int NSInkTextPboardType();
-//public static final native int NSInsertsNullPlaceholderBindingOption();
-//public static final native int NSInterfaceStyleDefault();
-//public static final native int NSInvokesSeparatelyWithArrayObjectsBindingOption();
-//public static final native int NSIsIndeterminateBinding();
-//public static final native int NSKernAttributeName();
-//public static final native int NSKeywordsDocumentAttribute();
-//public static final native int NSLabelBinding();
-//public static final native int NSLeftMarginDocumentAttribute();
-//public static final native int NSLigatureAttributeName();
-//public static final native int NSLightGray();
+public static final NSString NSForegroundColorAttributeName = new NSString(NSForegroundColorAttributeName());
 public static final native int NSLinkAttributeName();
-//public static final native int NSLocalizedKeyDictionaryBinding();
-//public static final native int NSMacSimpleTextDocumentType();
-//public static final native int NSManagedObjectContextBinding();
-//public static final native int NSMarkedClauseSegmentAttributeName();
-//public static final native int NSMaxValueBinding();
-//public static final native int NSMaxWidthBinding();
-//public static final native int NSMaximumRecentsBinding();
-//public static final native int NSMenuDidAddItemNotification();
-//public static final native int NSMenuDidBeginTrackingNotification();
-//public static final native int NSMenuDidChangeItemNotification();
-//public static final native int NSMenuDidEndTrackingNotification();
-//public static final native int NSMenuDidRemoveItemNotification();
-//public static final native int NSMenuDidSendActionNotification();
-//public static final native int NSMenuWillSendActionNotification();
-//public static final native int NSMinValueBinding();
-//public static final native int NSMinWidthBinding();
-//public static final native int NSMixedStateImageBinding();
-//public static final native int NSModalPanelRunLoopMode();
-//public static final native int NSModificationTimeDocumentAttribute();
-//public static final native int NSMultipleTextSelectionPboardType();
-//public static final native int NSMultipleValuesMarker();
-//public static final native int NSMultipleValuesPlaceholderBindingOption();
-//public static final native int NSNamedColorSpace();
-//public static final native int NSNibLoadingException();
-//public static final native int NSNibOwner();
-//public static final native int NSNibTopLevelObjects();
-//public static final native int NSNoSelectionMarker();
-//public static final native int NSNoSelectionPlaceholderBindingOption();
-//public static final native int NSNotApplicableMarker();
-//public static final native int NSNotApplicablePlaceholderBindingOption();
-//public static final native int NSNullPlaceholderBindingOption();
-//public static final native int NSObliquenessAttributeName();
-//public static final native int NSObservedKeyPathKey();
-//public static final native int NSObservedObjectKey();
-//public static final native int NSOffStateImageBinding();
-//public static final native int NSOfficeOpenXMLTextDocumentType();
-//public static final native int NSOnStateImageBinding();
-//public static final native int NSOpenDocumentTextDocumentType();
-//public static final native int NSOptionsKey();
-//public static final native int NSOutlineViewColumnDidMoveNotification();
-//public static final native int NSOutlineViewColumnDidResizeNotification();
-//public static final native int NSOutlineViewItemDidCollapseNotification();
-//public static final native int NSOutlineViewItemDidExpandNotification();
-//public static final native int NSOutlineViewItemWillCollapseNotification();
-//public static final native int NSOutlineViewItemWillExpandNotification();
-//public static final native int NSOutlineViewSelectionDidChangeNotification();
-//public static final native int NSOutlineViewSelectionIsChangingNotification();
-//public static final native int NSPDFPboardType();
-//public static final native int NSPICTPboardType();
-//public static final native int NSPPDIncludeNotFoundException();
-//public static final native int NSPPDIncludeStackOverflowException();
-//public static final native int NSPPDIncludeStackUnderflowException();
-//public static final native int NSPPDParseException();
-//public static final native int NSPaperSizeDocumentAttribute();
+public static final NSString NSLinkAttributeName = new NSString(NSLinkAttributeName());
 public static final native int NSParagraphStyleAttributeName();
-//public static final native int NSPasteboardCommunicationException();
-//public static final native int NSPatternColorSpace();
-//public static final native int NSPlainFileType();
-//public static final native int NSPlainTextDocumentType();
-//public static final native int NSPopUpButtonCellWillPopUpNotification();
-//public static final native int NSPopUpButtonWillPopUpNotification();
-//public static final native int NSPostScriptPboardType();
-//public static final native int NSPredicateBinding();
-//public static final native int NSPredicateFormatBindingOption();
-//public static final native int NSPrefixSpacesDocumentAttribute();
+public static final NSString NSParagraphStyleAttributeName = new NSString(NSParagraphStyleAttributeName());
 public static final native int NSPrintAllPages();
-//public static final native int NSPrintBottomMargin();
-//public static final native int NSPrintCancelJob();
+public static final NSString NSPrintAllPages = new NSString(NSPrintAllPages());
 public static final native int NSPrintCopies();
-//public static final native int NSPrintDetailedErrorReporting();
-//public static final native int NSPrintFaxCoverSheetName();
-//public static final native int NSPrintFaxHighResolution();
-//public static final native int NSPrintFaxJob();
-//public static final native int NSPrintFaxModem();
-//public static final native int NSPrintFaxNumber();
-//public static final native int NSPrintFaxReceiverNames();
-//public static final native int NSPrintFaxReceiverNumbers();
-//public static final native int NSPrintFaxReturnReceipt();
-//public static final native int NSPrintFaxSendTime();
-//public static final native int NSPrintFaxTrimPageEnds();
-//public static final native int NSPrintFaxUseCoverSheet();
+public static final NSString NSPrintCopies = new NSString(NSPrintCopies());
 public static final native int NSPrintFirstPage();
-//public static final native int NSPrintFormName();
-//public static final native int NSPrintHeaderAndFooter();
-//public static final native int NSPrintHorizontalPagination();
-//public static final native int NSPrintHorizontallyCentered();
+public static final NSString NSPrintFirstPage = new NSString(NSPrintFirstPage());
 public static final native int NSPrintJobDisposition();
-//public static final native int NSPrintJobFeatures();
+public static final NSString NSPrintJobDisposition = new NSString(NSPrintJobDisposition());
 public static final native int NSPrintLastPage();
-//public static final native int NSPrintLeftMargin();
-//public static final native int NSPrintManualFeed();
+public static final NSString NSPrintLastPage = new NSString(NSPrintLastPage());
 public static final native int NSPrintMustCollate();
-//public static final native int NSPrintOperationExistsException();
-//public static final native int NSPrintOrientation();
-//public static final native int NSPrintPackageException();
-//public static final native int NSPrintPagesAcross();
-//public static final native int NSPrintPagesDown();
-//public static final native int NSPrintPagesPerSheet();
-//public static final native int NSPrintPanelAccessorySummaryItemDescriptionKey();
-//public static final native int NSPrintPanelAccessorySummaryItemNameKey();
-//public static final native int NSPrintPaperFeed();
-//public static final native int NSPrintPaperName();
-//public static final native int NSPrintPaperSize();
-//public static final native int NSPrintPhotoJobStyleHint();
+public static final NSString NSPrintMustCollate = new NSString(NSPrintMustCollate());
 public static final native int NSPrintPreviewJob();
-//public static final native int NSPrintPrinter();
-//public static final native int NSPrintPrinterName();
-//public static final native int NSPrintReversePageOrder();
-//public static final native int NSPrintRightMargin();
+public static final NSString NSPrintPreviewJob = new NSString(NSPrintPreviewJob());
 public static final native int NSPrintSaveJob();
+public static final NSString NSPrintSaveJob = new NSString(NSPrintSaveJob());
 public static final native int NSPrintSavePath();
-//public static final native int NSPrintScalingFactor();
+public static final NSString NSPrintSavePath = new NSString(NSPrintSavePath());
 public static final native int NSPrintSpoolJob();
-//public static final native int NSPrintTime();
-//public static final native int NSPrintTopMargin();
-//public static final native int NSPrintVerticalPagination();
-//public static final native int NSPrintVerticallyCentered();
-//public static final native int NSPrintingCommunicationException();
-//public static final native int NSRTFDPboardType();
-//public static final native int NSRTFDTextDocumentType();
-public static final NSString NSRTFPboardType = new NSString(NSRTFPboardType());
+public static final NSString NSPrintSpoolJob = new NSString(NSPrintSpoolJob());
 public static final native int NSRTFPboardType();
-//public static final native int NSRTFPropertyStackOverflowException();
-//public static final native int NSRTFTextDocumentType();
-//public static final native int NSRaisesForNotApplicableKeysBindingOption();
-//public static final native int NSReadOnlyDocumentAttribute();
-//public static final native int NSRecentSearchesBinding();
-//public static final native int NSRepresentedFilenameBinding();
-//public static final native int NSRightMarginDocumentAttribute();
-//public static final native int NSRowHeightBinding();
-//public static final native int NSRuleEditorPredicateComparisonModifier();
-//public static final native int NSRuleEditorPredicateCompoundType();
-//public static final native int NSRuleEditorPredicateCustomSelector();
-//public static final native int NSRuleEditorPredicateLeftExpression();
-//public static final native int NSRuleEditorPredicateOperatorType();
-//public static final native int NSRuleEditorPredicateOptions();
-//public static final native int NSRuleEditorPredicateRightExpression();
-//public static final native int NSRuleEditorRowsDidChangeNotification();
-//public static final native int NSRulerPboard();
-//public static final native int NSRulerPboardType();
-//public static final native int NSSelectedIdentifierBinding();
-//public static final native int NSSelectedIndexBinding();
-//public static final native int NSSelectedLabelBinding();
-//public static final native int NSSelectedObjectBinding();
-//public static final native int NSSelectedObjectsBinding();
-//public static final native int NSSelectedTagBinding();
-//public static final native int NSSelectedValueBinding();
-//public static final native int NSSelectedValuesBinding();
-//public static final native int NSSelectionIndexPathsBinding();
-//public static final native int NSSelectionIndexesBinding();
-//public static final native int NSSelectorNameBindingOption();
-//public static final native int NSSelectsAllWhenSettingContentBindingOption();
-//public static final native int NSShadowAttributeName();
-//public static final native int NSShellCommandFileType();
-//public static final native int NSSortDescriptorsBinding();
-//public static final native int NSSoundPboardType();
-//public static final native int NSSpeechCharacterModeProperty();
-//public static final native int NSSpeechCommandDelimiterProperty();
-//public static final native int NSSpeechCommandPrefix();
-//public static final native int NSSpeechCommandSuffix();
-//public static final native int NSSpeechCurrentVoiceProperty();
-//public static final native int NSSpeechDictionaryAbbreviations();
-//public static final native int NSSpeechDictionaryEntryPhonemes();
-//public static final native int NSSpeechDictionaryEntrySpelling();
-//public static final native int NSSpeechDictionaryLocaleIdentifier();
-//public static final native int NSSpeechDictionaryModificationDate();
-//public static final native int NSSpeechDictionaryPronunciations();
-//public static final native int NSSpeechErrorCount();
-//public static final native int NSSpeechErrorNewestCharacterOffset();
-//public static final native int NSSpeechErrorNewestCode();
-//public static final native int NSSpeechErrorOldestCharacterOffset();
-//public static final native int NSSpeechErrorOldestCode();
-//public static final native int NSSpeechErrorsProperty();
-//public static final native int NSSpeechInputModeProperty();
-//public static final native int NSSpeechModeLiteral();
-//public static final native int NSSpeechModeNormal();
-//public static final native int NSSpeechModePhoneme();
-//public static final native int NSSpeechModeText();
-//public static final native int NSSpeechNumberModeProperty();
-//public static final native int NSSpeechOutputToFileURLProperty();
-//public static final native int NSSpeechPhonemeInfoExample();
-//public static final native int NSSpeechPhonemeInfoHiliteEnd();
-//public static final native int NSSpeechPhonemeInfoHiliteStart();
-//public static final native int NSSpeechPhonemeInfoOpcode();
-//public static final native int NSSpeechPhonemeInfoSymbol();
-//public static final native int NSSpeechPhonemeSymbolsProperty();
-//public static final native int NSSpeechPitchBaseProperty();
-//public static final native int NSSpeechPitchModProperty();
-//public static final native int NSSpeechRateProperty();
-//public static final native int NSSpeechRecentSyncProperty();
-//public static final native int NSSpeechResetProperty();
-//public static final native int NSSpeechStatusNumberOfCharactersLeft();
-//public static final native int NSSpeechStatusOutputBusy();
-//public static final native int NSSpeechStatusOutputPaused();
-//public static final native int NSSpeechStatusPhonemeCode();
-//public static final native int NSSpeechStatusProperty();
-//public static final native int NSSpeechSynthesizerInfoIdentifier();
-//public static final native int NSSpeechSynthesizerInfoProperty();
-//public static final native int NSSpeechSynthesizerInfoVersion();
-//public static final native int NSSpeechVolumeProperty();
-//public static final native int NSSpellingStateAttributeName();
-//public static final native int NSSplitViewDidResizeSubviewsNotification();
-//public static final native int NSSplitViewWillResizeSubviewsNotification();
+public static final NSString NSRTFPboardType = new NSString(NSRTFPboardType());
 public static final native int NSStrikethroughColorAttributeName();
+public static final NSString NSStrikethroughColorAttributeName = new NSString(NSStrikethroughColorAttributeName());
 public static final native int NSStrikethroughStyleAttributeName();
-public static final NSString NSStringPboardType = new NSString(NSStringPboardType());
+public static final NSString NSStrikethroughStyleAttributeName = new NSString(NSStrikethroughStyleAttributeName());
 public static final native int NSStringPboardType();
-//public static final native int NSStrokeColorAttributeName();
-//public static final native int NSStrokeWidthAttributeName();
-//public static final native int NSSubjectDocumentAttribute();
-//public static final native int NSSuperscriptAttributeName();
-//public static final native int NSSystemColorsDidChangeNotification();
-//public static final native int NSTIFFException();
-public static final NSString NSTIFFPboardType = new NSString(NSTIFFPboardType());
+public static final NSString NSStringPboardType = new NSString(NSStringPboardType());
 public static final native int NSTIFFPboardType();
-//public static final native int NSTabColumnTerminatorsAttributeName();
-//public static final native int NSTableViewColumnDidMoveNotification();
-//public static final native int NSTableViewColumnDidResizeNotification();
-//public static final native int NSTableViewSelectionDidChangeNotification();
-//public static final native int NSTableViewSelectionIsChangingNotification();
-//public static final native int NSTabularTextPboardType();
-//public static final native int NSTargetBinding();
-//public static final native int NSTextColorBinding();
-//public static final native int NSTextDidBeginEditingNotification();
-//public static final native int NSTextDidChangeNotification();
-//public static final native int NSTextDidEndEditingNotification();
-//public static final native int NSTextEncodingNameDocumentAttribute();
-//public static final native int NSTextEncodingNameDocumentOption();
-//public static final native int NSTextLineTooLongException();
-//public static final native int NSTextNoSelectionException();
-//public static final native int NSTextReadException();
-//public static final native int NSTextSizeMultiplierDocumentOption();
-//public static final native int NSTextStorageDidProcessEditingNotification();
-//public static final native int NSTextStorageWillProcessEditingNotification();
-//public static final native int NSTextViewDidChangeSelectionNotification();
-//public static final native int NSTextViewDidChangeTypingAttributesNotification();
-//public static final native int NSTextViewWillChangeNotifyingTextViewNotification();
-//public static final native int NSTextWriteException();
-//public static final native int NSTimeoutDocumentOption();
-//public static final native int NSTitleBinding();
-//public static final native int NSTitleDocumentAttribute();
-//public static final native int NSToolTipAttributeName();
-//public static final native int NSToolTipBinding();
-//public static final native int NSToolbarCustomizeToolbarItemIdentifier();
-//public static final native int NSToolbarDidRemoveItemNotification();
-//public static final native int NSToolbarFlexibleSpaceItemIdentifier();
-//public static final native int NSToolbarPrintItemIdentifier();
-//public static final native int NSToolbarSeparatorItemIdentifier();
-//public static final native int NSToolbarShowColorsItemIdentifier();
-//public static final native int NSToolbarShowFontsItemIdentifier();
-//public static final native int NSToolbarSpaceItemIdentifier();
-//public static final native int NSToolbarWillAddItemNotification();
-//public static final native int NSTopMarginDocumentAttribute();
-//public static final native int NSTransparentBinding();
-//public static final native int NSTypedStreamVersionException();
-public static final NSString NSURLPboardType = new NSString(NSURLPboardType());
+public static final NSString NSTIFFPboardType = new NSString(NSTIFFPboardType());
 public static final native int NSURLPboardType();
-//public static final native int NSUnderlineByWordMask();
+public static final NSString NSURLPboardType = new NSString(NSURLPboardType());
 public static final native int NSUnderlineColorAttributeName();
-//public static final native int NSUnderlineStrikethroughMask();
+public static final NSString NSUnderlineColorAttributeName = new NSString(NSUnderlineColorAttributeName());
 public static final native int NSUnderlineStyleAttributeName();
-//public static final native int NSVCardPboardType();
-//public static final native int NSValidatesImmediatelyBindingOption();
-//public static final native int NSValueBinding();
-//public static final native int NSValuePathBinding();
-//public static final native int NSValueTransformerBindingOption();
-//public static final native int NSValueTransformerNameBindingOption();
-//public static final native int NSValueURLBinding();
-//public static final native int NSViewAnimationEffectKey();
-//public static final native int NSViewAnimationEndFrameKey();
-//public static final native int NSViewAnimationFadeInEffect();
-//public static final native int NSViewAnimationFadeOutEffect();
-//public static final native int NSViewAnimationStartFrameKey();
-//public static final native int NSViewAnimationTargetKey();
-//public static final native int NSViewBoundsDidChangeNotification();
-//public static final native int NSViewDidUpdateTrackingAreasNotification();
-//public static final native int NSViewFocusDidChangeNotification();
-//public static final native int NSViewFrameDidChangeNotification();
-//public static final native int NSViewGlobalFrameDidChangeNotification();
-//public static final native int NSViewModeDocumentAttribute();
-//public static final native int NSViewSizeDocumentAttribute();
-//public static final native int NSViewZoomDocumentAttribute();
-//public static final native int NSVisibleBinding();
-//public static final native int NSVoiceAge();
-//public static final native int NSVoiceDemoText();
-//public static final native int NSVoiceGender();
-//public static final native int NSVoiceGenderFemale();
-//public static final native int NSVoiceGenderMale();
-//public static final native int NSVoiceGenderNeuter();
-//public static final native int NSVoiceIdentifier();
-//public static final native int NSVoiceIndividuallySpokenCharacters();
-//public static final native int NSVoiceLocaleIdentifier();
-//public static final native int NSVoiceName();
-//public static final native int NSVoiceSupportedCharacters();
-//public static final native int NSWarningValueBinding();
-//public static final native int NSWebArchiveTextDocumentType();
-//public static final native int NSWebPreferencesDocumentOption();
-//public static final native int NSWebResourceLoadDelegateDocumentOption();
-//public static final native int NSWhite();
-//public static final native int NSWidthBinding();
-//public static final native int NSWindowDidBecomeKeyNotification();
-//public static final native int NSWindowDidBecomeMainNotification();
-//public static final native int NSWindowDidChangeScreenNotification();
-//public static final native int NSWindowDidChangeScreenProfileNotification();
-//public static final native int NSWindowDidDeminiaturizeNotification();
-//public static final native int NSWindowDidEndSheetNotification();
-//public static final native int NSWindowDidExposeNotification();
-//public static final native int NSWindowDidMiniaturizeNotification();
-//public static final native int NSWindowDidMoveNotification();
-//public static final native int NSWindowDidResignKeyNotification();
-//public static final native int NSWindowDidResignMainNotification();
-//public static final native int NSWindowDidResizeNotification();
-//public static final native int NSWindowDidUpdateNotification();
-//public static final native int NSWindowServerCommunicationException();
-//public static final native int NSWindowWillBeginSheetNotification();
-//public static final native int NSWindowWillCloseNotification();
-//public static final native int NSWindowWillMiniaturizeNotification();
-//public static final native int NSWindowWillMoveNotification();
-//public static final native int NSWordMLTextDocumentType();
-//public static final native int NSWordTablesReadException();
-//public static final native int NSWordTablesWriteException();
-//public static final native int NSWorkspaceCompressOperation();
-//public static final native int NSWorkspaceCopyOperation();
-//public static final native int NSWorkspaceDecompressOperation();
-//public static final native int NSWorkspaceDecryptOperation();
-//public static final native int NSWorkspaceDestroyOperation();
-//public static final native int NSWorkspaceDidLaunchApplicationNotification();
-//public static final native int NSWorkspaceDidMountNotification();
-//public static final native int NSWorkspaceDidPerformFileOperationNotification();
-//public static final native int NSWorkspaceDidTerminateApplicationNotification();
-//public static final native int NSWorkspaceDidUnmountNotification();
-//public static final native int NSWorkspaceDidWakeNotification();
-//public static final native int NSWorkspaceDuplicateOperation();
-//public static final native int NSWorkspaceEncryptOperation();
-//public static final native int NSWorkspaceLinkOperation();
-//public static final native int NSWorkspaceMoveOperation();
-//public static final native int NSWorkspaceRecycleOperation();
-//public static final native int NSWorkspaceSessionDidBecomeActiveNotification();
-//public static final native int NSWorkspaceSessionDidResignActiveNotification();
-//public static final native int NSWorkspaceWillLaunchApplicationNotification();
-//public static final native int NSWorkspaceWillPowerOffNotification();
-//public static final native int NSWorkspaceWillSleepNotification();
-//public static final native int NSWorkspaceWillUnmountNotification();
-//public static final native int NSAppleEventManagerWillProcessFirstEventNotification();
-//public static final native int NSAppleEventTimeOutDefault();
-//public static final native int NSAppleEventTimeOutNone();
-//public static final native int NSAppleScriptErrorAppName();
-//public static final native int NSAppleScriptErrorBriefMessage();
-//public static final native int NSAppleScriptErrorMessage();
-//public static final native int NSAppleScriptErrorNumber();
-//public static final native int NSAppleScriptErrorRange();
-//public static final native int NSArgumentDomain();
-//public static final native int NSAverageKeyValueOperator();
-//public static final native int NSBuddhistCalendar();
-//public static final native int NSBundleDidLoadNotification();
-//public static final native int NSCharacterConversionException();
-//public static final native int NSChineseCalendar();
-//public static final native int NSClassDescriptionNeededForClassNotification();
-//public static final native int NSCocoaErrorDomain();
-//public static final native int NSConnectionDidDieNotification();
-//public static final native int NSConnectionDidInitializeNotification();
-//public static final native int NSConnectionReplyMode();
-//public static final native int NSCountKeyValueOperator();
-//public static final native int NSCurrentLocaleDidChangeNotification();
-//public static final native int NSDeallocateZombies();
-//public static final native int NSDebugEnabled();
-//public static final native int NSDecimalNumberDivideByZeroException();
-//public static final native int NSDecimalNumberExactnessException();
-//public static final native int NSDecimalNumberOverflowException();
-//public static final native int NSDecimalNumberUnderflowException();
-public static final NSString NSDefaultRunLoopMode = new NSString(OS.NSDefaultRunLoopMode());
+public static final NSString NSUnderlineStyleAttributeName = new NSString(NSUnderlineStyleAttributeName());
 public static final native int NSDefaultRunLoopMode();
-//public static final native int NSDestinationInvalidException();
-//public static final native int NSDidBecomeSingleThreadedNotification();
-//public static final native int NSDistinctUnionOfArraysKeyValueOperator();
-//public static final native int NSDistinctUnionOfObjectsKeyValueOperator();
-//public static final native int NSDistinctUnionOfSetsKeyValueOperator();
+public static final NSString NSDefaultRunLoopMode = new NSString(NSDefaultRunLoopMode());
 public static final native int NSErrorFailingURLStringKey();
-//public static final native int NSFailedAuthenticationException();
-//public static final native int NSFileAppendOnly();
-//public static final native int NSFileBusy();
-//public static final native int NSFileCreationDate();
-//public static final native int NSFileDeviceIdentifier();
-//public static final native int NSFileExtensionHidden();
-//public static final native int NSFileGroupOwnerAccountID();
-//public static final native int NSFileGroupOwnerAccountName();
-//public static final native int NSFileHFSCreatorCode();
-//public static final native int NSFileHFSTypeCode();
-//public static final native int NSFileHandleConnectionAcceptedNotification();
-//public static final native int NSFileHandleDataAvailableNotification();
-//public static final native int NSFileHandleNotificationDataItem();
-//public static final native int NSFileHandleNotificationFileHandleItem();
-//public static final native int NSFileHandleNotificationMonitorModes();
-//public static final native int NSFileHandleOperationException();
-//public static final native int NSFileHandleReadCompletionNotification();
-//public static final native int NSFileHandleReadToEndOfFileCompletionNotification();
-//public static final native int NSFileImmutable();
-//public static final native int NSFileModificationDate();
-//public static final native int NSFileOwnerAccountID();
-//public static final native int NSFileOwnerAccountName();
-//public static final native int NSFilePathErrorKey();
-//public static final native int NSFilePosixPermissions();
-//public static final native int NSFileReferenceCount();
-//public static final native int NSFileSize();
-//public static final native int NSFileSystemFileNumber();
-//public static final native int NSFileSystemFreeNodes();
-//public static final native int NSFileSystemFreeSize();
-//public static final native int NSFileSystemNodes();
-//public static final native int NSFileSystemNumber();
-//public static final native int NSFileSystemSize();
-//public static final native int NSFileType();
-//public static final native int NSFileTypeBlockSpecial();
-//public static final native int NSFileTypeCharacterSpecial();
-//public static final native int NSFileTypeDirectory();
-//public static final native int NSFileTypeRegular();
-//public static final native int NSFileTypeSocket();
-//public static final native int NSFileTypeSymbolicLink();
-//public static final native int NSFileTypeUnknown();
-//public static final native int NSFoundationVersionNumber();
-//public static final native int NSGenericException();
-//public static final native int NSGlobalDomain();
-//public static final native int NSGrammarCorrections();
-//public static final native int NSGrammarRange();
-//public static final native int NSGrammarUserDescription();
-//public static final native int NSGregorianCalendar();
-//public static final native int NSHTTPCookieComment();
-//public static final native int NSHTTPCookieCommentURL();
-//public static final native int NSHTTPCookieDiscard();
-//public static final native int NSHTTPCookieDomain();
-//public static final native int NSHTTPCookieExpires();
-//public static final native int NSHTTPCookieManagerAcceptPolicyChangedNotification();
-//public static final native int NSHTTPCookieManagerCookiesChangedNotification();
-//public static final native int NSHTTPCookieMaximumAge();
-//public static final native int NSHTTPCookieName();
-//public static final native int NSHTTPCookieOriginURL();
-//public static final native int NSHTTPCookiePath();
-//public static final native int NSHTTPCookiePort();
-//public static final native int NSHTTPCookieSecure();
-//public static final native int NSHTTPCookieValue();
-//public static final native int NSHTTPCookieVersion();
-//public static final native int NSHangOnUncaughtException();
-//public static final native int NSHebrewCalendar();
-//public static final native int NSInconsistentArchiveException();
-//public static final native int NSIntegerHashCallBacks();
-//public static final native int NSIntegerMapKeyCallBacks();
-//public static final native int NSIntegerMapValueCallBacks();
-//public static final native int NSInternalInconsistencyException();
-//public static final native int NSInvalidArchiveOperationException();
-//public static final native int NSInvalidArgumentException();
-//public static final native int NSInvalidReceivePortException();
-//public static final native int NSInvalidSendPortException();
-//public static final native int NSInvalidUnarchiveOperationException();
-//public static final native int NSInvocationOperationCancelledException();
-//public static final native int NSInvocationOperationVoidResultException();
-//public static final native int NSIsNilTransformerName();
-//public static final native int NSIsNotNilTransformerName();
-//public static final native int NSIslamicCalendar();
-//public static final native int NSIslamicCivilCalendar();
-//public static final native int NSJapaneseCalendar();
-//public static final native int NSKeepAllocationStatistics();
-//public static final native int NSKeyValueChangeIndexesKey();
-//public static final native int NSKeyValueChangeKindKey();
-//public static final native int NSKeyValueChangeNewKey();
-//public static final native int NSKeyValueChangeNotificationIsPriorKey();
-//public static final native int NSKeyValueChangeOldKey();
-//public static final native int NSKeyedUnarchiveFromDataTransformerName();
-//public static final native int NSLoadedClasses();
-//public static final native int NSLocalNotificationCenterType();
-//public static final native int NSLocaleCalendar();
-//public static final native int NSLocaleCollationIdentifier();
-//public static final native int NSLocaleCountryCode();
-//public static final native int NSLocaleCurrencyCode();
-//public static final native int NSLocaleCurrencySymbol();
-//public static final native int NSLocaleDecimalSeparator();
-//public static final native int NSLocaleExemplarCharacterSet();
-//public static final native int NSLocaleGroupingSeparator();
-//public static final native int NSLocaleIdentifier();
-//public static final native int NSLocaleLanguageCode();
-//public static final native int NSLocaleMeasurementSystem();
-//public static final native int NSLocaleScriptCode();
-//public static final native int NSLocaleUsesMetricSystem();
-//public static final native int NSLocaleVariantCode();
-//public static final native int NSLocalizedDescriptionKey();
-//public static final native int NSLocalizedFailureReasonErrorKey();
-//public static final native int NSLocalizedRecoveryOptionsErrorKey();
-//public static final native int NSLocalizedRecoverySuggestionErrorKey();
-//public static final native int NSMachErrorDomain();
-//public static final native int NSMallocException();
-//public static final native int NSMaximumKeyValueOperator();
-//public static final native int NSMetadataQueryDidFinishGatheringNotification();
-//public static final native int NSMetadataQueryDidStartGatheringNotification();
-//public static final native int NSMetadataQueryDidUpdateNotification();
-//public static final native int NSMetadataQueryGatheringProgressNotification();
-//public static final native int NSMetadataQueryLocalComputerScope();
-//public static final native int NSMetadataQueryNetworkScope();
-//public static final native int NSMetadataQueryResultContentRelevanceAttribute();
-//public static final native int NSMetadataQueryUserHomeScope();
-//public static final native int NSMinimumKeyValueOperator();
-//public static final native int NSNegateBooleanTransformerName();
-//public static final native int NSNetServicesErrorCode();
-//public static final native int NSNetServicesErrorDomain();
-//public static final native int NSNonOwnedPointerHashCallBacks();
-//public static final native int NSNonOwnedPointerMapKeyCallBacks();
-//public static final native int NSNonOwnedPointerMapValueCallBacks();
-//public static final native int NSNonOwnedPointerOrNullMapKeyCallBacks();
-//public static final native int NSNonRetainedObjectHashCallBacks();
-//public static final native int NSNonRetainedObjectMapKeyCallBacks();
-//public static final native int NSNonRetainedObjectMapValueCallBacks();
-//public static final native int NSOSStatusErrorDomain();
-//public static final native int NSObjectHashCallBacks();
-//public static final native int NSObjectInaccessibleException();
-//public static final native int NSObjectMapKeyCallBacks();
-//public static final native int NSObjectMapValueCallBacks();
-//public static final native int NSObjectNotAvailableException();
-//public static final native int NSOldStyleException();
-//public static final native int NSOperationNotSupportedForKeyException();
-//public static final native int NSOwnedObjectIdentityHashCallBacks();
-//public static final native int NSOwnedPointerHashCallBacks();
-//public static final native int NSOwnedPointerMapKeyCallBacks();
-//public static final native int NSOwnedPointerMapValueCallBacks();
-//public static final native int NSPOSIXErrorDomain();
-//public static final native int NSParseErrorException();
-//public static final native int NSPointerToStructHashCallBacks();
-//public static final native int NSPortDidBecomeInvalidNotification();
-//public static final native int NSPortReceiveException();
-//public static final native int NSPortSendException();
-//public static final native int NSPortTimeoutException();
-//public static final native int NSRangeException();
-//public static final native int NSRecoveryAttempterErrorKey();
-//public static final native int NSRegistrationDomain();
-//public static final native int NSRunLoopCommonModes();
-//public static final native int NSStreamDataWrittenToMemoryStreamKey();
-//public static final native int NSStreamFileCurrentOffsetKey();
-//public static final native int NSStreamSOCKSErrorDomain();
-//public static final native int NSStreamSOCKSProxyConfigurationKey();
-//public static final native int NSStreamSOCKSProxyHostKey();
-//public static final native int NSStreamSOCKSProxyPasswordKey();
-//public static final native int NSStreamSOCKSProxyPortKey();
-//public static final native int NSStreamSOCKSProxyUserKey();
-//public static final native int NSStreamSOCKSProxyVersion4();
-//public static final native int NSStreamSOCKSProxyVersion5();
-//public static final native int NSStreamSOCKSProxyVersionKey();
-//public static final native int NSStreamSocketSSLErrorDomain();
-//public static final native int NSStreamSocketSecurityLevelKey();
-//public static final native int NSStreamSocketSecurityLevelNegotiatedSSL();
-//public static final native int NSStreamSocketSecurityLevelNone();
-//public static final native int NSStreamSocketSecurityLevelSSLv2();
-//public static final native int NSStreamSocketSecurityLevelSSLv3();
-//public static final native int NSStreamSocketSecurityLevelTLSv1();
-//public static final native int NSStringEncodingErrorKey();
-//public static final native int NSSumKeyValueOperator();
-//public static final native int NSSystemTimeZoneDidChangeNotification();
-//public static final native int NSTaskDidTerminateNotification();
-//public static final native int NSThreadWillExitNotification();
-//public static final native int NSURLAuthenticationMethodDefault();
-//public static final native int NSURLAuthenticationMethodHTMLForm();
-//public static final native int NSURLAuthenticationMethodHTTPBasic();
-//public static final native int NSURLAuthenticationMethodHTTPDigest();
-//public static final native int NSURLCredentialStorageChangedNotification();
-//public static final native int NSURLErrorDomain();
-//public static final native int NSURLErrorKey();
-//public static final native int NSURLFileScheme();
-//public static final native int NSURLProtectionSpaceFTPProxy();
-//public static final native int NSURLProtectionSpaceHTTPProxy();
-//public static final native int NSURLProtectionSpaceHTTPSProxy();
-//public static final native int NSURLProtectionSpaceSOCKSProxy();
-//public static final native int NSUnarchiveFromDataTransformerName();
-//public static final native int NSUndefinedKeyException();
-//public static final native int NSUnderlyingErrorKey();
-//public static final native int NSUndoManagerCheckpointNotification();
-//public static final native int NSUndoManagerDidOpenUndoGroupNotification();
-//public static final native int NSUndoManagerDidRedoChangeNotification();
-//public static final native int NSUndoManagerDidUndoChangeNotification();
-//public static final native int NSUndoManagerWillCloseUndoGroupNotification();
-//public static final native int NSUndoManagerWillRedoChangeNotification();
-//public static final native int NSUndoManagerWillUndoChangeNotification();
-//public static final native int NSUnionOfArraysKeyValueOperator();
-//public static final native int NSUnionOfObjectsKeyValueOperator();
-//public static final native int NSUnionOfSetsKeyValueOperator();
-//public static final native int NSUserDefaultsDidChangeNotification();
-//public static final native int NSWillBecomeMultiThreadedNotification();
-//public static final native int NSXMLParserErrorDomain();
-//public static final native int NSZeroPoint();
-//public static final native int NSZeroRect();
-//public static final native int NSZeroSize();
-//public static final native int NSZombieEnabled();
-//public static final native int DOMEventException();
-//public static final native int DOMException();
-//public static final native int DOMRangeException();
-//public static final native int DOMXPathException();
-//public static final native int WebActionButtonKey();
-//public static final native int WebActionElementKey();
-//public static final native int WebActionModifierFlagsKey();
-//public static final native int WebActionNavigationTypeKey();
-//public static final native int WebActionOriginalURLKey();
-//public static final native int WebArchivePboardType();
-//public static final native int WebElementDOMNodeKey();
-//public static final native int WebElementFrameKey();
-//public static final native int WebElementImageAltStringKey();
-//public static final native int WebElementImageKey();
-//public static final native int WebElementImageRectKey();
-//public static final native int WebElementImageURLKey();
-//public static final native int WebElementIsSelectedKey();
-//public static final native int WebElementLinkLabelKey();
-//public static final native int WebElementLinkTargetFrameKey();
-//public static final native int WebElementLinkTitleKey();
-//public static final native int WebElementLinkURLKey();
-//public static final native int WebHistoryAllItemsRemovedNotification();
-//public static final native int WebHistoryItemChangedNotification();
-//public static final native int WebHistoryItemsAddedNotification();
-//public static final native int WebHistoryItemsKey();
-//public static final native int WebHistoryItemsRemovedNotification();
-//public static final native int WebHistoryLoadedNotification();
-//public static final native int WebHistorySavedNotification();
-//public static final native int WebKitErrorDomain();
-//public static final native int WebKitErrorMIMETypeKey();
-//public static final native int WebKitErrorPlugInNameKey();
-//public static final native int WebKitErrorPlugInPageURLStringKey();
-//public static final native int WebPlugInAttributesKey();
-//public static final native int WebPlugInBaseURLKey();
-//public static final native int WebPlugInContainerKey();
-//public static final native int WebPlugInContainingElementKey();
-//public static final native int WebPreferencesChangedNotification();
-//public static final native int WebViewDidBeginEditingNotification();
-//public static final native int WebViewDidChangeNotification();
-//public static final native int WebViewDidChangeSelectionNotification();
-//public static final native int WebViewDidChangeTypingStyleNotification();
-//public static final native int WebViewDidEndEditingNotification();
-//public static final native int WebViewProgressEstimateChangedNotification();
-//public static final native int WebViewProgressFinishedNotification();
-//public static final native int WebViewProgressStartedNotification();
+public static final NSString NSErrorFailingURLStringKey = new NSString(NSErrorFailingURLStringKey());
 
 /** Functions */
-//public static final native int NSAccessibilityActionDescription(int action);
-//public static final native void NSAccessibilityPostNotification(int element, int notification);
-//public static final native void NSAccessibilityRaiseBadArgumentException(int element, int attribute, int value);
-//public static final native int NSAccessibilityRoleDescription(int role, int subrole);
-//public static final native int NSAccessibilityRoleDescriptionForUIElement(int element);
-//public static final native int NSAccessibilityUnignoredAncestor(int element);
-//public static final native int NSAccessibilityUnignoredChildren(int originalChildren);
-//public static final native int NSAccessibilityUnignoredChildrenForOnlyChild(int originalChild);
-//public static final native int NSAccessibilityUnignoredDescendant(int element);
-//public static final native boolean NSApplicationLoad();
-//public static final native int NSApplicationMain(int argc, int argv);
-//public static final native int NSAvailableWindowDepths();
-//public static final native void NSBeep();
-//public static final native void NSBeginAlertSheet(int title, int defaultButton, int alternateButton, int otherButton, int docWindow, int modalDelegate, int didEndSelector, int didDismissSelector, int contextInfo, int msgFormat);
-//public static final native void NSBeginCriticalAlertSheet(int title, int defaultButton, int alternateButton, int otherButton, int docWindow, int modalDelegate, int didEndSelector, int didDismissSelector, int contextInfo, int msgFormat);
-//public static final native void NSBeginInformationalAlertSheet(int title, int defaultButton, int alternateButton, int otherButton, int docWindow, int modalDelegate, int didEndSelector, int didDismissSelector, int contextInfo, int msgFormat);
-//public static final native int NSBestDepth(int colorSpace, int bps, int bpp, boolean planar, int exactMatch);
 public static final native int NSBitsPerPixelFromDepth(int depth);
-//public static final native int NSBitsPerSampleFromDepth(int depth);
-//public static final native int NSColorSpaceFromDepth(int depth);
-//public static final native int NSConvertGlyphsToPackedGlyphs(int glBuf, int count, int packing, int packedGlyphs);
-//public static final native void NSCopyBits(int srcGState, NSRect srcRect, NSPoint destPoint);
-//public static final native void NSCountWindows(int count);
-//public static final native void NSCountWindowsForContext(int context, int count);
-//public static final native int NSCreateFileContentsPboardType(int fileType);
-//public static final native int NSCreateFilenamePboardType(int fileType);
-//public static final native void NSDisableScreenUpdates();
-//public static final native void NSDottedFrameRect(NSRect aRect);
-//public static final native void NSDrawBitmap(NSRect rect, int width, int height, int bps, int spp, int bpp, int bpr, boolean isPlanar, boolean hasAlpha, int colorSpaceName, int data);
-//public static final native void NSDrawButton(NSRect aRect, NSRect clipRect);
-////public static final native NSRect NSDrawColorTiledRects(NSRect boundsRect, NSRect clipRect, int sides, int colors, int count);
-//public static final native void NSDrawDarkBezel(NSRect aRect, NSRect clipRect);
-//public static final native void NSDrawGrayBezel(NSRect aRect, NSRect clipRect);
-//public static final native void NSDrawGroove(NSRect aRect, NSRect clipRect);
-//public static final native void NSDrawLightBezel(NSRect aRect, NSRect clipRect);
-//public static final native void NSDrawNinePartImage(NSRect frame, int topLeftCorner, int topEdgeFill, int topRightCorner, int leftEdgeFill, int centerFill, int rightEdgeFill, int bottomLeftCorner, int bottomEdgeFill, int bottomRightCorner, int op, float alphaFraction, boolean flipped);
-//public static final native void NSDrawThreePartImage(NSRect frame, int startCap, int centerFill, int endCap, boolean vertical, int op, float alphaFraction, boolean flipped);
-////public static final native NSRect NSDrawTiledRects(NSRect boundsRect, NSRect clipRect, int sides, int grays, int count);
-//public static final native void NSDrawWhiteBezel(NSRect aRect, NSRect clipRect);
-//public static final native void NSDrawWindowBackground(NSRect aRect);
-//public static final native void NSEnableScreenUpdates();
-//public static final native void NSEraseRect(NSRect aRect);
-//public static final native int NSEventMaskFromType(int type);
-//public static final native void NSFrameRect(NSRect aRect);
-//public static final native void NSFrameRectWithWidth(NSRect aRect, float frameWidth);
-//public static final native void NSFrameRectWithWidthUsingOperation(NSRect aRect, float frameWidth, int op);
-//public static final native int NSGetAlertPanel(int title, int msgFormat, int defaultButton, int alternateButton, int otherButton);
-//public static final native int NSGetCriticalAlertPanel(int title, int msgFormat, int defaultButton, int alternateButton, int otherButton);
-//public static final native int NSGetFileType(int pboardType);
-//public static final native int NSGetFileTypes(int pboardTypes);
-//public static final native int NSGetInformationalAlertPanel(int title, int msgFormat, int defaultButton, int alternateButton, int otherButton);
-//public static final native int NSGetWindowServerMemory(int context, int virtualMemory, int windowBackingMemory, int windowDumpString);
-//public static final native void NSHighlightRect(NSRect aRect);
-//public static final native int NSInterfaceStyleForKey(int key, int responder);
-//public static final native boolean NSIsControllerMarker(int object);
-//public static final native int NSNumberOfColorComponents(int colorSpaceName);
-//public static final native void NSOpenGLGetOption(int pname, int param);
-//public static final native void NSOpenGLGetVersion(int major, int minor);
-//public static final native void NSOpenGLSetOption(int pname, int param);
-//public static final native boolean NSPerformService(int itemName, int pboard);
-//public static final native boolean NSPlanarFromDepth(int depth);
-//public static final native int NSReadPixel(NSPoint passedPoint);
-//public static final native void NSRectClip(NSRect aRect);
-//public static final native void NSRectClipList(int rects, int count);
-//public static final native void NSRectFill(NSRect aRect);
-//public static final native void NSRectFillList(int rects, int count);
-//public static final native void NSRectFillListUsingOperation(int rects, int count, int op);
-//public static final native void NSRectFillListWithColors(int rects, int colors, int num);
-//public static final native void NSRectFillListWithColorsUsingOperation(int rects, int colors, int num, int op);
-//public static final native void NSRectFillListWithGrays(int rects, int grays, int num);
-//public static final native void NSRectFillUsingOperation(NSRect aRect, int op);
-//public static final native void NSRegisterServicesProvider(int provider, int name);
-//public static final native void NSReleaseAlertPanel(int panel);
-//public static final native int NSRunAlertPanel(int title, int msgFormat, int defaultButton, int alternateButton, int otherButton);
-//public static final native int NSRunAlertPanelRelativeToWindow(int title, int msgFormat, int defaultButton, int alternateButton, int otherButton, int docWindow);
-//public static final native int NSRunCriticalAlertPanel(int title, int msgFormat, int defaultButton, int alternateButton, int otherButton);
-//public static final native int NSRunCriticalAlertPanelRelativeToWindow(int title, int msgFormat, int defaultButton, int alternateButton, int otherButton, int docWindow);
-//public static final native int NSRunInformationalAlertPanel(int title, int msgFormat, int defaultButton, int alternateButton, int otherButton);
-//public static final native int NSRunInformationalAlertPanelRelativeToWindow(int title, int msgFormat, int defaultButton, int alternateButton, int otherButton, int docWindow);
-//public static final native void NSSetFocusRingStyle(int placement);
-//public static final native int NSSetShowsServicesMenuItem(int itemName, boolean enabled);
-////public static final native void NSShowAnimationEffect(int animationEffect, NSPoint centerLocation, NSSize size, int animationDelegate, int didEndSelector, int contextInfo);
-//public static final native boolean NSShowsServicesMenuItem(int itemName);
-//public static final native void NSUnregisterServicesProvider(int name);
-//public static final native void NSUpdateDynamicServices();
-//public static final native void NSWindowList(int size, int list);
-//public static final native void NSWindowListForContext(int context, int size, int list);
-//public static final native int NSAllHashTableObjects(int table);
-//public static final native int NSAllMapTableKeys(int table);
-//public static final native int NSAllMapTableValues(int table);
-//public static final native int NSAllocateCollectable(int size, int options);
-//public static final native int NSAllocateMemoryPages(int bytes);
-//public static final native int NSAllocateObject(int aClass, int extraBytes, int zone);
-//public static final native int NSClassFromString(int aClassName);
-//public static final native boolean NSCompareHashTables(int table1, int table2);
-//public static final native boolean NSCompareMapTables(int table1, int table2);
-//public static final native boolean NSContainsRect(NSRect aRect, NSRect bRect);
-////public static final native NSSwappedDouble NSConvertHostDoubleToSwapped(double x);
-////public static final native NSSwappedFloat NSConvertHostFloatToSwapped(float x);
-//public static final native double NSConvertSwappedDoubleToHost(NSSwappedDouble x);
-//public static final native float NSConvertSwappedFloatToHost(NSSwappedFloat x);
-//public static final native int NSCopyHashTableWithZone(int table, int zone);
-//public static final native int NSCopyMapTableWithZone(int table, int zone);
-//public static final native void NSCopyMemoryPages(int source, int dest, int bytes);
-//public static final native int NSCopyObject(int object, int extraBytes, int zone);
-//public static final native int NSCountFrames();
-//public static final native int NSCountHashTable(int table);
-//public static final native int NSCountMapTable(int table);
-//public static final native int NSCreateHashTable(NSHashTableCallBacks callBacks, int capacity);
-//public static final native int NSCreateHashTableWithZone(NSHashTableCallBacks callBacks, int capacity, int zone);
-//public static final native int NSCreateMapTable(NSMapTableKeyCallBacks keyCallBacks, NSMapTableValueCallBacks valueCallBacks, int capacity);
-//public static final native int NSCreateMapTableWithZone(NSMapTableKeyCallBacks keyCallBacks, NSMapTableValueCallBacks valueCallBacks, int capacity, int zone);
-//public static final native int NSCreateZone(int startSize, int granularity, boolean canFree);
-//public static final native void NSDeallocateMemoryPages(int ptr, int bytes);
-//public static final native void NSDeallocateObject(int object);
-//public static final native int NSDecimalAdd(int result, int leftOperand, int rightOperand, int roundingMode);
-//public static final native void NSDecimalCompact(int number);
-//public static final native int NSDecimalCompare(int leftOperand, int rightOperand);
-//public static final native void NSDecimalCopy(int destination, int source);
-//public static final native int NSDecimalDivide(int result, int leftOperand, int rightOperand, int roundingMode);
-//public static final native boolean NSDecimalIsNotANumber(int dcm);
-//public static final native int NSDecimalMultiply(int result, int leftOperand, int rightOperand, int roundingMode);
-//public static final native int NSDecimalMultiplyByPowerOf10(int result, int number, short power, int roundingMode);
-//public static final native int NSDecimalNormalize(int number1, int number2, int roundingMode);
-//public static final native int NSDecimalPower(int result, int number, int power, int roundingMode);
-//public static final native void NSDecimalRound(int result, int number, int scale, int roundingMode);
-//public static final native int NSDecimalString(int dcm, int locale);
-//public static final native int NSDecimalSubtract(int result, int leftOperand, int rightOperand, int roundingMode);
-//public static final native boolean NSDecrementExtraRefCountWasZero(int object);
-//public static final native int NSDefaultMallocZone();
-//public static final native void NSDivideRect(NSRect inRect, int slice, int rem, float amount, int edge);
-//public static final native void NSEndHashTableEnumeration(int enumerator);
-//public static final native void NSEndMapTableEnumeration(int enumerator);
-////public static final native NSHashEnumerator NSEnumerateHashTable(int table);
-////public static final native NSMapEnumerator NSEnumerateMapTable(int table);
-//public static final native boolean NSEqualPoints(NSPoint aPoint, NSPoint bPoint);
-//public static final native boolean NSEqualRanges(NSRange range1, NSRange range2);
-//public static final native boolean NSEqualRects(NSRect aRect, NSRect bRect);
-//public static final native boolean NSEqualSizes(NSSize aSize, NSSize bSize);
-//public static final native int NSExtraRefCount(int object);
 public static final native int NSFileTypeForHFSTypeCode(int hfsFileTypeCode);
-//public static final native int NSFrameAddress(int frame);
-//public static final native void NSFreeHashTable(int table);
-//public static final native void NSFreeMapTable(int table);
-//public static final native int NSFullUserName();
-//public static final native int NSGetSizeAndAlignment(int typePtr, int sizep, int alignp);
-//public static final native int NSGetUncaughtExceptionHandler();
-//public static final native int NSHFSTypeCodeFromFileType(int fileTypeString);
-//public static final native int NSHFSTypeOfFile(int fullFilePath);
-//public static final native int NSHashGet(int table, int pointer);
-//public static final native void NSHashInsert(int table, int pointer);
-//public static final native int NSHashInsertIfAbsent(int table, int pointer);
-//public static final native void NSHashInsertKnownAbsent(int table, int pointer);
-//public static final native void NSHashRemove(int table, int pointer);
-//public static final native float NSHeight(NSRect aRect);
-//public static final native int NSHomeDirectory();
-//public static final native int NSHomeDirectoryForUser(int userName);
-//public static final native int NSHostByteOrder();
-//public static final native void NSIncrementExtraRefCount(int object);
-////public static final native NSRect NSInsetRect(NSRect aRect, float dX, float dY);
-////public static final native NSRect NSIntegralRect(NSRect aRect);
-////public static final native NSRange NSIntersectionRange(NSRange range1, NSRange range2);
-////public static final native NSRect NSIntersectionRect(NSRect aRect, NSRect bRect);
-//public static final native boolean NSIntersectsRect(NSRect aRect, NSRect bRect);
-//public static final native boolean NSIsEmptyRect(NSRect aRect);
-//public static final native boolean NSIsFreedObject(int anObject);
-//public static final native boolean NSLocationInRange(int loc, NSRange range);
-//public static final native void NSLog(int format);
-//public static final native int NSLogPageSize();
-//public static final native void NSLogv(int format, int args);
-//public static final native int NSMakeCollectable(int cf);
-////public static final native NSPoint NSMakePoint(float x, float y);
-////public static final native NSRange NSMakeRange(int loc, int len);
-////public static final native NSRect NSMakeRect(float x, float y, float w, float h);
-////public static final native NSSize NSMakeSize(float w, float h);
-//public static final native int NSMapGet(int table, int key);
-//public static final native void NSMapInsert(int table, int key, int value);
-//public static final native int NSMapInsertIfAbsent(int table, int key, int value);
-//public static final native void NSMapInsertKnownAbsent(int table, int key, int value);
-//public static final native boolean NSMapMember(int table, int key, int originalKey, int value);
-//public static final native void NSMapRemove(int table, int key);
-//public static final native int NSMaxRange(NSRange range);
-//public static final native float NSMaxX(NSRect aRect);
-//public static final native float NSMaxY(NSRect aRect);
-//public static final native float NSMidX(NSRect aRect);
-//public static final native float NSMidY(NSRect aRect);
-//public static final native float NSMinX(NSRect aRect);
-//public static final native float NSMinY(NSRect aRect);
-//public static final native boolean NSMouseInRect(NSPoint aPoint, NSRect aRect, boolean flipped);
-//public static final native int NSNextHashEnumeratorItem(int enumerator);
-//public static final native boolean NSNextMapEnumeratorPair(int enumerator, int key, int value);
-////public static final native NSRect NSOffsetRect(NSRect aRect, float dX, float dY);
-//public static final native int NSOpenStepRootDirectory();
-//public static final native int NSPageSize();
-////public static final native NSPoint NSPointFromCGPoint(CGPoint cgpoint);
-////public static final native NSPoint NSPointFromString(int aString);
-//public static final native boolean NSPointInRect(NSPoint aPoint, NSRect aRect);
-////public static final native CGPoint NSPointToCGPoint(NSPoint nspoint);
-//public static final native int NSProtocolFromString(int namestr);
-////public static final native NSRange NSRangeFromString(int aString);
-//public static final native int NSRealMemoryAvailable();
-//public static final native int NSReallocateCollectable(int ptr, int size, int options);
-//public static final native void NSRecordAllocationEvent(int eventType, int object);
-////public static final native NSRect NSRectFromCGRect(CGRect cgrect);
-////public static final native NSRect NSRectFromString(int aString);
-////public static final native CGRect NSRectToCGRect(NSRect nsrect);
-//public static final native void NSRecycleZone(int zone);
-//public static final native void NSResetHashTable(int table);
-//public static final native void NSResetMapTable(int table);
-//public static final native int NSReturnAddress(int frame);
-//public static final native int NSRoundDownToMultipleOfPageSize(int bytes);
-//public static final native int NSRoundUpToMultipleOfPageSize(int bytes);
 public static final native int NSSearchPathForDirectoriesInDomains(int directory, int domainMask, boolean expandTilde);
-//public static final native int NSSelectorFromString(int aSelectorName);
-//public static final native void NSSetUncaughtExceptionHandler(int dummy);
-//public static final native void NSSetZoneName(int zone, int name);
-//public static final native boolean NSShouldRetainWithZone(int anObject, int requestedZone);
-////public static final native NSSize NSSizeFromCGSize(CGSize cgsize);
-////public static final native NSSize NSSizeFromString(int aString);
-////public static final native CGSize NSSizeToCGSize(NSSize nssize);
-//public static final native int NSStringFromClass(int aClass);
-//public static final native int NSStringFromHashTable(int table);
-//public static final native int NSStringFromMapTable(int table);
-//public static final native int NSStringFromPoint(NSPoint aPoint);
-//public static final native int NSStringFromProtocol(int proto);
-//public static final native int NSStringFromRange(NSRange range);
-//public static final native int NSStringFromRect(NSRect aRect);
-//public static final native int NSStringFromSelector(int aSelector);
-//public static final native int NSStringFromSize(NSSize aSize);
-//public static final native double NSSwapBigDoubleToHost(NSSwappedDouble x);
-//public static final native float NSSwapBigFloatToHost(NSSwappedFloat x);
-//public static final native int NSSwapBigIntToHost(int x);
-//public static final native long NSSwapBigLongLongToHost(long x);
-//public static final native int NSSwapBigLongToHost(int x);
-//public static final native short NSSwapBigShortToHost(short x);
-////public static final native NSSwappedDouble NSSwapDouble(NSSwappedDouble x);
-////public static final native NSSwappedFloat NSSwapFloat(NSSwappedFloat x);
-////public static final native NSSwappedDouble NSSwapHostDoubleToBig(double x);
-////public static final native NSSwappedDouble NSSwapHostDoubleToLittle(double x);
-////public static final native NSSwappedFloat NSSwapHostFloatToBig(float x);
-////public static final native NSSwappedFloat NSSwapHostFloatToLittle(float x);
-//public static final native int NSSwapHostIntToBig(int x);
-//public static final native int NSSwapHostIntToLittle(int x);
-//public static final native long NSSwapHostLongLongToBig(long x);
-//public static final native long NSSwapHostLongLongToLittle(long x);
-//public static final native int NSSwapHostLongToBig(int x);
-//public static final native int NSSwapHostLongToLittle(int x);
-//public static final native short NSSwapHostShortToBig(short x);
-//public static final native short NSSwapHostShortToLittle(short x);
-//public static final native int NSSwapInt(int inv);
-//public static final native double NSSwapLittleDoubleToHost(NSSwappedDouble x);
-//public static final native float NSSwapLittleFloatToHost(NSSwappedFloat x);
-//public static final native int NSSwapLittleIntToHost(int x);
-//public static final native long NSSwapLittleLongLongToHost(long x);
-//public static final native int NSSwapLittleLongToHost(int x);
-//public static final native short NSSwapLittleShortToHost(short x);
-//public static final native int NSSwapLong(int inv);
-//public static final native long NSSwapLongLong(long inv);
-//public static final native short NSSwapShort(short inv);
 public static final native int NSTemporaryDirectory();
-//public static final native NSRange NSUnionRange(NSRange range1, NSRange range2);
-//public static final native NSRect NSUnionRect(NSRect aRect, NSRect bRect);
-//public static final native int NSUserName();
-//public static final native float NSWidth(NSRect aRect);
-//public static final native int NSZoneCalloc(int zone, int numElems, int byteSize);
-//public static final native void NSZoneFree(int zone, int ptr);
-//public static final native int NSZoneFromPointer(int ptr);
-//public static final native int NSZoneMalloc(int zone, int size);
-//public static final native int NSZoneName(int zone);
-//public static final native int NSZoneRealloc(int zone, int ptr, int size);
-//public static final native int NXReadNSObjectFromCoder(int decoder);
+
+/** Sends */
+public static final native int objc_msgSend(int id, int sel, NSRect arg0, NSPoint arg1);
+public static final native int objc_msgSend(int id, int sel, byte[] arg0, int arg1);
+public static final native double objc_msgSend_fpret(int id, int sel, int arg0, int arg1);
+public static final native void objc_msgSend_stret(NSPoint result, int id, int sel, NSPoint arg0, int arg1);
+public static final native int objc_msgSend(int id, int sel, NSRect arg0, NSRange arg1, NSRect arg2);
+public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, int arg2, boolean arg3);
+public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, boolean arg3);
+public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6);
+public static final native int objc_msgSend(int id, int sel, int[] arg0, int arg1, int arg2);
+public static final native void objc_msgSend_stret(NSRange result, int id, int sel);
+public static final native int objc_msgSend(int id, int sel, NSPoint arg0, float arg1, float arg2, float arg3, boolean arg4);
+public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, NSRange arg2);
+public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, int arg1);
+public static final native void objc_msgSend_stret(NSSize result, int id, int sel, NSSize arg0, boolean arg1, boolean arg2, int arg3);
+public static final native int objc_msgSend(int id, int sel, float[] arg0);
+public static final native void objc_msgSend_stret(NSRect result, int id, int sel, NSRange arg0, int arg1);
+public static final native int objc_msgSend(int id, int sel, NSSize arg0);
+public static final native void objc_msgSend_stret(NSRect result, int id, int sel, NSRect arg0);
+public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, boolean arg2, int arg3);
+public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3);
+public static final native int objc_msgSend(int id, int sel, int arg0, int arg1);
+public static final native int objc_msgSend(int id, int sel, int arg0);
+public static final native int objc_msgSend(int id, int sel, int arg0, NSPoint arg1, int arg2, double arg3, int arg4, int arg5, short arg6, int arg7, int arg8);
+public static final native int objc_msgSend(int id, int sel, NSRect arg0, NSRect arg1, int arg2, float arg3);
+public static final native void objc_msgSend_stret(NSRect result, int id, int sel);
+public static final native int objc_msgSend(int id, int sel, NSRange arg0);
+public static final native int objc_msgSend(int id, int sel, char[] arg0, int arg1);
+public static final native int objc_msgSend(int id, int sel, float arg0, float arg1);
+public static final native void objc_msgSend_stret(NSSize result, int id, int sel, NSSize arg0);
+public static final native int objc_msgSend(int id, int sel, int arg0, boolean arg1);
+public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3, int arg4, boolean arg5, boolean arg6, int arg7, int arg8, int arg9);
+public static final native int objc_msgSend(int id, int sel, int arg0, NSRange arg1);
+public static final native int objc_msgSend(int id, int sel, int[] arg0);
+public static final native int objc_msgSend(int id, int sel, NSAffineTransformStruct arg0);
+public static final native int objc_msgSend(int id, int sel, int arg0, NSPoint arg1);
+public static final native int objc_msgSend(int id, int sel, NSRange arg0, int arg1);
+public static final native int objc_msgSend(int id, int sel, char[] arg0);
+public static final native int objc_msgSend(int id, int sel, byte[] arg0);
+public static final native int objc_msgSend(int id, int sel, float arg0);
+public static final native int objc_msgSend(int id, int sel, NSPoint arg0, float arg1, float arg2, float arg3);
+public static final native double objc_msgSend_fpret(int id, int sel);
+public static final native void objc_msgSend_stret(NSRect result, int id, int sel, NSRect arg0, int arg1);
+public static final native void objc_msgSend_stret(NSAffineTransformStruct result, int id, int sel);
+public static final native int objc_msgSend(int id, int sel, NSPoint arg0);
+public static final native int objc_msgSend(int id, int sel, boolean arg0, int arg1);
+public static final native void objc_msgSend_stret(NSPoint result, int id, int sel);
+public static final native int objc_msgSend(int id, int sel, float[] arg0, int arg1, float arg2);
+public static final native int objc_msgSend(int id, int sel, NSPoint arg0, NSRect arg1, int arg2, float arg3);
+public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1);
+public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, int arg2, boolean arg3, int arg4);
+public static final native void objc_msgSend_stret(NSSize result, int id, int sel, NSSize arg0, int arg1);
+public static final native int objc_msgSend(int id, int sel, NSPoint arg0, NSPoint arg1, int arg2);
+public static final native double objc_msgSend_fpret(int id, int sel, int arg0);
+public static final native int objc_msgSend(int id, int sel, double arg0);
+public static final native int objc_msgSend(int id, int sel, NSRect arg0, int arg1, int arg2);
+public static final native int objc_msgSend(int id, int sel, boolean arg0);
+public static final native int objc_msgSend(int id, int sel, float arg0, float arg1, float arg2, float arg3);
+public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0, int arg1, boolean arg2);
+public static final native int objc_msgSend(int id, int sel, NSRect arg0, float arg1, float arg2);
+public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, boolean arg2);
+public static final native int objc_msgSend(int id, int sel);
+public static final native int objc_msgSend(int id, int sel, NSPoint arg0, NSPoint arg1, NSPoint arg2);
+public static final native int objc_msgSend(int id, int sel, NSRect arg0);
+public static final native int objc_msgSend(int id, int sel, double arg0, int arg1, int arg2, int arg3, boolean arg4);
+public static final native void objc_msgSend_stret(NSPoint result, int id, int sel, int arg0);
+public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3, int arg4, boolean arg5, boolean arg6, int arg7, int arg8, int arg9, int arg10);
+public static final native void objc_msgSend_stret(NSRect result, int id, int sel, int arg0);
+public static final native int objc_msgSend(int id, int sel, NSRange arg0, NSPoint arg1);
+public static final native void objc_msgSend_stret(NSSize result, int id, int sel);
+public static final native int objc_msgSend(int id, int sel, NSPoint arg0, int arg1, float[] arg2);
+public static final native int objc_msgSend(int id, int sel, NSRect arg0, float arg1);
+public static final native int objc_msgSend(int id, int sel, NSRect arg0, boolean arg1);
+public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2, int arg3, int arg4);
+public static final native void objc_msgSend_stret(NSRange result, int id, int sel, int arg0);
+public static final native int objc_msgSend(int id, int sel, char[] arg0, NSRange arg1);
+public static final native int objc_msgSend(int id, int sel, int arg0, int arg1, int arg2);
+public static final native void objc_msgSend_stret(NSPoint result, int id, int sel, NSPoint arg0);
+public static final native int objc_msgSend(int id, int sel, int arg0, float arg1);
+
+/** Sizeof natives */
+public static final native int NSAffineTransformStruct_sizeof();
+public static final native int NSPoint_sizeof();
+public static final native int NSRange_sizeof();
+public static final native int NSRect_sizeof();
+public static final native int NSSize_sizeof();
+
+/** Memmove natives */
+public static final native void memmove(int /*long*/ dest, NSAffineTransformStruct src, int size);
+public static final native void memmove(NSAffineTransformStruct dest, int /*long*/ src, int size);
+public static final native void memmove(int /*long*/ dest, NSPoint src, int size);
+public static final native void memmove(NSPoint dest, int /*long*/ src, int size);
+public static final native void memmove(int /*long*/ dest, NSRange src, int size);
+public static final native void memmove(NSRange dest, int /*long*/ src, int size);
+public static final native void memmove(int /*long*/ dest, NSRect src, int size);
+public static final native void memmove(NSRect dest, int /*long*/ src, int size);
+public static final native void memmove(int /*long*/ dest, NSSize src, int size);
+public static final native void memmove(NSSize dest, int /*long*/ src, int size);
 
 /** This section is auto generated */
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSQuickDrawView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Protocol.java
index 2fb33ea7d6..c23340b371 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSQuickDrawView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Protocol.java
@@ -10,18 +10,18 @@
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
-public class NSQuickDrawView extends NSView {
+public class Protocol extends id {
 
-public NSQuickDrawView() {
+public Protocol() {
 	super();
 }
 
-public NSQuickDrawView(int id) {
+public Protocol(int /*long*/ id) {
 	super(id);
 }
 
-public int qdPort() {
-	return OS.objc_msgSend(this.id, OS.sel_qdPort);
+public Protocol(id id) {
+	super(id);
 }
 
 }
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 1d16e40b91..adeaad77d9 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
@@ -16,17 +16,12 @@ public WebDataSource() {
 	super();
 }
 
-public WebDataSource(int id) {
+public WebDataSource(int /*long*/ id) {
 	super(id);
 }
 
-public NSData data() {
-	int result = OS.objc_msgSend(this.id, OS.sel_data);
-	return result != 0 ? new NSData(result) : null;
-}
-
-public boolean isLoading() {
-	return OS.objc_msgSend(this.id, OS.sel_isLoading) != 0;
+public WebDataSource(id id) {
+	super(id);
 }
 
 public NSString pageTitle() {
@@ -44,16 +39,6 @@ public NSMutableURLRequest request() {
 	return result != 0 ? new NSMutableURLRequest(result) : null;
 }
 
-public NSURLResponse response() {
-	int result = OS.objc_msgSend(this.id, OS.sel_response);
-	return result != 0 ? new NSURLResponse(result) : null;
-}
-
-public NSString textEncodingName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_textEncodingName);
-	return result != 0 ? new NSString(result) : null;
-}
-
 public WebFrame webFrame() {
 	int 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 7cb23997b3..6d8006c0ca 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
@@ -16,7 +16,11 @@ public WebFrame() {
 	super();
 }
 
-public WebFrame(int id) {
+public WebFrame(int /*long*/ id) {
+	super(id);
+}
+
+public WebFrame(id id) {
 	super(id);
 }
 
@@ -25,67 +29,17 @@ public DOMDocument DOMDocument() {
 	return result != 0 ? new DOMDocument(result) : null;
 }
 
-public NSArray childFrames() {
-	int result = OS.objc_msgSend(this.id, OS.sel_childFrames);
-	return result != 0 ? new NSArray(result) : null;
-}
-
 public WebDataSource dataSource() {
 	int result = OS.objc_msgSend(this.id, OS.sel_dataSource);
 	return result != 0 ? new WebDataSource(result) : null;
 }
 
-public WebFrame findFrameNamed(NSString name) {
-	int result = OS.objc_msgSend(this.id, OS.sel_findFrameNamed_1, name != null ? name.id : 0);
-	return result == this.id ? this : (result != 0 ? new WebFrame(result) : null);
-}
-
-public int globalContext() {
-	return OS.objc_msgSend(this.id, OS.sel_globalContext);
-}
-
-public void loadAlternateHTMLString(NSString string, NSURL baseURL, NSURL unreachableURL) {
-	OS.objc_msgSend(this.id, OS.sel_loadAlternateHTMLString_1baseURL_1forUnreachableURL_1, string != null ? string.id : 0, baseURL != null ? baseURL.id : 0, unreachableURL != null ? unreachableURL.id : 0);
-}
-
-public void loadData(NSData data, NSString MIMEType, NSString encodingName, NSURL URL) {
-	OS.objc_msgSend(this.id, OS.sel_loadData_1MIMEType_1textEncodingName_1baseURL_1, data != null ? data.id : 0, MIMEType != null ? MIMEType.id : 0, encodingName != null ? encodingName.id : 0, URL != null ? URL.id : 0);
-}
-
 public void loadHTMLString(NSString string, NSURL URL) {
-	OS.objc_msgSend(this.id, OS.sel_loadHTMLString_1baseURL_1, string != null ? string.id : 0, URL != null ? URL.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_loadHTMLString_baseURL_, string != null ? string.id : 0, URL != null ? URL.id : 0);
 }
 
 public void loadRequest(NSURLRequest request) {
-	OS.objc_msgSend(this.id, OS.sel_loadRequest_1, request != null ? request.id : 0);
-}
-
-public NSString name() {
-	int result = OS.objc_msgSend(this.id, OS.sel_name);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public WebFrame parentFrame() {
-	int result = OS.objc_msgSend(this.id, OS.sel_parentFrame);
-	return result == this.id ? this : (result != 0 ? new WebFrame(result) : null);
-}
-
-public WebDataSource provisionalDataSource() {
-	int result = OS.objc_msgSend(this.id, OS.sel_provisionalDataSource);
-	return result != 0 ? new WebDataSource(result) : null;
-}
-
-public void reload() {
-	OS.objc_msgSend(this.id, OS.sel_reload);
-}
-
-public void stopLoading() {
-	OS.objc_msgSend(this.id, OS.sel_stopLoading);
-}
-
-public WebView webView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_webView);
-	return result != 0 ? new WebView(result) : null;
+	OS.objc_msgSend(this.id, OS.sel_loadRequest_, request != null ? request.id : 0);
 }
 
 }
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 e1101bec2b..30f121f132 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
@@ -16,21 +16,12 @@ public WebFrameView() {
 	super();
 }
 
-public WebFrameView(int id) {
+public WebFrameView(int /*long*/ id) {
 	super(id);
 }
 
-public boolean allowsScrolling() {
-	return OS.objc_msgSend(this.id, OS.sel_allowsScrolling) != 0;
-}
-
-public boolean canPrintHeadersAndFooters() {
-	return OS.objc_msgSend(this.id, OS.sel_canPrintHeadersAndFooters) != 0;
-}
-
-public NSView  documentView() {
-	int result = OS.objc_msgSend(this.id, OS.sel_documentView);
-	return result != 0 ? new NSView (result) : null;
+public WebFrameView(id id) {
+	super(id);
 }
 
 public boolean documentViewShouldHandlePrint() {
@@ -42,17 +33,8 @@ public void printDocumentView() {
 }
 
 public NSPrintOperation printOperationWithPrintInfo(NSPrintInfo printInfo) {
-	int result = OS.objc_msgSend(this.id, OS.sel_printOperationWithPrintInfo_1, printInfo != null ? printInfo.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_printOperationWithPrintInfo_, printInfo != null ? printInfo.id : 0);
 	return result != 0 ? new NSPrintOperation(result) : null;
 }
 
-public void setAllowsScrolling(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsScrolling_1, flag);
-}
-
-public WebFrame webFrame() {
-	int 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/WebOpenPanelResultListener.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebOpenPanelResultListener.java
index 86b9ca11d1..242a19bf8f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebOpenPanelResultListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebOpenPanelResultListener.java
@@ -21,6 +21,6 @@ public void cancel() {
 }
 
 public void chooseFilename(NSString string) {
-	OS.objc_msgSend(id, OS.sel_chooseFilename_1, string != null ? string.id : 0);
+	OS.objc_msgSend(id, OS.sel_chooseFilename_, string != null ? string.id : 0);
 }
 }
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 0f8bcbcb89..10c078246f 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
@@ -16,22 +16,16 @@ public WebPreferences() {
 	super();
 }
 
-public WebPreferences(int id) {
+public WebPreferences(int /*long*/ id) {
 	super(id);
 }
 
-public NSString identifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_identifier);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public id initWithIdentifier(NSString anIdentifier) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_1, anIdentifier != null ? anIdentifier.id : 0);
-	return result != 0 ? new id(result) : null;
+public WebPreferences(id id) {
+	super(id);
 }
 
 public void setJavaEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setJavaEnabled_1, flag);
+	OS.objc_msgSend(this.id, OS.sel_setJavaEnabled_, flag);
 }
 
 public static WebPreferences standardPreferences() {
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 d89bbb185d..4fb81a9088 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
@@ -16,49 +16,12 @@ public WebView() {
 	super();
 }
 
-public WebView(int id) {
+public WebView(int /*long*/ id) {
 	super(id);
 }
 
-public static NSArray MIMETypesShownAsHTML() {
-	int result = OS.objc_msgSend(OS.class_WebView, OS.sel_MIMETypesShownAsHTML);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public id UIDelegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_UIDelegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public static NSURL URLFromPasteboard(NSPasteboard pasteboard) {
-	int result = OS.objc_msgSend(OS.class_WebView, OS.sel_URLFromPasteboard_1, pasteboard != null ? pasteboard.id : 0);
-	return result != 0 ? new NSURL(result) : null;
-}
-
-public static NSString URLTitleFromPasteboard(NSPasteboard pasteboard) {
-	int result = OS.objc_msgSend(OS.class_WebView, OS.sel_URLTitleFromPasteboard_1, pasteboard != null ? pasteboard.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void alignCenter(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_alignCenter_1, sender != null ? sender.id : 0);
-}
-
-public void alignJustified(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_alignJustified_1, sender != null ? sender.id : 0);
-}
-
-public void alignLeft(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_alignLeft_1, sender != null ? sender.id : 0);
-}
-
-public void alignRight(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_alignRight_1, sender != null ? sender.id : 0);
-}
-
-public NSString applicationNameForUserAgent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_applicationNameForUserAgent);
-	return result != 0 ? new NSString(result) : null;
+public WebView(id id) {
+	super(id);
 }
 
 public boolean canGoBack() {
@@ -69,149 +32,21 @@ public boolean canGoForward() {
 	return OS.objc_msgSend(this.id, OS.sel_canGoForward) != 0;
 }
 
-public boolean canMakeTextLarger() {
-	return OS.objc_msgSend(this.id, OS.sel_canMakeTextLarger) != 0;
-}
-
-public boolean canMakeTextSmaller() {
-	return OS.objc_msgSend(this.id, OS.sel_canMakeTextSmaller) != 0;
-}
-
-public boolean canMakeTextStandardSize() {
-	return OS.objc_msgSend(this.id, OS.sel_canMakeTextStandardSize) != 0;
-}
-
 public static boolean canShowMIMEType(NSString MIMEType) {
-	return OS.objc_msgSend(OS.class_WebView, OS.sel_canShowMIMEType_1, MIMEType != null ? MIMEType.id : 0) != 0;
-}
-
-public static boolean canShowMIMETypeAsHTML(NSString MIMEType) {
-	return OS.objc_msgSend(OS.class_WebView, OS.sel_canShowMIMETypeAsHTML_1, MIMEType != null ? MIMEType.id : 0) != 0;
-}
-
-public void changeAttributes(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_changeAttributes_1, sender != null ? sender.id : 0);
-}
-
-public void changeColor(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_changeColor_1, sender != null ? sender.id : 0);
-}
-
-public void changeDocumentBackgroundColor(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_changeDocumentBackgroundColor_1, sender != null ? sender.id : 0);
-}
-
-public void changeFont(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_changeFont_1, sender != null ? sender.id : 0);
-}
-
-public void checkSpelling(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_checkSpelling_1, sender != null ? sender.id : 0);
-}
-
-public void close() {
-	OS.objc_msgSend(this.id, OS.sel_close);
-}
-
-public void copy(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_copy_1, sender != null ? sender.id : 0);
-}
-
-public void copyFont(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_copyFont_1, sender != null ? sender.id : 0);
-}
-
-public NSString customTextEncodingName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_customTextEncodingName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString customUserAgent() {
-	int result = OS.objc_msgSend(this.id, OS.sel_customUserAgent);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void cut(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_cut_1, sender != null ? sender.id : 0);
-}
-
-public void delete(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_delete_1, sender != null ? sender.id : 0);
-}
-
-public void deleteSelection() {
-	OS.objc_msgSend(this.id, OS.sel_deleteSelection);
-}
-
-public id downloadDelegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_downloadDelegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean drawsBackground() {
-	return OS.objc_msgSend(this.id, OS.sel_drawsBackground) != 0;
-}
-
-public id editingDelegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_editingDelegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSDictionary elementAtPoint(NSPoint point) {
-	int result = OS.objc_msgSend(this.id, OS.sel_elementAtPoint_1, point);
-	return result != 0 ? new NSDictionary(result) : null;
-}
-
-public double estimatedProgress() {
-	return OS.objc_msgSend_fpret(this.id, OS.sel_estimatedProgress);
-}
-
-public id frameLoadDelegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_frameLoadDelegate);
-	return result != 0 ? new id(result) : null;
+	return OS.objc_msgSend(OS.class_WebView, OS.sel_canShowMIMEType_, MIMEType != null ? MIMEType.id : 0) != 0;
 }
 
 public boolean goBack() {
 	return OS.objc_msgSend(this.id, OS.sel_goBack) != 0;
 }
 
-public void goBack_(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_goBack_1, sender != null ? sender.id : 0);
-}
-
 public boolean goForward() {
 	return OS.objc_msgSend(this.id, OS.sel_goForward) != 0;
 }
 
-public void goForward_(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_goForward_1, sender != null ? sender.id : 0);
-}
-
-public NSString groupName() {
-	int result = OS.objc_msgSend(this.id, OS.sel_groupName);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSWindow hostWindow() {
-	int result = OS.objc_msgSend(this.id, OS.sel_hostWindow);
-	return result != 0 ? new NSWindow(result) : null;
-}
-
-public id initWithFrame(NSRect frame, NSString frameName, NSString groupName) {
-	int result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_1frameName_1groupName_1, frame, frameName != null ? frameName.id : 0, groupName != null ? groupName.id : 0);
-	return result != 0 ? new id(result) : null;
-}
-
-public boolean isContinuousSpellCheckingEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_isContinuousSpellCheckingEnabled) != 0;
-}
-
-public boolean isEditable() {
-	return OS.objc_msgSend(this.id, OS.sel_isEditable) != 0;
-}
-
-public boolean isLoading() {
-	return OS.objc_msgSend(this.id, OS.sel_isLoading) != 0;
+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);
+	return result == this.id ? this : (result != 0 ? new WebView(result) : null);
 }
 
 public WebFrame mainFrame() {
@@ -219,296 +54,41 @@ public WebFrame mainFrame() {
 	return result != 0 ? new WebFrame(result) : null;
 }
 
-public NSImage mainFrameIcon() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mainFrameIcon);
-	return result != 0 ? new NSImage(result) : null;
-}
-
-public NSString mainFrameTitle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mainFrameTitle);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public NSString mainFrameURL() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mainFrameURL);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean maintainsInactiveSelection() {
-	return OS.objc_msgSend(this.id, OS.sel_maintainsInactiveSelection) != 0;
-}
-
-public void makeTextLarger(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_makeTextLarger_1, sender != null ? sender.id : 0);
-}
-
-public void makeTextSmaller(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_makeTextSmaller_1, sender != null ? sender.id : 0);
-}
-
-public void makeTextStandardSize(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_makeTextStandardSize_1, sender != null ? sender.id : 0);
-}
-
-public NSString mediaStyle() {
-	int result = OS.objc_msgSend(this.id, OS.sel_mediaStyle);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public void moveDragCaretToPoint(NSPoint point) {
-	OS.objc_msgSend(this.id, OS.sel_moveDragCaretToPoint_1, point);
-}
-
-public void moveToBeginningOfSentence(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveToBeginningOfSentence_1, sender != null ? sender.id : 0);
-}
-
-public void moveToBeginningOfSentenceAndModifySelection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveToBeginningOfSentenceAndModifySelection_1, sender != null ? sender.id : 0);
-}
-
-public void moveToEndOfSentence(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveToEndOfSentence_1, sender != null ? sender.id : 0);
-}
-
-public void moveToEndOfSentenceAndModifySelection(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_moveToEndOfSentenceAndModifySelection_1, sender != null ? sender.id : 0);
-}
-
-public void paste(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_paste_1, sender != null ? sender.id : 0);
-}
-
-public void pasteAsPlainText(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_pasteAsPlainText_1, sender != null ? sender.id : 0);
-}
-
-public void pasteAsRichText(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_pasteAsRichText_1, sender != null ? sender.id : 0);
-}
-
-public void pasteFont(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_pasteFont_1, sender != null ? sender.id : 0);
-}
-
-public NSArray pasteboardTypesForElement(NSDictionary element) {
-	int result = OS.objc_msgSend(this.id, OS.sel_pasteboardTypesForElement_1, element != null ? element.id : 0);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public NSArray pasteboardTypesForSelection() {
-	int result = OS.objc_msgSend(this.id, OS.sel_pasteboardTypesForSelection);
-	return result != 0 ? new NSArray(result) : null;
-}
-
-public void performFindPanelAction(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_performFindPanelAction_1, sender != null ? sender.id : 0);
-}
-
-public id policyDelegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_policyDelegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public NSString preferencesIdentifier() {
-	int result = OS.objc_msgSend(this.id, OS.sel_preferencesIdentifier);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public static void registerURLSchemeAsLocal(NSString scheme) {
-	OS.objc_msgSend(OS.class_WebView, OS.sel_registerURLSchemeAsLocal_1, scheme != null ? scheme.id : 0);
-}
-
-public static void registerViewClass(int viewClass, int representationClass, NSString MIMEType) {
-	OS.objc_msgSend(OS.class_WebView, OS.sel_registerViewClass_1representationClass_1forMIMEType_1, viewClass, representationClass, MIMEType != null ? MIMEType.id : 0);
-}
-
 public void reload(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_reload_1, sender != null ? sender.id : 0);
-}
-
-public void removeDragCaret() {
-	OS.objc_msgSend(this.id, OS.sel_removeDragCaret);
-}
-
-public void replaceSelectionWithMarkupString(NSString markupString) {
-	OS.objc_msgSend(this.id, OS.sel_replaceSelectionWithMarkupString_1, markupString != null ? markupString.id : 0);
-}
-
-public void replaceSelectionWithText(NSString text) {
-	OS.objc_msgSend(this.id, OS.sel_replaceSelectionWithText_1, text != null ? text.id : 0);
-}
-
-public id resourceLoadDelegate() {
-	int result = OS.objc_msgSend(this.id, OS.sel_resourceLoadDelegate);
-	return result != 0 ? new id(result) : null;
-}
-
-public void selectSentence(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_selectSentence_1, sender != null ? sender.id : 0);
-}
-
-public int selectionAffinity() {
-	return OS.objc_msgSend(this.id, OS.sel_selectionAffinity);
+	OS.objc_msgSend(this.id, OS.sel_reload_, sender != null ? sender.id : 0);
 }
 
 public void setApplicationNameForUserAgent(NSString applicationName) {
-	OS.objc_msgSend(this.id, OS.sel_setApplicationNameForUserAgent_1, applicationName != null ? applicationName.id : 0);
-}
-
-public void setContinuousSpellCheckingEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setContinuousSpellCheckingEnabled_1, flag);
-}
-
-public void setCustomTextEncodingName(NSString encodingName) {
-	OS.objc_msgSend(this.id, OS.sel_setCustomTextEncodingName_1, encodingName != null ? encodingName.id : 0);
-}
-
-public void setCustomUserAgent(NSString userAgentString) {
-	OS.objc_msgSend(this.id, OS.sel_setCustomUserAgent_1, userAgentString != null ? userAgentString.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setApplicationNameForUserAgent_, applicationName != null ? applicationName.id : 0);
 }
 
 public void setDownloadDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDownloadDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setDrawsBackground(boolean drawsBackround) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_1, drawsBackround);
-}
-
-public void setEditable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEditable_1, flag);
-}
-
-public void setEditingDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setEditingDelegate_1, delegate != null ? delegate.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setDownloadDelegate_, delegate != null ? delegate.id : 0);
 }
 
 public void setFrameLoadDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setFrameLoadDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setGroupName(NSString groupName) {
-	OS.objc_msgSend(this.id, OS.sel_setGroupName_1, groupName != null ? groupName.id : 0);
-}
-
-public void setHostWindow(NSWindow hostWindow) {
-	OS.objc_msgSend(this.id, OS.sel_setHostWindow_1, hostWindow != null ? hostWindow.id : 0);
-}
-
-public static void setMIMETypesShownAsHTML(NSArray MIMETypes) {
-	OS.objc_msgSend(OS.class_WebView, OS.sel_setMIMETypesShownAsHTML_1, MIMETypes != null ? MIMETypes.id : 0);
-}
-
-public void setMainFrameURL(NSString URLString) {
-	OS.objc_msgSend(this.id, OS.sel_setMainFrameURL_1, URLString != null ? URLString.id : 0);
-}
-
-public void setMaintainsBackForwardList(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setMaintainsBackForwardList_1, flag);
-}
-
-public void setMediaStyle(NSString mediaStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setMediaStyle_1, mediaStyle != null ? mediaStyle.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setFrameLoadDelegate_, delegate != null ? delegate.id : 0);
 }
 
 public void setPolicyDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setPolicyDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setPreferencesIdentifier(NSString anIdentifier) {
-	OS.objc_msgSend(this.id, OS.sel_setPreferencesIdentifier_1, anIdentifier != null ? anIdentifier.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setPolicyDelegate_, delegate != null ? delegate.id : 0);
 }
 
 public void setResourceLoadDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setResourceLoadDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public void setShouldCloseWithWindow(boolean close) {
-	OS.objc_msgSend(this.id, OS.sel_setShouldCloseWithWindow_1, close);
-}
-
-public void setSmartInsertDeleteEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSmartInsertDeleteEnabled_1, flag);
-}
-
-public void setTextSizeMultiplier(float multiplier) {
-	OS.objc_msgSend(this.id, OS.sel_setTextSizeMultiplier_1, multiplier);
+	OS.objc_msgSend(this.id, OS.sel_setResourceLoadDelegate_, delegate != null ? delegate.id : 0);
 }
 
 public void setUIDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setUIDelegate_1, delegate != null ? delegate.id : 0);
-}
-
-public boolean shouldCloseWithWindow() {
-	return OS.objc_msgSend(this.id, OS.sel_shouldCloseWithWindow) != 0;
-}
-
-public void showGuessPanel(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_showGuessPanel_1, sender != null ? sender.id : 0);
-}
-
-public boolean smartInsertDeleteEnabled() {
-	return OS.objc_msgSend(this.id, OS.sel_smartInsertDeleteEnabled) != 0;
-}
-
-public int spellCheckerDocumentTag() {
-	return OS.objc_msgSend(this.id, OS.sel_spellCheckerDocumentTag);
-}
-
-public void startSpeaking(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_startSpeaking_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_setUIDelegate_, delegate != null ? delegate.id : 0);
 }
 
 public void stopLoading(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_stopLoading_1, sender != null ? sender.id : 0);
-}
-
-public void stopSpeaking(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_stopSpeaking_1, sender != null ? sender.id : 0);
+	OS.objc_msgSend(this.id, OS.sel_stopLoading_, sender != null ? sender.id : 0);
 }
 
 public NSString stringByEvaluatingJavaScriptFromString(NSString script) {
-	int result = OS.objc_msgSend(this.id, OS.sel_stringByEvaluatingJavaScriptFromString_1, script != null ? script.id : 0);
-	return result != 0 ? new NSString(result) : null;
-}
-
-public boolean supportsTextEncoding() {
-	return OS.objc_msgSend(this.id, OS.sel_supportsTextEncoding) != 0;
-}
-
-public void takeStringURLFrom(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_takeStringURLFrom_1, sender != null ? sender.id : 0);
-}
-
-public float textSizeMultiplier() {
-	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_textSizeMultiplier);
-}
-
-public void toggleContinuousSpellChecking(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_toggleContinuousSpellChecking_1, sender != null ? sender.id : 0);
-}
-
-public void toggleSmartInsertDelete(id sender) {
-	OS.objc_msgSend(this.id, OS.sel_toggleSmartInsertDelete_1, sender != null ? sender.id : 0);
-}
-
-public NSUndoManager undoManager() {
-	int result = OS.objc_msgSend(this.id, OS.sel_undoManager);
-	return result != 0 ? new NSUndoManager(result) : null;
-}
-
-public NSString userAgentForURL(NSURL URL) {
-	int result = OS.objc_msgSend(this.id, OS.sel_userAgentForURL_1, URL != null ? URL.id : 0);
+	int result = OS.objc_msgSend(this.id, OS.sel_stringByEvaluatingJavaScriptFromString_, script != null ? script.id : 0);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public void writeElement(NSDictionary element, NSArray types, NSPasteboard pasteboard) {
-	OS.objc_msgSend(this.id, OS.sel_writeElement_1withPasteboardTypes_1toPasteboard_1, element != null ? element.id : 0, types != null ? types.id : 0, pasteboard != null ? pasteboard.id : 0);
-}
-
-public void writeSelectionWithPasteboardTypes(NSArray types, NSPasteboard pasteboard) {
-	OS.objc_msgSend(this.id, OS.sel_writeSelectionWithPasteboardTypes_1toPasteboard_1, types != null ? types.id : 0, pasteboard != null ? pasteboard.id : 0);
-}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java
index dc3b98d0c9..a1d9feda22 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java
@@ -11,12 +11,24 @@
 package org.eclipse.swt.internal.cocoa;
 
 public class id {
-public int id;
+
+public int /*long*/ id;
 
 public id() {
 }
 
-public id(int id) {
+public id(int /*long*/ id) {
 	this.id = id;
 }
+
+public id(id id) {
+	this.id = id != null ? id.id : 0;
+}
+
+public int objc_getClass() {
+	String name = getClass().getName();
+	int index = name.lastIndexOf('.');
+	if (index != -1) name = name.substring(index + 1);
+	return OS.objc_getClass(name);
+}
 }