Changeset 12568

Timestamp:

Dec 5, 1999, 5:37:59 PM (25 years ago)

Author:

sandervl

Message:

tasklist changes

Location:

tags/trunk/src/user32

Files:

• oslibwin.cpp (modified) (4 diffs)
• oslibwin.h (modified) (2 diffs)
• win32wbase.cpp (modified) (8 diffs)
• win32wbase.h (modified) (2 diffs)

tags/trunk/src/user32/oslibwin.cpp ¶

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.49 1999-11-26 17:06:08 cbratschi Exp $ */
+/* $Id: oslibwin.cpp,v 1.50 1999-12-05 16:37:57 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -54 +54 @@
 HWND OSLibWinCreateWindow(HWND hwndParent, ULONG dwWinStyle, ULONG dwFrameStyle,
                           char *pszName, HWND Owner, ULONG fHWND_BOTTOM, HWND *hwndFrame,
-                          ULONG id)
+                          ULONG id, BOOL fTaskList)
 {
  HWND  hwndClient;
@@ -81 +81 @@
 
   dwFrameStyle |= FCF_NOBYTEALIGN;
-  if (hwndParent == HWND_DESKTOP && dwFrameStyle & FCF_TITLEBAR) {
+  if(fTaskList)
+  {
     dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
   }
@@ -1053 +1054 @@
 //******************************************************************************
 //******************************************************************************
-void OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle)
+void OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle, BOOL fTaskList)
 {
   ULONG OSWinStyle, OSFrameStyle, borderWidth, borderHeight,dwExStyle;
 
   OSLibWinConvertStyle(dwStyle, &dwExStyle, &OSWinStyle, &OSFrameStyle, &borderWidth, &borderHeight);
+
+  if(fTaskList)
+  {
+    OSFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
+  }
 
 //  OSWinStyle = OSWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);

tags/trunk/src/user32/oslibwin.h ¶

@@ -1 @@
-/* $Id: oslibwin.h,v 1.26 1999-11-24 19:32:21 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.27 1999-12-05 16:37:58 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -39 +39 @@
 HWND  OSLibWinCreateWindow(HWND hwndParent, ULONG dwWinStyle, ULONG dwFrameStyle,
                            char *pszName, HWND Owner, ULONG fBottom,
-                           HWND *hwndFrame, ULONG id);
+                           HWND *hwndFrame, ULONG id, BOOL fTaskList);
 
 BOOL  OSLibWinConvertStyle(ULONG dwStyle, ULONG *dwExStyle, ULONG *OSWinStyle, ULONG *OSFrameStyle, ULONG *borderWidth, ULONG *borderHeight);
-void  OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle);
+void  OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle, BOOL fTaskList);
 
 #define OSLIB_QWL_USER -4

tags/trunk/src/user32/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.104 1999-12-05 00:31:48 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.105 1999-12-05 16:37:58 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -146 +146 @@
   fIsDestroyed     = FALSE;
   fCreated         = FALSE;
+  fTaskList        = FALSE;
 
   windowNameA      = NULL;
@@ -509 +510 @@
   }
 
+  if(((cs->style & 0xC0000000) == WS_OVERLAPPED) && ((cs->style & WS_CAPTION) == WS_CAPTION) && owner == NULL)
+  {
+            fTaskList = TRUE;
+  }
+
   DWORD dwOSWinStyle, dwOSFrameStyle;
 
@@ -561 +567 @@
                                  (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
                                  (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
-                                 &OS2HwndFrame, 0);
+                                 &OS2HwndFrame, 0, fTaskList);
 
   if(OS2Hwnd == 0) {
@@ -718 +724 @@
 {
   if(SendInternalMessageA(WM_CLOSE, 0, 0) == 0) {
-        dprintf(("Win32BaseWindow::MsgClose, app handles msg"));
+    dprintf(("Win32BaseWindow::MsgClose, app handles msg"));
         return 0; //app handles this message
   }
@@ -1674 +1680 @@
     case WM_PAINTICON:
     case WM_PAINT:
-        {
-            PAINTSTRUCT ps;
-            HDC hdc = BeginPaint(getWindowHandle(), &ps );
-            if( hdc )
-            {
-              if( (getStyle() & WS_MINIMIZE) && getWindowClass()->getIcon())
-              {
-                int x = (rectWindow.right - rectWindow.left - GetSystemMetrics(SM_CXICON))/2;
-                int y = (rectWindow.bottom - rectWindow.top - GetSystemMetrics(SM_CYICON))/2;
-                    dprintf(("Painting class icon: vis rect=(%i,%i - %i,%i)\n", ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom ));
-                DrawIcon(hdc, x, y, getWindowClass()->getIcon() );
-              }
-              EndPaint(getWindowHandle(), &ps );
-            }
-            return 0;
-        }
+    {
+        PAINTSTRUCT ps;
+        HDC hdc = BeginPaint(getWindowHandle(), &ps );
+        if( hdc )
+        {
+          if( (getStyle() & WS_MINIMIZE) && getWindowClass()->getIcon())
+          {
+            int x = (rectWindow.right - rectWindow.left - GetSystemMetrics(SM_CXICON))/2;
+            int y = (rectWindow.bottom - rectWindow.top - GetSystemMetrics(SM_CYICON))/2;
+            dprintf(("Painting class icon: vis rect=(%i,%i - %i,%i)\n", ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom ));
+            DrawIcon(hdc, x, y, getWindowClass()->getIcon() );
+          }
+          EndPaint(getWindowHandle(), &ps );
+        }
+        return 0;
+    }
 
     case WM_GETDLGCODE:
@@ -2343 +2349 @@
 
     BOOL rc = OSLibWinShowWindow(OS2HwndFrame, showstate);
+
     return rc;
 }
@@ -2957 +2964 @@
   if(IsWindowDestroyed()) return;
 
-/*
-  if (isChild())
-  {
-    DWORD dwOSWinStyle,dwOSFrameStyle,newBorderWidth,newBorderHeight;
-
-    OSLibWinConvertStyle(dwStyle,&dwExStyle,&dwOSWinStyle,&dwOSFrameStyle,&newBorderWidth,&newBorderHeight);
-    if (newBorderWidth != borderWidth || newBorderHeight != borderHeight)
-    {
-      borderWidth = newBorderWidth;
-      borderHeight = newBorderHeight;
-      FrameSetBorderSize(this,TRUE);
-    }
-  }
-*/
-
-  if (dwStyle != oldStyle) OSLibSetWindowStyle(OS2HwndFrame,dwStyle);
+  if (dwStyle != oldStyle) OSLibSetWindowStyle(OS2HwndFrame, dwStyle, fTaskList);
 }
 //******************************************************************************

tags/trunk/src/user32/win32wbase.h ¶

@@ -1 @@
-/* $Id: win32wbase.h,v 1.48 1999-12-02 19:30:41 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.49 1999-12-05 16:37:59 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -301 +301 @@
         BOOL    fIsDestroyed;
         BOOL    fCreated;
+        BOOL    fTaskList;              //should be listed in PM tasklist or not
 
         PVOID   pOldFrameProc;