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

Timestamp:

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

Author:

cbratschi

Message:

trackbar buddy fix, tooltip enhancements

File:

• trunk/src/comctl32/monthcal.cpp (modified) (12 diffs)

trunk/src/comctl32/monthcal.cpp

@@ -24 +24 @@
 #include "commctrl.h"
 #include "comctl32.h"
+#include "ccbase.h"
 #include "monthcal.h"
 #include "winnls.h"
@@ -45 +46 @@
 
 
-#define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)GetWindowLongA(hwnd, 0))
+#define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)getInfoPtr(hwnd))
 
 /* helper functions  */
@@ -1095 +1096 @@
     int i;
 
-    nmds.nmhdr.hwndFrom = hwnd;
-    nmds.nmhdr.idFrom   = GetWindowLongA(hwnd, GWL_ID);
-    nmds.nmhdr.code     = MCN_GETDAYSTATE;
     nmds.cDayState      = infoPtr->monthRange;
     nmds.prgDayState    = (DWORD*)COMCTL32_Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE));
 
-    SendMessageA(GetParent(hwnd), WM_NOTIFY,
-    (WPARAM)nmds.nmhdr.idFrom, (LPARAM)&nmds);
+    sendNotify(hwnd,MCN_GETDAYSTATE,&nmds.nmhdr);
     for(i=0; i<infoPtr->monthRange; i++)
       infoPtr->monthdayState[i] = nmds.prgDayState[i];
@@ -1125 +1122 @@
     int i;
 
-    nmds.nmhdr.hwndFrom = hwnd;
-    nmds.nmhdr.idFrom   = GetWindowLongA(hwnd, GWL_ID);
-    nmds.nmhdr.code     = MCN_GETDAYSTATE;
     nmds.cDayState      = infoPtr->monthRange;
     nmds.prgDayState    = (DWORD*)COMCTL32_Alloc
                         (infoPtr->monthRange * sizeof(MONTHDAYSTATE));
 
-    SendMessageA(GetParent(hwnd), WM_NOTIFY,
-        (WPARAM)nmds.nmhdr.idFrom, (LPARAM)&nmds);
+    sendNotify(hwnd,MCN_GETDAYSTATE,&nmds.nmhdr);
     for(i=0; i<infoPtr->monthRange; i++)
        infoPtr->monthdayState[i] = nmds.prgDayState[i];
@@ -1209 +1202 @@
 
     //TRACE("\n");
-    nmsc.nmhdr.hwndFrom = hwnd;
-    nmsc.nmhdr.idFrom   = GetWindowLongA(hwnd, GWL_ID);
-    nmsc.nmhdr.code     = MCN_SELCHANGE;
     MONTHCAL_CopyTime(&nmsc.stSelStart, &infoPtr->minSel);
     MONTHCAL_CopyTime(&nmsc.stSelEnd, &infoPtr->maxSel);
 
-    SendMessageA(GetParent(hwnd), WM_NOTIFY,
-           (WPARAM)nmsc.nmhdr.idFrom,(LPARAM)&nmsc);
+    sendNotify(hwnd,MCN_SELCHANGE,&nmsc.nmhdr);
 
     MONTHCAL_CopyTime(&ht.st, &selArray[0]);
@@ -1248 +1237 @@
   MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr(hwnd);
   NMSELCHANGE nmsc;
-  NMHDR nmhdr;
   HDC hdc;
   BOOL redraw = FALSE;
@@ -1265 +1253 @@
   infoPtr->status = MC_SEL_LBUTUP;
 
-  nmhdr.hwndFrom = hwnd;
-  nmhdr.idFrom   = GetWindowLongA( hwnd, GWL_ID);
-  nmhdr.code     = NM_RELEASEDCAPTURE;
-  //TRACE("Sent notification from %x to %x\n", hwnd, GetParent(hwnd));
-
-  SendMessageA(GetParent(hwnd), WM_NOTIFY,
-                                (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
-
-  nmsc.nmhdr.hwndFrom = hwnd;
-  nmsc.nmhdr.idFrom   = GetWindowLongA(hwnd, GWL_ID);
-  nmsc.nmhdr.code     = MCN_SELECT;
+  sendNotify(hwnd,NM_RELEASEDCAPTURE);
+
   MONTHCAL_CopyTime(&nmsc.stSelStart, &infoPtr->minSel);
   MONTHCAL_CopyTime(&nmsc.stSelEnd, &infoPtr->maxSel);
 
-  SendMessageA(GetParent(hwnd), WM_NOTIFY,
-           (WPARAM)nmsc.nmhdr.idFrom, (LPARAM)&nmsc);
+  sendNotify(hwnd,MCN_SELECT,&nmsc.nmhdr);
 
   /* redraw if necessary */
@@ -1569 +1547 @@
 
   /* allocate memory for info structure */
-  infoPtr =(MONTHCAL_INFO*)COMCTL32_Alloc(sizeof(MONTHCAL_INFO));
-  SetWindowLongA(hwnd, 0, (DWORD)infoPtr);
+  infoPtr =(MONTHCAL_INFO*)initControl(hwnd,sizeof(MONTHCAL_INFO));
 
   if(infoPtr == NULL) {
@@ -1620 +1597 @@
 
   /* free month calendar info data */
-  COMCTL32_Free(infoPtr);
+  doneControl(hwnd);
 
   return 0;
@@ -1730 +1707 @@
     //if(uMsg >= WM_USER)
     //  ERR( "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;
@@ -1740 +1717 @@
 {
   WNDCLASSA wndClass;
-
-//SvL: Don't check this now
-//  if(GlobalFindAtomA(MONTHCAL_CLASSA)) return;
 
   ZeroMemory(&wndClass, sizeof(WNDCLASSA));
@@ -1760 +1734 @@
 MONTHCAL_Unregister(void)
 {
-  if(GlobalFindAtomA(MONTHCAL_CLASSA))
-    UnregisterClassA(MONTHCAL_CLASSA, (HINSTANCE)NULL);
-}
+  UnregisterClassA(MONTHCAL_CLASSA, (HINSTANCE)NULL);
+}