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

Timestamp:

Oct 18, 1999, 12:54:04 PM (26 years ago)

Author:

sandervl

Message:

WS_VISIBLE & scrollbar fixes

File:

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

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.10 1999-10-17 18:09:22 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.11 1999-10-18 10:54:03 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -692 +692 @@
                                      BOOL arrows, BOOL interior )
 {
-    //HDC hdc = GetDCEx( hwnd, 0,
-    //                       DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW) );
-HDC hdc;
-
-return;
-//CB: bug: paints in client window!
-//    GetClientRect returns wrong window size after GetDC
-//    why?!?
+  Win32BaseWindow *window;
+  HWND hwndScroll;
+  HDC hdc;
+
+    //SvL: Get scrollbar handle from parent window
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window && nBar != SB_CTL) {
+        dprintf(("SCROLL_RefreshScrollBar window %x not found!", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return;
+    }
+    if(nBar == SB_VERT) 
+    {
+        hwndScroll = Win32BaseWindow::OS2ToWin32Handle(window->getVertScrollHandle());
+    }
+    else 
+    if(nBar == SB_HORZ)
+    {
+        hwndScroll = Win32BaseWindow::OS2ToWin32Handle(window->getHorzScrollHandle());
+    }
+    else hwndScroll = hwnd;
+
+    if(hwndScroll == 0)
+        return;
+
+    hdc = GetDCEx( hwndScroll, 0, DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW));
 
     if (!hdc) return;
 
-    SCROLL_DrawScrollBar( hwnd, hdc, nBar, arrows, interior );
-    ReleaseDC( hwnd, hdc );
+    SCROLL_DrawScrollBar( hwndScroll, hdc, nBar, arrows, interior );
+    ReleaseDC( hwndScroll, hdc );
 }
 /***********************************************************************
@@ -1302 +1320 @@
   INT retVal;
 
-/* CB: handled here, todo: hide/show
-    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    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 )