Changeset 9143 for trunk/src

Timestamp:

Aug 27, 2002, 11:30:50 AM (23 years ago)

Author:

sandervl

Message:

PF: Added support for WS_EX_TOPMOST

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.125 2002-08-21 16:41:36 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.126 2002-08-27 09:30:50 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -34 +34 @@
 #include "dbglocal.h"
 
+//Undocumented PM WS_TOPMOST style; similar to WS_EX_TOPMOST in Windows
+#define WS_TOPMOST                 0x00200000L
+
 //******************************************************************************
 //******************************************************************************
@@ -124 +127 @@
   if(dwStyle & WS_CLIPCHILDREN_W)
         *OSWinStyle |= WS_CLIPCHILDREN;
+  if(dwExStyle & WS_EX_TOPMOST_W)
+        *OSWinStyle |= WS_TOPMOST;
 
   if(fOS2Look) {
@@ -996 +1001 @@
     }
     else dwWinStyle &= ~WS_DISABLED;
+
+    if(dwExStyle & WS_EX_TOPMOST_W) {
+         dwWinStyle |= WS_TOPMOST;
+    }
+    else dwWinStyle &= ~WS_TOPMOST;
 
     if(dwStyle & WS_CLIPSIBLINGS_W) {

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.336 2002-08-23 15:06:01 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.337 2002-08-27 09:30:50 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -365 +365 @@
                     return FALSE;
             }
+            if (window->getExStyle() & WS_EX_TOPMOST)
+                 cs->dwExStyle |= WS_EX_TOPMOST;          
+
             RELEASE_WNDOBJ(window);
             /* Windows does this for overlapped windows
@@ -3611 +3614 @@
                 setExStyle(ss.styleNew);
                 SendMessageA(getWindowHandle(),WM_STYLECHANGED,GWL_EXSTYLE,(LPARAM)&ss);
+                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), getStyle(), getExStyle());
                 oldval = ss.styleOld;
                 break;