diff dwt/widgets/Widget.d @ 35:99d8b02576c3

Control
author Frank Benoit <benoit@tionex.de>
date Tue, 29 Jan 2008 00:16:12 +0100
parents 2985239119a3
children 3052439af4b5
line wrap: on
line diff
--- a/dwt/widgets/Widget.d	Mon Jan 28 21:27:31 2008 +0100
+++ b/dwt/widgets/Widget.d	Tue Jan 29 00:16:12 2008 +0100
@@ -26,12 +26,6 @@
 }
 ++/
 
-enum LRESULT {
-    NULL = -1,
-    ZERO = 0,
-    ONE = 1,
-}
-
 import dwt.DWT;
 import dwt.DWTException;
 import dwt.events.DisposeListener;
@@ -79,6 +73,14 @@
  */
 
 public abstract class Widget {
+
+    public enum LRESULT {
+        NULL = -1,
+        ZERO = 0,
+        ONE = 1,
+    }
+
+
     int style, state;
     Display display;
     EventTable eventTable;
@@ -232,8 +234,8 @@
     addListener (DWT.Dispose, typedListener);
 }
 
-int callWindowProc (HWND hwnd, int msg, int wParam, int lParam) {
-    return 0;
+LRESULT callWindowProc (HWND hwnd, int msg, int wParam, int lParam) {
+    return LRESULT.ZERO;
 }
 
 /**
@@ -1303,12 +1305,12 @@
     return Format( "{} {{{}}", getName (), string ); //$NON-NLS-1$ //$NON-NLS-2$
 }
 
-LRESULT wmCaptureChanged (int hwnd, int wParam, int lParam) {
+LRESULT wmCaptureChanged (HWND hwnd, int wParam, int lParam) {
     display.captureChanged = true;
     return LRESULT.NULL;
 }
 
-LRESULT wmChar (int hwnd, int wParam, int lParam) {
+LRESULT wmChar (HWND hwnd, int wParam, int lParam) {
     /*
     * Do not report a lead byte as a key pressed.
     */
@@ -1713,7 +1715,7 @@
 }
 
 LRESULT wmKillFocus (HWND hwnd, int wParam, int lParam) {
-    int code = callWindowProc (hwnd, OS.WM_KILLFOCUS, wParam, lParam);
+    LRESULT code = callWindowProc (hwnd, OS.WM_KILLFOCUS, wParam, lParam);
     assert( code !is LRESULT.NULL );
     sendFocusEvent (DWT.FocusOut);
     // widget could be disposed at this point
@@ -1749,7 +1751,7 @@
     display.captureChanged = false;
     sendMouseEvent (DWT.MouseDown, 1, hwnd, OS.WM_LBUTTONDOWN, wParam, lParam);
     if (sendMouseEvent (DWT.MouseDoubleClick, 1, hwnd, OS.WM_LBUTTONDBLCLK, wParam, lParam)) {
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_LBUTTONDBLCLK, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_LBUTTONDBLCLK, wParam, lParam);
         assert( result !is LRESULT.NULL );
     } else {
         result = LRESULT.ZERO;
@@ -1788,7 +1790,7 @@
     display.captureChanged = false;
     bool dispatch = sendMouseEvent (DWT.MouseDown, 1, count, 0, false, hwnd, OS.WM_LBUTTONDOWN, wParam, lParam);
     if (dispatch && (consume is null || !consume [0])) {
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_LBUTTONDOWN, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_LBUTTONDOWN, wParam, lParam);
         assert( result !is LRESULT.NULL );
     } else {
         result = LRESULT.ZERO;
@@ -1855,7 +1857,7 @@
     Display display = this.display;
     LRESULT result = LRESULT.NULL;
     if (sendMouseEvent (DWT.MouseUp, 1, hwnd, OS.WM_LBUTTONUP, wParam, lParam)) {
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_LBUTTONUP, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_LBUTTONUP, wParam, lParam);
         assert( result !is LRESULT.NULL );
     } else {
         result = LRESULT.ZERO;
@@ -1893,7 +1895,7 @@
     display.captureChanged = false;
     sendMouseEvent (DWT.MouseDown, 2, hwnd, OS.WM_MBUTTONDOWN, wParam, lParam);
     if (sendMouseEvent (DWT.MouseDoubleClick, 2, hwnd, OS.WM_MBUTTONDBLCLK, wParam, lParam)) {
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_MBUTTONDBLCLK, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_MBUTTONDBLCLK, wParam, lParam);
         assert( result !is LRESULT.NULL );
     } else {
         result = LRESULT.ZERO;
@@ -1909,7 +1911,7 @@
     Display display = this.display;
     display.captureChanged = false;
     if (sendMouseEvent (DWT.MouseDown, 2, hwnd, OS.WM_MBUTTONDOWN, wParam, lParam)) {
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_MBUTTONDOWN, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_MBUTTONDOWN, wParam, lParam);
         assert( result !is LRESULT.NULL );
     } else {
         result = LRESULT.ZERO;
@@ -1924,7 +1926,7 @@
     Display display = this.display;
     LRESULT result = LRESULT.NULL;
     if (sendMouseEvent (DWT.MouseUp, 2, hwnd, OS.WM_MBUTTONUP, wParam, lParam)) {
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_MBUTTONUP, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_MBUTTONUP, wParam, lParam);
         assert( result !is LRESULT.NULL );
     } else {
         result = LRESULT.ZERO;
@@ -2052,7 +2054,7 @@
     if (OS.IsWinCE) {
         RECT rect;
         OS.GetUpdateRect (hwnd, &rect, false);
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_PAINT, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_PAINT, wParam, lParam);
         assert( result !is LRESULT.NULL );
         /*
         * Bug in Windows.  When InvalidateRgn(), InvalidateRect()
@@ -2089,7 +2091,7 @@
     } else {
         auto rgn = OS.CreateRectRgn (0, 0, 0, 0);
         OS.GetUpdateRgn (hwnd, rgn, false);
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_PAINT, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_PAINT, wParam, lParam);
         assert( result !is LRESULT.NULL );
         GCData data = new GCData ();
         data.hwnd = hwnd;
@@ -2134,7 +2136,7 @@
         if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
             int bits = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE);
             if ((bits & OS.WS_EX_CLIENTEDGE) !is 0) {
-                int code = callWindowProc (hwnd, OS.WM_PRINT, wParam, lParam);
+                LRESULT code = callWindowProc (hwnd, OS.WM_PRINT, wParam, lParam);
                 assert( code !is LRESULT.NULL );
                 RECT rect;
                 OS.GetWindowRect (hwnd, &rect);
@@ -2170,7 +2172,7 @@
     display.captureChanged = false;
     sendMouseEvent (DWT.MouseDown, 3, hwnd, OS.WM_RBUTTONDOWN, wParam, lParam);
     if (sendMouseEvent (DWT.MouseDoubleClick, 3, hwnd, OS.WM_RBUTTONDBLCLK, wParam, lParam)) {
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_RBUTTONDBLCLK, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_RBUTTONDBLCLK, wParam, lParam);
         assert( result !is LRESULT.NULL );
     } else {
         result = LRESULT.ZERO;
@@ -2186,7 +2188,7 @@
     Display display = this.display;
     display.captureChanged = false;
     if (sendMouseEvent (DWT.MouseDown, 3, hwnd, OS.WM_RBUTTONDOWN, wParam, lParam)) {
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_RBUTTONDOWN, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_RBUTTONDOWN, wParam, lParam);
         assert( result !is LRESULT.NULL );
     } else {
         result = LRESULT.ZERO;
@@ -2201,7 +2203,7 @@
     Display display = this.display;
     LRESULT result = LRESULT.NULL;
     if (sendMouseEvent (DWT.MouseUp, 3, hwnd, OS.WM_RBUTTONUP, wParam, lParam)) {
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_RBUTTONUP, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_RBUTTONUP, wParam, lParam);
         assert( result !is LRESULT.NULL );
     } else {
         /* Call the DefWindowProc() to support WM_CONTEXTMENU */
@@ -2223,7 +2225,7 @@
 }
 
 LRESULT wmSetFocus (HWND hwnd, int wParam, int lParam) {
-    LRESULT code = cast(LRESULT) callWindowProc (hwnd, OS.WM_SETFOCUS, wParam, lParam);
+    LRESULT code = callWindowProc (hwnd, OS.WM_SETFOCUS, wParam, lParam);
     assert( code !is LRESULT.NULL );
     sendFocusEvent (DWT.FocusIn);
     // widget could be disposed at this point
@@ -2253,7 +2255,7 @@
     /* Call the window proc to determine whether it is a system key or mnemonic */
     bool oldKeyHit = display.mnemonicKeyHit;
     display.mnemonicKeyHit = true;
-    LRESULT result = cast(LRESULT) callWindowProc (hwnd, OS.WM_SYSCHAR, wParam, lParam);
+    LRESULT result = callWindowProc (hwnd, OS.WM_SYSCHAR, wParam, lParam);
     assert( result !is LRESULT.NULL );
     bool consumed = false;
     if (!display.mnemonicKeyHit) {
@@ -2412,7 +2414,7 @@
     int button = (wParam >> 16 is OS.XBUTTON1) ? 4 : 5;
     sendMouseEvent (DWT.MouseDown, button, hwnd, OS.WM_XBUTTONDOWN, wParam, lParam);
     if (sendMouseEvent (DWT.MouseDoubleClick, button, hwnd, OS.WM_XBUTTONDBLCLK, wParam, lParam)) {
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_XBUTTONDBLCLK, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_XBUTTONDBLCLK, wParam, lParam);
         assert( result !is LRESULT.NULL );
     } else {
         result = LRESULT.ZERO;
@@ -2430,7 +2432,7 @@
     display.xMouse = true;
     int button = (wParam >> 16 is OS.XBUTTON1) ? 4 : 5;
     if (sendMouseEvent (DWT.MouseDown, button, hwnd, OS.WM_XBUTTONDOWN, wParam, lParam)) {
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_XBUTTONDOWN, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_XBUTTONDOWN, wParam, lParam);
         assert( result !is LRESULT.NULL );
     } else {
         result = LRESULT.ZERO;
@@ -2446,7 +2448,7 @@
     LRESULT result = LRESULT.NULL;
     int button = (wParam >> 16 is OS.XBUTTON1) ? 4 : 5;
     if (sendMouseEvent (DWT.MouseUp, button, hwnd, OS.WM_XBUTTONUP, wParam, lParam)) {
-        result = cast(LRESULT) callWindowProc (hwnd, OS.WM_XBUTTONUP, wParam, lParam);
+        result = callWindowProc (hwnd, OS.WM_XBUTTONUP, wParam, lParam);
         assert( result !is LRESULT.NULL );
     } else {
         result = LRESULT.ZERO;