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

Timestamp:

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

Author:

cbratschi

Message:

trackbar buddy fix, tooltip enhancements

File:

• trunk/src/comctl32/progress.cpp (modified) (9 diffs)

trunk/src/comctl32/progress.cpp

@@ -1 @@
-/* $Id: progress.cpp,v 1.1 2000-02-23 17:09:46 cbratschi Exp $ */
+/* $Id: progress.cpp,v 1.2 2000-03-17 17:13:23 cbratschi Exp $ */
 /*
  * Progress control
@@ -14 +14 @@
 #include "winbase.h"
 #include "commctrl.h"
+#include "ccbase.h"
 #include "progress.h"
 #include "comctl32.h"
 
-
 /* Control configuration constants */
 
@@ -23 +23 @@
 #define BORDER_WIDTH 1
 
-#define PROGRESS_GetInfoPtr(hwnd) ((PROGRESS_INFO *)GetWindowLongA(hwnd,0))
+#define PROGRESS_GetInfoPtr(hwnd) ((PROGRESS_INFO*)getInfoPtr(hwnd))
 
 
@@ -279 +279 @@
 
   /* allocate memory for info struct */
-  infoPtr = (PROGRESS_INFO *)COMCTL32_Alloc(sizeof(PROGRESS_INFO));
+  infoPtr = (PROGRESS_INFO*)initControl(hwnd,sizeof(PROGRESS_INFO));
   SetWindowLongA(hwnd,0,(DWORD)infoPtr);
 
@@ -290 +290 @@
   infoPtr->ColorBk = CLR_DEFAULT;
   infoPtr->hFont = (HANDLE)NULL;
-//      TRACE(progress, "Progress Ctrl creation, hwnd=%04x\n", hwnd);
 
   return 0;
@@ -299 +298 @@
   PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
 
-  //      TRACE (progress, "Progress Ctrl destruction, hwnd=%04x\n", hwnd);
-  COMCTL32_Free (infoPtr);
+  doneControl(hwnd);
 
   return 0;
@@ -536 +534 @@
 //      ERR(progress, "unknown msg %04x wp=%04x lp=%08lx\n",
 //                  message, wParam, lParam );
-      return DefWindowProcA( hwnd, message, wParam, lParam );
+      return defComCtl32ProcA( hwnd, message, wParam, lParam );
     }
 
@@ -553 +551 @@
 {
     WNDCLASSA wndClass;
-
-//SvL: Don't check this now
-//    if (GlobalFindAtomA(PROGRESS_CLASSA)) return;
 
     ZeroMemory (&wndClass, sizeof( WNDCLASSA));
@@ -578 +573 @@
 PROGRESS_Unregister (VOID)
 {
-    if (GlobalFindAtomA(PROGRESS_CLASSA))
-        UnregisterClassA(PROGRESS_CLASSA, (HINSTANCE)NULL);
-}
-
+    UnregisterClassA(PROGRESS_CLASSA, (HINSTANCE)NULL);
+}
+