moved HasTransparentBackground() from wxUniv to common wxWindow

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex
index 62a3be878a4e844fc80949c221fb1c42e3908b29..6a0f3ab2ed70d85912b4ed3964a89073cebcf47c 100644 (file)
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -1326,7 +1326,6 @@ Returns {\tt true} if this window has the current mouse capture.
 
 \constfunc{virtual bool}{HasScrollbar}{\param{int }{orient}}
 
-
 Returns {\tt true} if this window has a scroll bar for this orientation.
 
 \wxheading{Parameters}
@@ -1334,6 +1333,18 @@ Returns {\tt true} if this window has a scroll bar for this orientation.
 \docparam{orient}{Orientation to check, either {\tt wxHORIZONTAL} or {\tt wxVERTICAL}.}
 
 
+\membersection{wxWindow::HasTransparentBackground}\label{wxwindowhastransparentbackground}
+
+\constfunc{virtual bool}{HasTransparentBackground}{\void}
+
+Returns \true if this window background is transparent (as, for example, for
+wxStaticText) and should show the parent window background.
+
+This method is mostly used internally by the library itself and you normally
+shouldn't have to call it. You may, however, have to override it in your
+wxWindow-derived class to ensure that background is painted correctly.
+
+
 \membersection{wxWindow::Hide}\label{wxwindowhide}
 
 \func{bool}{Hide}{\void}

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index dc333f37e8dc44df95ee5a710fbc161ad1bf7ec2..7ed44aaefc093ceb42ad8b52c68283646bfc1bcb 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -106,8 +106,7 @@ public:
         return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER);
     }
 
-    virtual void ApplyParentThemeBackground(const wxColour& bg)
-        { SetBackgroundColour(bg); }
+    virtual bool HasTransparentBackground() { return true; }
 
 protected:
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index d5661e10fc5b62b1f1e7637e2b769c3d0a49ffec..c286ad829db4ab4e6a63769785de6e1237ecc7bd 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -18,27 +18,26 @@ public:
 
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
-    virtual void ApplyParentThemeBackground(const wxColour& bg)
-        { SetBackgroundColour(bg); }
+    virtual bool HasTransparentBackground() { return true; }
 
 private:
     DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
 };
 
 #if defined(__WXUNIVERSAL__)
-#include "wx/univ/statbox.h"
+    #include "wx/univ/statbox.h"
 #elif defined(__WXMSW__)
-#include "wx/msw/statbox.h"
+    #include "wx/msw/statbox.h"
 #elif defined(__WXMOTIF__)
-#include "wx/motif/statbox.h"
+    #include "wx/motif/statbox.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/statbox.h"
+    #include "wx/gtk/statbox.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/statbox.h"
+    #include "wx/mac/statbox.h"
 #elif defined(__WXCOCOA__)
-#include "wx/cocoa/statbox.h"
+    #include "wx/cocoa/statbox.h"
 #elif defined(__WXPM__)
-#include "wx/os2/statbox.h"
+    #include "wx/os2/statbox.h"
 #endif
 
 #endif // wxUSE_STATBOX

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 8590052f74938221b45eccb6218c4ffaed5ff1ef..979152cb16eaa35a79367d5b6ab31bcd9e680fec 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -14,8 +14,7 @@ public:
 
     // overriden base virtuals
     virtual bool AcceptsFocus() const { return false; }
-    virtual void ApplyParentThemeBackground(const wxColour& bg)
-        { SetBackgroundColour(bg); }
+    virtual bool HasTransparentBackground() { return true; }
 
 private:
     DECLARE_NO_COPY_CLASS(wxStaticTextBase)

diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h
index 9c6108fac9ab74defadfd1f458815cf8acee0343..b2c7b4ec4f1c4d6923a464bbc7259349e23dbed2 100644 (file)
--- a/include/wx/univ/checkbox.h
+++ b/include/wx/univ/checkbox.h
@@ -101,8 +101,6 @@ public:
     // overridden base class virtuals
     virtual bool IsPressed() const { return m_isPressed; }
 
-    virtual bool HasTransparentBackground() { return true; }
-
 protected:
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state));
     virtual wxCheckBoxState DoGet3StateValue() const;

diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h
index cdc8223bdc65bd947bde868e46252c71b9ae2ad9..c4578fa6c20a746b476c4d3312009713151139c4 100644 (file)
--- a/include/wx/univ/statbox.h
+++ b/include/wx/univ/statbox.h
@@ -51,8 +51,6 @@ public:
     // take account of this
     virtual wxPoint GetBoxAreaOrigin() const;
 
-    virtual bool HasTransparentBackground() { return true; }
-    
 protected:
     // draw the control
     virtual void DoDraw(wxControlRenderer *renderer);

diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index 0961ba67ab5a5a3787a44729ac5c8a2d9f61abc2..95de78f9ef9c97e020b51b894e720eb429eef08d 100644 (file)
--- a/include/wx/univ/stattext.h
+++ b/include/wx/univ/stattext.h
@@ -55,8 +55,6 @@ public:
 
     virtual void SetLabel(const wxString& label);
 
-    virtual bool HasTransparentBackground() { return true; }
-
     virtual bool IsFocused() const { return false; }
 
 protected:

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 2ef6b3ea943d927770a5bd780685179210378c76..13a54c942142f6feef6a44ac83751de5f9fa9c0c 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -144,11 +144,6 @@ public:
     // controls only
     virtual bool IsCanvasWindow() const { return false; }
 
-    // returns true if the control has "transparent" areas such
-    // as a wxStaticText and wxCheckBox and the background should
-    // be adapted from a parent window
-    virtual bool HasTransparentBackground() { return false; }
-
     // return true if this control can be highlighted when the mouse is over
     // it (the theme decides itself whether it is really highlighted or not)
     virtual bool CanBeHighlighted() const { return false; }

diff --git a/include/wx/window.h b/include/wx/window.h
index ffa36e365e95ea7207207264ac85739721e834e9..7c72d59bb1fa40b383e18ef467ff371c05ac9f2b 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -777,6 +777,11 @@ public:
     virtual bool SetBackgroundStyle(wxBackgroundStyle style) { m_backgroundStyle = style; return true; }
     virtual wxBackgroundStyle GetBackgroundStyle() const { return m_backgroundStyle; }
 
+        // returns true if the control has "transparent" areas such as a
+        // wxStaticText and wxCheckBox and the background should be adapted
+        // from a parent window
+    virtual bool HasTransparentBackground() { return false; }
+
         // set/retrieve the font for the window (SetFont() returns true if the
         // font really changed)
     virtual bool SetFont(const wxFont& font) = 0;