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

Timestamp:

Nov 19, 1999, 6:59:35 PM (26 years ago)

Author:

cbratschi

Message:

fixed listbox scrolling, first work on combo code

File:

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

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.23 1999-11-17 17:04:54 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.24 1999-11-19 17:59:34 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -1474 +1474 @@
 {
   SCROLLBAR_INFO *infoPtr;
+  HWND hwndScroll;
 
     dprintf(("USER32: GetScrollInfo"));
 
-    if (!(infoPtr = SCROLL_GetInfoPtr(SCROLL_GetScrollHandle(hwnd,nBar),nBar))) return FALSE;
+    hwndScroll = SCROLL_GetScrollHandle(hwnd,nBar);
+    if (!hwndScroll || !(infoPtr = SCROLL_GetInfoPtr(hwndScroll,nBar))) return FALSE;
     if (info->fMask & ~(SIF_ALL | SIF_DISABLENOSCROLL)) return FALSE;
     if ((info->cbSize != sizeof(*info)) &&
@@ -1485 +1487 @@
     if (info->fMask & SIF_POS) info->nPos = infoPtr->CurVal;
     if ((info->fMask & SIF_TRACKPOS) && (info->cbSize == sizeof(*info)))
-        info->nTrackPos = (SCROLL_TrackingWin==hwnd) ? SCROLL_TrackingVal : infoPtr->CurVal;
+      info->nTrackPos = (SCROLL_MovingThumb && SCROLL_TrackingWin == hwndScroll && SCROLL_TrackingBar == nBar) ? SCROLL_TrackingVal:infoPtr->CurVal;
+
     if (info->fMask & SIF_RANGE)
     {
@@ -1548 +1551 @@
 }
 
-// CB: functions to get 32bit SB_THUMBTRACK position, for internal use (controls)
-//     not supported by Windows, Windows only delivers the 16bit value
-
-BOOL IsScrollBarTracking(HWND hwnd,INT nBar)
-{
-  HWND hwndScroll = SCROLL_GetScrollHandle(hwnd,nBar);
-
-  return (SCROLL_MovingThumb && SCROLL_TrackingWin == hwnd && SCROLL_TrackingBar == nBar);
-}
-
-INT WINAPI GetScrollTrackPos(HWND hwnd,INT nBar)
-{
-  SCROLLBAR_INFO *infoPtr;
-
-  infoPtr = SCROLL_GetInfoPtr(SCROLL_GetScrollHandle(hwnd,nBar),nBar);
-  if (!infoPtr) return 0;
-
-  return (SCROLL_MovingThumb && SCROLL_TrackingWin == hwnd && SCROLL_TrackingBar == nBar) ? SCROLL_TrackingVal:infoPtr->CurVal;
-}
-
 /*************************************************************************
  *           SetScrollRange   (USER32.503)