Changeset 397 for trunk/src/user32/new/oslibwin.cpp

Timestamp:

Jul 26, 1999, 11:01:34 AM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

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

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.19 1999-07-24 14:01:44 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.20 1999-07-26 09:01:34 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -48 +48 @@
         pszName = NULL;
   }
-  if(hwndParent == 0) {
+  if(hwndParent == OSLIB_HWND_DESKTOP) {
         hwndParent = HWND_DESKTOP;
   }
+  if(Owner == OSLIB_HWND_DESKTOP) {
+        Owner = HWND_DESKTOP;
+  }
+
   if(dwFrameStyle) {
         dwWinStyle &= ~WS_CLIPCHILDREN; //invalid style according to docs
@@ -56 +60 @@
                 dwFrameStyle |= FCF_TITLEBAR;
 
+        dwFrameStyle |= FCF_TASKLIST;
         *hwndFrame = WinCreateStdWindow(hwndParent, dwWinStyle,
                                        &dwFrameStyle, WIN32_STDCLASS,
@@ -76 +81 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG *OSWinStyle, ULONG *OSFrameStyle)
+BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle, ULONG *OSFrameStyle)
 {
   *OSWinStyle   = 0;
@@ -121 +126 @@
         *OSFrameStyle |= FCF_MAXBUTTON;
 
+  if(dwExStyle & WINWS_EX_DLGMODALFRAME)
+        *OSFrameStyle |= FCF_DLGBORDER;
+
   return TRUE;
 }
@@ -217 +225 @@
 {
  HWND hwndParent = hwndInsertBehind;
-
-  if(fl & SWP_MOVE) {
+ BOOL rc;
+
+    if(fl & SWP_MOVE) {
         switch(hwndParent)
         {
@@ -227 +236 @@
         }
         y = MapOS2ToWin32Y(hwndParent, cy, y);
-  }
-  dprintf(("WinSetWindowPos %x %x %d %d %d %d %x", hwnd, hwndInsertBehind, x, y, cx, cy, fl));
-  return WinSetWindowPos(hwnd, hwndInsertBehind, x, y, cx, cy, fl);
+    }
+    rc = WinSetWindowPos(hwnd, hwndInsertBehind, x, y, cx, cy, fl);
+    dprintf(("WinSetWindowPos %x %x %d %d %d %d %x returned %d (%x)", hwnd, hwndInsertBehind, x, y, cx, cy, fl, rc, WinGetLastError(GetThreadHAB())));
+    return rc;
 }
 //******************************************************************************