use ShouldInheritColours() instead of IsContainerWindow()

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

diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index 07bbd27a55ec83c2a41415e446ee7a7677abee0b..b5c6cc2c21d42b26ae007bd06c36f0a158c3f16c 100644 (file)
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -167,11 +167,9 @@ public:
                                long numArg = 0l,
                                const wxString& strArg = wxEmptyString);
 
-    // let wxColourScheme choose the right colours for us
-    virtual bool IsContainerWindow() const { return TRUE; }
-
     // idle processing
     virtual void OnInternalIdle();
+
 protected:
     // geometry
     virtual wxSize DoGetBestClientSize() const;

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index adcbc90209a38cddc3c564f1da8de454a38e1a95..444962d382f4f413f501d944726b0cb2ab2f19d3 100644 (file)
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -252,8 +252,7 @@ public:
     virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
     virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const;
 
-    // set the right colours and border
-    virtual bool IsContainerWindow() const { return TRUE; }
+    // ensure we have correct default border
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_SUNKEN; }
 
     // perform an action

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 7c5ee592305c4d6aeb8ae39c7c3f59eee8112d98..01115c15f335e2b79bf1bddf4d5a9eecf5a57864 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -142,11 +142,6 @@ public:
     // controls only
     virtual bool IsCanvasWindow() const { return FALSE; }
 
-    // return TRUE if this a container window which contains the other items:
-    // e.g, a listbox, listctrl, treectrl, ... and FALSE if it is a monolithic
-    // control (e.g. a button, checkbox, ...)
-    virtual bool IsContainerWindow() 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