X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01c500af65d6e42b407e850348458e299a824653..252d21bd383ac3c94c45bfd919bdfb82f43345d8:/include/wx/msw/window.h?ds=sidebyside

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 996e063f8a..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
@@ -305,12 +307,7 @@ public:
 
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
-    bool HandleCtlColor(WXHBRUSH *hBrush,
-                        WXHDC hdc,
-                        WXHWND hWnd,
-                        WXUINT message,
-                        WXWPARAM wParam,
-                        WXLPARAM lParam);
+    bool HandleCtlColor(WXHBRUSH *hBrush, WXHDC hdc, WXHWND hWnd);
 
     bool HandlePaletteChanged(WXHWND hWndPalChange);
     bool HandleQueryNewPalette();
@@ -369,13 +366,41 @@ public:
     // with or 0 for the default brush
     virtual WXHBRUSH MSWControlColor(WXHDC hDC);
 
-    // deprecated, for compatibility only: override MSWControlColor instead
-    virtual WXHBRUSH OnCtlColor(WXHDC hDC,
-                                WXHWND hWnd,
-                                WXUINT nCtlColor,
-                                WXUINT message,
-                                WXWPARAM wParam,
-                                WXLPARAM lParam);
+    // this function should return the brush to paint the children controls
+    // background or 0 if this window doesn't impose any particular background
+    // on its children
+    //
+    // the base class version uses MSWGetBgColourForChild() and returns a solid
+    // brush if we have a non default background colour or 0 otherwise
+    virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC WXUNUSED(hDC), wxWindow *child)
+    {
+        return MSWGetSolidBgBrushForChild(child);
+    }
+
+    // return the background colour of this window under the given child
+    // (possible grand child)
+    //
+    // this is a hack as if the background is themed, there is no single colour
+    // representing it, but sometimes we can't use the pattern brush returned
+    // by MSWGetBgBrushForChild() anyhow and then this function is used as
+    // fallback
+    //
+    // the base class version returns bg colour if it had been explicitely set
+    // or wxNullColour otherwise
+    virtual wxColour MSWGetBgColourForChild(wxWindow *child);
+
+    // convenience function: returns a solid brush of the colour returned by
+    // MSWGetBgColourForChild() or 0
+    WXHBRUSH MSWGetSolidBgBrushForChild(wxWindow *child);
+
+    // 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 the background brush to use for this window by quering the parent
+    // windows via their MSWGetBgBrushForChild() recursively
+    WXHBRUSH MSWGetBgBrush(WXHDC hDC);
 
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);
@@ -412,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;
@@ -451,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();
@@ -470,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()