Changeset 3970 for trunk/src/comctl32/tooltips.cpp

Timestamp:

Aug 8, 2000, 7:05:02 PM (25 years ago)

Author:

cbratschi

Message:

Corel WINE 20000807 changes - part 1

File:

• trunk/src/comctl32/tooltips.cpp (modified) (10 diffs)

trunk/src/comctl32/tooltips.cpp

@@ -1 @@
-/* $Id: tooltips.cpp,v 1.10 2000-08-06 20:28:29 sandervl Exp $ */
+/* $Id: tooltips.cpp,v 1.11 2000-08-08 17:05:01 cbratschi Exp $ */
 /*
  * Tool tip control
@@ -18 +18 @@
 
 /*
- - Corel WINE 20000513 level
+ - Corel WINE 20000807 level
  - (WINE 20000130 level)
 */
@@ -341 +341 @@
     RECT rect, wndrect;
     SIZE size;
-    HDC  hdc;
     NMHDR  hdr;
 
@@ -424 +423 @@
 
     /* repaint the tooltip */
-    hdc = GetDC (hwnd);
-    TOOLTIPS_Draw(hwnd, hdc);
-    ReleaseDC (hwnd, hdc);
+    InvalidateRect(hwnd,NULL,TRUE);
+    UpdateWindow(hwnd);
 
     SetTimer (hwnd, ID_TIMERPOP, infoPtr->nAutoPopTime, 0);
@@ -463 +461 @@
     TTTOOL_INFO *toolPtr;
     RECT rect;
-    HDC  hdc;
     NMHDR hdr;
 
@@ -498 +495 @@
                     SWP_SHOWWINDOW | SWP_NOACTIVATE );
 
-    hdc = GetDC (hwnd);
-    TOOLTIPS_Draw(hwnd, hdc);
-    ReleaseDC (hwnd, hdc);
+    InvalidateRect(hwnd,NULL,TRUE);
+    UpdateWindow(hwnd);
 }
 
@@ -740 +736 @@
           COMCTL32_Free(&lpttsi);
         }
-//          else
-//              ERR (tooltips, "Invalid data handle!\n");
+          //else
+          //    ERR (tooltips, "Invalid data handle!\n");
       } else
       {
@@ -750 +746 @@
           if (lpttsi->uRefCount == 1)
           {
-            SetWindowLongA((HWND)toolPtr->uId,GWL_WNDPROC,(LONG)lpttsi->wpOrigProc);
-            RemovePropA((HWND)toolPtr->uId,COMCTL32_aSubclass);
+            SetWindowLongA((HWND)toolPtr->hwnd,GWL_WNDPROC,(LONG)lpttsi->wpOrigProc);
+            RemovePropA((HWND)toolPtr->hwnd,COMCTL32_aSubclass);
             COMCTL32_Free(&lpttsi);
           } else lpttsi->uRefCount--;
@@ -1575 +1571 @@
               } else
               {
-                /*
-                 * Need to set nCurrentTool to nOldTool so we hide the tool.
-                 *  nTool and nOldTool values change when the mouse leaves the window.
-                 * If using TTM_UPDATETIPTEXT we can end up with an nCurrentTool = -1 if the
-                 * text can't be found, thus the tooltip would never be hidden.
-                 */
-                if (infoPtr->nTool != infoPtr->nOldTool)
-                  infoPtr->nCurrentTool = infoPtr->nOldTool;
+                /*
+                 * Need to set nCurrentTool to nOldTool so we hide the tool.
+                 *  nTool and nOldTool values change when the mouse leaves the window.
+                 * If using TTM_UPDATETIPTEXT we can end up with an nCurrentTool = -1 if the
+                 * text can't be found, thus the tooltip would never be hidden.
+                 */
+                if (infoPtr->nTool != infoPtr->nOldTool)
+                  infoPtr->nCurrentTool = infoPtr->nOldTool;
 
                 TOOLTIPS_Hide(hwnd,infoPtr);
@@ -2043 +2039 @@
             if (toolPtr->uFlags & TTF_SUBCLASS) {
                 LPTT_SUBCLASS_INFO lpttsi;
-
-                if (toolPtr->uFlags & TTF_IDISHWND)
-                    lpttsi = (LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
-                else
-                    lpttsi = (LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
-
+                if (toolPtr->uFlags & TTF_IDISHWND) {
+                lpttsi = (LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
                 if (lpttsi) {
                     SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
-                                      (LONG)lpttsi->wpOrigProc);
+                              (LONG)lpttsi->wpOrigProc);
                     RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
                     COMCTL32_Free (&lpttsi);
                 }
             }
+            else  {
+                    lpttsi = (LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
+
+                    if (lpttsi) {
+                        SetWindowLongA ((HWND)toolPtr->hwnd, GWL_WNDPROC,
+                                          (LONG)lpttsi->wpOrigProc);
+                        RemovePropA ((HWND)toolPtr->hwnd, COMCTL32_aSubclass);
+                        COMCTL32_Free (&lpttsi);
+                    }
+            }
+         }
       }
       COMCTL32_Free (infoPtr->tools);