Changeset 1526 for trunk/src/user32/win32wbase.h

Timestamp:

Oct 31, 1999, 2:14:44 AM (26 years ago)

Author:

sandervl

Message:

Window size + paint fix + dialog fixes

File:

• trunk/src/user32/win32wbase.h (modified) (6 diffs)

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.36 1999-10-30 18:40:48 cbratschi Exp $ */
+/* $Id: win32wbase.h,v 1.37 1999-10-31 01:14:43 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -148 +148 @@
          BOOL   ShowWindow(ULONG nCmdShow);
          BOOL   SetWindowPos(HWND hwndInsertAfter, int x, int y, int cx, int cy, UINT fuFlags);
-         BOOL   SetWindowPlacement(WINDOWPLACEMENT *winpos);
+         BOOL   SetWindowPlacement(WINDOWPLACEMENT *winpos);
          BOOL   DestroyWindow();
          HWND   SetActiveWindow();
@@ -205 +205 @@
            BOOL EnumChildWindows(WNDENUMPROC lpfn, LPARAM lParam);
 
+         HWND   getNextDlgTabItem(HWND hwndCtrl, BOOL fPrevious);
+         HWND   getNextDlgGroupItem(HWND hwndCtrl, BOOL fPrevious);
+
     static HWND Win32ToOS2Handle(HWND hwnd);
     static HWND Win32ToOS2FrameHandle(HWND hwnd);
@@ -218 +221 @@
        ULONG getBorderHeight() { return borderHeight; };
 
-static  void  NC_AdjustRectInner(LPRECT rect, DWORD style, DWORD exStyle);
-static  void  NC_AdjustRectOuter(LPRECT rect, DWORD style, BOOL menu, DWORD exStyle);
-static  BOOL  WindowNeedsWMBorder( DWORD style, DWORD exStyle );
+static  void  NC_AdjustRectInner(LPRECT rect, DWORD style, DWORD exStyle);
+static  void  NC_AdjustRectOuter(LPRECT rect, DWORD style, BOOL menu, DWORD exStyle);
+static  BOOL  WindowNeedsWMBorder( DWORD style, DWORD exStyle );
 
        PVOID getOldWndProc() { return pOldWndProc; }
@@ -303 +306 @@
 #ifndef OS2_INCLUDED
         void  GetMinMaxInfo(POINT *maxSize, POINT *maxPos, POINT *minTrack, POINT *maxTrack );
-        LONG  HandleWindowPosChanging(WINDOWPOS *winpos);
+        LONG  HandleWindowPosChanging(WINDOWPOS *winpos);
         LONG  HandleSysCommand(WPARAM wParam, POINT *pt32);
 
@@ -345 +348 @@
          BOOL   isPSErase()      { return EraseBkgndFlag | PSEraseFlag; }
          BOOL   isSupressErase() { return SupressEraseFlag; }
-
-protected:
-        BOOL    DIALOG_Init(void);
-        BOOL    getCharSizeFromDC( HDC hDC, HFONT hFont, SIZE * pSize );
-        BOOL    getCharSize( HFONT hFont, SIZE * pSize);
-
-public:
-         HWND   getNextDlgTabItem(HWND hwndCtrl, BOOL fPrevious);
-         HWND   getNextDlgGroupItem(HWND hwndCtrl, BOOL fPrevious);
-
-         BOOL   MapDialogRect(LPRECT rect);
-
-static   ULONG  GetDialogBaseUnits()  { return MAKELONG(xBaseUnit, yBaseUnit); };
-static   int    getXBaseUnit() { return xBaseUnit; }
-static   int    getYBaseUnit() { return yBaseUnit; }
-
-private:
- static BOOL    fInitialized;
- static int     xBaseUnit;
- static int     yBaseUnit;
 };