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

trunk/src/comctl32/tooltips.cpp

@@ -1 @@
-/* $Id: tooltips.cpp,v 1.3 2000-03-17 17:13:26 cbratschi Exp $ */
+/* $Id: tooltips.cpp,v 1.4 2000-03-18 16:17:32 cbratschi Exp $ */
 /*
  * Tool tip control
@@ -17 +17 @@
  */
 
-/* WINE 20000130 level */
+/*
+ - Corel WINE 20000317 level
+ - (WINE 20000130 level)
+*/
 
 #include <string.h>
@@ -23 +26 @@
 #include "winbase.h"
 #include "commctrl.h"
+#include "ccbase.h"
 #include "tooltips.h"
 #include "comctl32.h"
@@ -1926 +1930 @@
 
     /* allocate memory for info structure */
-    infoPtr = (TOOLTIPS_INFO *)COMCTL32_Alloc(sizeof(TOOLTIPS_INFO));
-    SetWindowLongA(hwnd,0,(DWORD)infoPtr);
+    infoPtr = (TOOLTIPS_INFO*)initControl(hwnd,sizeof(TOOLTIPS_INFO));
 
     /* initialize info structure */
@@ -1954 +1957 @@
 
     SetRectEmpty(&infoPtr->rcMargin);
-
-    nResult = (INT)SendMessageA(GetParent(hwnd),WM_NOTIFYFORMAT,(WPARAM)hwnd,(LPARAM)NF_QUERY);
-//    if (nResult == NFR_ANSI)
-//      TRACE (tooltips, " -- WM_NOTIFYFORMAT returns: NFR_ANSI\n");
-//    else if (nResult == NFR_UNICODE)
-//      FIXME (tooltips, " -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n");
-//    else
-//      FIXME (tooltips, " -- WM_NOTIFYFORMAT returns: error!\n");
 
     SetWindowPos(hwnd,HWND_TOP,0,0,0,0,SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE);
@@ -2013 +2008 @@
 
     /* free tool tips info data */
-    COMCTL32_Free(infoPtr);
+    doneControl(hwnd);
 
     return 0;
@@ -2087 +2082 @@
 
     return DefWindowProcA (hwnd, WM_NCHITTEST, wParam, lParam);
-}
-
-static LRESULT
-TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-//    FIXME ("hwnd=%x wParam=%x lParam=%lx\n", hwnd, wParam, lParam);
-
-    return 0;
 }
 
@@ -2244 +2231 @@
         case WM_RBUTTONUP:
             infoPtr = TOOLTIPS_GetInfoPtr(lpttsi->hwndToolTip);
-                nTool = TOOLTIPS_GetToolFromMessage (infoPtr, hwnd);
-
-//              TRACE (tooltips, "subclassed mouse message %04x\n", uMsg);
-                infoPtr->nOldTool = infoPtr->nTool;
-                infoPtr->nTool = nTool;
+            if (!infoPtr) break;
+            nTool = TOOLTIPS_GetToolFromMessage (infoPtr, hwnd);
+
+            infoPtr->nOldTool = infoPtr->nTool;
+            infoPtr->nTool = nTool;
             TOOLTIPS_Hide (lpttsi->hwndToolTip, infoPtr);
             break;
@@ -2254 +2241 @@
         case WM_MOUSEMOVE:
                 infoPtr = TOOLTIPS_GetInfoPtr (lpttsi->hwndToolTip);
-                //@@@AH 2000/02/25 check if there is a valid instance data pointer
-                if (!infoPtr)
-                {
-                  dprintf(("Tooltips:SubclassProc:WM_MOUSEMOVE: infoPtr == NULL!\n"));
-                  break;
-                }
+                if (!infoPtr) break;
                 nTool = TOOLTIPS_GetToolFromMessage (infoPtr, hwnd);
 
-//              TRACE (tooltips, "subclassed WM_MOUSEMOVE\n");
                 infoPtr->nOldTool = infoPtr->nTool;
                 infoPtr->nTool = nTool;
@@ -2271 +2252 @@
                     SetTimer (hwnd, ID_TIMERSHOW,
                                     infoPtr->nInitialTime, 0);
-//                      TRACE (tooltips, "timer 1 started!\n");
+                      //TRACE (tooltips, "timer 1 started!\n");
                     }
                     else {
@@ -2445 +2426 @@
             return TOOLTIPS_NCHitTest (hwnd, wParam, lParam);
 
-        case WM_NOTIFYFORMAT:
-            return TOOLTIPS_NotifyFormat (hwnd, wParam, lParam);
-
         case WM_PAINT:
             return TOOLTIPS_Paint (hwnd, wParam, lParam);
@@ -2464 +2442 @@
 //              ERR (tooltips, "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;