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

Timestamp:

Jun 17, 2001, 11:08:01 PM (24 years ago)

Author:

sandervl

Message:

WS_VISIBLE flag change allowed in SetWindowLong; scrollbar fix for sizebox/grip style

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.270 2001-06-14 14:49:17 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.271 2001-06-17 21:08:01 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -3463 +3463 @@
                     break;
                 }
-                value &= ~(WS_CHILD|WS_VISIBLE);      /* Some bits can't be changed this way (WINE) */
+                dprintf(("SetWindowLong GWL_STYLE %x old %x new style %x (%x)", getWindowHandle(), dwStyle, value));
+#ifdef DEBUG
+                if((value & WS_CHILD) != (dwStyle & WS_CHILD)) {
+                    DebugInt3(); //is this allowed?
+                }
+#endif
+                value &= ~(WS_CHILD);
                 ss.styleOld = getStyle();
-                ss.styleNew = value | (ss.styleOld & (WS_CHILD|WS_VISIBLE));
-                dprintf(("SetWindowLong GWL_STYLE %x old %x new style %x", getWindowHandle(), ss.styleOld, ss.styleNew));
+                ss.styleNew = value | (ss.styleOld & WS_CHILD);
                 SendInternalMessageA(WM_STYLECHANGING,GWL_STYLE,(LPARAM)&ss);
                 setStyle(ss.styleNew);
                 SendInternalMessageA(WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
                 OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), getStyle(), getExStyle());
+
+                //TODO: Might not be correct to use ShowWindow here
+                if((ss.styleOld & WS_VISIBLE) != (ss.styleNew & WS_VISIBLE)) {
+                    if(ss.styleNew & WS_VISIBLE)
+                         ShowWindow(SW_SHOWNOACTIVATE);
+                    else ShowWindow(SW_HIDE);
+                }
 #ifdef DEBUG
                 PrintWindowStyle(ss.styleNew, 0);
@@ -3705 +3717 @@
  Win32BaseWindow *window;
 
+////TODO: temporary workaround for crashes in Opera (pmwinx; releasesemaphore)
+////      while browsing
+////      Not thread safe now!
 ////    lock(&critsect);
     if(HwGetWindowHandleData(hwnd, (DWORD *)&window) == TRUE) {