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

Timestamp:

Oct 12, 1999, 8:14:56 PM (26 years ago)

Author:

sandervl

Message:

Lots of changes again

File:

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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.22 1999-10-12 14:47:22 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.23 1999-10-12 18:14:55 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -622 +622 @@
             y = parentHeight - y - pswpOld->cy;
          }
+         else     y = parentHeight - y - cy;
       }
-
+      else     y = parentHeight - y - cy;
+ 
       if (flags & SWP_SIZE)
       {
@@ -635 +637 @@
       }
 
-      y = parentHeight - y - cy;
-
-      if ((pswpOld->x == x) && (pswpOld->y == y))
+       if ((pswpOld->x == x) && (pswpOld->y == y))
          flags &= ~SWP_MOVE;
 
@@ -738 +738 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinShowScrollBar(HWND hwndParent, HWND hwndScroll, int scrollBar, BOOL fShow)
+BOOL OSLibWinShowScrollBar(HWND hwndParent, HWND hwndScroll, int scrollBar, 
+                           BOOL fShow, BOOL fForceChange)
 {
    if(hwndScroll == NULL) {
@@ -745 +746 @@
    }
 
-   if(fShow != WinIsWindowVisible(hwndScroll))
+   if(fShow != WinIsWindowVisible(hwndScroll) || fForceChange)
    {
          WinSetParent(hwndScroll, fShow ? hwndParent : HWND_OBJECT, FALSE);