Changeset 1762 for trunk/src/comctl32

Timestamp:

Nov 17, 1999, 6:06:23 PM (26 years ago)

Author:

cbratschi

Message:

cursor handling fixed

Location:

trunk/src/comctl32

Files:

• header.c (modified) (3 diffs)
• monthcal.c (modified) (1 diff)
• rebar.c (modified) (2 diffs)
• status.c (modified) (4 diffs)
• trackbar.c (modified) (2 diffs)

trunk/src/comctl32/header.c

@@ -1 @@
-/* $Id: header.c,v 1.18 1999-10-24 22:49:43 sandervl Exp $ */
+/* $Id: header.c,v 1.19 1999-11-17 17:06:22 cbratschi Exp $ */
 /*
  *  Header control
@@ -2304 +2304 @@
       } else SetCursor(infoPtr->hcurArrow);
 
-      return 0;
+      return TRUE;
     }
 
@@ -2314 +2314 @@
         SetCursor (infoPtr->hcurArrow);
 
-    return 0;
+    return TRUE;
 }
 

trunk/src/comctl32/monthcal.c

@@ -1 @@
-
+/* $Id: monthcal.c,v 1.6 1999-11-17 17:06:22 cbratschi Exp $ */
 /* Month calendar control
 

trunk/src/comctl32/rebar.c

@@ -1 @@
-/* $Id: rebar.c,v 1.9 1999-10-24 22:49:46 sandervl Exp $ */
+/* $Id: rebar.c,v 1.10 1999-11-17 17:06:23 cbratschi Exp $ */
 /*
  * Rebar control
@@ -1763 +1763 @@
     else if (flags != RBHT_CLIENT)
         SetCursor (infoPtr->hcurArrow);
-
-    return 0;
+    //CB: else not handled -> cursor not changed
+
+    return TRUE;
 }
 

trunk/src/comctl32/status.c

@@ -1 @@
-/* $Id: status.c,v 1.13 1999-11-03 22:05:23 cbratschi Exp $ */
+/* $Id: status.c,v 1.14 1999-11-17 17:06:23 cbratschi Exp $ */
 /*
  * Interface code to StatusWindow widget/control
@@ -1020 +1020 @@
 }
 
+static LRESULT STATUSBAR_WMSetCursor(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+
+  if (dwStyle & SBARS_SIZEGRIP)
+  {
+    RECT rect = STATUSBAR_GetSizeBox(hwnd);
+    POINT pt;
+
+    GetCursorPos(&pt);
+    ScreenToClient(hwnd,&pt);
+
+    if (PtInRect(&rect,pt))
+    {
+      SetCursor(LoadCursorA(0,IDC_SIZENWSEA));
+      return TRUE;
+    }
+  }
+
+  return DefWindowProcA(hwnd,WM_SETCURSOR,wParam,lParam);
+}
 
 static LRESULT
@@ -1025 +1046 @@
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr(hwnd);
-    DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
-
-    if (dwStyle & SBARS_SIZEGRIP)
-    {
-      RECT rect = STATUSBAR_GetSizeBox(hwnd);
-      POINT point;
-
-      point.x = (SHORT)LOWORD(lParam);
-      point.y = (SHORT)HIWORD(lParam);
-      if (PtInRect(&rect,point)) SetCursor(LoadCursorA(0,IDC_SIZENWSEA));
-    }
 
     if (infoPtr->hwndToolTip)
@@ -1311 +1321 @@
             return STATUSBAR_SendNotify (hwnd, NM_RCLICK);
 
+        case WM_SETCURSOR:
+            return STATUSBAR_WMSetCursor(hwnd,wParam,lParam);
+
         case WM_SETFONT:
             return STATUSBAR_WMSetFont (hwnd, wParam, lParam);

trunk/src/comctl32/trackbar.c

@@ -1 @@
-/* $Id: trackbar.c,v 1.22 1999-11-09 17:09:27 cbratschi Exp $ */
+/* $Id: trackbar.c,v 1.23 1999-11-17 17:06:23 cbratschi Exp $ */
 /*
  * Trackbar control
@@ -2211 +2211 @@
     }
 
-    return TRUE;
+    return 0;
 }