Changeset 496 for trunk/src/comctl32/hotkey.c

Timestamp:

Aug 14, 1999, 6:13:16 PM (26 years ago)

Author:

cbratschi

Message:

wine-990731 update

File:

• trunk/src/comctl32/hotkey.c (modified) (9 diffs)

trunk/src/comctl32/hotkey.c

@@ -1 @@
-/* $Id: hotkey.c,v 1.3 1999-06-10 16:21:59 achimha Exp $ */
+/* $Id: hotkey.c,v 1.4 1999-08-14 16:13:10 cbratschi Exp $ */
 /*
  * Hotkey control
@@ -79 +79 @@
 
     hBrush =
-        (HBRUSH)SendMessageA (GetParent (hwnd), WM_CTLCOLOREDIT,
-                                wParam, (LPARAM)hwnd);
+        (HBRUSH)SendMessageA (GetParent (hwnd), WM_CTLCOLOREDIT,
+                                wParam, (LPARAM)hwnd);
     if (hBrush)
-        hBrush = (HBRUSH)GetStockObject (WHITE_BRUSH);
+        hBrush = (HBRUSH)GetStockObject (WHITE_BRUSH);
     GetClientRect (hwnd, &rc);
 
@@ -106 +106 @@
 
     switch (wParam) {
-        case VK_RETURN:
-        case VK_TAB:
-        case VK_SPACE:
-        case VK_DELETE:
-        case VK_ESCAPE:
-        case VK_BACK:
-            return DefWindowProcA (hwnd, WM_KEYDOWN, wParam, lParam);
-
-        case VK_SHIFT:
-        case VK_CONTROL:
-        case VK_MENU:
-//          FIXME (hotkey, "modifier key pressed!\n");
-            break;
-
-        default:
-//          FIXME (hotkey, " %d\n", wParam);
-            break;
+        case VK_RETURN:
+        case VK_TAB:
+        case VK_SPACE:
+        case VK_DELETE:
+        case VK_ESCAPE:
+        case VK_BACK:
+            return DefWindowProcA (hwnd, WM_KEYDOWN, wParam, lParam);
+
+        case VK_SHIFT:
+        case VK_CONTROL:
+        case VK_MENU:
+//          FIXME (hotkey, "modifier key pressed!\n");
+            break;
+
+        default:
+//          FIXME (hotkey, " %d\n", wParam);
+            break;
     }
 
@@ -206 +206 @@
     hdc = GetDC (hwnd);
     if (infoPtr->hFont)
-        hOldFont = SelectObject (hdc, infoPtr->hFont);
+        hOldFont = SelectObject (hdc, infoPtr->hFont);
 
     GetTextMetricsA (hdc, &tm);
@@ -212 +212 @@
 
     if (infoPtr->hFont)
-        SelectObject (hdc, hOldFont);
+        SelectObject (hdc, hOldFont);
     ReleaseDC (hwnd, hdc);
 
     if (LOWORD(lParam)) {
 
-//      FIXME (hotkey, "force redraw!\n");
+//      FIXME (hotkey, "force redraw!\n");
 
     }
@@ -231 +231 @@
 
     switch (wParam) {
-        case VK_RETURN:
-        case VK_TAB:
-        case VK_SPACE:
-        case VK_DELETE:
-        case VK_ESCAPE:
-        case VK_BACK:
-            return DefWindowProcA (hwnd, WM_SYSKEYDOWN, wParam, lParam);
-
-        case VK_SHIFT:
-        case VK_CONTROL:
-        case VK_MENU:
-//          FIXME (hotkey, "modifier key pressed!\n");
-            break;
-
-        default:
-//          FIXME (hotkey, " %d\n", wParam);
-            break;
+        case VK_RETURN:
+        case VK_TAB:
+        case VK_SPACE:
+        case VK_DELETE:
+        case VK_ESCAPE:
+        case VK_BACK:
+            return DefWindowProcA (hwnd, WM_SYSKEYDOWN, wParam, lParam);
+
+        case VK_SHIFT:
+        case VK_CONTROL:
+        case VK_MENU:
+//          FIXME (hotkey, "modifier key pressed!\n");
+            break;
+
+        default:
+//          FIXME (hotkey, " %d\n", wParam);
+            break;
     }
 
@@ -266 +266 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)
     {
-/*      case HKM_GETHOTKEY: */
-/*      case HKM_SETHOTKEY: */
-/*      case HKM_SETRULES: */
-
-/*      case WM_CHAR: */
-
-        case WM_CREATE:
-            return HOTKEY_Create (hwnd, wParam, lParam);
-
-        case WM_DESTROY:
-            return HOTKEY_Destroy (hwnd, wParam, lParam);
-
-        case WM_ERASEBKGND:
-            return HOTKEY_EraseBackground (hwnd, wParam, lParam);
-
-        case WM_GETDLGCODE:
-            return DLGC_WANTCHARS | DLGC_WANTARROWS;
-
-        case WM_GETFONT:
-            return HOTKEY_GetFont (hwnd, wParam, lParam);
-
-        case WM_KEYDOWN:
-        case WM_SYSKEYDOWN:
-            return HOTKEY_KeyDown (hwnd, wParam, lParam);
-
-        case WM_KEYUP:
-        case WM_SYSKEYUP:
-            return HOTKEY_KeyUp (hwnd, wParam, lParam);
-
-        case WM_KILLFOCUS:
-            return HOTKEY_KillFocus (hwnd, wParam, lParam);
-
-        case WM_LBUTTONDOWN:
-            return HOTKEY_LButtonDown (hwnd, wParam, lParam);
-
-        case WM_NCCREATE:
-            return HOTKEY_NCCreate (hwnd, wParam, lParam);
-
-/*      case WM_PAINT: */
-
-        case WM_SETFOCUS:
-            return HOTKEY_SetFocus (hwnd, wParam, lParam);
-
-        case WM_SETFONT:
-            return HOTKEY_SetFont (hwnd, wParam, lParam);
-
-/*      case WM_SYSCHAR: */
-
-        default:
-//          if (uMsg >= WM_USER)
-//              ERR (hotkey, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+/*      case HKM_GETHOTKEY: */
+/*      case HKM_SETHOTKEY: */
+/*      case HKM_SETRULES: */
+
+/*      case WM_CHAR: */
+
+        case WM_CREATE:
+            return HOTKEY_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return HOTKEY_Destroy (hwnd, wParam, lParam);
+
+        case WM_ERASEBKGND:
+            return HOTKEY_EraseBackground (hwnd, wParam, lParam);
+
+        case WM_GETDLGCODE:
+            return DLGC_WANTCHARS | DLGC_WANTARROWS;
+
+        case WM_GETFONT:
+            return HOTKEY_GetFont (hwnd, wParam, lParam);
+
+        case WM_KEYDOWN:
+        case WM_SYSKEYDOWN:
+            return HOTKEY_KeyDown (hwnd, wParam, lParam);
+
+        case WM_KEYUP:
+        case WM_SYSKEYUP:
+            return HOTKEY_KeyUp (hwnd, wParam, lParam);
+
+        case WM_KILLFOCUS:
+            return HOTKEY_KillFocus (hwnd, wParam, lParam);
+
+        case WM_LBUTTONDOWN:
+            return HOTKEY_LButtonDown (hwnd, wParam, lParam);
+
+        case WM_NCCREATE:
+            return HOTKEY_NCCreate (hwnd, wParam, lParam);
+
+/*      case WM_PAINT: */
+
+        case WM_SETFOCUS:
+            return HOTKEY_SetFocus (hwnd, wParam, lParam);
+
+        case WM_SETFONT:
+            return HOTKEY_SetFont (hwnd, wParam, lParam);
+
+/*      case WM_SYSCHAR: */
+
+        default:
+//          if (uMsg >= WM_USER)
+//              ERR (hotkey, "unknown msg %04x wp=%08x lp=%08lx\n",
+//                   uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -344 +344 @@
     wndClass.hbrBackground = 0;
     wndClass.lpszClassName = HOTKEY_CLASSA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -353 +353 @@
 {
     if (GlobalFindAtomA (HOTKEY_CLASSA))
-        UnregisterClassA (HOTKEY_CLASSA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (HOTKEY_CLASSA, (HINSTANCE)NULL);
+}
+