Changeset 107:a378481be65f

Timestamp:

02/10/08 19:54:57 (1 year ago)

Author:

John Reimer <terminal.node@gmail.com

branch:

default

Message:

Adding "static if" where necessary

Files:

• dwt/widgets/Control.d (modified) (8 diffs)
• dwt/widgets/ExpandBar.d (modified) (4 diffs)
• dwt/widgets/Widget.d (modified) (10 diffs)

dwt/widgets/Control.d

@@ -1963 +1963 @@
-//  checkWidget ();
-    if (!OS.IsWindowVisible (handle)) return;
-
+static 
-        OS.InvalidateRect (handle, null, true);
-    } else {
@@ -2007 +2007 @@
-    RECT rect;
-    OS.SetRect (&rect, x, y, x + width, y + height);
-
+static 
-        OS.InvalidateRect (handle, &rect, true);
-    } else {
@@ -2502 +2502 @@
-
-void setBackgroundImage (HBITMAP hBitmap) {
-
+static 
-        OS.InvalidateRect (handle, null, true);
-    } else {
@@ -2511 +2511 @@
-
-void setBackgroundPixel (int pixel) {
-
+static 
-        OS.InvalidateRect (handle, null, true);
-    } else {
@@ -2874 +2874 @@
-    * not running on WinCE.
-    */
-
+static 
-    setBounds (x, y, 0, 0, flags);
-}
@@ -2993 +2993 @@
-                if (handle !is topHandle_) OS.ShowWindow (handle, OS.SW_HIDE);
-            } else {
-
+static 
-                    OS.InvalidateRect (topHandle_, null, true);
-                    if (handle !is topHandle_) OS.InvalidateRect (handle, null, true);
@@ -3579 +3579 @@
-void update (bool all) {
-//  checkWidget ();
-
+static 
-        OS.UpdateWindow (handle);
-    } else {
@@ -3932 +3932 @@
-
-LRESULT WM_HELP (int wParam, int lParam) {
-
+static 
-    HELPINFO* lphi = cast(HELPINFO*)lParam;
-    Decorations shell = menuShell ();

dwt/widgets/ExpandBar.d

@@ -161 +161 @@
-                    hCurrentFont = hFont;
-                } else {
-
+static 
-                        NONCLIENTMETRICS info;
-                        info.cbSize = NONCLIENTMETRICS.sizeof;
@@ -284 +284 @@
-    HFONT hCaptionFont, oldFont;
-    if (hTheme is null) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -494 +496 @@
-override void setBackgroundPixel (int pixel) {
-    super.setBackgroundPixel (pixel);
-
+static 
-        int flags = OS.RDW_ERASE | OS.RDW_FRAME | OS.RDW_INVALIDATE | OS.RDW_ALLCHILDREN;
-        OS.RedrawWindow (handle, null, null, flags);
@@ -508 +510 @@
-override void setForegroundPixel (int pixel) {
-    super.setForegroundPixel (pixel);
-
+static 
-        int flags = OS.RDW_ERASE | OS.RDW_FRAME | OS.RDW_INVALIDATE | OS.RDW_ALLCHILDREN;
-        OS.RedrawWindow (handle, null, null, flags);

dwt/widgets/Widget.d

@@ -391 +391 @@
-
-HDWP DeferWindowPos(HDWP hWinPosInfo, HWND hWnd, HWND hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags){
-
+static 
-        /*
-        * Feature in Windows.  On Windows CE, DeferWindowPos always causes
@@ -1253 +1253 @@
-
-bool SetWindowPos (HWND hWnd, HWND hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags) {
-
+static 
-        /*
-        * Feature in Windows.  On Windows CE, SetWindowPos() always causes
@@ -1347 +1347 @@
-    * not support WM_CONTEXTMENU.
-    */
-
+static 
-
-    /*
@@ -1430 +1430 @@
-    */
-    int mapKey = 0;
-
+static 
-        switch (wParam) {
-            case OS.VK_BACK: mapKey = DWT.BS; break;
@@ -1624 +1624 @@
-
-    /* Check for hardware keys */
-
+static 
-        if (OS.VK_APP1 <= wParam && wParam <= OS.VK_APP6) {
-            display.lastKey = display.lastAscii = 0;
@@ -1659 +1659 @@
-    */
-    int mapKey = 0;
-
+static 
-        switch (wParam) {
-            case OS.VK_BACK: mapKey = DWT.BS; break;
@@ -1780 +1780 @@
-    int count = display.getClickCount (DWT.MouseDown, 1, hwnd, lParam);
-    if (count is 1 && (state & DRAG_DETECT) !is 0 && hooks (DWT.DragDetect)) {
-
+static 
-            /*
-            * Feature in Windows.  It's possible that the drag
@@ -1980 +1980 @@
-    int pos = OS.GetMessagePos ();
-    if (pos !is display.lastMouse || display.captureChanged) {
-
+static 
-            bool trackMouse = (state & TRACK_MOUSE) !is 0;
-            bool mouseEnter = hooks (DWT.MouseEnter) || display.filters (DWT.MouseEnter);
@@ -2060 +2060 @@
-    /* Issue a paint event */
-    LRESULT result = LRESULT.NULL;
-
+static 
-        RECT rect;
-        OS.GetUpdateRect (hwnd, &rect, false);
@@ -2331 +2331 @@
-    */
-    int mapKey = 0;
-
+static 
-        switch (wParam) {
-            case OS.VK_BACK: mapKey = DWT.BS; break;