Changeset 1828 for trunk/src/user32/scroll.cpp

Timestamp:

Nov 24, 1999, 7:21:37 PM (26 years ago)

Author:

cbratschi

Message:

added button styles and messages, bug fixes

File:

• trunk/src/user32/scroll.cpp (modified) (4 diffs)

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.24 1999-11-19 17:59:34 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.25 1999-11-24 18:21:37 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -266 +266 @@
         if (pt.y < rect.top + arrowSize) return (infoPtr->flags & ESB_DISABLE_LTUP) ? SCROLL_NOWHERE:SCROLL_TOP_ARROW;
         if (pt.y >= rect.bottom - arrowSize) return (infoPtr->flags & ESB_DISABLE_RTDN) ? SCROLL_NOWHERE:SCROLL_BOTTOM_ARROW;
-        if (!thumbPos) return SCROLL_TOP_RECT;
+        if (!thumbPos) return ((infoPtr->flags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH) ? SCROLL_NOWHERE:SCROLL_TOP_RECT;
         pt.y -= rect.top;
         if (pt.y < thumbPos) return SCROLL_TOP_RECT;
@@ -275 +275 @@
         if (pt.x < rect.left + arrowSize) return (infoPtr->flags & ESB_DISABLE_LTUP) ? SCROLL_NOWHERE:SCROLL_TOP_ARROW;
         if (pt.x >= rect.right - arrowSize) return (infoPtr->flags & ESB_DISABLE_RTDN) ? SCROLL_NOWHERE:SCROLL_BOTTOM_ARROW;
-        if (!thumbPos) return SCROLL_TOP_RECT;
+        if (!thumbPos) return ((infoPtr->flags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH) ? SCROLL_NOWHERE:SCROLL_TOP_RECT;
         pt.x -= rect.left;
         if (pt.x < thumbPos) return SCROLL_TOP_RECT;
@@ -795 +795 @@
         SCROLL_trackVertical = vertical;
         SCROLL_trackHitTest = hittest = SCROLL_HitTest( hwnd, nBar, pt, FALSE );
-        if (SCROLL_trackHitTest == SCROLL_NOWHERE) return res;
+        if (SCROLL_trackHitTest == SCROLL_NOWHERE)
+        {
+          MessageBeep(MB_ICONEXCLAMATION);
+
+          return res;
+        }
         SCROLL_Scrolling = TRUE;
         timerRunning = FALSE;