Changeset 3365 for trunk/src

Timestamp:

Apr 10, 2000, 9:42:38 PM (25 years ago)

Author:

sandervl

Message:

topmost window changes

Location:

trunk/src/user32

Files:

• pmframe.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (5 diffs)
• win32wbase.h (modified) (3 diffs)

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.48 2000-04-10 19:40:45 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.49 2000-04-10 19:42:38 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -480 +480 @@
 
     case WM_VRNENABLED:
-        if(!win32wnd->isComingToTop() && ((win32wnd->getStyle() & WS_EX_TOPMOST_W) == WS_EX_TOPMOST_W))
+        if(!win32wnd->isComingToTop() && ((win32wnd->getExStyle() & WS_EX_TOPMOST_W) == WS_EX_TOPMOST_W))
         {
                 HWND hwndrelated;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.177 2000-04-07 12:55:16 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.178 2000-04-10 19:40:45 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -94 +94 @@
   fTaskList        = FALSE;
   fParentDC        = FALSE;
+  fComingToTop     = FALSE;
 
   windowNameA      = NULL;
@@ -158 +159 @@
 Win32BaseWindow::~Win32BaseWindow()
 {
+    OSLibWinSetVisibleRegionNotify(OS2HwndFrame, FALSE);
     OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, 0);
     OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_MAGIC, 0);
@@ -494 +496 @@
 
   OSLibWinConvertStyle(dwStyle,dwExStyle,&dwOSWinStyle);
+#if 0
+  if(((dwStyle & (WS_CAPTION|WS_POPUP)) == WS_CAPTION) && (getParent() == NULL || getParent() == windowDesktop)) {
+        fTaskList = TRUE;
+  }
+#else
   if (((dwStyle & (WS_CAPTION | WS_SYSMENU | 0xC0000000)) == (WS_CAPTION | WS_SYSMENU))) fTaskList = TRUE;
+#endif
 
   OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
@@ -506 +514 @@
         return FALSE;
   }
+  OSLibWinSetVisibleRegionNotify(OS2HwndFrame, TRUE);
 
   SetLastError(0);

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.91 2000-03-31 14:42:49 cbratschi Exp $ */
+/* $Id: win32wbase.h,v 1.92 2000-04-10 19:40:46 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -277 +277 @@
          HWND   getNextDlgGroupItem(HWND hwndCtrl, BOOL fPrevious);
 
+         BOOL   isComingToTop()                 { return fComingToTop; };
+         void   setComingToTop(BOOL fTop)       { fComingToTop = fTop; };
+         BOOL   isInTasklist()                  { return fTaskList; };
+
     static HWND Win32ToOS2Handle(HWND hwnd);
     static HWND Win32ToOS2FrameHandle(HWND hwnd);
@@ -340 +344 @@
         BOOL    fCXDefault;
         BOOL    fParentDC;
+        BOOL    fComingToTop;
 
         HRGN    hWindowRegion;