Changeset 1511 for trunk/src/user32/oslibwin.cpp

Timestamp:

Oct 29, 1999, 6:06:56 PM (26 years ago)

Author:

cbratschi

Message:

scrollbar updates

File:

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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.37 1999-10-28 15:20:25 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.38 1999-10-29 16:06:55 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -926 +926 @@
 //******************************************************************************
 //******************************************************************************
+HWND OSLibWinQueryObjectWindow(VOID)
+{
+  return WinQueryObjectWindow(HWND_DESKTOP);
+}
+//******************************************************************************
+//******************************************************************************
 BOOL OSLibWinShowScrollBar(HWND hwndParent, HWND hwndScroll, int scrollBar,
                            BOOL fShow, BOOL fForceChange)
 {
+   HWND hwndObj = WinQueryObjectWindow(HWND_DESKTOP),hwndCurPar = WinQueryWindow(hwndScroll,QW_PARENT);
+
    if(hwndScroll == NULL) {
         dprintf(("OSLibWinShowScrollBar: scrollbar %d (parent %x) not found!", scrollBar, hwndParent));
@@ -934 +942 @@
    }
 
-   if(fShow != WinIsWindowVisible(hwndScroll) || fForceChange)
+   if ((fShow && hwndCurPar == hwndObj) || (!fShow && hwndCurPar != hwndObj) || fForceChange)
    {
-         WinSetParent(hwndScroll, fShow ? hwndParent : HWND_OBJECT, FALSE);
+     //CB: bug: winhlp32: hide vert scrollbar on maximize doesn't update the frame
+         WinSetParent(hwndScroll,fShow ? hwndParent:HWND_OBJECT,FALSE);
          WinSendMsg(hwndParent, WM_UPDATEFRAME,
                     MPFROMLONG( ( scrollBar == OSLIB_VSCROLL ) ? FCF_VERTSCROLL
                                                                : FCF_HORZSCROLL),
                     MPVOID );
-
-         WinShowWindow(hwndScroll, fShow);
    }
    return TRUE;
@@ -1049 +1056 @@
                     OSWinStyle);
 
+  //CB: bug: it doesn't work with child windows!
+
   if(OSFrameStyle & FCF_TITLEBAR)
   {