Changeset 3364 for trunk/src

Timestamp:

Apr 10, 2000, 9:40:45 PM (25 years ago)

Author:

sandervl

Message:

topmost window changes

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (2 diffs)
• pmframe.cpp (modified) (2 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.72 2000-03-27 15:06:29 cbratschi Exp $ */
+/* $Id: oslibwin.cpp,v 1.73 2000-04-10 19:40:44 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -931 +931 @@
 //******************************************************************************
 //******************************************************************************
+void OSLibWinSetVisibleRegionNotify(HWND hwnd, BOOL fNotify)
+{
+  WinSetVisibleRegionNotify(hwnd, fNotify);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.40 2000-03-27 15:06:30 cbratschi Exp $ */
+/* $Id: oslibwin.h,v 1.41 2000-04-10 19:40:45 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -280 +280 @@
 void  OSLibWinShowTaskList(HWND hwndFrame);
 
+void  OSLibWinSetVisibleRegionNotify(HWND hwnd, BOOL fNotify);
+
 #endif //__OSLIBWIN_H__

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.47 2000-04-01 10:01:53 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.48 2000-04-10 19:40:45 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -474 +474 @@
     case WM_DESTROY:
       dprintf(("PMFRAME: WM_DESTROY %x",hwnd));
+      WinSetVisibleRegionNotify(hwnd, FALSE);
       WinSubclassWindow(hwnd,OldFrameProc);
       win32wnd->setOldFrameProc(NULL);
       goto RunDefFrameProc;
+
+    case WM_VRNENABLED:
+        if(!win32wnd->isComingToTop() && ((win32wnd->getStyle() & WS_EX_TOPMOST_W) == WS_EX_TOPMOST_W))
+        {
+                HWND hwndrelated;
+                Win32BaseWindow *topwindow;
+
+                win32wnd->setComingToTop(TRUE);
+
+                hwndrelated = WinQueryWindow(hwnd, QW_PREV);
+                dprintf(("WM_VRNENABLED hwndrelated = %x (hwnd=%x)", hwndrelated, hwnd));
+                topwindow = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndrelated);
+                if(topwindow == NULL || ((win32wnd->getStyle() & WS_EX_TOPMOST_W) == 0)) {
+                        //put window at the top of z order
+                        WinSetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_ZORDER );
+                }
+
+                win32wnd->setComingToTop(FALSE);
+                break;
+        }
+        goto RunDefFrameProc;
 
     default: