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

Timestamp:

Jul 17, 1999, 11:17:58 AM (26 years ago)

Author:

sandervl

Message:

Lots of changes/additions

File:

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

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.4 1999-07-16 11:32:08 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.5 1999-07-17 09:17:58 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -14 +14 @@
 #include <os2.h>
 #include <os2wrap.h>
+#include <misc.h>
 #include <oslibwin.h>
 #include "oslibstyle.h"
+#include "oslibutil.h"
 #include "pmwindow.h"
 
@@ -33 +35 @@
 HWND OSLibWinCreateWindow(HWND hwndParent, ULONG dwWinStyle, ULONG dwFrameStyle,
                           char *pszName, ULONG x, ULONG y, ULONG cx, ULONG cy,
-                          HWND Owner, ULONG fHWND_BOTTOM)
+                          HWND Owner, ULONG fHWND_BOTTOM, HWND *hwndFrame)
 {
  HWND  hwndClient;
- HWND  hwndFrame;
  RECTL rectl;
 
@@ -42 +43 @@
         hwndParent = HWND_DESKTOP;
   }
-  if(WinQueryWindowRect(hwndParent, &rectl) == 0) {
+  if(WinQueryWindowRect(hwndParent, &rectl) == TRUE) {
         y = OS2TOWIN32POINT(rectl.yTop - rectl.yBottom, y);
   }
   if(dwFrameStyle) {
         dwWinStyle &= ~WS_CLIPCHILDREN; //invalid style according to docs
-        hwndFrame = WinCreateStdWindow(hwndParent, dwWinStyle,
+        *hwndFrame = WinCreateStdWindow(hwndParent, dwWinStyle,
                                        &dwFrameStyle, WIN32_STDCLASS,
                                        "", 0, 0, 0, &hwndClient) != 0;
-        if(hwndFrame) {
+        if(*hwndFrame) {
                 if(pszName) {
-                        WinSetWindowText(hwndFrame, pszName);
+                        WinSetWindowText(*hwndFrame, pszName);
                 }
-                WinSetWindowPos(hwndFrame, (fHWND_BOTTOM) ? HWND_BOTTOM :HWND_TOP,
+                WinSetWindowPos(*hwndFrame, (fHWND_BOTTOM) ? HWND_BOTTOM :HWND_TOP,
                                 x, y, cx, cy, SWP_SIZE | SWP_MOVE);
 
-                return hwndFrame;
+                return hwndClient;
         }
+        dprintf(("OSLibWinCreateWindow: WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB())));
         return 0;
   }
-  else  return WinCreateWindow(hwndParent, WIN32_STDCLASS, pszName, dwWinStyle, x, y, cx, cy,
+  hwndClient = WinCreateWindow(hwndParent, WIN32_STDCLASS, pszName, dwWinStyle, x, y, cx, cy,
                                Owner, (fHWND_BOTTOM) ? HWND_BOTTOM :HWND_TOP, 0, NULL,
                                NULL);
+  *hwndFrame = hwndClient;
+  return hwndClient;
 }
 //******************************************************************************
@@ -143 +147 @@
 //******************************************************************************
 //******************************************************************************
+BOOL OSLibWinSetWindowPos(HWND hwnd, HWND hwndInsertBehind, LONG x, LONG y, LONG cx, 
+                          LONG cy, ULONG fl)
+{
+  return WinSetWindowPos(hwnd, hwndInsertBehind, x, y, cx, cy, fl);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibWinShowWindow(HWND hwnd, ULONG fl)
+{
+  return WinSetWindowPos(hwnd, 0, 0, 0, 0, 0, fl);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibWinDestroyWindow(HWND hwnd)
+{
+  return WinDestroyWindow(hwnd);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibWinQueryUpdateRect(HWND hwnd, PVOID pRect)
+{
+  return WinQueryUpdateRect(hwnd, (RECTL *)pRect);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibWinIsIconic(HWND hwnd)
+{
+ SWP  swp;
+ BOOL rc;
+
+  rc = WinQueryWindowPos(hwnd, &swp);
+  if(rc == FALSE) {
+        dprintf(("OSLibWinIsIconic: WinQueryWindowPos %x failed", hwnd));
+        return FALSE;
+  }
+
+  if(swp.fl & SWP_MINIMIZE)
+        return TRUE;
+  else  return FALSE;
+}
+//******************************************************************************
+//******************************************************************************