Changeset 3145 for trunk/src/comctl32/pager.cpp

Timestamp:

Mar 17, 2000, 6:13:26 PM (25 years ago)

Author:

cbratschi

Message:

trackbar buddy fix, tooltip enhancements

File:

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

trunk/src/comctl32/pager.cpp

@@ -1 @@
-/* $Id: pager.cpp,v 1.1 2000-02-23 17:09:45 cbratschi Exp $ */
+/* $Id: pager.cpp,v 1.2 2000-03-17 17:13:23 cbratschi Exp $ */
 /*
  * Pager control
@@ -18 +18 @@
 #include "winbase.h"
 #include "commctrl.h"
+#include "ccbase.h"
 #include "pager.h"
 
-
-#define PAGER_GetInfoPtr(hwnd) ((PAGER_INFO *)GetWindowLongA(hwnd, 0))
-
+#define PAGER_GetInfoPtr(hwnd) ((PAGER_INFO*)getInfoPtr(hwnd))
 
 static LRESULT
@@ -94 +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);
+        sendNotify(hwnd,PGN_CALCSIZE,&nmpgcs.hdr);
 
         infoPtr->nChildSize = (dwStyle & PGS_HORZ) ? nmpgcs.iWidth : nmpgcs.iHeight;
@@ -205 +200 @@
 
     /* allocate memory for info structure */
-    infoPtr = (PAGER_INFO *)COMCTL32_Alloc (sizeof(PAGER_INFO));
+    infoPtr = (PAGER_INFO*)initControl(hwnd,sizeof(PAGER_INFO));
     SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
 
@@ -225 +220 @@
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
 
-
-
-
     /* free pager info data */
-    COMCTL32_Free (infoPtr);
+    doneControl(hwnd);
 
     return 0;
@@ -356 +348 @@
 //              ERR (pager, "unknown msg %04x wp=%08x lp=%08lx\n",
 //                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+            return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -366 +358 @@
 {
     WNDCLASSA wndClass;
-
-//SvL: Don't check this now
-//    if (GlobalFindAtomA (WC_PAGESCROLLERA)) return;
 
     ZeroMemory (&wndClass, sizeof(WNDCLASSA));
@@ -386 +375 @@
 PAGER_Unregister (VOID)
 {
-    if (GlobalFindAtomA (WC_PAGESCROLLERA))
-        UnregisterClassA (WC_PAGESCROLLERA, (HINSTANCE)NULL);
-}
-
+    UnregisterClassA (WC_PAGESCROLLERA, (HINSTANCE)NULL);
+}
+