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

Timestamp:

Jul 14, 1999, 11:05:59 PM (26 years ago)

Author:

cbratschi

Message:

several bugs fixed, RegisterClass works, CreateWindow on the way

File:

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

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.1 1999-07-14 08:35:35 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.2 1999-07-14 21:05:58 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -24 +24 @@
   if(hwndParent == OSLIB_HWND_DESKTOP)
   {
-        hwndParent = HWND_DESKTOP;
+        hwndParent = HWND_DESKTOP;
   }
 
@@ -40 +40 @@
 
   if(hwndParent == 0) {
-        hwndParent = HWND_DESKTOP;
+        hwndParent = HWND_DESKTOP;
   }
   if(WinQueryWindowRect(hwndParent, &rectl) == 0) {
-        y = OS2TOWIN32POINT(rectl.yTop - rectl.yBottom, y);
+        y = OS2TOWIN32POINT(rectl.yTop - rectl.yBottom, y);
   }
   if(dwFrameStyle) {
-        dwWinStyle &= ~WS_CLIPCHILDREN; //invalid style according to docs
-        hwndFrame = WinCreateStdWindow(hwndParent, dwWinStyle, 
-                                       &dwFrameStyle, WIN32_STDCLASS,
+        dwWinStyle &= ~WS_CLIPCHILDREN; //invalid style according to docs
+        hwndFrame = WinCreateStdWindow(hwndParent, dwWinStyle,
+                                       &dwFrameStyle, WIN32_STDCLASS,
                                        "", 0, 0, 0, &hwndClient) != 0;
-        if(hwndFrame) {
-                if(pszName) {
-                        WinSetWindowText(hwndFrame, pszName);
-                }
-                WinSetWindowPos(hwndFrame, (fHWND_BOTTOM) ? HWND_BOTTOM :HWND_TOP,  
-                                x, y, cx, cy, SWP_SIZE | SWP_MOVE);
+        if(hwndFrame) {
+                if(pszName) {
+                        WinSetWindowText(hwndFrame, pszName);
+                }
+                WinSetWindowPos(hwndFrame, (fHWND_BOTTOM) ? HWND_BOTTOM :HWND_TOP,
+                                x, y, cx, cy, SWP_SIZE | SWP_MOVE);
 
-                return hwndFrame;
-        }
-        return 0;
+                return hwndFrame;
+        }
+        return 0;
   }
-  else  return WinCreateWindow(hwndParent, WIN32_STDCLASS, pszName, dwWinStyle, x, y, cx, cy,
+  else  return WinCreateWindow(hwndParent, WIN32_STDCLASS, pszName, dwWinStyle, x, y, cx, cy,
                                Owner, (fHWND_BOTTOM) ? HWND_BOTTOM :HWND_TOP, 0, NULL,
                                NULL);
@@ -74 +74 @@
   /* Window styles */
   if(dwStyle & WINWS_MINIMIZE)
-        *OSWinStyle |= WS_MINIMIZED;
+        *OSWinStyle |= WS_MINIMIZED;
   if(dwStyle & WINWS_VISIBLE)
-        *OSWinStyle |= WS_VISIBLE;
+        *OSWinStyle |= WS_VISIBLE;
   if(dwStyle & WINWS_DISABLED)
-        *OSWinStyle |= WS_DISABLED;
+        *OSWinStyle |= WS_DISABLED;
   if(dwStyle & WINWS_CLIPSIBLINGS)
-        *OSWinStyle |= WS_CLIPSIBLINGS;
+        *OSWinStyle |= WS_CLIPSIBLINGS;
   if(dwStyle & WINWS_CLIPCHILDREN)
-        *OSWinStyle |= WS_CLIPCHILDREN;
+        *OSWinStyle |= WS_CLIPCHILDREN;
   if(dwStyle & WINWS_MAXIMIZE)
-        *OSWinStyle |= WS_MAXIMIZED;
+        *OSWinStyle |= WS_MAXIMIZED;
   if(dwStyle & WINWS_GROUP)
-        *OSWinStyle |= WS_GROUP;
+        *OSWinStyle |= WS_GROUP;
   if(dwStyle & WINWS_TABSTOP)
-        *OSWinStyle |= WS_TABSTOP;
+        *OSWinStyle |= WS_TABSTOP;
 
   if(dwStyle & WINWS_CAPTION)
-        *OSFrameStyle |= FCF_TITLEBAR;
+        *OSFrameStyle |= FCF_TITLEBAR;
   if(dwStyle & WINWS_BORDER)
-        *OSFrameStyle |= FCF_BORDER;
+        *OSFrameStyle |= FCF_BORDER;
   if(dwStyle & WINWS_DLGFRAME)
-        *OSFrameStyle |= FCF_DLGBORDER;
+        *OSFrameStyle |= FCF_DLGBORDER;
   if(dwStyle & WINWS_VSCROLL)
-        *OSFrameStyle |= FCF_VERTSCROLL;
+        *OSFrameStyle |= FCF_VERTSCROLL;
   if(dwStyle & WINWS_HSCROLL)
-        *OSFrameStyle |= FCF_HORZSCROLL;
+        *OSFrameStyle |= FCF_HORZSCROLL;
   if(dwStyle & WINWS_SYSMENU)
-        *OSFrameStyle |= FCF_SYSMENU;
+        *OSFrameStyle |= FCF_SYSMENU;
   if(dwStyle & WINWS_THICKFRAME)
-        *OSFrameStyle |= FCF_SIZEBORDER;        //??
+        *OSFrameStyle |= FCF_SIZEBORDER;        //??
   if(dwStyle & WINWS_MINIMIZEBOX)
-        *OSFrameStyle |= FCF_MINBUTTON;
+        *OSFrameStyle |= FCF_MINBUTTON;
   if(dwStyle & WINWS_MAXIMIZEBOX)
-        *OSFrameStyle |= FCF_MAXBUTTON;
+        *OSFrameStyle |= FCF_MAXBUTTON;
 
   return TRUE;
@@ -115 +115 @@
 BOOL OSLibWinSetWindowULong(HWND hwnd, ULONG offset, ULONG value)
 {
-  return WinSetWindowULong(hwnd, offset, value) == 0;
+  return WinSetWindowULong(hwnd, offset, value);
 }
 //******************************************************************************
@@ -121 +121 @@
 ULONG OSLibWinGetWindowULong(HWND hwnd, ULONG offset)
 {
-  return WinGetWindowULong(hwnd, offset);
+  return WinQueryWindowULong(hwnd, offset);
 }
 //******************************************************************************