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

Timestamp:

Dec 5, 2002, 9:36:28 PM (23 years ago)

Author:

umoeller

Message:

New toolbar control.

File:

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

trunk/src/helpers/cctl_tooltip.c

@@ -112 +112 @@
 {
     return WinRegisterClass(hab,
-                            COMCTL_TOOLTIP_CLASS,
+                            WC_CCTL_TOOLTIP,
                             ctl_fnwpTooltip,
                             CS_HITTEST,     // class styles;
@@ -295 +295 @@
     if (!FindSubclassedTool(hwndTool))
     {
-        PFNWP   pfnwpOrig = WinSubclassWindow(hwndTool,
-                                              ctl_fnwpSubclassedTool);
-        if (pfnwpOrig)
+        PFNWP   pfnwpOrig;
+        if (pfnwpOrig = WinSubclassWindow(hwndTool,
+                                          ctl_fnwpSubclassedTool))
         {
-            PSUBCLASSEDTOOL pst = (PSUBCLASSEDTOOL)malloc(sizeof(SUBCLASSEDTOOL));
-            if (pst)
+            PSUBCLASSEDTOOL pst;
+            if (pst = (PSUBCLASSEDTOOL)malloc(sizeof(SUBCLASSEDTOOL)))
             {
                 pst->pfnwpOrig = pfnwpOrig;
@@ -361 +361 @@
     HAB         hab;                // from WM_CREATE
     USHORT      usTooltipID;        // from WM_CREATE
-
-    LONG        cxScreen,
-                cyScreen;
 
     BOOL        fIsActive;          // TRUE per default; changed by TTM_ACTIVATE
@@ -457 +454 @@
         pttd->usTooltipID = pcs->id;
 
-        pttd->cxScreen = WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN);
-        pttd->cyScreen = WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN);
-
         pttd->fIsActive = TRUE;
 
@@ -1133 +1127 @@
     if (ptlTooltip.y < 0)
         ptlTooltip.y = 0;
-    if (ptlTooltip.x + cx > pttd->cxScreen)
-        ptlTooltip.x = pttd->cxScreen-cx;
-    if (ptlTooltip.y + cy > pttd->cyScreen)
-        ptlTooltip.y = pttd->cyScreen-cy;
+    if (ptlTooltip.x + cx > G_cxScreen)
+        ptlTooltip.x = G_cxScreen - cx;
+    if (ptlTooltip.y + cy > G_cyScreen)
+        ptlTooltip.y = G_cyScreen - cy;
 
     // if shadow is enabled,
@@ -1350 +1344 @@
  +          ctlRegisterTooltip(hab);
  +          hwndTooltip = WinCreateWindow(HWND_DESKTOP, // parent
- +                           COMCTL_TOOLTIP_CLASS, // wnd class (comctl.h)
+ +                           WC_CCTL_TOOLTIP, // wnd class (comctl.h)
  +                           NULL,          // window text
  +                           TTS_ALWAYSTIP, // window style, ignored except for TTS_* flags