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

Timestamp:

May 11, 2001, 10:39:46 AM (24 years ago)

Author:

sandervl

Message:

client/frame rewrite

File:

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

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.115 2001-04-27 17:36:39 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.116 2001-05-11 08:39:45 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -134 +134 @@
          ULONG  MsgPaint(ULONG tmp1, BOOL select = TRUE);
          ULONG  MsgEraseBackGround(HDC hdc);
-#ifndef ODIN_HITTEST
-         ULONG  MsgHitTest(MSG *msg);
-#endif
-         ULONG  MsgNCPaint();
+         ULONG  MsgNCPaint(PRECT pUpdateRect);
          ULONG  MsgFormatFrame(WINDOWPOS *lpWndPos);
          ULONG  DispatchMsgA(MSG *msg);
@@ -160 +157 @@
          HWND   getWindowHandle()               { return Win32Hwnd; };
          HWND   getOS2WindowHandle()            { return OS2Hwnd; };
+         HWND   getOS2FrameWindowHandle()       { return OS2HwndFrame; };
 
  Win32WndClass *getWindowClass()                { return windowClass; };
@@ -260 +258 @@
          BOOL   IsMixMaxStateChanging()       { return fMinMaxChange; };
 
+         void   SetVisibleRegionChanged(BOOL changed) { fVisibleRegionChanged = changed; };
+         BOOL   IsVisibleRegionChanged()              { return fVisibleRegionChanged; };
+
          int    GetWindowTextLength(BOOL fUnicode);
          int    GetWindowTextLengthA() { return GetWindowTextLength(FALSE); };
@@ -317 +318 @@
 static Win32BaseWindow *GetWindowFromHandle(HWND hwnd);
 static Win32BaseWindow *GetWindowFromOS2Handle(HWND hwnd);
+static Win32BaseWindow *GetWindowFromOS2FrameHandle(HWND hwnd);
 
     static void DestroyAll();
@@ -334 +336 @@
     PROPERTY   *findWindowProperty(LPCSTR str);
 
-        HWND    OS2Hwnd;
+        HWND    OS2Hwnd, OS2HwndFrame;
         HMENU   hSysMenu;
         HWND    Win32Hwnd;
@@ -358 +360 @@
         HWND    OS2HwndModalDialog;
 
-        unsigned fFirstShow:1;
-        unsigned fIsDialog:1;
-        unsigned fIsModalDialog:1;
-        unsigned fIsModalDialogOwner:1;
-        unsigned fInternalMsg:1;         //Used to distinguish between messages
+        ULONG    fFirstShow:1,
+                 fIsDialog:1,
+                 fIsModalDialog:1,
+                 fIsModalDialogOwner:1,
+                 fInternalMsg:1,         //Used to distinguish between messages
                                          //sent by PM and those sent by apps
-        unsigned fNoSizeMsg:1;
-        unsigned fIsDestroyed:1;
-        unsigned fDestroyWindowCalled:1; //DestroyWindow was called for this window
-        unsigned fCreated:1;
-        unsigned fCreationFinished:1;    //True when window or dialog has been created successfully
+                 fNoSizeMsg:1,
+                 fIsDestroyed:1,
+                 fDestroyWindowCalled:1, //DestroyWindow was called for this window
+                 fCreated:1,
+                 fCreationFinished:1,    //True when window or dialog has been created successfully
                                          //Needed to prevent DestroyWindow from deleting the window
                                          //object during construction
-        unsigned fTaskList:1;            //should be listed in PM tasklist or not
-        unsigned fXDefault:1;
-        unsigned fCXDefault:1;
-        unsigned fParentDC:1;
-        unsigned fComingToTop:1;
-        unsigned fCreateSetWindowPos:1;  //FALSE -> SetWindowPos in Win32BaseWindow::MsgCreate not yet called
-        unsigned isUnicode:1;
-        unsigned fMinMaxChange:1;        //set when switching between min/max/restored state
-        unsigned fOwnDCDirty:1;          //set when selectClientArea must reset the origin + visible region
+                 fTaskList:1,            //should be listed in PM tasklist or not
+                 fXDefault:1,
+                 fCXDefault:1,
+                 fParentDC:1,
+                 fComingToTop:1,
+                 fCreateSetWindowPos:1,  //FALSE -> SetWindowPos in Win32BaseWindow::MsgCreate not yet called
+                 isUnicode:1,
+                 fMinMaxChange:1,        //set when switching between min/max/restored state
+                 fVisibleRegionChanged:1, //set when visible region has changed -> erase background must be sent during next BeginPaint
+                 fEraseBkgndFlag:1;
 
         HRGN    hWindowRegion;
@@ -469 +472 @@
          BOOL   isOwnDC() { return (windowClass && windowClass->getStyle() & CS_OWNDC_W); }
 #endif
-         void   invalidateOwnDC() { fOwnDCDirty = TRUE; };
-         void   validateOwnDC()   { fOwnDCDirty = FALSE; };
-         BOOL   isOwnDCDirty()    { return fOwnDCDirty; };
 
          HDC    getOwnDC() { return ownDC; }
@@ -478 +478 @@
          HDC    ownDC;
 
-         ULONG  EraseBkgndFlag:1,
-                filler:31;
 public:
-         VOID   setEraseBkgnd (BOOL erase)      { EraseBkgndFlag = erase; }
-         BOOL   needsEraseBkgnd()               { return EraseBkgndFlag; }
+         VOID   setEraseBkgnd (BOOL erase)      { fEraseBkgndFlag = erase; }
+         BOOL   needsEraseBkgnd()               { return fEraseBkgndFlag; }
 };