Changeset 2666 for trunk/src/user32/oslibwin.cpp

Timestamp:

Feb 5, 2000, 8:45:19 PM (26 years ago)

Author:

cbratschi

Message:

several fixes -> changelog

File:

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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.66 2000-02-05 14:08:53 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.67 2000-02-05 19:45:16 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -51 +51 @@
 HWND OSLibWinCreateWindow(HWND hwndParent,ULONG dwWinStyle,
                           char *pszName, HWND Owner, ULONG fHWND_BOTTOM, HWND *hwndFrame,
-                          ULONG id, BOOL fTaskList,BOOL saveBits)
+                          ULONG id, BOOL fTaskList,BOOL fShellPosition,BOOL saveBits)
 {
  HWND  hwndClient;
@@ -81 +81 @@
     dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
   }
+  if (fShellPosition) dwFrameStyle |= FCF_SHELLPOSITION;
 
   dwWinStyle &= ~WS_CLIPCHILDREN;
@@ -102 +103 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG *dwExStyle, ULONG *OSWinStyle)
+BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle)
 {
   *OSWinStyle   = 0;
@@ -912 +913 @@
   ULONG dwWinStyle;
 
-  OSLibWinConvertStyle(dwStyle, &dwExStyle, &dwWinStyle);
+  OSLibWinConvertStyle(dwStyle, dwExStyle, &dwWinStyle);
 
   dwWinStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPCHILDREN);