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

Timestamp:

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

Author:

sandervl

Message:

WS_VISIBLE & scrollbar fixes

File:

• trunk/src/user32/win32wbase.cpp (modified) (7 diffs)

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
 }
 //******************************************************************************