Changeset 2895 for trunk/src/comctl32/datetime.cpp

Timestamp:

Feb 25, 2000, 6:00:18 PM (26 years ago)

Author:

cbratschi

Message:

unicode and other changes

File:

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

trunk/src/comctl32/datetime.cpp

@@ -1 @@
-/* $Id: datetime.cpp,v 1.1 2000-02-23 17:09:41 cbratschi Exp $ */
+/* $Id: datetime.cpp,v 1.2 2000-02-25 17:00:15 cbratschi Exp $ */
 /*
  * Date and time picker control
@@ -19 +19 @@
 #include "winbase.h"
 #include "commctrl.h"
+#include "ccbase.h"
 #include "datetime.h"
 #include "monthcal.h"
@@ -25 +26 @@
 
 
-#define DATETIME_GetInfoPtr(hwnd) ((DATETIME_INFO *)GetWindowLongA (hwnd, 0))
-static BOOL
-
-DATETIME_SendSimpleNotify (HWND hwnd, UINT code);
+#define DATETIME_GetInfoPtr(hwnd) ((DATETIME_INFO*)getInfoPtr(hwnd))
 
 static char *days[] = {"Sunday", "Monday", "Tuesday", "Wednesday",
@@ -282 +280 @@
 
                         SetFocus (hwnd);
-                        DATETIME_SendSimpleNotify (hwnd, DTN_DROPDOWN);
+                        sendNotify(hwnd,DTN_DROPDOWN);
         }
     return 0;
@@ -335 +333 @@
 
         if (infoPtr->select) {
-                        DATETIME_SendSimpleNotify (hwnd, NM_KILLFOCUS);
+                        sendNotify(hwnd,NM_KILLFOCUS);
                         infoPtr->select&= ~DTHT_GOTFOCUS;
         }
@@ -356 +354 @@
 
         if (infoPtr->select) {
-                        DATETIME_SendSimpleNotify (hwnd, NM_SETFOCUS);
+                        sendNotify(hwnd,NM_SETFOCUS);
                         infoPtr->select|=DTHT_GOTFOCUS;
         }
@@ -367 +365 @@
 
 
-static BOOL
-DATETIME_SendSimpleNotify (HWND hwnd, UINT code)
-{
-    NMHDR nmhdr;
-
-    //TRACE("%x\n",code);
-    nmhdr.hwndFrom = hwnd;
-    nmhdr.idFrom   = GetWindowLongA( hwnd, GWL_ID);
-    nmhdr.code     = code;
-
-    return (BOOL) SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                                   (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
-}
-
-
-
-
-
-
 static LRESULT
 DATETIME_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
@@ -393 +372 @@
 
     /* allocate memory for info structure */
-    infoPtr = (DATETIME_INFO *)COMCTL32_Alloc (sizeof(DATETIME_INFO));
+    infoPtr = (DATETIME_INFO*)initControl(hwnd,sizeof(DATETIME_INFO));
     if (infoPtr == NULL) {
         //ERR("could not allocate info memory!\n");
         return 0;
     }
-
-    SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
 
         if (dwStyle & DTS_SHOWNONE) {
@@ -431 +408 @@
 DATETIME_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
-
-    COMCTL32_Free (infoPtr);
+    doneControl(hwnd);
+
     return 0;
 }
@@ -513 +489 @@
                 //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;
@@ -523 +499 @@
 {
     WNDCLASSA wndClass;
-
-//SvL: Don't check this now
-//    if (GlobalFindAtomA (DATETIMEPICK_CLASSA)) return;
 
     ZeroMemory (&wndClass, sizeof(WNDCLASSA));
@@ -543 +516 @@
 DATETIME_Unregister (void)
 {
-    if (GlobalFindAtomA (DATETIMEPICK_CLASSA))
-        UnregisterClassA (DATETIMEPICK_CLASSA, (HINSTANCE)NULL);
-}
-
+    UnregisterClassA (DATETIMEPICK_CLASSA, (HINSTANCE)NULL);
+}
+