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

Timestamp:

Jul 17, 1999, 5:23:38 PM (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.7 1999-07-17 12:49:40 cbratschi Exp $ */
+/* $Id: oslibwin.cpp,v 1.8 1999-07-17 15:23:38 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -38 +38 @@
 //******************************************************************************
 HWND OSLibWinCreateWindow(HWND hwndParent, ULONG dwWinStyle, ULONG dwFrameStyle,
-                          char *pszName, ULONG x, ULONG y, ULONG cx, ULONG cy,
-                          HWND Owner, ULONG fHWND_BOTTOM, HWND *hwndFrame)
+                          char *pszName, HWND Owner, ULONG fHWND_BOTTOM, HWND *hwndFrame)
 {
  HWND  hwndClient;
  RECTL rectl;
 
+  if(pszName && *pszName == 0) {
+        pszName = NULL;
+  }
   if(hwndParent == 0) {
         hwndParent = HWND_DESKTOP;
-  }
-  if(WinQueryWindowRect(hwndParent, &rectl) == TRUE) {
-        y = OS2TOWIN32POINT(rectl.yTop - rectl.yBottom, y);
   }
   if(dwFrameStyle) {
@@ -59 +58 @@
                         WinSetWindowText(*hwndFrame, pszName);
                 }
-                WinSetWindowPos(*hwndFrame, (fHWND_BOTTOM) ? HWND_BOTTOM :HWND_TOP,
-                                x, y, cx, cy, SWP_SIZE | SWP_MOVE);
-
                 return hwndClient;
         }
@@ -67 +63 @@
         return 0;
   }
-  hwndClient = WinCreateWindow(hwndParent, WIN32_STDCLASS, pszName, dwWinStyle, x, y, cx, cy,
+  hwndClient = WinCreateWindow(hwndParent, WIN32_STDCLASS, pszName, dwWinStyle, 0, 0, 0, 0,
                                Owner, (fHWND_BOTTOM) ? HWND_BOTTOM :HWND_TOP, 0, NULL,
                                NULL);
@@ -83 +79 @@
   if(dwStyle & WINWS_MINIMIZE)
         *OSWinStyle |= WS_MINIMIZED;
+//Done explicitely in CreateWindowExA
+#if 0
   if(dwStyle & WINWS_VISIBLE)
         *OSWinStyle |= WS_VISIBLE;
+#endif
   if(dwStyle & WINWS_DISABLED)
         *OSWinStyle |= WS_DISABLED;
@@ -178 +177 @@
                           LONG cy, ULONG fl)
 {
+ RECTL rectl;
+ HWND  hwndParent;
+
+  if(fl & SWP_MOVE) {
+        hwndParent = WinQueryWindow(hwnd, QW_PARENT);
+        if(WinQueryWindowRect(hwnd, &rectl)) {
+                y = OS2TOWIN32POINT(rectl.yTop - rectl.yBottom, y);
+        }
+  }
   return WinSetWindowPos(hwnd, hwndInsertBehind, x, y, cx, cy, fl);
 }
@@ -184 +192 @@
 BOOL OSLibWinShowWindow(HWND hwnd, ULONG fl)
 {
-  return WinSetWindowPos(hwnd, 0, 0, 0, 0, 0, fl);
+ BOOL rc;
+
+  if(fl & SWP_SHOW) {
+         rc = WinShowWindow(hwnd, TRUE);
+  }
+  if(rc == 0)
+        dprintf(("WinShowWindow %x failed %x", hwnd, WinGetLastError(GetThreadHAB())));
+  rc = WinSetWindowPos(hwnd, 0, 0, 0, 0, 0, fl);
+  if(rc == 0)
+        dprintf(("WinShowWindow %x failed %x", hwnd, WinGetLastError(GetThreadHAB())));
+  return rc;
 }
 //******************************************************************************