projects/dwt-win: dwt/widgets/Spinner.d comparison

comparison dwt/widgets/Spinner.d @ 213:36f5cb12e1a2

Update to SWT 3.4M7

author	Frank Benoit <benoit@tionex.de>
date	Sat, 17 May 2008 17:34:28 +0200
parents	ab60f3309436
children	e2affbeb686d

comparison

equal deleted inserted replaced

-:ab60f3309436
+:36f5cb12e1a2
 import dwt.dwthelper.utils;
 import tango.text.convert.Integer : toString;
 static import tango.text.Text;
 alias tango.text.Text.Text!(char) StringBuffer;
+import tango.util.Convert;
 /**
 * Instances of this class are selectable user interface
 * objects that allow the user to enter and modify numeric
 * values.
 OS.GetClassInfo (null, UpDownClass.ptr, &lpWndClass);
 UpDownProc = lpWndClass.lpfnWndProc;
 static_this_completed = true;
 }
 }
+/**
+* the operating system limit for the number of characters
+* that the text field in an instance of this class can hold
+*
+* @since 3.4
+*/
+public static 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 this() {
+LIMIT = OS.IsWinNT ? 0x7FFFFFFF : 0x7FFF;
+}
 /**
 * Constructs a new instance of this class given its parent
 * and a style value describing its behavior and appearance.
 * <p>
 handle,
 null,
 hInstance,
 null);
 if (hwndText is null) error (DWT.ERROR_NO_HANDLES);
-OS.SetWindowLong (hwndText, OS.GWL_ID, cast(int) hwndText);
+OS.SetWindowLongPtr (hwndText, OS.GWLP_ID, cast(LONG_PTR)hwndText);
 int upDownStyle = OS.WS_CHILD | OS.WS_VISIBLE | OS.UDS_AUTOBUDDY;
 if ((style & DWT.WRAP) !is 0) upDownStyle |= OS.UDS_WRAP;
 if ((style & DWT.BORDER) !is 0) {
 if ((style & DWT.RIGHT_TO_LEFT) !is 0) {
 upDownStyle |= OS.UDS_ALIGNLEFT;
 hInstance,
 null);
 if (hwndUpDown is null) error (DWT.ERROR_NO_HANDLES);
 int flags = OS.SWP_NOSIZE | OS.SWP_NOMOVE | OS.SWP_NOACTIVATE;
 SetWindowPos (hwndText, hwndUpDown, 0, 0, 0, 0, flags);
-OS.SetWindowLong (hwndUpDown, OS.GWL_ID, cast(int) hwndUpDown);
+OS.SetWindowLongPtr (hwndUpDown, OS.GWLP_ID, cast(LONG_PTR)hwndUpDown);
 if (OS.IsDBLocale) {
 auto hIMC = OS.ImmGetContext (handle);
 OS.ImmAssociateContext (hwndText, hIMC);
 OS.ImmAssociateContext (hwndUpDown, hIMC);
 OS.ImmReleaseContext (handle, hIMC);
 * The preferred height of a single-line text widget
 * has been hand-crafted to be the same height as
 * the single-line text widget in an editable combo
 * box.
 */
-int margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0);
+int /*long*/ margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0);
-x -= margins & 0xFFFF;
+x -= OS.LOWORD (margins);
-width += (margins & 0xFFFF) + ((margins >> 16) & 0xFFFF);
+width += OS.LOWORD (margins) + OS.HIWORD (margins);
 if ((style & DWT.BORDER) !is 0) {
 x -= 1;
 y -= 1;
 width += 2;
 height += 2;
 * </ul>
 */
 public int getSelection () {
 checkWidget ();
 static if (OS.IsWinCE) {
-return OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0) & 0xFFFF;
+return OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0));
 } else {
 return OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0);
 }
 }
-int getSelectionText () {
+int getSelectionText (bool [] parseFail) {
 int length_ = OS.GetWindowTextLength (hwndText);
 TCHAR[] buffer = NewTCHARs (getCodePage (), length_ + 1);
 OS.GetWindowText (hwndText, buffer.ptr, length_ + 1);
 String string = TCHARsToStr( buffer[ 0 .. length_] );
 try {
 int value;
 if (digits > 0) {
 String decimalSeparator = getDecimalSeparator ();
 int index = string.indexOf (decimalSeparator);
 if (index !is -1)  {
-String wholePart = string.substring (0, index);
+int startIndex = string.startsWith ("+") || string.startsWith ("-") ? 1 : 0;
+String wholePart = startIndex !is index ? string.substring (startIndex, index) : "0";
 String decimalPart = string.substring (index + 1);
 if (decimalPart.length > digits) {
 decimalPart = decimalPart.substring (0, digits);
 } else {
 int i = digits - decimalPart.length;
 }
 int wholeValue = Integer.parseInt (wholePart);
 int decimalValue = Integer.parseInt (decimalPart);
 for (int i = 0; i < digits; i++) wholeValue *= 10;
 value = wholeValue + decimalValue;
+if (string.startsWith ("-")) value = -value;
 } else {
 value = Integer.parseInt (string);
+for (int i = 0; i < digits; i++) value *= 10;
 }
 } else {
 value = Integer.parseInt (string);
 }
 int max, min;
 OS.SendMessage (hwndUpDown , OS.UDM_GETRANGE32, &min, &max);
 if (min <= value && value <= max) return value;
 } catch (NumberFormatException e) {
 }
+parseFail [0] = true;
 return -1;
+}
+/**
+* Returns a string containing a copy of the contents of the
+* receiver's text field, or an empty string if there are no
+* contents.
+*
+* @return the receiver's text
+*
+* @exception DWTException <ul>
+*    <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>
+*
+* @since 3.4
+*/
+public String getText () {
+checkWidget ();
+int length_ = OS.GetWindowTextLength (hwndText);
+if (length_ is 0) return "";
+TCHAR[] buffer = NewTCHARs (getCodePage (), length_ + 1);
+OS.GetWindowText (hwndText, buffer.ptr, length_ + 1);
+return TCHARsToStr( buffer[0 .. length_] );
+}
+/**
+* Returns the maximum number of characters that the receiver's
+* text field is capable of holding. If this has not been changed
+* by <code>setTextLimit()</code>, it will be the constant
+* <code>Spinner.LIMIT</code>.
+*
+* @return the text limit
+*
+* @exception DWTException <ul>
+*    <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>
+*
+* @see #LIMIT
+*
+* @since 3.4
+*/
+public int getTextLimit () {
+checkWidget ();
+return OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF;
 }
 int mbcsToWcsPos (int mbcsPos) {
 if (mbcsPos <= 0) return 0;
 if (OS.IsUnicode) return mbcsPos;
 if (value < 0) error (DWT.ERROR_INVALID_ARGUMENT);
 if (value is this.digits) return;
 this.digits = value;
 int pos;
 static if (OS.IsWinCE) {
-pos = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0) & 0xFFFF;
+pos = OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0));
 } else {
 pos = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0);
 }
 setSelection (pos, false, true, false);
 }
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setMaximum (int value) {
 checkWidget ();
-if (value < 0) return;
 int min;
 OS.SendMessage (hwndUpDown , OS.UDM_GETRANGE32, &min, null);
 if (value <= min) return;
 int pos;
 static if (OS.IsWinCE) {
-pos = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0) & 0xFFFF;
+pos = OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0));
 } else {
 pos = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0);
 }
 OS.SendMessage (hwndUpDown , OS.UDM_SETRANGE32, min, value);
 if (pos > value) setSelection (value, true, true, false);
 }
 /**
 * Sets the minimum value that the receiver will allow.  This new
-* value will be ignored if it is negative or is not less than the receiver's
+* value will be ignored if it is not less than the receiver's
 * current maximum value.  If the new minimum is applied then the receiver's
 * selection value will be adjusted if necessary to fall within its new range.
 *
-* @param value the new minimum, which must be nonnegative and less than the current maximum
+* @param value the new minimum, which must be less than the current maximum
 *
 * @exception DWTException <ul>
 *    <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 setMinimum (int value) {
 checkWidget ();
-if (value < 0) return;
 int max;
 OS.SendMessage (hwndUpDown , OS.UDM_GETRANGE32, null, &max);
 if (value >= max) return;
 int pos;
 static if (OS.IsWinCE) {
-pos = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0) & 0xFFFF;
+pos = OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0));
 } else {
 pos = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0);
 }
 OS.SendMessage (hwndUpDown , OS.UDM_SETRANGE32, value, max);
 if (pos < value) setSelection (value, true, true, false);
 void setSelection (int value, bool setPos, bool setText, bool notify) {
 if (setPos) {
 OS.SendMessage (hwndUpDown , OS.IsWinCE ? OS.UDM_SETPOS : OS.UDM_SETPOS32, 0, value);
 }
 if (setText) {
-String string = .toString( value );
+String string;
-if (digits > 0) {
+if (digits is 0) {
+string = .toString (value);
+} else {
+string = to!(String)(Math.abs (value));
 String decimalSeparator = getDecimalSeparator ();
 int index = string.length - digits;
 StringBuffer buffer = new StringBuffer ();
+if (value < 0) buffer.append ("-");
 if (index > 0) {
 buffer.append (string.substring (0, index));
 buffer.append (decimalSeparator);
 buffer.append (string.substring (index));
 } else {
 string = verifyText (string, 0, length_, null);
 if (string is null) return;
 }
 TCHAR* buffer = StrToTCHARz (getCodePage (), string);
 OS.SetWindowText (hwndText, buffer);
+OS.SendMessage (hwndText, OS.EM_SETSEL, 0, -1);
+if (!OS.IsWinCE) {
+OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, hwndText, OS.OBJID_CLIENT, 0);
+}
 }
 if (notify) postEvent (DWT.Selection);
+}
+/**
+* Sets the maximum number of characters that the receiver's
+* text field is capable of holding to be the argument.
+* <p>
+* To reset this value to the default, use <code>setTextLimit(Spinner.LIMIT)</code>.
+* Specifying a limit value larger than <code>Spinner.LIMIT</code> sets the
+* receiver's limit to <code>Spinner.LIMIT</code>.
+* </p>
+* @param limit new text limit
+*
+* @exception IllegalArgumentException <ul>
+*    <li>ERROR_CANNOT_BE_ZERO - if the limit is zero</li>
+* </ul>
+* @exception DWTException <ul>
+*    <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>
+*
+* @see #LIMIT
+*
+* @since 3.4
+*/
+public void setTextLimit (int limit) {
+checkWidget ();
+if (limit is 0) error (DWT.ERROR_CANNOT_BE_ZERO);
+OS.SendMessage (hwndText, OS.EM_SETLIMITTEXT, limit, 0);
 }
 override void setToolTipText (Shell shell, String string) {
 shell.setToolTipText (hwndText, string);
 shell.setToolTipText (hwndUpDown, string);
 *
 * @since 3.2
 */
 public void setValues (int selection, int minimum, int maximum, int digits, int increment, int pageIncrement) {
 checkWidget ();
-if (minimum < 0) return;
 if (maximum <= minimum) return;
 if (digits < 0) return;
 if (increment < 1) return;
 if (pageIncrement < 1) return;
 selection = Math.min (Math.max (minimum, selection), maximum);
 setSelection (selection, true, true, false);
 }
 override void subclass () {
 super.subclass ();
-int newProc = display.windowProc;
+int /*long*/ newProc = display.windowProc;
-OS.SetWindowLong (hwndText, OS.GWL_WNDPROC, newProc);
+OS.SetWindowLongPtr (hwndText, OS.GWLP_WNDPROC, newProc);
-OS.SetWindowLong (hwndUpDown, OS.GWL_WNDPROC, newProc);
+OS.SetWindowLongPtr (hwndUpDown, OS.GWLP_WNDPROC, newProc);
 }
 override void unsubclass () {
 super.unsubclass ();
-OS.SetWindowLong (hwndText, OS.GWL_WNDPROC, cast(int) EditProc);
+OS.SetWindowLongPtr (hwndText, OS.GWLP_WNDPROC, cast(LONG_PTR)EditProc);
-OS.SetWindowLong (hwndUpDown, OS.GWL_WNDPROC, cast(int) UpDownProc);
+OS.SetWindowLongPtr (hwndUpDown, OS.GWLP_WNDPROC, cast(LONG_PTR)UpDownProc);
 }
 String verifyText (String string, int start, int end, Event keyEvent) {
 Event event = new Event ();
 event.text = string;
 index = string.indexOf (decimalSeparator);
 if (index !is -1) {
 string = string.substring (0, index) ~ string.substring (index + 1);
 }
 index = 0;
+}
+if (string.length > 0) {
+int min;
+OS.SendMessage (hwndUpDown , OS.UDM_GETRANGE32, &min, null);
+if (min < 0 && string.charAt (0) is '-') index++;
 }
 while (index < string.length ) {
 if (!CharacterIsDigit (string.charAt (index))) break;
 index++;
 }
 return null;
 }
 override LRESULT WM_SETFOCUS (int wParam, int lParam) {
 OS.SetFocus (hwndText);
+OS.SendMessage (hwndText, OS.EM_SETSEL, 0, -1);
 return null;
 }
 override LRESULT WM_SETFONT (int wParam, int lParam) {
 LRESULT result = super.WM_SETFONT (wParam, lParam);
 }
 override LRESULT WM_SIZE (int wParam, int lParam) {
 LRESULT result = super.WM_SIZE (wParam, lParam);
 if (isDisposed ()) return result;
-int width = lParam & 0xFFFF, height = lParam >> 16;
+int width = OS.LOWORD (lParam), height = OS.HIWORD (lParam);
 int upDownWidth = OS.GetSystemMetrics (OS.SM_CXVSCROLL);
 int textWidth = width - upDownWidth;
 int border = OS.GetSystemMetrics (OS.SM_CXEDGE);
 int flags = OS.SWP_NOZORDER | OS.SWP_DRAWFRAME | OS.SWP_NOACTIVATE;
 SetWindowPos (hwndText, null, 0, 0, textWidth + border, height, flags);
 }
 return null;
 }
 override LRESULT wmCommandChild (int wParam, int lParam) {
-int code = wParam >> 16;
+int code = OS.HIWORD (wParam);
 switch (code) {
 case OS.EN_CHANGE:
 if (ignoreModify) break;
-int value = getSelectionText ();
+bool [] parseFail = new bool [1];
-if (value !is -1) {
+int value = getSelectionText (parseFail);
+if (!parseFail [0]) {
 int pos;
 static if (OS.IsWinCE) {
-pos = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0) & 0xFFFF;
+pos = OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0));
 } else {
 pos = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0);
 }
 if (pos !is value) setSelection (value, true, false, true);
 }
 case OS.VK_PRIOR: delta = pageIncrement; break;
 case OS.VK_NEXT: delta = -pageIncrement; break;
 default:
 }
 if (delta !is 0) {
-int value = getSelectionText ();
+bool [1] parseFail;
-if (value !is -1) {
+int value = getSelectionText (parseFail);
+if (parseFail [0]) {
 static if (OS.IsWinCE) {
-value = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0) & 0xFFFF;
+value = OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0));
 } else {
 value = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0);
 }
 }
 int newValue = value + delta;
 }
 return result;
 }
 override LRESULT wmKillFocus (HWND hwnd, int wParam, int lParam) {
-int value = getSelectionText ();
+bool [1] parseFail;
-if (value is -1) {
+int value = getSelectionText (parseFail);
+if (parseFail [0]) {
 static if (OS.IsWinCE) {
-value = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0) & 0xFFFF;
+value = OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0));
 } else {
 value = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0);
 }
 setSelection (value, false, true, false);
 }
 }
 return super.wmNotifyChild (hdr, wParam, lParam);
 }
 override LRESULT wmScrollChild (int wParam, int lParam) {
-int code = wParam & 0xFFFF;
+int code = OS.LOWORD (wParam);
 switch (code) {
 case OS.SB_THUMBPOSITION:
 postEvent (DWT.Selection);
 break;
 default:

Mercurial > projects > dwt-win

comparison dwt/widgets/Spinner.d @ 213:36f5cb12e1a2