From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 16 Oct 2003 09:39:22 +0000 (+0000)
Subject: use ShouldInheritColours() instead of IsContainerWindow()
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/81b344a543beb1b7840e306ed82065beafa6b783

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 07bbd27a55..b5c6cc2c21 100644
--- 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 adcbc90209..444962d382 100644
--- 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 7c5ee59230..01115c15f3 100644
--- 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