Changeset 3365 for trunk/src/user32/win32wbase.cpp

Timestamp:

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

Author:

sandervl

Message:

topmost window changes

File:

• trunk/src/user32/win32wbase.cpp (modified) (5 diffs)

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);