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

Timestamp:

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

Author:

cbratschi

Message:

wine-990731 update

File:

• trunk/src/comctl32/pager.c (modified) (8 diffs)

trunk/src/comctl32/pager.c

@@ -1 @@
-/* $Id: pager.c,v 1.3 1999-06-10 16:22:01 achimha Exp $ */
+/* $Id: pager.c,v 1.4 1999-08-14 16:13:12 cbratschi Exp $ */
 /*
  * Pager control
@@ -93 +93 @@
 
     if (infoPtr->hwndChild) {
-        ZeroMemory (&nmpgcs, sizeof (NMPGCALCSIZE));
-        nmpgcs.hdr.hwndFrom = hwnd;
-        nmpgcs.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-        nmpgcs.hdr.code = PGN_CALCSIZE;
-        nmpgcs.dwFlag = (dwStyle & PGS_HORZ) ? PGF_CALCWIDTH : PGF_CALCHEIGHT;
-        SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                        (WPARAM)nmpgcs.hdr.idFrom, (LPARAM)&nmpgcs);
-
-        infoPtr->nChildSize = (dwStyle & PGS_HORZ) ? nmpgcs.iWidth : nmpgcs.iHeight;
+        ZeroMemory (&nmpgcs, sizeof (NMPGCALCSIZE));
+        nmpgcs.hdr.hwndFrom = hwnd;
+        nmpgcs.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
+        nmpgcs.hdr.code = PGN_CALCSIZE;
+        nmpgcs.dwFlag = (dwStyle & PGS_HORZ) ? PGF_CALCWIDTH : PGF_CALCHEIGHT;
+        SendMessageA (GetParent (hwnd), WM_NOTIFY,
+                        (WPARAM)nmpgcs.hdr.idFrom, (LPARAM)&nmpgcs);
+
+        infoPtr->nChildSize = (dwStyle & PGS_HORZ) ? nmpgcs.iWidth : nmpgcs.iHeight;
 
 
@@ -168 +168 @@
     /* FIXME: redraw */
     if (infoPtr->hwndChild) {
-        SetParent (infoPtr->hwndChild, hwnd);
-        SetWindowPos (infoPtr->hwndChild, HWND_TOP,
-                        0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE);
+        RECT rect;
+
+        GetClientRect(hwnd,&rect);
+        SetParent (infoPtr->hwndChild, hwnd);
+        SetWindowPos (infoPtr->hwndChild, HWND_TOP,
+                        0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE);
+
+        MoveWindow (infoPtr->hwndChild, 0, 0, rect.right, rect.bottom, TRUE);
     }
 
@@ -188 +193 @@
     /* FIXME: redraw */
     SetWindowPos (infoPtr->hwndChild, HWND_TOP,
-                    0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE);
+                    0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE);
 
     return 0;
@@ -268 +273 @@
     GetClientRect (hwnd, &rect);
     if (infoPtr->hwndChild) {
-        SetWindowPos (infoPtr->hwndChild, HWND_TOP, rect.left, rect.top,
-                        rect.right - rect.left, rect.bottom - rect.top,
-                        SWP_SHOWWINDOW);
-/*      MoveWindow32 (infoPtr->hwndChild, 1, 1, rect.right - 2, rect.bottom-2, TRUE); */
-/*      UpdateWindow32 (infoPtr->hwndChild); */
+        SetWindowPos (infoPtr->hwndChild, HWND_TOP, rect.left, rect.top,
+                        rect.right - rect.left, rect.bottom - rect.top,
+                        SWP_SHOWWINDOW);
+/*      MoveWindow (infoPtr->hwndChild, 1, 1, rect.right - 2, rect.bottom-2, TRUE); */
+/*      UpdateWindow (infoPtr->hwndChild); */
 
     }
-/*    FillRect32 ((HDC32)wParam, &rect, hBrush); */
-/*    DeleteObject32 (hBrush); */
+/*    FillRect ((HDC)wParam, &rect, hBrush); */
+/*    DeleteObject (hBrush); */
     return TRUE;
 }
@@ -282 +287 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)
     {
-        case PGM_FORWARDMOUSE:
-            return PAGER_ForwardMouse (hwnd, wParam);
-
-        case PGM_GETBKCOLOR:
-            return PAGER_GetBkColor (hwnd, wParam, lParam);
-
-        case PGM_GETBORDER:
-            return PAGER_GetBorder (hwnd, wParam, lParam);
-
-        case PGM_GETBUTTONSIZE:
-            return PAGER_GetButtonSize (hwnd, wParam, lParam);
-
-        case PGM_GETBUTTONSTATE:
-            return PAGER_GetButtonState (hwnd, wParam, lParam);
-
-/*      case PGM_GETDROPTARGET: */
-
-        case PGM_GETPOS:
-            return PAGER_SetPos (hwnd, wParam, lParam);
-
-        case PGM_RECALCSIZE:
-            return PAGER_RecalcSize (hwnd, wParam, lParam);
-
-        case PGM_SETBKCOLOR:
-            return PAGER_SetBkColor (hwnd, wParam, lParam);
-
-        case PGM_SETBORDER:
-            return PAGER_SetBorder (hwnd, wParam, lParam);
-
-        case PGM_SETBUTTONSIZE:
-            return PAGER_SetButtonSize (hwnd, wParam, lParam);
-
-        case PGM_SETCHILD:
-            return PAGER_SetChild (hwnd, wParam, lParam);
-
-        case PGM_SETPOS:
-            return PAGER_SetPos (hwnd, wParam, lParam);
-
-        case WM_CREATE:
-            return PAGER_Create (hwnd, wParam, lParam);
-
-        case WM_DESTROY:
-            return PAGER_Destroy (hwnd, wParam, lParam);
-
-        case WM_ERASEBKGND:
-            return PAGER_EraseBackground (hwnd, wParam, lParam);
-
-        case WM_MOUSEMOVE:
-            return PAGER_MouseMove (hwnd, wParam, lParam);
-
-        case WM_NOTIFY:
-        case WM_COMMAND:
-            return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
-
-/*      case WM_PAINT: */
-/*          return PAGER_Paint (hwnd, wParam); */
-
-        case WM_SIZE:
-            return PAGER_Size (hwnd, wParam, lParam);
-
-        default:
-//          if (uMsg >= WM_USER)
-//              ERR (pager, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        case PGM_FORWARDMOUSE:
+            return PAGER_ForwardMouse (hwnd, wParam);
+
+        case PGM_GETBKCOLOR:
+            return PAGER_GetBkColor (hwnd, wParam, lParam);
+
+        case PGM_GETBORDER:
+            return PAGER_GetBorder (hwnd, wParam, lParam);
+
+        case PGM_GETBUTTONSIZE:
+            return PAGER_GetButtonSize (hwnd, wParam, lParam);
+
+        case PGM_GETBUTTONSTATE:
+            return PAGER_GetButtonState (hwnd, wParam, lParam);
+
+/*      case PGM_GETDROPTARGET: */
+
+        case PGM_GETPOS:
+            return PAGER_SetPos (hwnd, wParam, lParam);
+
+        case PGM_RECALCSIZE:
+            return PAGER_RecalcSize (hwnd, wParam, lParam);
+
+        case PGM_SETBKCOLOR:
+            return PAGER_SetBkColor (hwnd, wParam, lParam);
+
+        case PGM_SETBORDER:
+            return PAGER_SetBorder (hwnd, wParam, lParam);
+
+        case PGM_SETBUTTONSIZE:
+            return PAGER_SetButtonSize (hwnd, wParam, lParam);
+
+        case PGM_SETCHILD:
+            return PAGER_SetChild (hwnd, wParam, lParam);
+
+        case PGM_SETPOS:
+            return PAGER_SetPos (hwnd, wParam, lParam);
+
+        case WM_CREATE:
+            return PAGER_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return PAGER_Destroy (hwnd, wParam, lParam);
+
+        case WM_ERASEBKGND:
+            return PAGER_EraseBackground (hwnd, wParam, lParam);
+
+        case WM_MOUSEMOVE:
+            return PAGER_MouseMove (hwnd, wParam, lParam);
+
+        case WM_NOTIFY:
+        case WM_COMMAND:
+            return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
+
+/*      case WM_PAINT: */
+/*          return PAGER_Paint (hwnd, wParam); */
+
+        case WM_SIZE:
+            return PAGER_Size (hwnd, wParam, lParam);
+
+        default:
+//          if (uMsg >= WM_USER)
+//              ERR (pager, "unknown msg %04x wp=%08x lp=%08lx\n",
+//                   uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -372 +377 @@
     wndClass.hbrBackground = 0;
     wndClass.lpszClassName = WC_PAGESCROLLERA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -381 +386 @@
 {
     if (GlobalFindAtomA (WC_PAGESCROLLERA))
-        UnregisterClassA (WC_PAGESCROLLERA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (WC_PAGESCROLLERA, (HINSTANCE)NULL);
+}
+