X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51e4e266702b0605ca3ab23983184edd7ec9e0aa..e7c240da70308b5e54bf8bcc9813b5c4e4fece4d:/include/wx/msw/window.h?ds=inline

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 1c480cc129..d322098a87 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -47,6 +47,12 @@ enum
 
 class WXDLLEXPORT wxWindowMSW : public wxWindowBase
 {
+    friend class wxSpinCtrl;
+    friend class wxSlider;
+    friend class wxRadioBox;
+#if defined __VISUALC__ && __VISUALC__ <= 1200
+    friend class wxWindowMSW;
+#endif
 public:
     wxWindowMSW() { Init(); }
 
@@ -174,10 +180,6 @@ public:
 #endif
 
 public:
-    // For implementation purposes - sometimes decorations make the client area
-    // smaller
-    virtual wxPoint GetClientAreaOrigin() const;
-
     // Windows subclassing
     void SubclassWin(WXHWND hWnd);
     void UnsubclassWin();
@@ -294,7 +296,8 @@ public:
     bool HandleDestroy();
 
     bool HandlePaint();
-    bool HandleEraseBkgnd(WXHDC pDC);
+    bool HandlePrintClient(WXHDC hDC);
+    bool HandleEraseBkgnd(WXHDC hDC);
 
     bool HandleMinimize();
     bool HandleMaximize();
@@ -362,45 +365,40 @@ public:
     // called when the window is about to be destroyed
     virtual void MSWDestroyWindow();
 
-    // this function should return the brush to paint the window background
-    // with or 0 for the default brush
-    virtual WXHBRUSH MSWControlColor(WXHDC hDC);
 
     // 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);
-    }
+    // the base class version returns a solid brush if we have a non default
+    // background colour or 0 otherwise
+    virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, WXHWND hWnd);
 
-    // 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
+    // return the background brush to use for painting the given window by
+    // quering the parent windows via their MSWGetBgBrushForChild() recursively
     //
-    // the base class version returns bg colour if it had been explicitely set
-    // or wxNullColour otherwise
-    virtual wxColour MSWGetBgColourForChild(wxWindow *child);
+    // hWndToPaint is normally NULL meaning this window itself, but it can also
+    // be a child of this window which is used by the static box and could be
+    // potentially useful for other transparent controls
+    WXHBRUSH MSWGetBgBrush(WXHDC hDC, WXHWND hWndToPaint = NULL);
 
-    // convenience function: returns a solid brush of the colour returned by
-    // MSWGetBgColourForChild() or 0
-    WXHBRUSH MSWGetSolidBgBrushForChild(wxWindow *child);
+    // gives the parent the possibility to draw its children background, e.g.
+    // this is used by wxNotebook to do it using DrawThemeBackground()
+    //
+    // return true if background was drawn, false otherwise
+    virtual bool MSWPrintChild(WXHDC WXUNUSED(hDC), wxWindow * WXUNUSED(child))
+    {
+        return false;
+    }
 
-    // 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);
+    // some controls (e.g. wxListBox) need to set the return value themselves
+    //
+    // return true to let parent handle it if we don't, false otherwise
+    virtual bool MSWShouldPropagatePrintChild()
+    {
+        return true;
+    }
 
-    // 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);
@@ -416,7 +414,7 @@ public:
 
     // virtual function for implementing internal idle
     // behaviour
-    virtual void OnInternalIdle() ;
+    virtual void OnInternalIdle();
 
 protected:
     // the window handle
@@ -457,6 +455,11 @@ protected:
     // has the window been frozen by Freeze()?
     bool IsFrozen() const { return m_frozenness > 0; }
 
+    // this simply moves/resizes the given HWND which is supposed to be our
+    // sibling (this is useful for controls which are composite at MSW level
+    // and for which DoMoveWindow() is not enough)
+    void DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height);
+
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::MoveWindow() except for composite controls which will want to arrange
@@ -479,8 +482,8 @@ protected:
 
 
     // default OnEraseBackground() implementation, return true if we did erase
-    // the background, false otherwise
-    bool DoEraseBackground(wxDC& dc);
+    // the background, false otherwise (i.e. the system should erase it)
+    bool DoEraseBackground(WXHDC hDC);
 
 private:
     // common part of all ctors
@@ -504,6 +507,11 @@ private:
     // current defer window position operation handle (may be NULL)
     WXHANDLE m_hDWP;
 
+    // When deferred positioning is done these hold the pending changes, and
+    // are used for the default values if another size/pos changes is done on
+    // this window before the group of deferred changes is completed.
+    wxPoint     m_pendingPosition;
+    wxSize      m_pendingSize;
 
     DECLARE_DYNAMIC_CLASS(wxWindowMSW)
     DECLARE_NO_COPY_CLASS(wxWindowMSW)