Changeset 3154 for trunk/src/comctl32/updown.cpp

Timestamp:

Mar 18, 2000, 5:17:35 PM (25 years ago)

Author:

cbratschi

Message:

Corel 20000317 merge, ccbase finished, bug fixes

File:

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

trunk/src/comctl32/updown.cpp

@@ -1 @@
-/* $Id: updown.cpp,v 1.1 2000-02-23 17:09:51 cbratschi Exp $ */
+/* $Id: updown.cpp,v 1.2 2000-03-18 16:17:35 cbratschi Exp $ */
 /*
  * Updown control
@@ -37 +37 @@
 #include "commctrl.h"
 #include "winnls.h"
+#include "ccbase.h"
 #include "updown.h"
 
@@ -70 +71 @@
 #define UNKNOWN_PARAM(msg, wParam, lParam)
 
-#define UPDOWN_GetInfoPtr(hwnd) ((UPDOWN_INFO *)GetWindowLongA(hwnd,0))
+#define UPDOWN_GetInfoPtr(hwnd) ((UPDOWN_INFO*)getInfoPtr(hwnd))
 
 static LRESULT CALLBACK
@@ -714 +715 @@
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
 
-  infoPtr = (UPDOWN_INFO*)COMCTL32_Alloc(sizeof(UPDOWN_INFO));
-  SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
+  infoPtr = (UPDOWN_INFO*)initControl(hwnd,sizeof(UPDOWN_INFO));
 
   /* initialize the info struct */
@@ -744 +744 @@
         RemovePropA(infoPtr->Buddy, BUDDY_UPDOWN_HWND);
 
-  COMCTL32_Free (infoPtr);
-
-//      TRACE(updown, "UpDown Ctrl destruction, hwnd=%04x\n", hwnd);
+  doneControl(hwnd);
 
   return 0;
@@ -1094 +1092 @@
 //      ERR (updown, "unknown msg %04x wp=%04x lp=%08lx\n",
 //           message, wParam, lParam);
-      return DefWindowProcA(hwnd,message,wParam,lParam);
+      return defComCtl32ProcA(hwnd,message,wParam,lParam);
     }
 
@@ -1159 +1157 @@
     WNDCLASSA wndClass;
 
-//SvL: Don't check this now
-//    if( GlobalFindAtomA( UPDOWN_CLASSA ) ) return;
-
     ZeroMemory( &wndClass, sizeof( WNDCLASSA ) );
     wndClass.style         = CS_GLOBALCLASS | CS_VREDRAW;
@@ -1184 +1179 @@
 UPDOWN_Unregister (VOID)
 {
-    if (GlobalFindAtomA (UPDOWN_CLASSA))
-        UnregisterClassA (UPDOWN_CLASSA, (HINSTANCE)NULL);
-}
-
+    UnregisterClassA (UPDOWN_CLASSA, (HINSTANCE)NULL);
+}
+