projects/dwt-mac: dwt/widgets/Combo.d comparison

comparison dwt/widgets/Combo.d @ 62:10eaa644646f

Ported dwt.widgets.Combo

author	Jacob Carlborg <doob@me.com>
date	Tue, 23 Dec 2008 22:21:02 +0100
parents	cfa563df4fdd
children	c7f7f4d7091a

comparison

equal deleted inserted replaced

-:c74ba20de292
+:10eaa644646f
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
+*
+* Port to the D programming language:
+*     Jacob Carlborg <doob@me.com>
 *******************************************************************************/
 module dwt.widgets.Combo;
 import dwt.dwthelper.utils;
 import dwt.internal.cocoa.NSTextFieldCell;
 import dwt.internal.cocoa.OS;
 import dwt.internal.cocoa.SWTComboBox;
 import dwt.internal.cocoa.SWTPopUpButton;
+import dwt.internal.c.Carbon;
+import objc = dwt.internal.objc.runtime;
+import dwt.widgets.Composite;
+import dwt.widgets.TypedListener;
 /**
 * Instances of this class are controls that allow the user
 * to choose an item from a list of items, or optionally
 * enter a new value by typing it into an editable text
 * field. Often, <code>Combo</code>s are used in the same place
 /**
 * the operating system limit for the number of characters
 * that the text field in an instance of this class can hold
 */
-public static final int LIMIT;
+public static const int LIMIT;
 /*
 * These values can be different on different platforms.
 * Therefore they are not initialized in the declaration
 * to stop the compiler from inlining.
 */
-static {
+static this () {
 LIMIT = 0x7FFFFFFF;
 }
 /**
 checkWidget ();
 if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
 NSString str = NSString.stringWith(string);
 if ((style & DWT.READ_ONLY) !is 0) {
 NSMenu nsMenu = (cast(NSPopUpButton)view).menu();
-NSMenuItem nsItem = cast(NSMenuItem)new NSMenuItem().alloc();
+NSMenuItem nsItem = cast(NSMenuItem)(new NSMenuItem()).alloc();
-nsItem.initWithTitle(str, 0, NSString.stringWith(""));
+nsItem.initWithTitle(str, null, NSString.stringWith(""));
 nsMenu.addItem(nsItem);
 nsItem.release();
 } else {
 (cast(NSComboBox)view).addItemWithObjectValue(str);
 }
 int count = getItemCount ();
 if (0 > index || index > count) error (DWT.ERROR_INVALID_RANGE);
 NSString str = NSString.stringWith(string);
 if ((style & DWT.READ_ONLY) !is 0) {
 NSMenu nsMenu = (cast(NSPopUpButton)view).menu();
-NSMenuItem nsItem = cast(NSMenuItem)new NSMenuItem().alloc();
+NSMenuItem nsItem = cast(NSMenuItem)(new NSMenuItem()).alloc();
-nsItem.initWithTitle(str, 0, NSString.stringWith(""));
+nsItem.initWithTitle(str, null, NSString.stringWith(""));
 nsMenu.insertItem(nsItem, index);
 nsItem.release();
 } else {
 (cast(NSComboBox)view).insertItemWithObjectValue(str, index);
 }
 if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
 TypedListener typedListener = new TypedListener (listener);
 addListener (DWT.Verify, typedListener);
 }
-bool becomeFirstResponder (int /*long*/ id, int /*long*/ sel) {
+bool becomeFirstResponder (objc.id id, objc.SEL sel) {
 receivingFocus = true;
 bool result = super.becomeFirstResponder (id, sel);
 receivingFocus = false;
 return result;
 }
 public Point computeSize (int wHint, int hHint, bool changed) {
 checkWidget ();
 int width = 0, height = 0;
 NSControl widget = cast(NSControl)view;
-NSRect rect = new NSRect ();
+NSRect rect = NSRect ();
 rect.width = rect.height = Float.MAX_VALUE;
 NSSize size = widget.cell ().cellSizeForBounds (rect);
-width = (int)Math.ceil (size.width);
+width = cast(int)Math.ceil (size.width);
 height = cast(int)Math.ceil (size.height);
 /*
 * Feature in Cocoa.  Attempting to create an NSComboBox with a
 * height > 27 spews a very long warning message to stdout and
 * often draws the combo incorrectly.  The workaround is to limit
 copyToClipboard (getText (selection.x, selection.y));
 }
 void createHandle () {
 if ((style & DWT.READ_ONLY) !is 0) {
-NSPopUpButton widget = cast(NSPopUpButton)new SWTPopUpButton().alloc();
+NSPopUpButton widget = cast(NSPopUpButton)(new SWTPopUpButton()).alloc();
 widget.initWithFrame(NSRect(), false);
 widget.menu().setAutoenablesItems(false);
 widget.setTarget(widget);
 widget.setAction(OS.sel_sendSelection);
 view = widget;
 } else {
-NSComboBox widget = cast(NSComboBox)new SWTComboBox().alloc();
+NSComboBox widget = cast(NSComboBox)(new SWTComboBox()).alloc();
 widget.initWithFrame(NSRect());
 widget.setDelegate(widget);
 view = widget;
 }
 }
 }
 void deregister() {
 super.deregister();
-display.removeWidget(((NSControl)view).cell());
+display.removeWidget((cast(NSControl)view).cell());
 }
 /**
 * Deselects the item at the given zero-relative index in the receiver's
 * list.  If the item at the index was already deselected, it remains
 } else {
 setText ("");
 }
 }
-int getCharCount() {
+NSUInteger getCharCount() {
 NSString str;
 if ((style & DWT.READ_ONLY) !is 0) {
 str = (cast(NSPopUpButton)view).titleOfSelectedItem();
 } else {
-str = new NSCell((cast(NSComboBox)view).cell()).title();
+str = (new NSCell((cast(NSComboBox)view).cell())).title();
 }
-return (int)/*64*/str.length();
+return str.length();
 }
 /**
 * Returns the item at the given, zero-relative index in the
 * receiver's list. Throws an exception if the index is out
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public String [] getItems () {
 checkWidget ();
-int count = getItemCount ();
+NSUInteger count = getItemCount ();
 String [] result = new String [count];
-for (int i=0; i<count; i++) result [i] = getItem (i);
+for (NSUInteger i=0; i<count; i++) result [i] = getItem (i);
 return result;
 }
 int getMininumHeight () {
 return getTextHeight ();
 * </ul>
 */
 public Point getSelection () {
 checkWidget ();
 if ((style & DWT.READ_ONLY) !is 0) {
-return new Point (0, getCharCount ());
+return new Point (0, cast(int) getCharCount ());
 } else {
 if (selectionRange is null) {
-NSString str = new NSTextFieldCell (((NSTextField) view).cell ()).title ();
+NSString str = (new NSTextFieldCell ((cast(NSTextField) view).cell ())).title ();
-return new Point((int)/*64*/str.length (), (int)/*64*/str.length ());
+return new Point(cast(int)/*64*/str.length (), cast(int)/*64*/str.length ());
 }
-return new Point((int)/*64*/selectionRange.location, (int)/*64*/(selectionRange.location + selectionRange.length));
+return new Point(cast(int)/*64*/selectionRange.location, cast(int)/*64*/(selectionRange.location + selectionRange.length));
 }
 }
 /**
 * Returns the zero-relative index of the item which is currently
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public String getText () {
 checkWidget ();
-return new String (getText(0, -1));
+return new_String (getText(0, -1));
 }
-char [] getText (int start, int end) {
+wchar [] getText (int start, int end) {
 NSString str;
 if ((style & DWT.READ_ONLY) !is 0) {
 str = (cast(NSPopUpButton)view).titleOfSelectedItem();
 } else {
-str = new NSCell((cast(NSComboBox)view).cell()).title();
+str = (new NSCell((cast(NSComboBox)view).cell())).title();
 }
-if (str is null) return new char[0];
+if (str is null) return new wchar[0];
-NSRange range = new NSRange ();
+NSRange range = NSRange ();
 range.location = start;
 if (end is -1) {
-int /*long*/ length = str.length();
+NSUInteger length = str.length();
 range.length = length - start;
 } else {
 range.length = end - start;
 }
-char [] buffer= new char [(int)/*64*/range.length];
+wchar [] buffer= new wchar [range.length];
-str.getCharacters(buffer, range);
+str.getCharacters(buffer.ptr, range);
 return buffer;
 }
 /**
 * Returns the height of the receivers's text field.
 }
 return -1;
 }
 void insertEditText (String string) {
-int length = string.length ();
+NSUInteger length = string.length ();
 Point selection = getSelection ();
 if (hasFocus ()) {
 if (textLimit !is LIMIT) {
 int charCount = getCharCount();
 if (charCount - (selection.y - selection.x) + length > textLimit) {
 length = textLimit - charCount + (selection.y - selection.x);
 }
 }
-char [] buffer = new char [length];
+wchar [] buffer = new wchar [length];
 string.getChars (0, buffer.length, buffer, 0);
-NSString nsstring = NSString.stringWithCharacters (buffer, buffer.length);
+NSString nsstring = NSString.stringWithCharacters (buffer.ptr, buffer.length);
-NSText editor = ((NSTextField) view).currentEditor ();
+NSText editor = (cast(NSTextField) view).currentEditor ();
 editor.replaceCharactersInRange (editor.selectedRange (), nsstring);
 selectionRange = null;
 } else {
 String oldText = getText ();
 if (textLimit !is LIMIT) {
 string = string.substring(0, textLimit - charCount + (selection.y - selection.x));
 }
 }
 String newText = oldText.substring (0, selection.x) + string + oldText.substring (selection.y);
 NSString nsstring = NSString.stringWith(newText);
-new NSCell (((NSTextField) view).cell ()).setTitle (nsstring);
+(new NSCell ((cast(NSTextField) view).cell ())).setTitle (nsstring);
 selectionRange = null;
 setSelection (new Point(selection.x + string.length (), 0));
 }
 }
 sendEvent (DWT.Modify);
 }
 void register() {
 super.register();
-display.addWidget(((NSControl)view).cell(), this);
+display.addWidget((cast(NSControl)view).cell(), this);
 }
 void releaseWidget () {
 super.releaseWidget ();
 selectionRange = null;
 bool sendKeyEvent (NSEvent nsEvent, int type) {
 bool result = super.sendKeyEvent (nsEvent, type);
 if (!result) return result;
 int stateMask = 0;
-int /*long*/ modifierFlags = nsEvent.modifierFlags();
+NSUInteger modifierFlags = nsEvent.modifierFlags();
 if ((modifierFlags & OS.NSAlternateKeyMask) !is 0) stateMask |= DWT.ALT;
 if ((modifierFlags & OS.NSShiftKeyMask) !is 0) stateMask |= DWT.SHIFT;
 if ((modifierFlags & OS.NSControlKeyMask) !is 0) stateMask |= DWT.CONTROL;
 if ((modifierFlags & OS.NSCommandKeyMask) !is 0) stateMask |= DWT.COMMAND;
 if (type !is DWT.KeyDown)  return result;
 if (stateMask is DWT.COMMAND) {
-short keyCode = nsEvent.keyCode ();
+ushort keyCode = nsEvent.keyCode ();
 switch (keyCode) {
 case 7: /* X */
 cut ();
 return false;
 case 8: /* C */
 paste ();
 return false;
 }
 }
 if ((style & DWT.SINGLE) !is 0) {
-short keyCode = nsEvent.keyCode ();
+ushort keyCode = nsEvent.keyCode ();
 switch (keyCode) {
 case 76: /* KP Enter */
 case 36: /* Return */
 postEvent (DWT.DefaultSelection);
 }
 if ((stateMask & DWT.COMMAND) !is 0) return result;
 String oldText = "";
 int charCount = getCharCount ();
 Point selection = getSelection ();
 int start = selection.x, end = selection.y;
-short keyCode = nsEvent.keyCode ();
+ushort keyCode = nsEvent.keyCode ();
 NSString characters = nsEvent.charactersIgnoringModifiers();
-char character = (char) characters.characterAtIndex(0);
+wchar character = characters.characterAtIndex(0);
 switch (keyCode) {
 case 51: /* Backspace */
 if (start is end) {
 if (start is 0) return true;
 start = Math.max (0, start - 1);
 end = Math.min (end + 1, charCount);
 }
 break;
 default:
 if (character !is '\t' && character < 0x20) return true;
-oldText = new String (new char [] {character});
+oldText = new_String ([character]);
 }
 String newText = verifyText (oldText, start, end, nsEvent);
 if (newText is null) return false;
 if (charCount - (end - start) + newText.length () > textLimit) {
 return false;
 if (newText.length () !is 0) sendEvent (DWT.Modify);
 }
 return result;
 }
-void setBackground (float [] color) {
+void setBackground (CGFloat [] color) {
 NSColor nsColor;
 if (color is null) {
 return; // TODO reset to OS default
 } else {
 nsColor = NSColor.colorWithDeviceRed(color[0], color[1], color[2], 1);
 * often draws the combo incorrectly.  The workaround is to limit
 * the height of editable Combos to the height that is required
 * to display their text.
 */
 if ((style & DWT.READ_ONLY) is 0) {
-NSControl widget = (NSControl)view;
+NSControl widget = cast(NSControl)view;
-NSRect rect = new NSRect ();
+NSRect rect = NSRect ();
 rect.width = rect.height = Float.MAX_VALUE;
 NSSize size = widget.cell ().cellSizeForBounds (rect);
-height = Math.min (height, (int)Math.ceil (size.height));
+height = Math.min (height, cast(int)Math.ceil (size.height));
 }
 super.setBounds (x, y, width, height, move, resize);
 }
-void setForeground (float [] color) {
+void setForeground (CGFloat [] color) {
 NSColor nsColor;
 if (color is null) {
 return; // TODO reset to OS default
 } else {
 nsColor = NSColor.colorWithDeviceRed(color[0], color[1], color[2], 1);
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setItem (int index, String string) {
 checkWidget ();
-if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
+//if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
 int count = getItemCount ();
 if (0 > index || index >= count) error (DWT.ERROR_INVALID_RANGE);
 NSString str = NSString.stringWith(string);
 if ((style & DWT.READ_ONLY) !is 0) {
 NSMenuItem nsItem = (cast(NSPopUpButton)view).itemAtIndex(index);
 if (items.length is 0) return;
 for (int i= 0; i < items.length; i++) {
 NSString str = NSString.stringWith(items[i]);
 if ((style & DWT.READ_ONLY) !is 0) {
 NSMenu nsMenu = (cast(NSPopUpButton)view).menu();
-NSMenuItem nsItem = cast(NSMenuItem)new NSMenuItem().alloc();
+NSMenuItem nsItem = cast(NSMenuItem)(new NSMenuItem()).alloc();
-nsItem.initWithTitle(str, 0, NSString.stringWith(""));
+nsItem.initWithTitle(str, null, NSString.stringWith(""));
 nsMenu.addItem(nsItem);
 nsItem.release();
 } else {
 (cast(NSComboBox)view).addItemWithObjectValue(str);
 }
 */
 public void setSelection (Point selection) {
 checkWidget ();
 if (selection is null) error (DWT.ERROR_NULL_ARGUMENT);
 if ((style & DWT.READ_ONLY) is 0) {
-NSString str = new NSCell(((NSComboBox)view).cell()).title();
+NSString str = (new NSCell((cast(NSComboBox)view).cell())).title();
-int length = (int)/*64*/str.length();
+NSUInteger length = str.length();
-int start = Math.min (Math.max (Math.min (selection.x, selection.y), 0), length);
+NSUInteger start = Math.min (Math.max (Math.min (selection.x, selection.y), 0), length);
-int end = Math.min (Math.max (Math.max (selection.x, selection.y), 0), length);
+NSUInteger end = Math.min (Math.max (Math.max (selection.x, selection.y), 0), length);
 selectionRange = NSRange();
 selectionRange.location = start;
 selectionRange.length = end - start;
 if (this is display.getFocusControl ()) {
 NSText editor = view.window().fieldEditor(false, view);
 if (index !is -1 && index !is getSelectionIndex ()) {
 select (index);
 if (notify) sendEvent (DWT.Modify);
 }
 } else {
-new NSCell((cast(NSComboBox)view).cell()).setTitle(NSString.stringWith(string));
+(new NSCell((cast(NSComboBox)view).cell())).setTitle(NSString.stringWith(string));
 if (notify) sendEvent (DWT.Modify);
 }
 selectionRange = null;
 }
 } else {
 (cast(NSComboBox)view).setNumberOfVisibleItems(count);
 }
 }
-void textViewDidChangeSelection(int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void textViewDidChangeSelection(objc.id id, objc.SEL sel, objc.id aNotification) {
 NSNotification notification = new NSNotification(aNotification);
 NSText editor = new NSText(notification.object().id);
 selectionRange = editor.selectedRange();
 }
-void textDidChange (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void textDidChange (objc.id id, objc.SEL sel, objc.id aNotification) {
 postEvent (DWT.Modify);
 }
-NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange(int /*long*/ id, int /*long*/ sel, int /*long*/ aTextView, int /*long*/ oldSelectedCharRange, int /*long*/ newSelectedCharRange) {
+NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange(objc.id id, objc.SEL sel, objc.id aTextView, objc.id oldSelectedCharRange, objc.id newSelectedCharRange) {
 /*
 * If the selection is changing as a result of the receiver getting focus
 * then return the receiver's last selection range, otherwise the full
 * text will be automatically selected.
 */
 if (receivingFocus && selectionRange !is null) return selectionRange;
 /* allow the selection change to proceed */
 NSRange result = NSRange();
-OS.memmove(result, newSelectedCharRange, NSRange.sizeof);
+OS.memmove(&result, newSelectedCharRange, NSRange.sizeof);
 return result;
 }
 String verifyText (String string, int start, int end, NSEvent keyEvent) {
 Event event = new Event ();

Mercurial > projects > dwt-mac

comparison dwt/widgets/Combo.d @ 62:10eaa644646f