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

Timestamp:

May 26, 2000, 8:43:35 PM (25 years ago)

Author:

sandervl

Message:

Tasklist fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.194 2000-05-24 19:30:06 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.195 2000-05-26 18:43:34 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -149 +149 @@
   hClipRegion        = 0;
 
+  hTaskList          = 0;
+
   if(currentProcessId == -1)
   {
@@ -161 +163 @@
 Win32BaseWindow::~Win32BaseWindow()
 {
+    if(hTaskList) {
+        OSLibWinRemoveFromTasklist(hTaskList);
+    }
+
     OSLibWinSetVisibleRegionNotify(OS2HwndFrame, FALSE);
     OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, 0);
@@ -240 +246 @@
     PrintWindowStyle(cs->style, cs->dwExStyle);
 #endif
+
+    //If window has no owner/parent window, then it will be added to the tasklist
+    //(depending on visibility state)
+    if (!cs->hwndParent) fTaskList = TRUE;
 
     sw = SW_SHOW;
@@ -501 +511 @@
 
   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,
@@ -520 +523 @@
   }
   OSLibWinSetVisibleRegionNotify(OS2HwndFrame, TRUE);
-
   SetLastError(0);
   return TRUE;
@@ -664 +666 @@
   //Note: Solitaire crashes when receiving WM_SIZE messages before WM_CREATE
   fCreated = TRUE;
+
+  if(fTaskList) {
+        hTaskList = OSLibWinAddToTaskList(OS2HwndFrame, windowNameA, (cs->style & WS_VISIBLE) ? 1 : 0);
+  }
 
   if (SendInternalMessageA(WM_NCCREATE,0,(LPARAM)cs))
@@ -1337 +1343 @@
         {
           HandleNCPaint((HRGN)1);
-          OSLibWinSetWindowText(OS2HwndFrame,(LPSTR)windowNameA);
+          if(hTaskList) {
+                OSLibWinChangeTaskList(hTaskList, OS2HwndFrame, getWindowNameA(), (getStyle() & WS_VISIBLE) ? 1 : 0);
+          }
         }
 
@@ -1795 +1803 @@
         {
           HandleNCPaint((HRGN)1);
-          OSLibWinSetWindowText(OS2HwndFrame,(LPSTR)windowNameA);
+          if(hTaskList) {
+                OSLibWinChangeTaskList(hTaskList, OS2HwndFrame, getWindowNameA(), (getStyle() & WS_VISIBLE) ? 1 : 0);
+          }
         }
 
@@ -2098 +2108 @@
 
     if(showstate & SWPOS_SHOW) {
-            setStyle(getStyle() | WS_VISIBLE);
-    }
-    else    setStyle(getStyle() & ~WS_VISIBLE);
-
+         setStyle(getStyle() | WS_VISIBLE);
+         if(hTaskList) {
+                OSLibWinChangeTaskList(hTaskList, OS2HwndFrame, getWindowNameA(), (getStyle() & WS_VISIBLE) ? 1 : 0);
+         }
+    }
+    else {
+        if(hTaskList) {
+                OSLibWinChangeTaskList(hTaskList, OS2HwndFrame, getWindowNameA(), (getStyle() & WS_VISIBLE) ? 1 : 0);
+        }
+        setStyle(getStyle() & ~WS_VISIBLE);
+    }
     showFlag = (nCmdShow != SW_HIDE);
 
@@ -2248 +2265 @@
         //SvL: TODO: Send WM_SHOWWINDOW??
         OSLibWinShowWindow(OS2Hwnd, SWPOS_SHOW);
+        if(hTaskList) {
+                OSLibWinChangeTaskList(hTaskList, OS2HwndFrame, getWindowNameA(), (getStyle() & WS_VISIBLE) ? 1 : 0);
+        }
     }
     else
@@ -2254 +2274 @@
         //SvL: TODO: Send WM_SHOWWINDOW??
         OSLibWinShowWindow(OS2Hwnd, SWPOS_HIDE);
+        if(hTaskList) {
+                OSLibWinChangeTaskList(hTaskList, OS2HwndFrame, getWindowNameA(), (getStyle() & WS_VISIBLE) ? 1 : 0);
+        }
     }
     rc = OSLibWinSetMultWindowPos(&swp, 1);