Changeset 2292 for trunk/src/user32/new/win32wbase.h

Timestamp:

Jan 2, 2000, 8:30:47 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

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

trunk/src/user32/new/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.13 2000-01-01 14:54:55 cbratschi Exp $ */
+/* $Id: win32wbase.h,v 1.14 2000-01-02 19:30:45 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -131 +131 @@
          ULONG  getClientWidth()                { return rectClient.right - rectClient.left; };
          BOOL   isChild();
-         PRECT  getClientRect()                 { return &rectClient; };
+         PRECT  getClientRectPtr()              { return &rectClient; };
+         void   getClientRect(PRECT rect)
+         {
+                *rect = rectClient;
+                rectClient.right  -= rectClient.left;
+                rectClient.bottom -= rectClient.top;
+                rectClient.left = rectClient.top = 0;
+         }
          void   setClientRect(PRECT rect)       { rectClient = *rect; };
          PRECT  getWindowRect()                 { return &rectWindow; };
@@ -179 +186 @@
          HWND   getOS2HwndModalDialog()       { return OS2HwndModalDialog; };
          BOOL   CanReceiveSizeMsgs()          { return !fNoSizeMsg; };
+         BOOL   IsWindowCreated()             { return fCreated; }
          BOOL   IsWindowDestroyed()           { return fIsDestroyed; };
          BOOL   IsWindowEnabled();
@@ -252 +260 @@
        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 );
-
        PVOID getOldWndProc() { return pOldWndProc; }
        VOID  setOldWndProc(PVOID aOldWndProc) { pOldWndProc = aOldWndProc; }
@@ -327 +331 @@
         ULONG   nrUserWindowLong;
 
-        RECT    rectWindow;
-        RECT    rectClient;
+        RECT    rectWindow; //relative to screen
+        RECT    rectClient;  //relative to parent
 
 CREATESTRUCTA  *tmpcs; //temporary pointer to CREATESTRUCT used in CreateWindowEx
@@ -346 +350 @@
         void  GetMinMaxInfo(POINT *maxSize, POINT *maxPos, POINT *minTrack, POINT *maxTrack );
         LONG  HandleWindowPosChanging(WINDOWPOS *winpos);
+        LONG  HandleNCActivate(WPARAM wParam);
+        VOID  TrackMinMaxBox(WORD wParam);
+        VOID  TrackCloseButton(WORD wParam);
         LONG  HandleNCLButtonDown(WPARAM wParam,LPARAM lParam);
         LONG  HandleNCLButtonUp(WPARAM wParam,LPARAM lParam);
         LONG  HandleNCLButtonDblClk(WPARAM wParam,LPARAM lParam);
+        BOOL  WindowNeedsWMBorder();
+        VOID  AdjustRectOuter(LPRECT rect,BOOL menu);
+        VOID  AdjustRectInner(LPRECT rect);
+        LONG  HandleNCCalcSize(RECT *winRect);
+        LONG  HandleNCHitTest(POINT pt);
+        VOID  GetInsideRect(RECT *rect);
+        VOID  DrawFrame(HDC hdc,RECT *rect,BOOL dlgFrame,BOOL active);
+        BOOL  DrawSysButton(HDC hdc,BOOL down);
+        BOOL  DrawGrayButton(HDC hdc,int x,int y);
+        VOID  DrawCloseButton(HDC hdc,BOOL down,BOOL bGrayed);
+        VOID  DrawMaxButton(HDC hdc,BOOL down,BOOL bGrayed);
+        VOID  DrawMinButton(HDC hdc,BOOL down,BOOL bGrayed);
+        VOID  DrawCaption(HDC hdc,RECT *rect,BOOL active);
+        VOID  DoNCPaint(HRGN clip,BOOL suppress_menupaint);
+        LONG  HandleNCPaint(HRGN clip);
         LONG  HandleSysCommand(WPARAM wParam, POINT *pt32);
 
@@ -355 +377 @@
                              RECT *oldClientRect, WINDOWPOS *winpos,
                              RECT *newClientRect );
-
-        LONG  NCHandleCalcSize(WPARAM wParam, NCCALCSIZE_PARAMS *ncsize);
 
      LRESULT  SendInternalMessage(ULONG msg, WPARAM wParam, LPARAM lParam)