Changeset 1348 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

WS_VISIBLE & scrollbar fixes

Location:

trunk/src/user32

Files:

• listbox.cpp (modified) (3 diffs)
• scroll.cpp (modified) (3 diffs)
• user32.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (7 diffs)

trunk/src/user32/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.7 1999-10-17 12:17:42 cbratschi Exp $ */
+/* $Id: listbox.cpp,v 1.8 1999-10-18 10:54:03 sandervl Exp $ */
 /*
  * Listbox controls
@@ -204 +204 @@
         info.fMask = SIF_RANGE | SIF_POS | SIF_PAGE;
         info.nMin  = 0;
-//        info.nMax = descr->nb_items - info.nPage;
         info.nMax = descr->nb_items;
 
@@ -210 +209 @@
             info.fMask |= SIF_DISABLENOSCROLL;
 
-        if(info.nMax > (INT)info.nPage) {
-            ShowScrollBar(hwnd, SB_VERT, TRUE);
-            EnableScrollBar(hwnd, SB_VERT, ESB_ENABLE_BOTH);
-            SetScrollInfo( hwnd, SB_VERT, &info, TRUE );
-        }
-        else {
-            ShowScrollBar(hwnd, SB_VERT, FALSE);
-            EnableScrollBar(hwnd, SB_VERT, ESB_DISABLE_BOTH);
-        }
+        SetScrollInfo( hwnd, SB_VERT, &info, TRUE );
 
         if (descr->horz_extent)

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 )

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.43 1999-10-17 15:46:08 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.44 1999-10-18 10:54:04 sandervl Exp $ */
 
 /*
@@ -687 +687 @@
 //******************************************************************************
 //******************************************************************************
-HWND WIN32API GetCapture(void)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  GetCapture\n");
-#endif
-    return Win32Window::OS2ToWin32Handle(O32_GetCapture());
-}
-//******************************************************************************
-//******************************************************************************
 UINT WIN32API GetDoubleClickTime(void)
 {
@@ -735 +726 @@
 BOOL WIN32API ReleaseCapture(void)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  ReleaseCapture\n");
-#endif
+    dprintf(("USER32:  ReleaseCapture"));
     return O32_ReleaseCapture();
 }
 //******************************************************************************
 //******************************************************************************
+HWND WIN32API GetCapture(void)
+{
+ HWND hwnd;
+
+    hwnd = Win32Window::OS2ToWin32Handle(O32_GetCapture());
+    dprintf(("USER32: GetCapture returned %x", hwnd));
+    return hwnd;
+}
+//******************************************************************************
+//******************************************************************************
 HWND WIN32API SetCapture( HWND hwnd)
 {
 #ifdef DEBUG
-    WriteLog("USER32:  SetCapture\n");
+    WriteLog("USER32: SetCapture %x", hwnd);
 #endif
     hwnd = Win32Window::Win32ToOS2Handle(hwnd);

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.52 1999-10-17 20:18:45 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.53 1999-10-18 10:54:04 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -607 +607 @@
   {
         hwndHorzScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_HSCROLL);
-//        OSLibWinShowScrollBar(OS2HwndFrame, hwndHorzScroll, OSLIB_HSCROLL, FALSE, TRUE);
+        OSLibWinShowScrollBar(OS2HwndFrame, hwndHorzScroll, OSLIB_HSCROLL, FALSE, TRUE);
   }
 
   if (dwStyle & WS_VSCROLL) {
         hwndVertScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_VSCROLL);
-//        OSLibWinShowScrollBar(OS2HwndFrame, hwndVertScroll, OSLIB_VSCROLL, FALSE, TRUE);
+        OSLibWinShowScrollBar(OS2HwndFrame, hwndVertScroll, OSLIB_VSCROLL, FALSE, TRUE);
   }
 
@@ -643 +643 @@
   }
 
-  //Subclass frame
-//  if(isFrameWindow() && (HAS_3DFRAME(dwExStyle) ||
-//     (!HAS_DLGFRAME(dwStyle, dwExStyle) && (dwStyle & (WS_DLGFRAME|WS_BORDER|WS_THICKFRAME)) == WS_BORDER)))
-//  {
-        pOldFrameProc = FrameSubclassFrameWindow(this);
-        if (isChild()) FrameSetBorderSize(this,TRUE);
-//  }
+  // Subclass frame
+  pOldFrameProc = FrameSubclassFrameWindow(this);
+  if (isChild()) FrameSetBorderSize(this,TRUE);
 
   /* Send the WM_CREATE message
@@ -1948 +1944 @@
     }
 
-#if 0
-    if(showstate & SWPOS_SHOW && (getStyle() & WS_VISIBLE) == 0) {
-        SetWindowLongA(GWL_STYLE, getStyle() | WS_VISIBLE);
-    }
-#endif
+    if(showstate & SWPOS_SHOW) {
+            setStyle(getStyle() | WS_VISIBLE);
+    }
+    else    setStyle(getStyle() & ~WS_VISIBLE);
+
     BOOL rc = OSLibWinShowWindow(OS2HwndFrame, showstate);
     return rc;
@@ -2486 +2482 @@
            STYLESTRUCT ss;
 
+                if(dwExStyle == value)
+                    return value;
+
                 ss.styleOld = dwExStyle;
                 ss.styleNew = value;
@@ -2497 +2496 @@
         {
            STYLESTRUCT ss;
+
+                if(dwStyle == value)
+                    return value;
 
                 ss.styleOld = dwStyle;
@@ -2671 +2673 @@
             return window->getWindowHandle();
     }
-    else    return hwnd;    //OS/2 window handle
+    else    return 0;
+//    else    return hwnd;    //OS/2 window handle
 }
 //******************************************************************************