Changeset 184 for trunk/src/helpers/cctl_tooltip.c

Timestamp:

Jul 5, 2002, 9:13:36 AM (23 years ago)

Author:

umoeller

Message:

Second round of fixes for 0.9.19.

File:

• trunk/src/helpers/cctl_tooltip.c (modified) (10 diffs)

trunk/src/helpers/cctl_tooltip.c

@@ -111 +111 @@
 BOOL ctlRegisterTooltip(HAB hab)
 {
-    return (WinRegisterClass(hab,
-                             COMCTL_TOOLTIP_CLASS,
-                             ctl_fnwpTooltip,
-                             CS_HITTEST,     // class styles;
-                                             // CS_FRAME not working,
-                                             // CS_CLIPSIBLINGS not working
-                             sizeof(PVOID)*2));   // addt'l bytes to reserve:
+    return WinRegisterClass(hab,
+                            COMCTL_TOOLTIP_CLASS,
+                            ctl_fnwpTooltip,
+                            CS_HITTEST,     // class styles;
+                                            // CS_FRAME not working,
+                                            // CS_CLIPSIBLINGS not working
+                            sizeof(PVOID) * 2);   // addt'l bytes to reserve:
                                     // one pointer for QWL_USER,
                                     // one more for instance data
@@ -203 +203 @@
         PSUBCLASSEDTOOL pstThis = (PSUBCLASSEDTOOL)pNode->pItemData;
         if (pstThis->hwndTool == hwndTool)
-        {
-            return (pstThis);
-        }
+            return pstThis;
+
         pNode = pNode->pNext;
     }
@@ -327 +326 @@
 static BOOL UnSubclassTool(HWND hwndTool)
 {
-    PSUBCLASSEDTOOL pst = FindSubclassedTool(hwndTool);
-    if (pst)
+    PSUBCLASSEDTOOL pst;
+    if (pst = FindSubclassedTool(hwndTool))
     {
         WinSubclassWindow(hwndTool,
                           pst->pfnwpOrig);
                             // orig winproc == un-subclass
-        return (lstRemoveItem(&G_llSubclassedTools, pst));
+        return lstRemoveItem(&G_llSubclassedTools, pst);
                     // this frees the item
     }
 
-    return (FALSE);
+    return FALSE;
 }
 
@@ -446 +445 @@
 
     // allocate and initialize tooltip data
-    pttd = (PTOOLTIPDATA)malloc(sizeof(TOOLTIPDATA));
-    if (pttd)
+    if (pttd = (PTOOLTIPDATA)malloc(sizeof(TOOLTIPDATA)))
     {
         CHAR        szFont[256];
@@ -498 +496 @@
         return (MPARAM)FALSE;
     }
-    else
-        // malloc failed:
-        return (MPARAM)TRUE;
+
+    // malloc failed:
+    return (MPARAM)TRUE;
 }
 
@@ -543 +541 @@
     } // end switch
 
-    return (TRUE);
+    return TRUE;
 }
 
@@ -735 +733 @@
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
-    PTOOLINFO ptiSearch = (PTOOLINFO)mp2;
-    if (ptiSearch)
+    PTOOLINFO ptiSearch;
+    if (ptiSearch = (PTOOLINFO)mp2)
     {
         PLISTNODE pToolNode = lstQueryFirstNode(&pttd->llTools);
@@ -962 +960 @@
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
-    PTOOLINFO ptiTarget = (PTOOLINFO)mp2;
-    if (ptiTarget)
+    PTOOLINFO ptiTarget;
+    if (ptiTarget = (PTOOLINFO)mp2)
     {
         PTOOLINFO ptiFound = (PTOOLINFO)lstItemFromIndex(&pttd->llTools,
@@ -987 +985 @@
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
-    PTOOLINFO ptiTarget = (PTOOLINFO)mp2;
-    if (ptiTarget)
+    PTOOLINFO ptiTarget;
+    if (ptiTarget = (PTOOLINFO)mp2)
     {
         if (pttd->ptiMouseOver)
         {
             memcpy(ptiTarget, pttd->ptiMouseOver, sizeof(TOOLINFO));
-            return (MPARAM)TRUE;
+            return (MRESULT)TRUE;
         }
     }
 
-    return ((MPARAM)FALSE);
+    return (MRESULT)FALSE;
 }
 
@@ -1010 +1008 @@
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
-    PTOOLINFO ptiSearch = (PTOOLINFO)mp2;
-    if (ptiSearch)
+    PTOOLINFO ptiSearch;
+    if (ptiSearch = (PTOOLINFO)mp2)
     {
         PLISTNODE pToolNode = lstQueryFirstNode(&pttd->llTools);