Changeset 3662 for trunk/src/user32/oslibwin.h

Timestamp:

Jun 7, 2000, 4:51:33 PM (25 years ago)

Author:

sandervl

Message:

Major rewrite: frame/client -> frame

File:

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

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.45 2000-05-26 18:43:34 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.46 2000-06-07 14:51:27 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -40 +40 @@
 HWND  OSLibWinCreateWindow(HWND hwndParent,ULONG dwWinStyle,
                            char *pszName, HWND Owner, ULONG fBottom,
-                           HWND *hwndFrame, ULONG id, BOOL fTaskList,BOOL fShellPosition, int classStyle);
+                           ULONG id, BOOL fTaskList,BOOL fShellPosition, int classStyle);
 
 BOOL  OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle);
@@ -73 +73 @@
 ULONG OSLibGetWindowHeight(HWND hwnd); //for point transformation
 
-extern ULONG ScreenHeight;
+extern ULONG ScreenHeight, ScreenWidth;
 inline ULONG OSLibQueryScreenHeight(void) { return (ScreenHeight); }
+inline ULONG OSLibQueryScreenWidth(void)  { return (ScreenWidth); }
 
 //reserved deleted
@@ -220 +221 @@
 #define RELATIVE_TO_WINDOW 0
 #define RELATIVE_TO_SCREEN 1
-BOOL  OSLibWinQueryWindowRect(HWND hwnd, PRECT pRect, int RelativeTo = RELATIVE_TO_WINDOW);
+BOOL  OSLibWinQueryWindowRect(Win32BaseWindow *window, PRECT pRect, int RelativeTo = RELATIVE_TO_WINDOW);
 BOOL  OSLibWinCalcFrameRect(HWND hwnd, RECT *pRect, BOOL fClient);
 BOOL  OSLibGetMinMaxInfo(HWND hwndFrame, MINMAXINFO *pMinMax);
@@ -247 +248 @@
 
 BOOL  OSLibWinQueryWindowPos (HWND hwnd, PSWP pswp);
-void  OSLibMapSWPtoWINDOWPOS(PSWP pswp, struct tagWINDOWPOS *pwpos, PSWP pswpOld, HWND hParent, HWND hFrame);
-void  OSLibMapSWPtoWINDOWPOSFrame(PSWP pswp, struct tagWINDOWPOS *pwpos, PSWP pswpOld, HWND hParent, HWND hFrame);
-void  OSLibMapWINDOWPOStoSWP(struct tagWINDOWPOS *pwpos, PSWP pswp, PSWP pswpOld, HWND hParent, HWND hFrame);
-void  OSLibMapWINDOWPOStoSWPFrame(PWINDOWPOS pwpos, PSWP pswp, PSWP pswpOld, HWND hParent, HWND hFrame);
+void  OSLibMapSWPtoWINDOWPOS(PSWP pswp, PWINDOWPOS pwpos, PSWP pswpOld, 
+                            int parentHeight, int clientOrgX, int clientOrgY, 
+                            HWND hwnd);
+void  OSLibMapWINDOWPOStoSWP(struct tagWINDOWPOS *pwpos, PSWP pswp, PSWP pswpOld, 
+                             int parentHeight, int clientOrgX, int clientOrgY, HWND hFrame);
 
 HWND  OSLibWinBeginEnumWindows(HWND hwnd);