use ShouldInheritColours() instead of IsContainerWindow()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -167,11 +167,9 @@ public:
|
|||||||
long numArg = 0l,
|
long numArg = 0l,
|
||||||
const wxString& strArg = wxEmptyString);
|
const wxString& strArg = wxEmptyString);
|
||||||
|
|
||||||
// let wxColourScheme choose the right colours for us
|
|
||||||
virtual bool IsContainerWindow() const { return TRUE; }
|
|
||||||
|
|
||||||
// idle processing
|
// idle processing
|
||||||
virtual void OnInternalIdle();
|
virtual void OnInternalIdle();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// geometry
|
// geometry
|
||||||
virtual wxSize DoGetBestClientSize() const;
|
virtual wxSize DoGetBestClientSize() const;
|
||||||
|
@@ -252,8 +252,7 @@ public:
|
|||||||
virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
|
virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
|
||||||
virtual void CalcScrolledPosition(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
|
// ensure we have correct default border
|
||||||
virtual bool IsContainerWindow() const { return TRUE; }
|
|
||||||
virtual wxBorder GetDefaultBorder() const { return wxBORDER_SUNKEN; }
|
virtual wxBorder GetDefaultBorder() const { return wxBORDER_SUNKEN; }
|
||||||
|
|
||||||
// perform an action
|
// perform an action
|
||||||
|
@@ -142,11 +142,6 @@ public:
|
|||||||
// controls only
|
// controls only
|
||||||
virtual bool IsCanvasWindow() const { return FALSE; }
|
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
|
// returns TRUE if the control has "transparent" areas such
|
||||||
// as a wxStaticText and wxCheckBox and the background should
|
// as a wxStaticText and wxCheckBox and the background should
|
||||||
// be adapted from a parent window
|
// be adapted from a parent window
|
||||||
|
Reference in New Issue
Block a user