Changeset 3154 for trunk/src/comctl32/rebar.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/rebar.cpp (modified) (14 diffs)

trunk/src/comctl32/rebar.cpp

@@ -1 @@
-/* $Id: rebar.cpp,v 1.1 2000-02-23 17:09:47 cbratschi Exp $ */
+/* $Id: rebar.cpp,v 1.2 2000-03-18 16:17:27 cbratschi Exp $ */
 /*
  * Rebar control
@@ -29 +29 @@
 #include "wingdi.h"
 #include "commctrl.h"
+#include "ccbase.h"
 #include "rebar.h"
 #include "comctl32.h"
@@ -42 +43 @@
 
 
-#define REBAR_GetInfoPtr(wndPtr) ((REBAR_INFO *)GetWindowLongA (hwnd, 0))
+#define REBAR_GetInfoPtr(hwnd) ((REBAR_INFO*)getInfoPtr(hwnd))
 
 
@@ -909 +910 @@
 
 static LRESULT
-REBAR_GetUnicodeFormat (HWND hwnd)
-{
-    REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
-    return infoPtr->bUnicode;
-}
-
-static LRESULT
-REBAR_GetVersion (HWND hwnd)
-{
-    REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
-    return infoPtr->iVersion;
-}
-
-static LRESULT
 REBAR_HitTest (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1498 +1485 @@
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
-    HWND hwndTemp = infoPtr->hwndNotify;
-
-    infoPtr->hwndNotify = (HWND)wParam;
+    HWND hwndTemp = infoPtr->header.hwndNotify;
+
+    infoPtr->header.hwndNotify = (HWND)wParam;
 
     return (LRESULT)hwndTemp;
@@ -1523 +1510 @@
 /* << REBAR_SetTooltips >> */
 
-
-static LRESULT
-REBAR_SetUnicodeFormat (HWND hwnd, WPARAM wParam)
-{
-    REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
-    BOOL bTemp = infoPtr->bUnicode;
-    infoPtr->bUnicode = (BOOL)wParam;
-    return bTemp;
-}
-
-static LRESULT
-REBAR_SetVersion (HWND hwnd, INT iVersion)
-{
-    REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
-    INT iOldVersion = infoPtr->iVersion;
-
-    if (iVersion > COMCTL32_VERSION)
-        return -1;
-
-    infoPtr->iVersion = iVersion;
-
-    return iOldVersion;
-}
 
 static LRESULT
@@ -1613 +1577 @@
 
     /* allocate memory for info structure */
-    infoPtr = (REBAR_INFO *)COMCTL32_Alloc (sizeof(REBAR_INFO));
-    SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
+    infoPtr = (REBAR_INFO*)initControl(hwnd,sizeof(REBAR_INFO));
 
     /* initialize info structure */
-    infoPtr->iVersion = 0;
     infoPtr->clrBk = CLR_NONE;
     infoPtr->clrText = RGB(0, 0, 0);
@@ -1627 +1589 @@
     infoPtr->hcurDrag  = LoadCursorA (0, IDC_SIZEA);
 
-    infoPtr->bUnicode = IsWindowUnicode (hwnd);
-
 //    if (GetWindowLongA (hwnd, GWL_STYLE) & RBS_AUTOSIZE)
 //      FIXME (rebar, "style RBS_AUTOSIZE set!\n");
 
-#if 0
-    SendMessageA (hwnd, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY);
-#endif
-
-//    TRACE (rebar, "created!\n");
     return 0;
 }
@@ -1681 +1636 @@
 
     /* free rebar info data */
-    COMCTL32_Free (infoPtr);
-
-//    TRACE (rebar, "destroyed!\n");
+    doneControl(hwnd);
+
     return 0;
 }
@@ -1943 +1897 @@
             return REBAR_GetToolTips (hwnd);
 
-        case RB_GETUNICODEFORMAT:
-            return REBAR_GetUnicodeFormat (hwnd);
-
-        case CCM_GETVERSION:
-            return REBAR_GetVersion (hwnd);
-
         case RB_HITTEST:
             return REBAR_HitTest (hwnd, wParam, lParam);
@@ -1993 +1941 @@
 
 /*      case RB_SETTOOLTIPS: */
-
-        case RB_SETUNICODEFORMAT:
-            return REBAR_SetUnicodeFormat (hwnd, wParam);
-
-        case CCM_SETVERSION:
-            return REBAR_SetVersion (hwnd, (INT)wParam);
 
         case RB_SHOWBAND:
@@ -2051 +1993 @@
 //              ERR (rebar, "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;
@@ -2061 +2003 @@
 {
     WNDCLASSA wndClass;
-
-//SvL: Don't check this now
-//    if (GlobalFindAtomA (REBARCLASSNAMEA)) return;
 
     ZeroMemory (&wndClass, sizeof(WNDCLASSA));
@@ -2081 +2020 @@
 REBAR_Unregister (VOID)
 {
-    if (GlobalFindAtomA (REBARCLASSNAMEA))
-        UnregisterClassA (REBARCLASSNAMEA, (HINSTANCE)NULL);
-}
-
+     UnregisterClassA (REBARCLASSNAMEA, (HINSTANCE)NULL);
+}
+