Changeset 165

Timestamp:

May 27, 2002, 8:10:46 PM (23 years ago)

Author:

umoeller

Message:

Bunch of fixes.

Location:

trunk

Files:

• include/helpers/dialog.h (modified) (2 diffs)
• src/helpers/cctl_tooltip.c (modified) (3 diffs)
• src/helpers/winh.c (modified) (2 diffs)

trunk/include/helpers/dialog.h

@@ -130 +130 @@
                 // adds extra spacing to this size:
                 // -- the group control's cx will be
-                //      2 * szlControlProposed.cx
+                //      szlControlProposed.cx
                 //    + 2 * ulSpacing
                 //    + 2 * GROUP_INNER_SPACING_X
                 // -- the group control's cy will be
-                //      2 * szlControlProposed.cy
+                //      szlControlProposed.cy
                 //    + 2 * ulSpacing
                 //    + GROUP_INNER_SPACING_Y
@@ -326 +326 @@
             WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON | BS_NOPOINTERFOCUS, \
             id, CTL_COMMON_FONT, 0, {cx, cy}, COMMON_SPACING }
+
+    #define LOADDEF_NOFOCUSBUTTON(id) CONTROLDEF_NOFOCUSBUTTON(LOAD_STRING, id, STD_BUTTON_WIDTH, STD_BUTTON_HEIGHT)
 
     #define CONTROLDEF_HELPPUSHBUTTON(pcsz, id, cx, cy) { WC_BUTTON, pcsz, \

trunk/src/helpers/cctl_tooltip.c

@@ -778 +778 @@
  *
  *@@added V0.9.13 (2001-06-21) [umoeller]
+ *@@changed V0.9.19 (2002-05-14) [umoeller]: fixed bad stop timer, thanks yuri
  */
 
@@ -789 +790 @@
         PLISTNODE   pToolNode;
 
-        if (pttd->idTimerInitial)
-        {
-            // _Pmpf(("TTM_RELAYEVENT: Stopping timer: %d", pttd->idTimerInitial));
-            WinStopTimer(pttd->hab,
-                         hwndTooltip,
-                         TOOLTIP_ID_TIMER_INITIAL);
-            pttd->idTimerInitial = 0;
-        }
+        // moved stop timer down V0.9.19 (2002-05-14) [umoeller]
 
         WinQueryPointerPos(HWND_DESKTOP, &ptlPointer);
@@ -823 +817 @@
         {
             // mouse pos changed:
+            // moved stop timer here V0.9.19 (2002-05-14) [umoeller]
+            if (pttd->idTimerInitial)
+            {
+                // _Pmpf(("TTM_RELAYEVENT: Stopping timer: %d", pttd->idTimerInitial));
+                WinStopTimer(pttd->hab,
+                             hwndTooltip,
+                             TOOLTIP_ID_TIMER_INITIAL);
+                pttd->idTimerInitial = 0;
+            }
+
             // hide tooltip
             WinPostMsg(hwndTooltip,

trunk/src/helpers/winh.c

@@ -4092 +4092 @@
                     CHAR szClass[10];
 
+                    WinQueryWindowPos(hwndItem, pswpThis);
+
                     // special handling for entry fields
                     // V0.9.16 (2002-02-02) [umoeller]
@@ -4102 +4104 @@
 
                     // check lowest y
-                    WinQueryWindowPos(hwndItem, pswpThis);
                     if (    (pswpThis->y < yLowest)
                          // ignore combobox, this will distort everything