X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c5bd3c6268277ae8fedddcd6ebafa8ba90f3d551..748a46846984b408135b2e1c1093db31f9296543:/include/wx/msw/window.h

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index d445002683..f26f55877f 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -32,12 +32,14 @@
 // constants
 // ---------------------------------------------------------------------------
 
-// FIXME does anybody use those? they're unused by wxWidgets...
+#if WXWIN_COMPATIBILITY_2_4
+// they're unused by wxWidgets...
 enum
 {
     wxKEY_SHIFT = 1,
     wxKEY_CTRL  = 2
 };
+#endif
 
 // ---------------------------------------------------------------------------
 // wxWindow declaration for MSW
@@ -394,10 +396,7 @@ public:
     // normally just calls MSWGetBgBrushForChild() on the parent window but may
     // be overridden if the default background brush is not suitable for some
     // reason (e.g. wxStaticBox uses MSWGetSolidBgBrushForChild() instead)
-    virtual WXHBRUSH MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC)
-    {
-        return parent->MSWGetBgBrushForChild(hDC, this);
-    }
+    virtual WXHBRUSH MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC);
 
     // return the background brush to use for this window by quering the parent
     // windows via their MSWGetBgBrushForChild() recursively
@@ -438,8 +437,6 @@ protected:
     int                   m_lastMouseEvent;
 #endif // wxUSE_MOUSEEVENT_HACK
 
-    WXHMENU               m_hMenu; // Menu, if any
-
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;
@@ -477,6 +474,11 @@ protected:
     wxKeyEvent CreateKeyEvent(wxEventType evType, int id,
                               WXLPARAM lParam = 0, WXWPARAM wParam = 0) const;
 
+
+    // default OnEraseBackground() implementation, return true if we did erase
+    // the background, false otherwise
+    bool DoEraseBackground(wxDC& dc);
+
 private:
     // common part of all ctors
     void Init();
@@ -496,6 +498,10 @@ private:
     // number of calls to Freeze() minus number of calls to Thaw()
     unsigned int m_frozenness;
 
+    // current defer window position operation handle (may be NULL)
+    WXHANDLE m_hDWP;
+
+
     DECLARE_DYNAMIC_CLASS(wxWindowMSW)
     DECLARE_NO_COPY_CLASS(wxWindowMSW)
     DECLARE_EVENT_TABLE()