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

Timestamp:

Sep 29, 1999, 10:27:16 AM (26 years ago)

Author:

sandervl

Message:

Scrollbar changes

File:

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

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.3 1999-09-26 15:25:55 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.4 1999-09-29 08:27:15 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -167 +167 @@
 static SCROLLBAR_INFO *SCROLL_GetScrollInfo( HWND hwnd, INT nBar )
 {
-   return SCROLL_GetPtrScrollInfo( hwnd, nBar );
+ Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window && nBar != SB_CTL) {
+        dprintf(("SCROLL_GetScrollInfo window %x not found!", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return NULL;
+    }
+
+    if (window) {
+            return window->getScrollInfo(nBar);
+    }
+
+    return SCROLL_GetPtrScrollInfo( hwnd, nBar );
 }
 
@@ -1125 +1138 @@
   Win32BaseWindow *window;
   INT action;
-  INT retVal = SCROLL_SetScrollInfo( hwnd, nBar, info, &action );
+  INT retVal;
 
     window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
+    if(!window && nBar != SB_CTL) {
         dprintf(("SetScrollInfo window not found!"));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
         return FALSE;
     }
-
+    if(window) {
+        return window->setScrollInfo(nBar, (SCROLLINFO *)info, bRedraw);
+    }
+
+    retVal = SCROLL_SetScrollInfo( hwnd, nBar, info, &action );
     if( action & SA_SSI_HIDE )
         SCROLL_ShowScrollBar( hwnd, nBar, FALSE, FALSE );
@@ -1170 +1187 @@
 
     /* Set the page size */
-
     if (info->fMask & SIF_PAGE)
     {
@@ -1182 +1198 @@
 
     /* Set the scroll pos */
-
     if (info->fMask & SIF_POS)
     {
@@ -1194 +1209 @@
 
     /* Set the scroll range */
-
     if (info->fMask & SIF_RANGE)
     {
@@ -1239 +1253 @@
 
     /* Check if the scrollbar should be hidden or disabled */
-
     if (info->fMask & (SIF_RANGE | SIF_PAGE | SIF_DISABLENOSCROLL))
     {
@@ -1288 +1301 @@
                 LPSCROLLINFO info /* [IO] (info.fMask [I] specifies which values are to retrieve) */)
 {
-  Win32BaseWindow *window;
   SCROLLBAR_INFO *infoPtr;
 
-    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
-        dprintf(("GetScrollInfo window not found!"));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return FALSE;
-    }
     if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, nBar ))) return FALSE;
     if (info->fMask & ~(SIF_ALL | SIF_DISABLENOSCROLL)) return FALSE;
@@ -1330 +1336 @@
                 BOOL bRedraw /* [I] Should scrollbar be redrawn afterwards ? */ )
 {
-  Win32BaseWindow *window;
   SCROLLINFO info;
   SCROLLBAR_INFO *infoPtr;
@@ -1336 +1341 @@
 
     dprintf(("SetScrollPos %x %d %d %d", hwnd, nBar, nPos, bRedraw));
-    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
-        dprintf(("SetScrollPos window not found!"));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return FALSE;
-    }
-
     if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, nBar ))) return 0;
     oldPos      = infoPtr->CurVal;
@@ -1366 +1364 @@
                 INT nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */)
 {
-  Win32BaseWindow *window;
   SCROLLBAR_INFO *infoPtr;
 
     dprintf(("GetScrollPos %x %d", hwnd, nBar));
 
-    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
-        dprintf(("GetScrollPos window not found!"));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return 0;
-    }
-
-    if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, nBar ))) return 0;
+    infoPtr = SCROLL_GetScrollInfo( hwnd, nBar );
+    if (!infoPtr) return 0;
+
     return infoPtr->CurVal;
 }
@@ -1393 +1385 @@
                 BOOL bRedraw /* [I] Should scrollbar be redrawn afterwards ? */)
 {
-  Win32BaseWindow *window;
   SCROLLINFO info;
 
-    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
-        dprintf(("SetScrollRange window not found!"));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return FALSE;
-    }
-
+    dprintf(("SetScrollRange %x %x %d %d %d", hwnd, nBar, MinVal, MaxVal, bRedraw));
     info.cbSize = sizeof(info);
     info.nMin   = MinVal;
@@ -1455 +1440 @@
                 LPINT lpMax  /* [O] Where to store maximum value */)
 {
-  Win32BaseWindow *window;
   SCROLLBAR_INFO *infoPtr;
 
-    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
-        dprintf(("GetScrollRange window not found!"));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return FALSE;
-    }
-
-    if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, nBar )))
+    infoPtr = SCROLL_GetScrollInfo( hwnd, nBar );
+    if (!infoPtr)
     {
         if (lpMin) lpMin = 0;
@@ -1566 +1544 @@
 
     window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
+    if(!window && nBar != SB_CTL) {
         dprintf(("ShowScrollBar window not found!"));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
@@ -1600 +1578 @@
 
     window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
+    if(!window && nBar != SB_CTL) {
         dprintf(("EnableScrollBar window not found!"));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);