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

Timestamp:

Apr 15, 2001, 7:05:29 PM (24 years ago)

Author:

sandervl

Message:

SetWindowLong fix for GWL_STYLE & childchildren/siblings

File:

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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.90 2001-04-05 09:31:27 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.91 2001-04-15 17:05:29 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -93 +93 @@
 }
 //******************************************************************************
+//Note: Also check OSLibSetWindowStyle when changing this!!
 //******************************************************************************
 BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle)
@@ -99 +100 @@
 
   /* Window styles */
+#if 0
+  //Done explicitely in CreateWindowExA
   if(dwStyle & WS_MINIMIZE_W)
         *OSWinStyle |= WS_MINIMIZED;
-//Done explicitely in CreateWindowExA
-#if 0
   if(dwStyle & WS_VISIBLE_W)
         *OSWinStyle |= WS_VISIBLE;
@@ -112 +113 @@
   if(dwStyle & WS_CLIPCHILDREN_W)
         *OSWinStyle |= WS_CLIPCHILDREN;
+#if 0
   if(dwStyle & WS_MAXIMIZE_W)
         *OSWinStyle |= WS_MAXIMIZED;
@@ -118 +120 @@
   if(dwStyle & WS_TABSTOP_W)
         *OSWinStyle |= WS_TABSTOP;
+#endif
 
   return TRUE;
@@ -713 +716 @@
 //******************************************************************************
 //******************************************************************************
-void OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle, ULONG dwExStyle, BOOL saveBits)
-{
-  ULONG dwWinStyle;
-
-  OSLibWinConvertStyle(dwStyle, dwExStyle, &dwWinStyle);
-
-  dwWinStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPCHILDREN);
-  if(saveBits) dwWinStyle |= WS_SAVEBITS;
-  if(dwStyle & WS_VISIBLE_W)
-        dwWinStyle |= WS_VISIBLE;
-
-  WinSetWindowULong(hwnd, QWL_STYLE,
-                    (WinQueryWindowULong(hwnd, QWL_STYLE) & ~0xffff0000) |
-                     dwWinStyle);
+void OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle, ULONG dwExStyle)
+{
+  ULONG dwWinStyle = WinQueryWindowULong(hwnd, QWL_STYLE);
+  ULONG dwOldWinStyle = dwWinStyle;
+
+  if(dwStyle & WS_DISABLED_W) {
+        dwWinStyle |= WS_DISABLED;
+  }
+  else  dwWinStyle &= ~WS_DISABLED;
+
+  if(dwStyle & WS_CLIPSIBLINGS_W) {
+        dwWinStyle |= WS_CLIPSIBLINGS;
+  }
+  else  dwWinStyle &= ~WS_CLIPSIBLINGS;
+
+  if(dwStyle & WS_CLIPCHILDREN_W) {
+        dwWinStyle |= WS_CLIPCHILDREN;
+  }
+  else  dwWinStyle &= ~WS_CLIPCHILDREN;
+
+  if(dwWinStyle != dwOldWinStyle) {
+      WinSetWindowULong(hwnd, QWL_STYLE, dwWinStyle);
+  }
 }
 //******************************************************************************