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

Timestamp:

Jul 18, 1999, 3:57:48 PM (26 years ago)

Author:

cbratschi

Message:

API Open32 -> PM

File:

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

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.10 1999-07-18 10:39:51 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.11 1999-07-18 13:57:47 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -46 +46 @@
 
   if(pszName && *pszName == 0) {
-        pszName = NULL;
+        pszName = NULL;
   }
   if(hwndParent == 0) {
@@ -53 +53 @@
   if(dwFrameStyle) {
         dwWinStyle &= ~WS_CLIPCHILDREN; //invalid style according to docs
-        if(pszName)
-                dwFrameStyle |= FCF_TITLEBAR;
+        if(pszName)
+                dwFrameStyle |= FCF_TITLEBAR;
 
         *hwndFrame = WinCreateStdWindow(hwndParent, dwWinStyle,
@@ -60 +60 @@
                                        "", 0, 0, 0, &hwndClient);
         if(*hwndFrame) {
-                if(pszName) {
-                        WinSetWindowText(*hwndFrame, pszName);
-                }
+                if(pszName) {
+                        WinSetWindowText(*hwndFrame, pszName);
+                }
                 return hwndClient;
         }
@@ -161 +161 @@
 //******************************************************************************
 //******************************************************************************
+HWND OSLibWinQueryFocus(HWND hwndDeskTop)
+{
+  return WinQueryFocus(hwndDeskTop);
+}
+//******************************************************************************
+//******************************************************************************
+HWND OSLibWinWindowFromID(HWND hwndParent,ULONG id)
+{
+  return WinWindowFromID(hwndParent,id);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibWinSetFocus(HWND hwndDeskTop,HWND hwndNewFocus)
+{
+  return WinSetFocus(hwndDeskTop,hwndNewFocus);
+}
+//******************************************************************************
+//******************************************************************************
+ULONG OSLibGetWindowHeight(HWND hwnd)
+{
+  RECTL rect;
+
+  return (WinQueryWindowRect(hwnd,&rect)) ? rect.yTop-rect.yBottom:0;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibWinInvalidateRect(HWND hwnd,POSRECTL pwrc,BOOL fIncludeChildren)
+{
+  return WinInvalidateRect(hwnd,(PRECTL)pwrc,fIncludeChildren);
+}
+//******************************************************************************
+//******************************************************************************
+LONG OSLibWinQuerySysValue(HWND hwndDeskTop,LONG iSysValue)
+{
+  return WinQuerySysValue(hwndDeskTop,iSysValue);
+}
+//******************************************************************************
+//******************************************************************************
+ULONG OSLibWinQueryDlgItemText(HWND hwndDlg,ULONG idItem,LONG cchBufferMax,char* pchBuffer)
+{
+  return WinQueryDlgItemText(hwndDlg,idItem,cchBufferMax,pchBuffer);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibWinSetDlgItemText(HWND hwndDlg,ULONG idItem,char* pszText)
+{
+  return WinSetDlgItemText(hwndDlg,idItem,pszText);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibWinQueryPointerPos(HWND hwndDeskTop,PPOINT pptlPoint)
+{
+  return WinQueryPointerPos(hwndDeskTop,(PPOINTL)pptlPoint);
+}
 //******************************************************************************
 //******************************************************************************
@@ -173 +227 @@
 {
   if(fl & SWP_MOVE) {
-        y = MapOS2ToWin32Y(hwnd, cy, y);
+        y = MapOS2ToWin32Y(hwnd, cy, y);
   }
   dprintf(("WinSetWindowPos %x %x %d %d %d %d %x", hwnd, hwndInsertBehind, x, y, cx, cy, fl));
@@ -185 +239 @@
 
   if(fl & SWP_SHOW) {
-         rc = WinShowWindow(hwnd, TRUE);
+         rc = WinShowWindow(hwnd, TRUE);
   }
   if(rc == 0)
-        dprintf(("WinShowWindow %x failed %x", hwnd, WinGetLastError(GetThreadHAB())));
+        dprintf(("WinShowWindow %x failed %x", hwnd, WinGetLastError(GetThreadHAB())));
   rc = WinSetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, fl);
   if(rc == 0)
-        dprintf(("WinShowWindow %x failed %x", hwnd, WinGetLastError(GetThreadHAB())));
+        dprintf(("WinShowWindow %x failed %x", hwnd, WinGetLastError(GetThreadHAB())));
   return rc;
 }
@@ -202 +256 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinQueryUpdateRect(HWND hwnd, PRECT pRect)
-{
- BOOL rc;
- RECTLOS2 rectl;
-
-  rc = WinQueryUpdateRect(hwnd, (PRECTL)&rectl);
-  if(rc) {
-        MapOS2ToWin32Rectl(hwnd, &rectl, pRect);
-  }
-  return rc;
+BOOL OSLibWinQueryUpdateRect(HWND hwnd, POSRECTL pRect)
+{
+  return WinQueryUpdateRect(hwnd, (PRECTL)pRect);
+  //CB: caller must convert rect
 }
 //******************************************************************************