Changeset 5512 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

SetWindowLong fix for GWL_STYLE & childchildren/siblings

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (6 diffs)
• oslibwin.h (modified) (2 diffs)
• win32wbase.cpp (modified) (3 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);
+  }
 }
 //******************************************************************************

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.52 2001-04-05 09:31:27 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.53 2001-04-15 17:05:29 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -43 +43 @@
 
 BOOL  OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle);
-void  OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle, BOOL fTaskList);
+void  OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle, ULONG dwExStyle);
 DWORD OSLibQueryWindowStyle(HWND hwnd);
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.250 2001-04-12 14:04:32 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.251 2001-04-15 17:05:29 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1581 +1581 @@
       int rc;
 
+        if(getWindowHandle() == 0x68000044) {
+          rc = GetClipBox( (HDC)wParam, &rect );
+          FillRect( (HDC)wParam, &rect, GetSysColorBrush(COLOR_WINDOWTEXT));
+          return 1;
+        }
+       
         if (!windowClass || !windowClass->getBackgroundBrush()) return 0;
 
@@ -3443 +3449 @@
                 setStyle(ss.styleNew);
                 SendInternalMessageA(WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
-////                OSLibSetWindowStyle(getOS2WindowHandle(), getStyle(), getExStyle(),
-////                                    windowClass->getStyle() & CS_SAVEBITS);
+                OSLibSetWindowStyle(getOS2WindowHandle(), getStyle(), getExStyle());
 #ifdef DEBUG
                 PrintWindowStyle(ss.styleNew, 0);