Changeset 4457 for trunk/src

Timestamp:

Oct 8, 2000, 8:45:36 PM (25 years ago)

Author:

sandervl

Message:

ShowScrollbar fix (SB_BOTH didn't enable the vertical scrollbar)

Location:

trunk/src/user32

Files:

• oslibmsgtranslate.cpp (modified) (2 diffs)
• scroll.cpp (modified) (2 diffs)
• window.cpp (modified) (3 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.36 2000-07-20 18:08:12 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.37 2000-10-08 18:45:35 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -243 +243 @@
 
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
-                dprintf(("Set client rectangle to (%d,%d)(%d,%d)", swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy));
+/////                dprintf(("Set client rectangle to (%d,%d)(%d,%d)", swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy));
 /////                win32wnd->setClientRect(swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy);
 

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.36 2000-03-24 17:12:20 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.37 2000-10-08 18:45:36 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -1519 +1519 @@
 
     case SB_VERT:
-        if (fShowV)
+        if (fShow)
         {
             fShowV = !(win32wnd->getStyle() & WS_VSCROLL);

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.77 2000-09-08 18:08:58 sandervl Exp $ */
+/* $Id: window.cpp,v 1.78 2000-10-08 18:45:36 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -907 +907 @@
 }
 //******************************************************************************
+//Calculate window rectangle based on given client rectangle, style, menu and extended style
 //******************************************************************************
 BOOL WIN32API AdjustWindowRectEx( PRECT rect, DWORD style, BOOL menu, DWORD exStyle)
 {
+    if(style == 0 && menu == FALSE && exStyle == 0) {
+        dprintf(("AdjustWindowRectEx %x %x %d (%d,%d)(%d,%d) -> no change required", style, exStyle, menu, rect->left, rect->top, rect->right, rect->bottom));
+        return TRUE;    //nothing needs to be changed (VERIFIED in NT 4)
+    }
     dprintf(("AdjustWindowRectEx %x %x %d (%d,%d)(%d,%d)\n", style, exStyle, menu, rect->left, rect->top, rect->right, rect->bottom));
-
-    if(style == 0 && menu == FALSE && exStyle == 0) {
-        return TRUE;    //nothing needs to be changed (VERIFIED in NT 4)
-    }
     /* Correct the window style */
     if (!(style & (WS_POPUP | WS_CHILD)))  /* Overlapped window */
@@ -1355 +1356 @@
     for (i = 0, winpos = pDWP->winPos; i < pDWP->actualCount; i++, winpos++)
     {
-        dprintf(("**EndDeferWindowPos %x (%d,%d) (%d,%d) %x", winpos->hwnd, winpos->x, winpos->y, winpos->x, winpos->cy, winpos->flags));
+        dprintf(("**EndDeferWindowPos %x (%d,%d) (%d,%d) %x", winpos->hwnd, winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags));
         if (!(res = SetWindowPos(winpos->hwnd, winpos->hwndInsertAfter,
                                  winpos->x, winpos->y, winpos->cx,