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

comparison dwt/widgets/Control.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	fd9c62a2998e

comparison

equal deleted inserted replaced

-:ab60f3309436
+:36f5cb12e1a2
 import dwt.graphics.GC;
 import dwt.graphics.GCData;
 import dwt.graphics.Image;
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
+import dwt.graphics.Region;
 import dwt.internal.win32.OS;
 import dwt.widgets.Widget;
 import dwt.widgets.Composite;
+import dwt.widgets.Dialog;
 import dwt.widgets.Event;
 import dwt.widgets.Shell;
 import dwt.widgets.Menu;
 import dwt.widgets.MenuItem;
 import dwt.widgets.Decorations;
 Menu menu;
 String toolTipText_;
 Object layoutData;
 Accessible accessible;
 Image backgroundImage;
+Region region;
+Font font;
 int drawCount, foreground, background;
 /**
 * Prevents uninitialized instances from being created outside the package.
 */
 void checkBuffered () {
 style &= ~DWT.DOUBLE_BUFFERED;
 }
+void checkComposited () {
+/* Do nothing */
+}
 bool checkHandle (HWND hwnd) {
 return hwnd is handle;
 }
 void checkMirrored () {
 OS.GetModuleHandle (null),
 widgetCreateStruct ());
 if (handle is null) error (DWT.ERROR_NO_HANDLES);
 int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
 if ((bits & OS.WS_CHILD) !is 0) {
-OS.SetWindowLong (handle, OS.GWL_ID, cast(int)handle);
+OS.SetWindowLongPtr (handle, OS.GWLP_ID, cast(LONG_PTR)handle);
 }
 if (OS.IsDBLocale && hwndParent !is null) {
 auto hIMC = OS.ImmGetContext (hwndParent);
 OS.ImmAssociateContext (handle, hIMC);
 OS.ImmReleaseContext (hwndParent, hIMC);
 foreground = background = -1;
 checkOrientation (parent);
 createHandle ();
 checkBackground ();
 checkBuffered ();
+checkComposited ();
 register ();
 subclass ();
 setDefaultFont ();
 checkMirrored ();
 checkBorder ();
 if ((stateMask & DWT.BUTTON1) !is 0) wParam |= OS.MK_LBUTTON;
 if ((stateMask & DWT.BUTTON2) !is 0) wParam |= OS.MK_MBUTTON;
 if ((stateMask & DWT.BUTTON3) !is 0) wParam |= OS.MK_RBUTTON;
 if ((stateMask & DWT.BUTTON4) !is 0) wParam |= OS.MK_XBUTTON1;
 if ((stateMask & DWT.BUTTON5) !is 0) wParam |= OS.MK_XBUTTON2;
-int lParam = (x & 0xFFFF) | ((y << 16) & 0xFFFF0000);
+int /*long*/ lParam = OS.MAKELPARAM (x, y);
 OS.SendMessage (handle, OS.WM_LBUTTONUP, wParam, lParam);
 }
 return false;
 }
 return sendDragEvent (button, stateMask, x, y);
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public Font getFont () {
 checkWidget ();
+if (font !is null) return font;
 auto hFont = cast(HFONT)OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
 if (hFont is null) hFont = defaultFont ();
 return Font.win32_new (display, hFont);
 }
 while (control !is shell) {
 result [--count] = control;
 control = control.parent;
 }
 return result;
+}
+/**
+* Returns the region that defines the shape of the control,
+* or null if the control has the default shape.
+*
+* @return the region that defines the shape of the shell (or null)
+*
+* @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 Region getRegion () {
+checkWidget ();
+return region;
 }
 /**
 * Returns the receiver's shell. For all controls other than
 * shells, this simply returns the control's nearest ancestor
 if (foreground !is OS.GetTextColor (hDC)) data.foreground = foreground;
 Control control = findBackgroundControl ();
 if (control is null) control = this;
 auto background = control.getBackgroundPixel ();
 if (background !is OS.GetBkColor (hDC)) data.background = background;
-data.hFont = cast(HFONT) OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0);
+data.font = font !is null ? font : Font.win32_new (display, cast(HFONT)OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0));
 data.uiState = OS.SendMessage (hwnd, OS.WM_QUERYUISTATE, 0, 0);
 }
 return hDC;
 }
 OS.EndPaint (hwnd, data.ps);
 }
 }
 bool isActive () {
-Shell dialogShell = display.getModalDialogShell ();
+Dialog dialog = display.getModalDialog ();
-if (dialogShell !is null && dialogShell !is getShell ()) {
+if (dialog !is null) {
-return false;
+Shell dialogShell = dialog.parent;
+if (dialogShell !is null && !dialogShell.isDisposed ()) {
+if (dialogShell !is getShell ()) return false;
+}
 }
 Shell shell = null;
 Shell [] modalShells = display.modalShells;
 if (modalShells !is null) {
 int bits = DWT.APPLICATION_MODAL | DWT.SYSTEM_MODAL;
 /*
 * Check to see if current damage is included.
 */
 //  if (!OS.IsWindowVisible (handle)) return false;
 //  int flags = OS.DCX_CACHE | OS.DCX_CLIPCHILDREN | OS.DCX_CLIPSIBLINGS;
-//  int hDC = OS.GetDCEx (handle, 0, flags);
+//  int /*long*/ hDC = OS.GetDCEx (handle, 0, flags);
 //  int result = OS.GetClipBox (hDC, new RECT ());
 //  OS.ReleaseDC (handle, hDC);
 //  return result !is OS.NULLREGION;
 }
 if (tabList [i] is this) return false;
 }
 }
 int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
 if ((bits & OS.WS_TABSTOP) !is 0) return false;
-int code = OS.SendMessage (handle, OS.WM_GETDLGCODE, 0, 0);
+int /*long*/ code = OS.SendMessage (handle, OS.WM_GETDLGCODE, 0, 0);
 if ((code & OS.DLGC_STATIC) !is 0) return false;
 if ((code & OS.DLGC_WANTALLKEYS) !is 0) return false;
 if ((code & OS.DLGC_WANTARROWS) !is 0) return false;
 if ((code & OS.DLGC_WANTTAB) !is 0) return false;
 return true;
 checkWidget ();
 setSize (computeSize (DWT.DEFAULT, DWT.DEFAULT, changed));
 }
 /**
+* Prints the receiver and all children.
+*
+* @param gc the gc where the drawing occurs
+*
+* @exception IllegalArgumentException <ul>
+*    <li>ERROR_NULL_ARGUMENT - if the gc is null</li>
+*    <li>ERROR_INVALID_ARGUMENT - if the gc has been disposed</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>
+*
+* @since 3.4
+*/
+public bool print (GC gc) {
+checkWidget ();
+if (gc is null) error (DWT.ERROR_NULL_ARGUMENT);
+if (gc.isDisposed ()) error (DWT.ERROR_INVALID_ARGUMENT);
+if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1)) {
+auto topHandle = topHandle ();
+int bits = OS.GetWindowLong (topHandle, OS.GWL_STYLE);
+if ((bits & OS.WS_VISIBLE) is 0) {
+OS.DefWindowProc (topHandle, OS.WM_SETREDRAW, 1, 0);
+}
+printWidget (topHandle, gc.handle);
+if ((bits & OS.WS_VISIBLE) is 0) {
+OS.DefWindowProc (topHandle, OS.WM_SETREDRAW, 0, 0);
+}
+return true;
+}
+return false;
+}
+void printWidget (HWND hwnd, HDC hDC) {
+OS.PrintWindow (hwnd, hDC, 0);
+}
+/**
 * Causes the entire bounds of the receiver to be marked
 * as needing to be redrawn. The next time a paint request
 * is processed, the control will be completely painted,
 * including the background.
 *
 layoutData = null;
 if (accessible !is null) {
 accessible.internal_dispose_Accessible ();
 }
 accessible = null;
+region = null;
+font = null;
 }
 /**
 * Removes the listener from the collection of listeners who will
 * be notified when the control is moved or resized.
 }
 }
 return true;
 }
+void sendMove () {
+sendEvent (DWT.Move);
+}
+void sendResize () {
+sendEvent (DWT.Resize);
+}
 void setBackground () {
 Control control = findBackgroundControl ();
 if (control is null) control = this;
 if (control.backgroundImage !is null) {
 Shell shell = getShell ();
 void setBounds (int x, int y, int width, int height, int flags) {
 setBounds (x, y, width, height, flags, true);
 }
 void setBounds (int x, int y, int width, int height, int flags, bool defer) {
+if (findImageControl () !is null) {
+if (backgroundImage is null) flags |= OS.SWP_NOCOPYBITS;
+} else {
+if (OS.GetWindow (handle, OS.GW_CHILD) is null) {
+if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
+if (findThemeControl () !is null) flags |= OS.SWP_NOCOPYBITS;
+}
+}
+}
 auto topHandle_ = topHandle ();
 if (defer && parent !is null) {
 forceResize ();
-if (OS.GetWindow (handle, OS.GW_CHILD) is null) {
+if (parent.lpwp !is null) {
-if (findImageControl () !is null) {
-flags |= OS.SWP_NOCOPYBITS;
-} else {
-if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-if (findThemeControl () !is null) flags |= OS.SWP_NOCOPYBITS;
-}
-}
-}
-WINDOWPOS* [] lpwp = parent.lpwp;
-if (lpwp is null) {
-SetWindowPos (topHandle_, null, x, y, width, height, flags);
-} else {
 int index = 0;
+auto lpwp = parent.lpwp;
 while (index < lpwp.length) {
 if (lpwp [index] is null) break;
 index ++;
 }
 if (index is lpwp.length) {
 wp.y = y;
 wp.cx = width;
 wp.cy = height;
 wp.flags = flags;
 lpwp [index] = wp;
-}
+return;
-} else {
+}
-SetWindowPos (topHandle_, null, x, y, width, height, flags);
+}
-}
+SetWindowPos (topHandle_, null, x, y, width, height, flags);
 }
 /**
 * Sets the receiver's size and location to the rectangular
 * area specified by the argument. The <code>x</code> and
 }
 /**
 * If the argument is <code>true</code>, causes the receiver to have
 * all mouse events delivered to it until the method is called with
-* <code>false</code> as the argument.
+* <code>false</code> as the argument.  Note that on some platforms,
+* a mouse button must currently be down for capture to be assigned.
 *
 * @param capture <code>true</code> to capture the mouse, and <code>false</code> to release it
 *
 * @exception DWTException <ul>
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 }
 }
 }
 void setCursor () {
-int lParam = OS.HTCLIENT | (OS.WM_MOUSEMOVE << 16);
+int /*long*/ lParam = OS.MAKELPARAM (OS.HTCLIENT, OS.WM_MOUSEMOVE);
 OS.SendMessage (handle, OS.WM_SETCURSOR, handle, lParam);
 }
 /**
 * Sets the receiver's cursor to the cursor specified by the
 public void setCursor (Cursor cursor) {
 checkWidget ();
 if (cursor !is null && cursor.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 this.cursor = cursor;
 static if (OS.IsWinCE) {
-int hCursor = cursor !is null ? cursor.handle : 0;
+int /*long*/ hCursor = cursor !is null ? cursor.handle : 0;
 OS.SetCursor (hCursor);
 return;
 }
 auto hwndCursor = OS.GetCapture ();
 if (hwndCursor is null) {
 HFONT hFont;
 if (font !is null) {
 if (font.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 hFont = font.handle;
 }
+this.font = font;
 if (hFont is null) hFont = defaultFont ();
 OS.SendMessage (handle, OS.WM_SETFONT, hFont, 1);
 }
 /**
 if (handle !is topHandle_) OS.SendMessage (handle, OS.WM_SETREDRAW, 0, 0);
 }
 }
 }
+/**
+* Sets the shape of the control to the region specified
+* by the argument.  When the argument is null, the
+* default shape of the control is restored.
+*
+* @param region the region that defines the shape of the control (or null)
+*
+* @exception IllegalArgumentException <ul>
+*    <li>ERROR_INVALID_ARGUMENT - if the region has been disposed</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>
+*
+* @since 3.4
+*
+*/
+public void setRegion (Region region) {
+checkWidget ();
+if (region !is null && region.isDisposed()) error (DWT.ERROR_INVALID_ARGUMENT);
+HRGN hRegion;
+if (region !is null) {
+hRegion = OS.CreateRectRgn (0, 0, 0, 0);
+OS.CombineRgn (hRegion, region.handle, hRegion, OS.RGN_OR);
+}
+OS.SetWindowRgn (handle, hRegion, true);
+this.region = region;
+}
 bool setSavedFocus () {
 return forceFocus ();
 }
 /**
 }
 }
 }
 void subclass () {
-int oldProc = windowProc ();
+int /*long*/ oldProc = windowProc ();
 int newProc = display.windowProc();
 if (oldProc is newProc) return;
-OS.SetWindowLong (handle, OS.GWL_WNDPROC, newProc);
+OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, newProc);
 }
 /**
 * Returns a point which is the result of converting the
 * argument, which is specified in display relative coordinates,
 bool translateMnemonic (MSG* msg) {
 if (msg.wParam < 0x20) return false;
 auto hwnd = msg.hwnd;
 if (OS.GetKeyState (OS.VK_MENU) >= 0) {
-int code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
 if ((code & OS.DLGC_WANTALLKEYS) !is 0) return false;
 if ((code & OS.DLGC_BUTTON) is 0) return false;
 }
 Decorations shell = menuShell ();
 if (shell.isVisible () && shell.isEnabled ()) {
 int lastKey = key, lastAscii = 0;
 switch (key) {
 case OS.VK_ESCAPE: {
 all = true;
 lastAscii = 27;
-int code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
 if ((code & OS.DLGC_WANTALLKEYS) !is 0) {
 /*
 * Use DLGC_HASSETSEL to determine that the control
 * is a text widget.  A text widget normally wants
 * all keys except VK_ESCAPE.  If this bit is not
 break;
 }
 case OS.VK_RETURN: {
 all = true;
 lastAscii = '\r';
-int code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
 if ((code & OS.DLGC_WANTALLKEYS) !is 0) doit = false;
 detail = DWT.TRAVERSE_RETURN;
 break;
 }
 case OS.VK_TAB: {
 lastAscii = '\t';
 bool next = OS.GetKeyState (OS.VK_SHIFT) >= 0;
-int code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
 if ((code & (OS.DLGC_WANTTAB | OS.DLGC_WANTALLKEYS)) !is 0) {
 /*
 * Use DLGC_HASSETSEL to determine that the control is a
 * text widget.  If the control is a text widget, then
 * Ctrl+Tab and Shift+Tab should traverse out of the widget.
 }
 } else {
 doit = false;
 }
 }
-if (parent !is null && (parent.style & DWT.MIRRORED) !is 0) {
-if (key is OS.VK_LEFT || key is OS.VK_RIGHT) next = !next;
-}
 detail = next ? DWT.TRAVERSE_TAB_NEXT : DWT.TRAVERSE_TAB_PREVIOUS;
 break;
 }
 case OS.VK_UP:
 case OS.VK_LEFT:
 */
 if (OS.IsSP) {
 if (key is OS.VK_LEFT || key is OS.VK_RIGHT) return false;
 }
 lastVirtual = true;
-int code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
 if ((code & (OS.DLGC_WANTARROWS /*| OS.DLGC_WANTALLKEYS*/)) !is 0) doit = false;
 bool next = key is OS.VK_DOWN || key is OS.VK_RIGHT;
+if (parent !is null && (parent.style & DWT.MIRRORED) !is 0) {
+if (key is OS.VK_LEFT || key is OS.VK_RIGHT) next = !next;
+}
 detail = next ? DWT.TRAVERSE_ARROW_NEXT : DWT.TRAVERSE_ARROW_PREVIOUS;
 break;
 }
 case OS.VK_PRIOR:
 case OS.VK_NEXT: {
 all = true;
 lastVirtual = true;
 if (OS.GetKeyState (OS.VK_CONTROL) >= 0) return false;
-int code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
 if ((code & OS.DLGC_WANTALLKEYS) !is 0) {
 /*
 * Use DLGC_HASSETSEL to determine that the control is a
 * text widget.  If the control is a text widget, then
 * Ctrl+PgUp and Ctrl+PgDn should traverse out of the widget.
 bool traverseReturn () {
 return false;
 }
 void unsubclass () {
-int newProc = windowProc ();
+int /*long*/ newProc = windowProc ();
-int oldProc = display.windowProc;
+int /*long*/ oldProc = display.windowProc;
 if (oldProc is newProc) return;
-OS.SetWindowLong (handle, OS.GWL_WNDPROC, newProc);
+OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, newProc);
 }
 /**
 * Forces all outstanding paint requests for the widget
 * to be processed before this method returns. If there
 return true;
 }
 abstract String windowClass ();
-abstract int windowProc ();
+abstract int /*long*/ windowProc ();
 int windowProc (HWND hwnd, int msg, int wParam, int lParam) {
 LRESULT result = null;
 switch (msg) {
 case OS.WM_ACTIVATE:            result = WM_ACTIVATE (wParam, lParam); break;
 case OS.WM_CAPTURECHANGED:      result = WM_CAPTURECHANGED (wParam, lParam); break;
+case OS.WM_CHANGEUISTATE:       result = WM_CHANGEUISTATE (wParam, lParam); break;
 case OS.WM_CHAR:                result = WM_CHAR (wParam, lParam); break;
 case OS.WM_CLEAR:               result = WM_CLEAR (wParam, lParam); break;
 case OS.WM_CLOSE:               result = WM_CLOSE (wParam, lParam); break;
 case OS.WM_COMMAND:             result = WM_COMMAND (wParam, lParam); break;
 case OS.WM_CONTEXTMENU:         result = WM_CONTEXTMENU (wParam, lParam); break;
 case OS.WM_GETMINMAXINFO:       result = WM_GETMINMAXINFO (wParam, lParam); break;
 case OS.WM_HELP:                result = WM_HELP (wParam, lParam); break;
 case OS.WM_HSCROLL:             result = WM_HSCROLL (wParam, lParam); break;
 case OS.WM_IME_CHAR:            result = WM_IME_CHAR (wParam, lParam); break;
 case OS.WM_IME_COMPOSITION:     result = WM_IME_COMPOSITION (wParam, lParam); break;
+case OS.WM_IME_COMPOSITION_START:   result = WM_IME_COMPOSITION_START (wParam, lParam); break;
+case OS.WM_IME_ENDCOMPOSITION:  result = WM_IME_ENDCOMPOSITION (wParam, lParam); break;
 case OS.WM_INITMENUPOPUP:       result = WM_INITMENUPOPUP (wParam, lParam); break;
 case OS.WM_INPUTLANGCHANGE:     result = WM_INPUTLANGCHANGE (wParam, lParam); break;
 case OS.WM_HOTKEY:              result = WM_HOTKEY (wParam, lParam); break;
 case OS.WM_KEYDOWN:             result = WM_KEYDOWN (wParam, lParam); break;
 case OS.WM_KEYUP:               result = WM_KEYUP (wParam, lParam); break;
 }
 if (result !is null) return result.value;
 return callWindowProc (hwnd, msg, wParam, lParam);
 }
-LRESULT WM_ACTIVATE (int wParam, int lParam) {
+LRESULT WM_ACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_CAPTURECHANGED (int wParam, int lParam) {
+LRESULT WM_CAPTURECHANGED (int /*long*/ wParam, int /*long*/ lParam) {
 return wmCaptureChanged (handle, wParam, lParam);
 }
-LRESULT WM_CHAR (int wParam, int lParam) {
+LRESULT WM_CHANGEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
+if ((state & IGNORE_WM_CHANGEUISTATE) !is 0) return LRESULT.ZERO;
+return null;
+}
+LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
 return wmChar (handle, wParam, lParam);
 }
-LRESULT WM_CLEAR (int wParam, int lParam) {
+LRESULT WM_CLEAR (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_CLOSE (int wParam, int lParam) {
+LRESULT WM_CLOSE (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_COMMAND (int wParam, int lParam) {
+LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) {
 /*
 * When the WM_COMMAND message is sent from a
 * menu, the HWND parameter in LPARAM is zero.
 */
 if (lParam is 0) {
 Decorations shell = menuShell ();
 if (shell.isEnabled ()) {
-int id = wParam & 0xFFFF;
+int id = OS.LOWORD (wParam);
 MenuItem item = display.getMenuItem (id);
 if (item !is null && item.isEnabled ()) {
 return item.wmCommandChild (wParam, lParam);
 }
 }
 Control control = display.getControl (cast(HANDLE)lParam);
 if (control is null) return null;
 return control.wmCommandChild (wParam, lParam);
 }
-LRESULT WM_CONTEXTMENU (int wParam, int lParam) {
+LRESULT WM_CONTEXTMENU (int /*long*/ wParam, int /*long*/ lParam) {
 return wmContextMenu (handle, wParam, lParam);
 }
-LRESULT WM_CTLCOLOR (int wParam, int lParam) {
+LRESULT WM_CTLCOLOR (int /*long*/ wParam, int /*long*/ lParam) {
 auto hPalette = display.hPalette;
 if (hPalette !is null) {
 OS.SelectPalette ( cast(HPALETTE)wParam, hPalette, false);
 OS.RealizePalette (cast(HPALETTE)wParam);
 }
 Control control = display.getControl (cast(HANDLE)lParam);
 if (control is null) return null;
 return control.wmColorChild (wParam, lParam);
 }
-LRESULT WM_CUT (int wParam, int lParam) {
+LRESULT WM_CUT (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_DESTROY (int wParam, int lParam) {
+LRESULT WM_DESTROY (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_DRAWITEM (int wParam, int lParam) {
+LRESULT WM_DRAWITEM (int /*long*/ wParam, int /*long*/ lParam) {
 DRAWITEMSTRUCT* struct_ = cast(DRAWITEMSTRUCT*)lParam;
 if (struct_.CtlType is OS.ODT_MENU) {
 MenuItem item = display.getMenuItem (struct_.itemID);
 if (item is null) return null;
 return item.wmDrawChild (wParam, lParam);
 Control control = display.getControl (struct_.hwndItem);
 if (control is null) return null;
 return control.wmDrawChild (wParam, lParam);
 }
-LRESULT WM_ENDSESSION (int wParam, int lParam) {
+LRESULT WM_ENDSESSION (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_ENTERIDLE (int wParam, int lParam) {
+LRESULT WM_ENTERIDLE (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_ERASEBKGND (int wParam, int lParam) {
+LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
 if ((state & DRAW_BACKGROUND) !is 0) {
 if (findImageControl () !is null) return LRESULT.ONE;
 }
 if ((state & THEME_BACKGROUND) !is 0) {
 if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
 }
 }
 return null;
 }
-LRESULT WM_GETDLGCODE (int wParam, int lParam) {
+LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_GETFONT (int wParam, int lParam) {
+LRESULT WM_GETFONT (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_GETOBJECT (int wParam, int lParam) {
+LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
 if (accessible !is null) {
-int result = accessible.internal_WM_GETOBJECT (wParam, lParam);
+int /*long*/ result = accessible.internal_WM_GETOBJECT (wParam, lParam);
 if (result !is 0) return new LRESULT (result);
 }
 return null;
 }
-LRESULT WM_GETMINMAXINFO (int wParam, int lParam) {
+LRESULT WM_GETMINMAXINFO (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_HOTKEY (int wParam, int lParam) {
+LRESULT WM_HOTKEY (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_HELP (int wParam, int lParam) {
+LRESULT WM_HELP (int /*long*/ wParam, int /*long*/ lParam) {
 static if (OS.IsWinCE) return null;
 HELPINFO* lphi = cast(HELPINFO*)lParam;
 Decorations shell = menuShell ();
 if (!shell.isEnabled ()) return null;
 if (lphi.iContextType is OS.HELPINFO_MENUITEM) {
 return LRESULT.ONE;
 }
 return null;
 }
-LRESULT WM_HSCROLL (int wParam, int lParam) {
+LRESULT WM_HSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
 Control control = display.getControl (cast(HANDLE)lParam);
 if (control is null) return null;
 return control.wmScrollChild (wParam, lParam);
 }
-LRESULT WM_IME_CHAR (int wParam, int lParam) {
+LRESULT WM_IME_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
 return wmIMEChar (handle, wParam, lParam);
 }
-LRESULT WM_IME_COMPOSITION (int wParam, int lParam) {
+LRESULT WM_IME_COMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_INITMENUPOPUP (int wParam, int lParam) {
+LRESULT WM_IME_COMPOSITION_START (int /*long*/ wParam, int /*long*/ lParam) {
+return null;
+}
+LRESULT WM_IME_ENDCOMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
+return null;
+}
+LRESULT WM_INITMENUPOPUP (int /*long*/ wParam, int /*long*/ lParam) {
 /* Ignore WM_INITMENUPOPUP for an accelerator */
 if (display.accelKeyHit) return null;
 /*
 * the menu is the system menu and we can ignore
 * WPARAM.  Otherwise, use WPARAM to find the menu.
 */
 Shell shell = getShell ();
 Menu oldMenu = shell.activeMenu, newMenu = null;
-if ((lParam >> 16) is 0) {
+if (OS.HIWORD (lParam) is 0) {
 newMenu = menuShell ().findMenu (cast(HANDLE)wParam);
 if (newMenu !is null) newMenu.update ();
 }
 Menu menu = newMenu;
 while (menu !is null && menu !is oldMenu) {
 // widget could be disposed at this point
 }
 return null;
 }
-LRESULT WM_INPUTLANGCHANGE (int wParam, int lParam) {
+LRESULT WM_INPUTLANGCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_KEYDOWN (int wParam, int lParam) {
+LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
 return wmKeyDown (handle, wParam, lParam);
 }
-LRESULT WM_KEYUP (int wParam, int lParam) {
+LRESULT WM_KEYUP (int /*long*/ wParam, int /*long*/ lParam) {
 return wmKeyUp (handle, wParam, lParam);
 }
-LRESULT WM_KILLFOCUS (int wParam, int lParam) {
+LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
 return wmKillFocus (handle, wParam, lParam);
 }
-LRESULT WM_LBUTTONDBLCLK (int wParam, int lParam) {
+LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
 return wmLButtonDblClk (handle, wParam, lParam);
 }
-LRESULT WM_LBUTTONDOWN (int wParam, int lParam) {
+LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
 return wmLButtonDown (handle, wParam, lParam);
 }
-LRESULT WM_LBUTTONUP (int wParam, int lParam) {
+LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
 return wmLButtonUp (handle, wParam, lParam);
 }
-LRESULT WM_MBUTTONDBLCLK (int wParam, int lParam) {
+LRESULT WM_MBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
 return wmMButtonDblClk (handle, wParam, lParam);
 }
-LRESULT WM_MBUTTONDOWN (int wParam, int lParam) {
+LRESULT WM_MBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
 return wmMButtonDown (handle, wParam, lParam);
 }
-LRESULT WM_MBUTTONUP (int wParam, int lParam) {
+LRESULT WM_MBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
 return wmMButtonUp (handle, wParam, lParam);
 }
-LRESULT WM_MEASUREITEM (int wParam, int lParam) {
+LRESULT WM_MEASUREITEM (int /*long*/ wParam, int /*long*/ lParam) {
 MEASUREITEMSTRUCT* struct_ = cast(MEASUREITEMSTRUCT*)lParam;;
 if (struct_.CtlType is OS.ODT_MENU) {
 MenuItem item = display.getMenuItem (struct_.itemID);
 if (item is null) return null;
 return item.wmMeasureChild (wParam, lParam);
 Control control = display.getControl (hwnd);
 if (control is null) return null;
 return control.wmMeasureChild (wParam, lParam);
 }
-LRESULT WM_MENUCHAR (int wParam, int lParam) {
+LRESULT WM_MENUCHAR (int /*long*/ wParam, int /*long*/ lParam) {
 /*
 * Feature in Windows.  When the user types Alt+<key>
 * and <key> does not match a mnemonic in the System
 * menu or the menu bar, Windows beeps.  This beep is
 * unexpected and unwanted by applications that look
 * for Alt+<key>.  The fix is to detect the case and
 * stop Windows from beeping by closing the menu.
 */
-int type = wParam >> 16;
+int type = OS.HIWORD (wParam);
 if (type is 0 || type is OS.MF_SYSMENU) {
 display.mnemonicKeyHit = false;
-return new LRESULT (OS.MNC_CLOSE << 16);
+return new LRESULT (OS.MAKELRESULT (0, OS.MNC_CLOSE));
 }
 return null;
 }
-LRESULT WM_MENUSELECT (int wParam, int lParam) {
+LRESULT WM_MENUSELECT (int /*long*/ wParam, int /*long*/ lParam) {
-int code = wParam >> 16;
+int code = OS.HIWORD (wParam);
 Shell shell = getShell ();
-if (code is -1 && lParam is 0) {
+if (code is 0xFFFF && lParam is 0) {
 Menu menu = shell.activeMenu;
 while (menu !is null) {
 /*
 * When the user cancels any menu that is not the
 * menu bar, assume a mnemonic key was pressed to open
 if ((code & OS.MF_SYSMENU) !is 0) return null;
 if ((code & OS.MF_HILITE) !is 0) {
 MenuItem item = null;
 Decorations menuShell = menuShell ();
 if ((code & OS.MF_POPUP) !is 0) {
-int index = wParam & 0xFFFF;
+int index = OS.LOWORD (wParam);
 MENUITEMINFO info;
 info.cbSize = MENUITEMINFO.sizeof;
 info.fMask = OS.MIIM_SUBMENU;
 if (OS.GetMenuItemInfo (cast(HANDLE)lParam, index, true, &info)) {
 Menu newMenu = menuShell.findMenu (info.hSubMenu);
 if (newMenu !is null) item = newMenu.cascade;
 }
 } else {
 Menu newMenu = menuShell.findMenu (cast(HANDLE)lParam);
 if (newMenu !is null) {
-int id = wParam & 0xFFFF;
+int id = OS.LOWORD (wParam);
 item = display.getMenuItem (id);
 }
 Menu oldMenu = shell.activeMenu;
 if (oldMenu !is null) {
 Menu ancestor = oldMenu;
 * because there is no longer a link to follow.
 */
 ancestor.sendEvent (DWT.Hide);
 if (ancestor.isDisposed ()) break;
 ancestor = ancestor.getParentMenu ();
+if (ancestor is null) break;
 }
 /*
 * The shell and/or the item could be disposed when
 * processing hide events from above.  If this happens,
 * ensure that the shell is not accessed and that no
 if (item !is null) item.sendEvent (DWT.Arm);
 }
 return null;
 }
-LRESULT WM_MOUSEACTIVATE (int wParam, int lParam) {
+LRESULT WM_MOUSEACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_MOUSEHOVER (int wParam, int lParam) {
+LRESULT WM_MOUSEHOVER (int /*long*/ wParam, int /*long*/ lParam) {
 return wmMouseHover (handle, wParam, lParam);
 }
-LRESULT WM_MOUSELEAVE (int wParam, int lParam) {
+LRESULT WM_MOUSELEAVE (int /*long*/ wParam, int /*long*/ lParam) {
 if (OS.COMCTL32_MAJOR >= 6) getShell ().fixToolTip ();
 return wmMouseLeave (handle, wParam, lParam);
 }
-LRESULT WM_MOUSEMOVE (int wParam, int lParam) {
+LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) {
 return wmMouseMove (handle, wParam, lParam);
 }
-LRESULT WM_MOUSEWHEEL (int wParam, int lParam) {
+LRESULT WM_MOUSEWHEEL (int /*long*/ wParam, int /*long*/ lParam) {
 return wmMouseWheel (handle, wParam, lParam);
 }
-LRESULT WM_MOVE (int wParam, int lParam) {
+LRESULT WM_MOVE (int /*long*/ wParam, int /*long*/ lParam) {
+state |= MOVE_OCCURRED;
 if (findImageControl () !is null) {
 if (this !is getShell ()) redrawChildren ();
 } else {
 if ((state & THEME_BACKGROUND) !is 0) {
 if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
 if (findThemeControl () !is null) redrawChildren ();
 }
 }
 }
 }
-sendEvent (DWT.Move);
+if ((state & MOVE_DEFERRED) is 0) sendEvent (DWT.Move);
 // widget could be disposed at this point
 return null;
 }
-LRESULT WM_NCACTIVATE (int wParam, int lParam) {
+LRESULT WM_NCACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_NCCALCSIZE (int wParam, int lParam) {
+LRESULT WM_NCCALCSIZE (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_NCHITTEST (int wParam, int lParam) {
+LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) {
 if (!OS.IsWindowEnabled (handle)) return null;
 if (!isActive ()) return new LRESULT (OS.HTTRANSPARENT);
 return null;
 }
-LRESULT WM_NCLBUTTONDOWN (int wParam, int lParam) {
+LRESULT WM_NCLBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_NCPAINT (int wParam, int lParam) {
+LRESULT WM_NCPAINT (int /*long*/ wParam, int /*long*/ lParam) {
-return null;
+return wmNCPaint (handle, wParam, lParam);
 }
-LRESULT WM_NOTIFY (int wParam, int lParam) {
+LRESULT WM_NOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
 NMHDR* hdr = cast(NMHDR*)lParam;
 return wmNotify (hdr, wParam, lParam);
 }
-LRESULT WM_PAINT (int wParam, int lParam) {
+LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
-return super.wmPaint (handle, wParam, lParam);
+return wmPaint (handle, wParam, lParam);
 }
-LRESULT WM_PALETTECHANGED (int wParam, int lParam) {
+LRESULT WM_PALETTECHANGED (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_PARENTNOTIFY (int wParam, int lParam) {
+LRESULT WM_PARENTNOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_PASTE (int wParam, int lParam) {
+LRESULT WM_PASTE (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_PRINT (int wParam, int lParam) {
+LRESULT WM_PRINT (int /*long*/ wParam, int /*long*/ lParam) {
 return wmPrint (handle, wParam, lParam);
 }
-LRESULT WM_PRINTCLIENT (int wParam, int lParam) {
+LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_QUERYENDSESSION (int wParam, int lParam) {
+LRESULT WM_QUERYENDSESSION (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_QUERYNEWPALETTE (int wParam, int lParam) {
+LRESULT WM_QUERYNEWPALETTE (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_QUERYOPEN (int wParam, int lParam) {
+LRESULT WM_QUERYOPEN (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_RBUTTONDBLCLK (int wParam, int lParam) {
+LRESULT WM_RBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
 return wmRButtonDblClk (handle, wParam, lParam);
 }
-LRESULT WM_RBUTTONDOWN (int wParam, int lParam) {
+LRESULT WM_RBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
 return wmRButtonDown (handle, wParam, lParam);
 }
-LRESULT WM_RBUTTONUP (int wParam, int lParam) {
+LRESULT WM_RBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
 return wmRButtonUp (handle, wParam, lParam);
 }
-LRESULT WM_SETCURSOR (int wParam, int lParam) {
+LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) {
-int hitTest = cast(short) (lParam & 0xFFFF);
+int hitTest = cast(short) OS.LOWORD (lParam);
 if (hitTest is OS.HTCLIENT) {
 Control control = display.getControl (cast(HANDLE)wParam);
 if (control is null) return null;
 Cursor cursor = control.findCursor ();
 if (cursor !is null) {
 }
 }
 return null;
 }
-LRESULT WM_SETFOCUS (int wParam, int lParam) {
+LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
 return wmSetFocus (handle, wParam, lParam);
 }
-LRESULT WM_SETTINGCHANGE (int wParam, int lParam) {
+LRESULT WM_SETTINGCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_SETFONT (int wParam, int lParam) {
+LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_SETREDRAW (int wParam, int lParam) {
+LRESULT WM_SETREDRAW (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_SHOWWINDOW (int wParam, int lParam) {
+LRESULT WM_SHOWWINDOW (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_SIZE (int wParam, int lParam) {
+LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
-sendEvent (DWT.Resize);
+state |= RESIZE_OCCURRED;
+if ((state & RESIZE_DEFERRED) is 0) sendEvent (DWT.Resize);
 // widget could be disposed at this point
 return null;
 }
-LRESULT WM_SYSCHAR (int wParam, int lParam) {
+LRESULT WM_SYSCHAR (int /*long*/ wParam, int /*long*/ lParam) {
 return wmSysChar (handle, wParam, lParam);
 }
-LRESULT WM_SYSCOLORCHANGE (int wParam, int lParam) {
+LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_SYSCOMMAND (int wParam, int lParam) {
+LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
 /*
 * Check to see if the command is a system command or
 * a user menu item that was added to the System menu.
 * When a user item is added to the System menu,
 * WM_SYSCOMMAND must always return zero.
+*
+* NOTE: This is undocumented.
 */
 if ((wParam & 0xF000) is 0) {
 Decorations shell = menuShell ();
 if (shell.isEnabled ()) {
-MenuItem item = display.getMenuItem (wParam & 0xFFFF);
+MenuItem item = display.getMenuItem (OS.LOWORD (wParam));
 if (item !is null) item.wmCommandChild (wParam, lParam);
 }
 return LRESULT.ZERO;
 }
 default:
 }
 return null;
 }
-LRESULT WM_SYSKEYDOWN (int wParam, int lParam) {
+LRESULT WM_SYSKEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
 return wmSysKeyDown (handle, wParam, lParam);
 }
-LRESULT WM_SYSKEYUP (int wParam, int lParam) {
+LRESULT WM_SYSKEYUP (int /*long*/ wParam, int /*long*/ lParam) {
 return wmSysKeyUp (handle, wParam, lParam);
 }
-LRESULT WM_TIMER (int wParam, int lParam) {
+LRESULT WM_TIMER (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_UNDO (int wParam, int lParam) {
+LRESULT WM_UNDO (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_UPDATEUISTATE (int wParam, int lParam) {
+LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT WM_VSCROLL (int wParam, int lParam) {
+LRESULT WM_VSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
 Control control = display.getControl (cast(HANDLE)lParam);
 if (control is null) return null;
 return control.wmScrollChild (wParam, lParam);
 }
-LRESULT WM_WINDOWPOSCHANGED (int wParam, int lParam) {
+LRESULT WM_WINDOWPOSCHANGED (int /*long*/ wParam, int /*long*/ lParam) {
-return null;
+try {
-}
+display.resizeCount++;
+int /*long*/ code = callWindowProc (handle, OS.WM_WINDOWPOSCHANGED, wParam, lParam);
-LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) {
+return code is 0 ? LRESULT.ZERO : new LRESULT (code);
+} finally {
+--display.resizeCount;
+}
+}
+LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
 /*
 * Bug in Windows.  When WM_SETREDRAW is used to turn off drawing
 * for a control and the control is moved or resized, Windows does
 * not redraw the area where the control once was in the parent.
 * The fix is to detect this case and redraw the area.
 if (shell !is this) {
 WINDOWPOS* lpwp = cast(WINDOWPOS*)lParam;
 if ((lpwp.flags & OS.SWP_NOMOVE) is 0 || (lpwp.flags & OS.SWP_NOSIZE) is 0) {
 RECT rect;
 OS.GetWindowRect (topHandle (), &rect);
-auto hwndParent = parent is null ? null : parent.handle;
+int width = rect.right - rect.left;
-OS.MapWindowPoints (null, hwndParent, cast(POINT*)&rect, 2);
+int height = rect.bottom - rect.top;
-OS.InvalidateRect (hwndParent, &rect, true);
+if (width !is 0 && height !is 0) {
+auto hwndParent = parent is null ? null : parent.handle;
+OS.MapWindowPoints (null, hwndParent, cast(POINT*)&rect, 2);
+static if (OS.IsWinCE) {
+OS.InvalidateRect (hwndParent, &rect, true);
+} else {
+auto rgn1 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom);
+auto rgn2 = OS.CreateRectRgn (lpwp.x, lpwp.y, lpwp.x + lpwp.cx, lpwp.y + lpwp.cy);
+OS.CombineRgn (rgn1, rgn1, rgn2, OS.RGN_DIFF);
+int flags = OS.RDW_ERASE | OS.RDW_FRAME | OS.RDW_INVALIDATE | OS.RDW_ALLCHILDREN;
+OS.RedrawWindow (hwndParent, null, rgn1, flags);
+OS.DeleteObject (rgn1);
+OS.DeleteObject (rgn2);
+}
+}
 }
 }
 }
 return null;
 }
-LRESULT WM_XBUTTONDBLCLK (int wParam, int lParam) {
+LRESULT WM_XBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
 return wmXButtonDblClk (handle, wParam, lParam);
 }
-LRESULT WM_XBUTTONDOWN (int wParam, int lParam) {
+LRESULT WM_XBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
 return wmXButtonDown (handle, wParam, lParam);
 }
-LRESULT WM_XBUTTONUP (int wParam, int lParam) {
+LRESULT WM_XBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
 return wmXButtonUp (handle, wParam, lParam);
 }
-LRESULT wmColorChild (int wParam, int lParam) {
+LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
 Control control = findBackgroundControl ();
 if (control is null) {
 if ((state & THEME_BACKGROUND) !is 0) {
 if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
 control = findThemeControl ();
 OS.SelectObject (cast(HANDLE)wParam, hOldBrush);
 }
 return new LRESULT ( cast(int) hBrush);
 }
-LRESULT wmCommandChild (int wParam, int lParam) {
+LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT wmDrawChild (int wParam, int lParam) {
+LRESULT wmDrawChild (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
-LRESULT wmMeasureChild (int wParam, int lParam) {
+LRESULT wmMeasureChild (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
 LRESULT wmNotify (NMHDR* hdr, int wParam, int lParam) {
 Control control = display.getControl (hdr.hwndFrom);
 LRESULT wmNotifyChild (NMHDR* hdr, int wParam, int lParam) {
 return null;
 }
-LRESULT wmScrollChild (int wParam, int lParam) {
+LRESULT wmScrollChild (int /*long*/ wParam, int /*long*/ lParam) {
 return null;
 }
 }

Mercurial > projects > dwt-win

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