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

comparison dwt/widgets/Text.d @ 45:d8635bb48c7c

Merge with SWT 3.5

author	Jacob Carlborg <doob@me.com>
date	Mon, 01 Dec 2008 17:07:00 +0100
parents	e831403a80a9
children	681769fb5a7a

comparison

equal deleted inserted replaced

-:ca5e494f2bbf
+:d8635bb48c7c
 /*******************************************************************************
-* Copyright (c) 2000, 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
 *
 import dwt.events.SelectionListener;
 import dwt.events.VerifyListener;
 import dwt.graphics.Color;
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
+import dwt.internal.cocoa.NSAttributedString;
 import dwt.internal.cocoa.NSCell;
 import dwt.internal.cocoa.NSColor;
 import dwt.internal.cocoa.NSControl;
 import dwt.internal.cocoa.NSEvent;
+import dwt.internal.cocoa.NSFont;
 import dwt.internal.cocoa.NSMutableString;
+import dwt.internal.cocoa.NSNotification;
 import dwt.internal.cocoa.NSRange;
 import dwt.internal.cocoa.NSRect;
-import dwt.internal.cocoa.NSSearchField;
+import dwt.internal.cocoa.NSScrollView;
-import dwt.internal.cocoa.NSSecureTextField;
 import dwt.internal.cocoa.NSSize;
 import dwt.internal.cocoa.NSString;
+import dwt.internal.cocoa.NSText;
+import dwt.internal.cocoa.NSTextContainer;
 import dwt.internal.cocoa.NSTextField;
 import dwt.internal.cocoa.NSTextFieldCell;
+import dwt.internal.cocoa.NSTextStorage;
 import dwt.internal.cocoa.NSTextView;
 import dwt.internal.cocoa.OS;
 import dwt.internal.cocoa.SWTScrollView;
+import dwt.internal.cocoa.SWTSearchField;
+import dwt.internal.cocoa.SWTSecureTextField;
 import dwt.internal.cocoa.SWTTextField;
 import dwt.internal.cocoa.SWTTextView;
 /**
 * Instances of this class are selectable user interface
 * objects that allow the user to enter and modify text.
+* Text controls can be either single or multi-line.
+* When a text control is created with a border, the
+* operating system includes a platform specific inset
+* around the contents of the control.  When created
+* without a border, an effort is made to remove the
+* inset such that the preferred size of the control
+* is the same size as the contents.
 * <p>
 * <dl>
 * <dt><b>Styles:</b></dt>
 * <dd>CANCEL, CENTER, LEFT, MULTI, PASSWORD, SEARCH, SINGLE, RIGHT, READ_ONLY, WRAP</dd>
 * <dt><b>Events:</b></dt>
 * Note: Only one of the styles MULTI and SINGLE may be specified,
 * and only one of the styles LEFT, CENTER, and RIGHT may be specified.
 * </p><p>
 * IMPORTANT: This class is <em>not</em> intended to be subclassed.
 * </p>
+*
+* @see <a href="http://www.eclipse.org/swt/snippets/#text">Text snippets</a>
+* @see <a href="http://www.eclipse.org/swt/examples.php">DWT Example: ControlExample</a>
+* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
 */
 public class Text : Scrollable {
 int textLimit = LIMIT, tabs = 8;
 char echoCharacter;
-bool doubleClick;
+bool doubleClick, receivingFocus;
 String hiddenText, message;
+NSRange selectionRange;
 /**
 * The maximum number of characters that can be entered
 * into a text widget.
 * <p>
 *
 * @see ModifyListener
 * @see #removeModifyListener
 */
 public void addModifyListener (ModifyListener listener) {
-checkWidget();
+checkWidget ();
 if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
 TypedListener typedListener = new TypedListener (listener);
 addListener (DWT.Modify, typedListener);
 }
 * @see SelectionListener
 * @see #removeSelectionListener
 * @see SelectionEvent
 */
 public void addSelectionListener(SelectionListener listener) {
-checkWidget();
+checkWidget ();
 if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
-TypedListener typedListener = new TypedListener(listener);
+TypedListener typedListener = new TypedListener (listener);
-addListener(DWT.Selection,typedListener);
+addListener (DWT.Selection,typedListener);
-addListener(DWT.DefaultSelection,typedListener);
+addListener (DWT.DefaultSelection,typedListener);
 }
 /**
 * Adds the listener to the collection of listeners who will
 * be notified when the receiver's text is verified, by sending
 *
 * @see VerifyListener
 * @see #removeVerifyListener
 */
 public void addVerifyListener (VerifyListener listener) {
-checkWidget();
+checkWidget ();
 if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
 TypedListener typedListener = new TypedListener (listener);
 addListener (DWT.Verify, typedListener);
 }
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void append (String string) {
-checkWidget();
+checkWidget ();
 if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
 if (hooks (DWT.Verify) || filters (DWT.Verify)) {
 int charCount = getCharCount ();
 string = verifyText (string, charCount, charCount, null);
 if (string is null) return;
 }
-NSString str = NSString.stringWith(string);
+NSString str = NSString.stringWith (string);
 if ((style & DWT.SINGLE) !is 0) {
-//      new NSTextFieldCell((cast(NSTextField)view).cell()).title().
+setSelection (getCharCount ());
-} else {
+insertEditText (string);
-NSTextView widget = cast(NSTextView)view;
+} else {
-NSMutableString mutableString = widget.textStorage().mutableString();
+NSTextView widget = cast(NSTextView) view;
-mutableString.appendString(str);
+NSMutableString mutableString = widget.textStorage ().mutableString ();
-NSRange range = new NSRange();
+mutableString.appendString (str);
-range.location = mutableString.length();
+NSRange range = new NSRange ();
-widget.scrollRangeToVisible(range);
+range.location = mutableString.length ();
+widget.scrollRangeToVisible (range);
 }
 if (string.length () !is 0) sendEvent (DWT.Modify);
+}
+bool becomeFirstResponder (int /*long*/ id, int /*long*/ sel) {
+receivingFocus = true;
+bool result = super.becomeFirstResponder (id, sel);
+receivingFocus = false;
+return result;
 }
 static int checkStyle (int style) {
 if ((style & DWT.SEARCH) !is 0) {
 style |= DWT.SINGLE | DWT.BORDER;
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void clearSelection () {
-checkWidget();
+checkWidget ();
 Point selection = getSelection ();
 setSelection (selection.x);
 }
 public Point computeSize (int wHint, int hHint, bool changed) {
-checkWidget();
+checkWidget ();
 int width = 0, height = 0;
 if ((style & DWT.SINGLE) !is 0) {
-NSTextField widget = cast(NSTextField)view;
+NSTextField widget = cast(NSTextField) view;
-NSRect oldRect = widget.frame();
+NSRect rect = new NSRect ();
-widget.sizeToFit();
+rect.width = rect.height = Float.MAX_VALUE;
-NSRect newRect = widget.frame();
+NSSize size = widget.cell ().cellSizeForBounds (rect);
+width = (int)Math.ceil (size.width);
+height = cast(int)Math.ceil (size.height);
+} else {
+NSTextView widget = cast(NSTextView) view;
+NSSize oldSize = null;
+NSTextContainer textContainer = widget.textContainer ();
+if ((style & DWT.WRAP) !is 0) {
+widget.setHorizontallyResizable (true);
+textContainer.setWidthTracksTextView (false);
+oldSize = textContainer.containerSize ();
+NSSize csize = new NSSize ();
+csize.width = wHint !is DWT.DEFAULT ? wHint : Float.MAX_VALUE;
+csize.height = hHint !is DWT.DEFAULT ? hHint : Float.MAX_VALUE;
+textContainer.setContainerSize (csize);
+}
+NSRect oldRect = widget.frame ();
+widget.sizeToFit ();
+NSRect newRect = widget.frame ();
 widget.setFrame (oldRect);
-width = cast(int)newRect.width;
+if ((style & DWT.WRAP) !is 0) {
-height = cast(int)newRect.height;
+widget.setHorizontallyResizable (false);
-} else {
+textContainer.setWidthTracksTextView (true);
-NSTextView widget = cast(NSTextView)view;
+textContainer.setContainerSize (oldSize);
-NSRect oldRect = widget.frame();
+}
-widget.sizeToFit();
+width = (int)(newRect.width + 1);
-NSRect newRect = widget.frame();
+height = (int)(newRect.height + 1);
-widget.setFrame (oldRect);
-width = cast(int)newRect.width;
-height = cast(int)newRect.height;
 }
 if (width <= 0) width = DEFAULT_WIDTH;
 if (height <= 0) height = DEFAULT_HEIGHT;
 if (wHint !is DWT.DEFAULT) width = wHint;
 if (hHint !is DWT.DEFAULT) height = hHint;
 * </ul>
 */
 public void copy () {
 checkWidget ();
 if ((style & DWT.SINGLE) !is 0) {
+Point selection = getSelection ();
-} else {
+if (selection.x is selection.y) return;
-(cast(NSTextView)view).copy();
+copyToClipboard (getEditText (selection.x, selection.y - 1));
+} else {
+NSText text = cast(NSText) view;
+if (text.selectedRange ().length is 0) return;
+text.copy (null);
 }
 }
 void createHandle () {
 if ((style & DWT.SINGLE) !is 0) {
 NSTextField widget;
 if ((style & DWT.PASSWORD) !is 0) {
-widget = cast(NSTextField)new NSSecureTextField().alloc();
+widget = cast(NSTextField) new SWTSecureTextField ().alloc ();
 } else if ((style & DWT.SEARCH) !is 0) {
-widget = cast(NSTextField)new NSSearchField().alloc();
+widget = cast(NSTextField) (new SWTSearchField ()).alloc ();
 } else {
-widget = cast(NSTextField)new SWTTextField().alloc();
+widget = cast(NSTextField) (new SWTTextField ()).alloc ();
 }
-widget.initWithFrame(new NSRect());
+widget.initWithFrame (new NSRect ());
-widget.setSelectable(true);
+widget.setSelectable (true);
 widget.setEditable((style & DWT.READ_ONLY) is 0);
-if ((style & DWT.BORDER) is 0) widget.setBordered(false);
+if ((style & DWT.BORDER) is 0) {
+widget.setFocusRingType (OS.NSFocusRingTypeNone);
+widget.setBordered (false);
+}
 int align = OS.NSLeftTextAlignment;
 if ((style & DWT.CENTER) !is 0) align = OS.NSCenterTextAlignment;
 if ((style & DWT.RIGHT) !is 0) align = OS.NSRightTextAlignment;
-widget.setAlignment(align);
+widget.setAlignment (align);
 //      widget.setTarget(widget);
 //      widget.setAction(OS.sel_sendSelection);
-widget.setTag(jniRef);
 view = widget;
-parent.contentView().addSubview_(widget);
+} else {
-} else {
+NSScrollView scrollWidget = cast(NSScrollView) new SWTScrollView ().alloc ();
-SWTScrollView scrollWidget = cast(SWTScrollView)new SWTScrollView().alloc();
+scrollWidget.initWithFrame (new NSRect ());
-scrollWidget.initWithFrame(new NSRect());
+scrollWidget.setHasVerticalScroller ((style & DWT.VERTICAL) !is 0);
-scrollWidget.setHasVerticalScroller((style & DWT.VERTICAL) !is 0);
+scrollWidget.setHasHorizontalScroller ((style & DWT.HORIZONTAL) !is 0);
-scrollWidget.setHasHorizontalScroller((style & DWT.HORIZONTAL) !is 0);
+scrollWidget.setAutoresizesSubviews (true);
-scrollWidget.setAutoresizesSubviews(true);
+if ((style & DWT.BORDER) !is 0) scrollWidget.setBorderType (OS.NSBezelBorder);
-scrollWidget.setTag(jniRef);
-SWTTextView widget = cast(SWTTextView)new SWTTextView().alloc();
+NSTextView widget = cast(NSTextView) new SWTTextView ().alloc ();
-widget.initWithFrame(new NSRect());
+widget.initWithFrame (new NSRect ());
-widget.setEditable((style & DWT.READ_ONLY) is 0);
+widget.setEditable ((style & DWT.READ_ONLY) is 0);
-if ((style & DWT.BORDER) is 0) widget.setFocusRingType(OS.NSFocusRingTypeNone);
-NSSize size = new NSSize();
+NSSize size = new NSSize ();
 size.width = size.height = Float.MAX_VALUE;
-widget.setMaxSize(size);
+widget.setMaxSize (size);
-widget.setAutoresizingMask(OS.NSViewWidthSizable | OS.NSViewHeightSizable);
+widget.setAutoresizingMask (OS.NSViewWidthSizable | OS.NSViewHeightSizable);
 if ((style & DWT.WRAP) is 0) {
-widget.setHorizontallyResizable(true);
+NSTextContainer textContainer = widget.textContainer ();
-NSSize csize = new NSSize();
+widget.setHorizontallyResizable (true);
+textContainer.setWidthTracksTextView (false);
+NSSize csize = new NSSize ();
 csize.width = csize.height = Float.MAX_VALUE;
-widget.textContainer().setWidthTracksTextView(false);
+textContainer.setContainerSize (csize);
-widget.textContainer().setContainerSize(csize);
 }
 int align = OS.NSLeftTextAlignment;
 if ((style & DWT.CENTER) !is 0) align = OS.NSCenterTextAlignment;
 if ((style & DWT.RIGHT) !is 0) align = OS.NSRightTextAlignment;
-widget.setAlignment(align);
+widget.setAlignment (align);
 //      widget.setTarget(widget);
 //      widget.setAction(OS.sel_sendSelection);
-widget.setTag(jniRef);
+widget.setRichText (false);
-widget.setRichText(false);
+widget.setDelegate(widget);
 view = widget;
 scrollView = scrollWidget;
-scrollView.setDocumentView(widget);
-parent.contentView().addSubview_(scrollView);
 }
 }
 void createWidget () {
 super.createWidget ();
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void cut () {
-checkWidget();
+checkWidget ();
 if ((style & DWT.READ_ONLY) !is 0) return;
-if ((style & DWT.SINGLE) !is 0) {
+bool cut = true;
+char [] oldText = null;
-} else {
+Point oldSelection = getSelection ();
-(cast(NSTextView)view).cut(null);
+if (hooks (DWT.Verify) || filters (DWT.Verify)) {
-}
+if (oldSelection.x !is oldSelection.y) {
-//  bool cut = true;
+oldText = getEditText (oldSelection.x, oldSelection.y - 1);
-//  char [] oldText = null;
+String newText = verifyText ("", oldSelection.x, oldSelection.y, null);
-//  Point oldSelection = getSelection ();
+if (newText is null) return;
-//  if (hooks (DWT.Verify) || filters (DWT.Verify)) {
+if (newText.length () !is 0) {
-//      if (oldSelection.x !is oldSelection.y) {
+copyToClipboard (oldText);
-//          oldText = getEditText (oldSelection.x, oldSelection.y - 1);
+if ((style & DWT.SINGLE) !is 0) {
-//          String newText = verifyText ("", oldSelection.x, oldSelection.y, null);
+insertEditText (newText);
-//          if (newText is null) return;
+} else {
-//          if (newText.length () !is 0) {
+NSTextView widget = (NSTextView) view;
-//              copyToClipboard (oldText);
+widget.replaceCharactersInRange (widget.selectedRange (), NSString.stringWith (newText));
-//              if (txnObject is 0) {
+}
-//                  insertEditText (newText);
+cut = false;
-//              } else {
+}
-//                  setTXNText (OS.kTXNUseCurrentSelection, OS.kTXNUseCurrentSelection, newText);
+}
-//                  OS.TXNShowSelection (txnObject, false);
+}
-//              }
+if (cut) {
-//              cut = false;
+if ((style & DWT.SINGLE) !is 0) {
-//          }
+if (oldText is null) oldText = getEditText (oldSelection.x, oldSelection.y - 1);
-//      }
+copyToClipboard (oldText);
-//  }
+insertEditText ("");
-//  if (cut) {
+} else {
-//      if (txnObject is 0) {
+(cast(NSTextView) view).cut (null);
-//          if (oldText is null) oldText = getEditText (oldSelection.x, oldSelection.y - 1);
+}
-//          copyToClipboard (oldText);
+}
-//          insertEditText ("");
+Point newSelection = getSelection ();
-//      } else {
+if (!cut || !oldSelection.equals (newSelection)) sendEvent (DWT.Modify);
-//          OS.TXNCut (txnObject);
-//
-//          /*
-//          * Feature in the Macintosh.  When an empty string is set in the TXNObject,
-//          * the font attributes are cleared.  The fix is to reset them.
-//          */
-//          if (OS.TXNDataSize (txnObject) / 2 is 0) setFontStyle (font);
-//      }
-//  }
-//  Point newSelection = getSelection ();
-//  if (!cut || !oldSelection.equals (newSelection)) sendEvent (DWT.Modify);
 }
 Color defaultBackground () {
 return display.getSystemColor (DWT.COLOR_LIST_BACKGROUND);
 }
 Color defaultForeground () {
 return display.getSystemColor (DWT.COLOR_LIST_FOREGROUND);
+}
+void deregister() {
+super.deregister();
+if ((style & DWT.SINGLE) !is 0) {
+display.removeWidget(((NSControl)view).cell());
+}
 }
 bool dragDetect (int x, int y, bool filter, bool [] consume) {
 if (filter) {
 Point selection = getSelection ();
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public int getCaretLineNumber () {
-checkWidget();
+checkWidget ();
 if ((style & DWT.SINGLE) !is 0) return 0;
 return (getTopPixel () + getCaretLocation ().y) / getLineHeight ();
 }
 /**
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public Point getCaretLocation () {
-checkWidget();
+checkWidget ();
 if ((style & DWT.SINGLE) !is 0) {
 //TODO - caret location for unicode text
 return new Point (0, 0);
 }
 //  NSText
-NSRange range = (cast(NSTextView)view).selectedRange();
+//  NSRange range = (cast(NSTextView)view).selectedRange();
-System.out.println(range.location + " " + range.length);
 return null;
 }
 /**
 * Returns the character position of the caret.
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public int getCaretPosition () {
-checkWidget();
+checkWidget ();
 if ((style & DWT.SINGLE) !is 0) {
 //TODO
 return 0;
 } else {
 NSRange range = (cast(NSTextView)view).selectedRange();
-return range.location;
+return (int)/*64*/range.location;
 }
 }
 /**
 * Returns the number of characters.
 * </ul>
 */
 public int getCharCount () {
 checkWidget ();
 if ((style & DWT.SINGLE) !is 0) {
-return new NSCell((cast(NSControl)view).cell()).title().length();
+return cast(int)/*64*/new NSCell ((cast(NSControl) view).cell ()).title ().length ();
 } else {
-//TODO
+return (int)/*64*/((NSTextView) view).textStorage ().length ();
-return 0;
 }
 }
 /**
 * Returns the double click enabled flag.
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public bool getDoubleClickEnabled () {
-checkWidget();
+checkWidget ();
 return doubleClick;
 }
 /**
 * Returns the echo character.
 * </ul>
 *
 * @see #setEchoChar
 */
 public char getEchoChar () {
-checkWidget();
+checkWidget ();
 return echoCharacter;
 }
 /**
 * Returns the editable state.
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public bool getEditable () {
-checkWidget();
+checkWidget ();
 return (style & DWT.READ_ONLY) is 0;
 }
+char [] getEditText () {
+NSString str = null;
+if ((style & DWT.SINGLE) !is 0) {
+str = new NSTextFieldCell (((NSTextField) view).cell ()).title ();
+} else {
+str = ((NSTextView)view).textStorage().string();
+}
+int length = (int)/*64*/str.length ();
+char [] buffer = new char [length];
+if (hiddenText !is null) {
+hiddenText.getChars (0, length, buffer, 0);
+} else {
+NSRange range = new NSRange ();
+range.length = length;
+str.getCharacters (buffer, range);
+}
+return buffer;
+}
+char [] getEditText (int start, int end) {
+NSString str = null;
+if ((style & DWT.SINGLE) !is 0) {
+str = new NSTextFieldCell (((NSTextField) view).cell ()).title ();
+} else {
+str = ((NSTextView)view).textStorage().string();
+}
+int length = (int)/*64*/str.length ();
+end = Math.min (end, length - 1);
+if (start > end) return new char [0];
+start = Math.max (0, start);
+NSRange range = new NSRange ();
+range.location = start;
+range.length = Math.max (0, end - start + 1);
+char [] buffer = new char [(int)/*64*/range.length];
+if (hiddenText !is null) {
+hiddenText.getChars ((int)/*64*/range.location, (int)/*64*/(range.location + range.length), buffer, 0);
+} else {
+str.getCharacters (buffer, range);
+}
+return buffer;
+}
 /**
 * Returns the number of lines.
 *
 * @return the number of lines in the widget
 *
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public int getLineCount () {
-checkWidget();
+checkWidget ();
 if ((style & DWT.SINGLE) !is 0) return 1;
-return (cast(NSTextView)view).textStorage().paragraphs().count();
+return cast(int)/*64*/(cast(NSTextView) view).textStorage ().paragraphs ().count ();
 }
 /**
 * Returns the line delimiter.
 *
 * </ul>
 *
 * @see #DELIMITER
 */
 public String getLineDelimiter () {
-checkWidget();
+checkWidget ();
 return DELIMITER;
 }
 /**
 * Returns the height of a line.
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public int getLineHeight () {
-checkWidget();
+checkWidget ();
 //TODO
 return 16;
 }
 /**
 * </ul>
 *
 * @since 2.1.2
 */
 public int getOrientation () {
-checkWidget();
+checkWidget ();
 return style & (DWT.LEFT_TO_RIGHT | DWT.RIGHT_TO_LEFT);
 }
 /**
 * Returns the widget message. When the widget is created
 //  checkWidget ();
 //TODO
 return 0;
 }
-public int getPosition (Point point) {
+/*public*/ int getPosition (Point point) {
 checkWidget ();
 if (point is null) error (DWT.ERROR_NULL_ARGUMENT);
 return getPosition (point.x, point.y);
 }
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public Point getSelection () {
-checkWidget();
+checkWidget ();
 if ((style & DWT.SINGLE) !is 0) {
-//      new NSTextFieldCell((cast(NSTextField)view).cell()).title().
+if (selectionRange is null) {
-return new Point(0, 0);
+NSString str = new NSTextFieldCell (((NSTextField) view).cell ()).title ();
-} else {
+return new Point((int)/*64*/str.length (), (int)/*64*/str.length ());
-NSTextView widget = cast(NSTextView)view;
+}
-NSRange range = widget.selectedRange();
+return new Point ((int)/*64*/selectionRange.location, (int)/*64*/(selectionRange.location + selectionRange.length));
-return new Point(range.location, range.location + range.length);
+} else {
+NSTextView widget = cast(NSTextView) view;
+NSRange range = widget.selectedRange ();
+return new Point ((int)/*64*/range.location, (int)/*64*/(range.location + range.length));
 }
 }
 /**
 * Returns the number of selected characters.
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public int getSelectionCount () {
-checkWidget();
+checkWidget ();
 if ((style & DWT.SINGLE) !is 0) {
-//      new NSTextFieldCell((cast(NSTextField)view).cell()).title().
+return selectionRange !is null ? cast(int)/*64*/selectionRange.length : 0;
-return -1;
+} else {
-} else {
+NSTextView widget = cast(NSTextView) view;
-NSTextView widget = cast(NSTextView)view;
+NSRange range = widget.selectedRange ();
-NSRange range = widget.selectedRange();
+return (int)/*64*/range.length;
-return range.length;
 }
 }
 /**
 * Gets the selected text, or an empty string if there is no current selection.
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public String getSelectionText () {
-checkWidget();
+checkWidget ();
 if ((style & DWT.SINGLE) !is 0) {
-//TODO
+Point selection = getSelection ();
-return "";
+if (selection.x is selection.y) return "";
-} else {
+return new String (getEditText (selection.x, selection.y - 1));
-NSTextView widget = cast(NSTextView)view;
+} else {
-NSRange range = widget.selectedRange();
+NSTextView widget = cast(NSTextView) view;
-NSString str = widget.textStorage().string();
+NSRange range = widget.selectedRange ();
-char[] buffer = new char[range.length];
+NSString str = widget.textStorage ().string ();
-str.getCharacters_range_(buffer, range);
+char[] buffer = new char [(int)/*64*/range.length];
-return new String(buffer);
+str.getCharacters (buffer, range);
+return new String (buffer);
 }
 }
 /**
 * Returns the number of tabs.
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public int getTabs () {
-checkWidget();
+checkWidget ();
 return tabs;
 }
 /**
 * Returns the widget text.
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public String getText () {
-checkWidget();
+checkWidget ();
 NSString str;
 if ((style & DWT.SINGLE) !is 0) {
-str = new NSTextFieldCell((cast(NSTextField)view).cell()).title();
+return new_String (getEditText ());
 } else {
-str = (cast(NSTextView)view).textStorage().string();
+str = (cast(NSTextView)view).textStorage ().string ();
 }
-if (str is null) return "";
+return str.getString();
-char[] buffer = new char[str.length()];
-str.getCharacters_(buffer);
-return new String(buffer);
 }
 /**
 * Returns a range of text.  Returns an empty string if the
 * start of the range is greater than the end.
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public String getText (int start, int end) {
 checkWidget ();
-NSString str;
+if (!(start <= end && 0 <= end)) return ""; //$NON-NLS-1$
 if ((style & DWT.SINGLE) !is 0) {
-str = new NSTextFieldCell((cast(NSTextField)view).cell()).title();
+return new_String (getEditText (start, end));
+}
-} else {
+NSTextStorage storage = ((NSTextView) view).textStorage ();
-str = null;
+end = Math.min (end, (int)/*64*/storage.length () - 1);
-//      return getTXNText (OS.kTXNStartOffset, OS.kTXNEndOffset);
+if (start > end) return ""; //$NON-NLS-1$
-}
+start = Math.max (0, start);
-if (str is null) return "";
+NSRange range = new NSRange ();
-char[] buffer = new char[str.length()];
+range.location = start;
-str.getCharacters_(buffer);
+range.length = end - start + 1;
-return new String(buffer, start, end - start);
+NSAttributedString substring = storage.attributedSubstringFromRange (range);
+NSString string = substring.string ();
+return string.getString();
 }
 /**
 * Returns the maximum number of characters that the receiver is capable of holding.
 * <p>
 * </ul>
 *
 * @see #LIMIT
 */
 public int getTextLimit () {
-checkWidget();
+checkWidget ();
 return textLimit;
 }
 /**
 * Returns the zero-relative index of the line which is currently
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public int getTopIndex () {
-checkWidget();
+checkWidget ();
 if ((style & DWT.SINGLE) !is 0) return 0;
 return getTopPixel () / getLineHeight ();
 }
 /**
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public int getTopPixel () {
-checkWidget();
+checkWidget ();
 if ((style & DWT.SINGLE) !is 0) return 0;
 //TODO
 return 0;
 }
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void insert (String string) {
-checkWidget();
+checkWidget ();
 if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
 if (hooks (DWT.Verify) || filters (DWT.Verify)) {
 Point selection = getSelection ();
 string = verifyText (string, selection.x, selection.y, null);
 if (string is null) return;
 }
 if ((style & DWT.SINGLE) !is 0) {
-//      new NSTextFieldCell((cast(NSTextField)view).cell()).title().
+insertEditText (string);
 } else {
-//
+NSString str = NSString.stringWith (string);
-NSString str = NSString.stringWith(string);
+NSTextView widget = cast(NSTextView) view;
-NSTextView widget = cast(NSTextView)view;
+NSRange range = widget.selectedRange ();
-NSRange range = widget.selectedRange();
+widget.textStorage ().replaceCharactersInRange (range, str);
-widget.textStorage().replaceCharactersInRange_withString_(range, str);
 }
 if (string.length () !is 0) sendEvent (DWT.Modify);
+}
+void insertEditText (String string) {
+int length = string.length ();
+Point selection = getSelection ();
+if (hasFocus () && hiddenText is null) {
+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];
+string.getChars (0, buffer.length, buffer, 0);
+NSString nsstring = NSString.stringWithCharacters (buffer, buffer.length);
+NSText editor = ((NSTextField) view).currentEditor ();
+editor.replaceCharactersInRange (editor.selectedRange (), nsstring);
+selectionRange = null;
+} else {
+String oldText = getText ();
+if (textLimit !is LIMIT) {
+int charCount = oldText.length ();
+if (charCount - (selection.y - selection.x) + length > textLimit) {
+string = string.substring(0, textLimit - charCount + (selection.y - selection.x));
+}
+}
+String newText = oldText.substring (0, selection.x) + string + oldText.substring (selection.y);
+setEditText (newText);
+setSelection (selection.x + string.length ());
+}
 }
 /**
 * Pastes text from clipboard.
 * <p>
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void paste () {
-checkWidget();
+checkWidget ();
 if ((style & DWT.READ_ONLY) !is 0) return;
-//  bool paste = true;
+bool paste = true;
-//  String oldText = null;
+String oldText = null;
-//  if (hooks (DWT.Verify) || filters (DWT.Verify)) {
+if (hooks (DWT.Verify) || filters (DWT.Verify)) {
-//      oldText = getClipboardText ();
+oldText = getClipboardText ();
-//      if (oldText !is null) {
+if (oldText !is null) {
-//          Point selection = getSelection ();
+Point selection = getSelection ();
-//          String newText = verifyText (oldText, selection.x, selection.y, null);
+String newText = verifyText (oldText, selection.x, selection.y, null);
-//          if (newText is null) return;
+if (newText is null) return;
-//          if (!newText.equals (oldText)) {
+if (!newText.equals (oldText)) {
-//              if (txnObject is 0) {
+if ((style & DWT.SINGLE) !is 0) {
-//                  insertEditText (newText);
+insertEditText (newText);
-//              } else {
+} else {
-//                  setTXNText (OS.kTXNUseCurrentSelection, OS.kTXNUseCurrentSelection, newText);
+NSTextView textView = (NSTextView) view;
-//                  OS.TXNShowSelection (txnObject, false);
+textView.replaceCharactersInRange (textView.selectedRange (), NSString.stringWith (newText));
-//              }
+}
-//              paste = false;
+paste = false;
-//          }
+}
-//      }
+}
-//  }
+}
-//  if (paste) {
+if (paste) {
-//      if (txnObject is 0) {
+if ((style & DWT.SINGLE) !is 0) {
-//          if (oldText is null) oldText = getClipboardText ();
+if (oldText is null) oldText = getClipboardText ();
-//          insertEditText (oldText);
+insertEditText (oldText);
-//      } else {
+} else {
-//          if (textLimit !is LIMIT) {
+//TODO check text limit
-//              if (oldText is null) oldText = getClipboardText ();
+((NSTextView) view).paste (null);
-//              setTXNText (OS.kTXNUseCurrentSelection, OS.kTXNUseCurrentSelection, oldText);
+}
-//              OS.TXNShowSelection (txnObject, false);
+}
-//          } else {
+sendEvent (DWT.Modify);
-//              OS.TXNPaste (txnObject);
+}
-//          }
-//      }
+void register() {
-//  }
+super.register();
-//  sendEvent (DWT.Modify);
+if ((style & DWT.SINGLE) !is 0) {
+display.addWidget(((NSControl)view).cell(), this);
+}
 }
 void releaseWidget () {
 super.releaseWidget ();
 hiddenText = message = null;
+selectionRange = null;
 }
 /**
 * Removes the listener from the collection of listeners who will
 * be notified when the receiver's text is modified.
 *
 * @see ModifyListener
 * @see #addModifyListener
 */
 public void removeModifyListener (ModifyListener listener) {
-checkWidget();
+checkWidget ();
 if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
 if (eventTable is null) return;
 eventTable.unhook (DWT.Modify, listener);
 }
 *
 * @see SelectionListener
 * @see #addSelectionListener
 */
 public void removeSelectionListener(SelectionListener listener) {
-checkWidget();
+checkWidget ();
 if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
 if (eventTable is null) return;
-eventTable.unhook(DWT.Selection, listener);
+eventTable.unhook (DWT.Selection, listener);
-eventTable.unhook(DWT.DefaultSelection,listener);
+eventTable.unhook (DWT.DefaultSelection,listener);
 }
 /**
 * Removes the listener from the collection of listeners who will
 * be notified when the control is verified.
 *
 * @see VerifyListener
 * @see #addVerifyListener
 */
 public void removeVerifyListener (VerifyListener listener) {
-checkWidget();
+checkWidget ();
 if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
 if (eventTable is null) return;
 eventTable.unhook (DWT.Verify, listener);
 }
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void selectAll () {
-checkWidget();
+checkWidget ();
 if ((style & DWT.SINGLE) !is 0) {
 setSelection (0, getCharCount ());
 } else {
-(cast(NSTextView)view).selectAll(null);
+(cast(NSTextView) view).selectAll (null);
 }
 }
-bool sendKeyEvent (int type, Event event) {
+bool sendKeyEvent (NSEvent nsEvent, int type) {
-if (!super.sendKeyEvent (type, event)) {
+bool result = super.sendKeyEvent (nsEvent, type);
-return false;
+if (!result) return result;
-}
+if (type !is DWT.KeyDown) return result;
-if (type !is DWT.KeyDown) return true;
+int stateMask = 0;
-if ((style & DWT.READ_ONLY) !is 0) return true;
+int /*long*/ modifierFlags = nsEvent.modifierFlags();
-if (event.character is 0) return true;
+if ((modifierFlags & OS.NSAlternateKeyMask) !is 0) stateMask |= DWT.ALT;
-if ((event.stateMask & DWT.COMMAND) !is 0) return true;
+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 (stateMask is DWT.COMMAND) {
+short keyCode = nsEvent.keyCode ();
+switch (keyCode) {
+case 7: /* X */
+cut ();
+return false;
+case 8: /* C */
+copy ();
+return false;
+case 9: /* V */
+paste ();
+return false;
+}
+}
+if ((style & DWT.SINGLE) !is 0) {
+short 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;
-switch (event.character) {
+short keyCode = nsEvent.keyCode ();
-case DWT.BS:
+NSString characters = nsEvent.charactersIgnoringModifiers();
+char character = (char) characters.characterAtIndex(0);
+switch (keyCode) {
+case 51: /* Backspace */
 if (start is end) {
 if (start is 0) return true;
 start = Math.max (0, start - 1);
 }
 break;
-case DWT.DEL:
+case 117: /* Delete */
 if (start is end) {
 if (start is charCount) return true;
 end = Math.min (end + 1, charCount);
 }
 break;
-case DWT.CR:
+case 36: /* Return */
 if ((style & DWT.SINGLE) !is 0) return true;
 oldText = DELIMITER;
 break;
 default:
-if (event.character !is '\t' && event.character < 0x20) return true;
+if (character !is '\t' && character < 0x20) return true;
-oldText = new String (new char [] {event.character});
+oldText = new String (new char [] {character});
 }
-String newText = verifyText (oldText, start, end, event);
+String newText = verifyText (oldText, start, end, nsEvent);
 if (newText is null) return false;
 if (charCount - (end - start) + newText.length () > textLimit) {
 return false;
 }
-bool result = newText is oldText;
+result = newText is oldText;
 if (newText !is oldText || hiddenText !is null) {
-//      if (txnObject is 0) {
+if ((style & DWT.SINGLE) !is 0) {
-//          String text = new String (getEditText (0, -1));
+insertEditText (newText);
-//          String leftText = text.substring (0, start);
+} else {
-//          String rightText = text.substring (end, text.length ());
+NSString str = NSString.stringWith (newText);
-//          setEditText (leftText + newText + rightText);
+NSTextView widget = (NSTextView) view;
-//          start += newText.length ();
+NSRange range = widget.selectedRange ();
-//          setSelection (new Point (start, start));
+widget.textStorage ().replaceCharactersInRange (range, str);
-//          result = false;
+}
-//      } else {
+if (newText.length () !is 0) sendEvent (DWT.Modify);
-//          setTXNText (start, end, newText);
+}
-//      }
-}
-/*
-* Post the modify event so that the character will be inserted
-* into the widget when the modify event is delivered.  Normally,
-* modify events are sent but it is safe to post the event here
-* because this method is called from the event loop.
-*/
-postEvent (DWT.Modify);
 return result;
 }
 void setBackground (float [] color) {
 NSColor nsColor;
 if (color is null) {
 return; // TODO reset to OS default
 } else {
-nsColor = NSColor.colorWithDeviceRed(color[0], color[1], color[2], 1);
+nsColor = NSColor.colorWithDeviceRed (color [0], color [1], color [2], 1);
 }
 if ((style & DWT.SINGLE) !is 0) {
-(cast(NSTextField)view).setBackgroundColor(nsColor);
+(cast(NSTextField) view).setBackgroundColor (nsColor);
 } else {
-(cast(NSTextView)view).setBackgroundColor(nsColor);
+(cast(NSTextView) view).setBackgroundColor (nsColor);
 }
 }
 /**
 * Sets the double click enabled flag.
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setDoubleClickEnabled (bool doubleClick) {
-checkWidget();
+checkWidget ();
 this.doubleClick = doubleClick;
 }
 /**
 * Sets the echo character.
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setEchoChar (char echo) {
-checkWidget();
+checkWidget ();
 if ((style & DWT.MULTI) !is 0) return;
 //  if (txnObject is 0) {
 //      if ((style & DWT.PASSWORD) is 0) {
 //          Point selection = getSelection ();
 //          String text = getText ();
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setEditable (bool editable) {
-checkWidget();
+checkWidget ();
 if (editable) {
 style &= ~DWT.READ_ONLY;
 } else {
 style |= DWT.READ_ONLY;
 }
 if ((style & DWT.SINGLE) !is 0) {
-(cast(NSTextField)view).setEditable(editable);
+(cast(NSTextField) view).setEditable (editable);
 } else {
-(cast(NSTextView)view).setEditable(editable);
+(cast(NSTextView) view).setEditable (editable);
 }
+}
+void setEditText (String string) {
+char [] buffer;
+if ((style & DWT.PASSWORD) is 0 && echoCharacter !is '\0') {
+hiddenText = string;
+buffer = new char [Math.min(hiddenText.length (), textLimit)];
+for (int i = 0; i < buffer.length; i++) buffer [i] = echoCharacter;
+} else {
+hiddenText = null;
+buffer = new char [Math.min(string.length (), textLimit)];
+string.getChars (0, buffer.length, buffer, 0);
+}
+NSString nsstring = NSString.stringWithCharacters (buffer, buffer.length);
+new NSCell (((NSTextField) view).cell ()).setTitle (nsstring);
+selectionRange = null;
+}
+void setFont(NSFont font) {
+if ((style & DWT.MULTI) !is  0) {
+((NSTextView) view).setFont (font);
+return;
+}
+super.setFont (font);
 }
 void setForeground (float [] color) {
 NSColor nsColor;
 if (color is null) {
 return; // TODO reset to OS default
 } else {
-nsColor = NSColor.colorWithDeviceRed(color[0], color[1], color[2], 1);
+nsColor = NSColor.colorWithDeviceRed (color [0], color [1], color [2], 1);
 }
 if ((style & DWT.SINGLE) !is 0) {
-(cast(NSTextField)view).setTextColor(nsColor);
+(cast(NSTextField) view).setTextColor (nsColor);
 } else {
-(cast(NSTextView)view).setTextColor_(nsColor);
+(cast(NSTextView) view).setTextColor (nsColor);
 }
 }
 /**
 * Sets the orientation of the receiver, which must be one
 * </ul>
 *
 * @since 2.1.2
 */
 public void setOrientation (int orientation) {
-checkWidget();
+checkWidget ();
 }
 /**
 * Sets the widget message. When the widget is created
 * with the style <code>DWT.SEARCH</code>, the message text
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setSelection (int start) {
-checkWidget();
+checkWidget ();
 setSelection (start, start);
 }
 /**
 * Sets the selection to the range specified
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setSelection (int start, int end) {
-checkWidget();
+checkWidget ();
 if ((style & DWT.SINGLE) !is 0) {
-//      int length = getCharCount ();
+NSString str = new NSCell (((NSTextField) view).cell ()).title ();
-//      ControlEditTextSelectionRec selection = new ControlEditTextSelectionRec ();
+int length = (int)/*64*/str.length ();
-//      selection.selStart = cast(short) Math.min (Math.max (Math.min (start, end), 0), length);
+int selStart = Math.min (Math.max (Math.min (start, end), 0), length);
-//      selection.selEnd = cast(short) Math.min (Math.max (Math.max (start, end), 0), length);
+int selEnd = Math.min (Math.max (Math.max (start, end), 0), length);
-//      if (hasFocus ()) {
+selectionRange = new NSRange ();
-//          OS.SetControlData (handle, OS.kControlEntireControl, OS.kControlEditTextSelectionTag, 4, selection);
+selectionRange.location = selStart;
-//      } else {
+selectionRange.length = selEnd - selStart;
-//          this.selection = selection;
+if (this is display.getFocusControl ()) {
-//      }
+NSText editor = view.window ().fieldEditor (false, view);
-} else {
+editor.setSelectedRange (selectionRange);
-//TODO - range test
+}
+} else {
+int length = (int)/*64*/((NSTextView) view).textStorage ().length ();
+int selStart = Math.min (Math.max (Math.min (start, end), 0), length);
+int selEnd = Math.min (Math.max (Math.max (start, end), 0), length);
 NSRange range = new NSRange ();
-range.location = start;
+range.location = selStart;
-range.length = end - start + 1;
+range.length = selEnd - selStart;
-(cast(NSTextView)view).setSelectedRange (range);
+(cast(NSTextView) view).setSelectedRange (range);
 }
 }
 /**
 * Sets the selection to the range specified
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setSelection (Point selection) {
-checkWidget();
+checkWidget ();
 if (selection is null) error (DWT.ERROR_NULL_ARGUMENT);
 setSelection (selection.x, selection.y);
 }
 /**
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setTabs (int tabs) {
-checkWidget();
+checkWidget ();
 if (this.tabs is tabs) return;
 //  if (txnObject is 0) return;
 //  this.tabs = tabs;
 //  TXNTab tab = new TXNTab ();
 //  tab.value = cast(short) (textExtent (new char[]{' '}, 0).x * tabs);
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setText (String string) {
-checkWidget();
+checkWidget ();
 if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
 if (hooks (DWT.Verify) || filters (DWT.Verify)) {
 string = verifyText (string, 0, getCharCount (), null);
 if (string is null) return;
 }
-NSString str = NSString.stringWith(string);
+if ((style & DWT.SINGLE) !is 0) {
-if ((style & DWT.SINGLE) !is 0) {
+setEditText (string);
-new NSCell((cast(NSTextField)view).cell()).setTitle(str);
+} else {
-} else {
+NSString str = NSString.stringWith (string);
-(cast(NSTextView)view).setString(str);
+(cast(NSTextView) view).setString (str);
 }
 sendEvent (DWT.Modify);
 }
 /**
 * </ul>
 *
 * @see #LIMIT
 */
 public void setTextLimit (int limit) {
-checkWidget();
+checkWidget ();
 if (limit is 0) error (DWT.ERROR_CANNOT_BE_ZERO);
 textLimit = limit;
 }
 /**
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setTopIndex (int index) {
-checkWidget();
+checkWidget ();
 if ((style & DWT.SINGLE) !is 0) return;
 //TODO no working
-NSTextView widget = cast(NSTextView)view;
+//  NSTextView widget = cast(NSTextView) view;
-NSRange range = new NSRange();
+//  NSRange range = new NSRange ();
-NSRect rect = widget.firstRectForCharacterRange(range);
+//  NSRect rect = widget.firstRectForCharacterRange (range);
-view.scrollRectToVisible(rect);
+//  view.scrollRectToVisible (rect);
 }
 /**
 * Shows the selection.
 * <p>
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void showSelection () {
-checkWidget();
+checkWidget ();
 if ((style & DWT.SINGLE) !is 0)  {
-setSelection (getSelection());
+setSelection (getSelection ());
 } else {
-NSTextView widget = cast(NSTextView)view;
+NSTextView widget = cast(NSTextView) view;
-widget.scrollRangeToVisible(widget.selectedRange());
+widget.scrollRangeToVisible (widget.selectedRange ());
 }
+}
+void textViewDidChangeSelection(int /*long*/ id, int /*long*/ sel, int /*long*/ 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) {
+postEvent (DWT.Modify);
+}
+NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange (int /*long*/ id, int /*long*/ sel, int /*long*/ aTextView, int /*long*/ oldSelectedCharRange, int /*long*/ 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 = new NSRange ();
+OS.memmove(result, newSelectedCharRange, NSRange.sizeof);
+return result;
 }
 int traversalCode (int key, NSEvent theEvent) {
 int bits = super.traversalCode (key, theEvent);
 if ((style & DWT.READ_ONLY) !is 0) return bits;
 if ((style & DWT.MULTI) !is 0) {
 bits &= ~DWT.TRAVERSE_RETURN;
-//      if (key is 48 /* Tab */ && theEvent !is 0) {
+if (key is 48 /* Tab */ && theEvent !is null) {
-//          int [] modifiers = new int [1];
+int /*long*/ modifiers = theEvent.modifierFlags ();
-//          OS.GetEventParameter (theEvent, OS.kEventParamKeyModifiers, OS.typeUInt32, null, 4, null, modifiers);
+bool next = (modifiers & OS.NSShiftKeyMask) is 0;
-//          bool next = (modifiers [0] & OS.shiftKey) is 0;
+if (next && (modifiers & OS.NSControlKeyMask) is 0) {
-//          if (next && (modifiers [0] & OS.controlKey) is 0) {
+bits &= ~(DWT.TRAVERSE_TAB_NEXT | DWT.TRAVERSE_TAB_PREVIOUS);
-//              bits &= ~(DWT.TRAVERSE_TAB_NEXT | DWT.TRAVERSE_TAB_PREVIOUS);
+}
-//          }
+}
-//      }
 }
 return bits;
 }
-String verifyText (String string, int start, int end, Event keyEvent) {
+String verifyText (String string, int start, int end, NSEvent keyEvent) {
 Event event = new Event ();
+if (keyEvent !is null) setKeyState(event, DWT.MouseDown, keyEvent);
 event.text = string;
 event.start = start;
 event.end = end;
-if (keyEvent !is null) {
-event.character = keyEvent.character;
-event.keyCode = keyEvent.keyCode;
-event.stateMask = keyEvent.stateMask;
-}
 /*
 * It is possible (but unlikely), that application
 * code could have disposed the widget in the verify
 * event.  If this happens, answer null to cancel
 * the operation.

Mercurial > projects > dwt-mac

comparison dwt/widgets/Text.d @ 45:d8635bb48c7c