From: Vadim Zeitlin Date: Thu, 8 Sep 2011 21:15:24 +0000 (+0000) Subject: Allow setting colours and font of wxTreeListCtrl. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1a661779516097cd84dc76ae878f4c2d32cca953?hp=--cc Allow setting colours and font of wxTreeListCtrl. Use wxCompositeWindow<> to propagate changes of colours and font to wxDataViewCtrl that wxTreeListCtrl uses internally. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- 1a661779516097cd84dc76ae878f4c2d32cca953 diff --git a/include/wx/treelist.h b/include/wx/treelist.h index dee836d209..1f013e8a37 100644 --- a/include/wx/treelist.h +++ b/include/wx/treelist.h @@ -15,6 +15,7 @@ #if wxUSE_TREELISTCTRL +#include "wx/compositewin.h" #include "wx/containr.h" #include "wx/headercol.h" #include "wx/itemid.h" @@ -88,8 +89,9 @@ extern WXDLLIMPEXP_DATA_ADV(const wxTreeListItem) wxTLI_LAST; // with wxDataViewCtrl directly but doing this makes your unportable to possible // future non-wxDataViewCtrl-based implementations of this class. -class WXDLLIMPEXP_ADV wxTreeListCtrl : public wxNavigationEnabled, - public wxWithImages +class WXDLLIMPEXP_ADV wxTreeListCtrl + : public wxCompositeWindow< wxNavigationEnabled >, + public wxWithImages { public: // Constructors and such @@ -324,6 +326,9 @@ private: // Common part of all ctors. void Init(); + // Pure virtual method inherited from wxCompositeWindow. + virtual wxWindowList GetCompositeWindowParts() const; + // Implementation of AppendColumn(). int DoInsertColumn(const wxString& title, int pos, // May be -1 meaning "append". diff --git a/src/generic/treelist.cpp b/src/generic/treelist.cpp index 2bcfaeb48b..cad5cca2e3 100644 --- a/src/generic/treelist.cpp +++ b/src/generic/treelist.cpp @@ -1022,6 +1022,13 @@ wxTreeListCtrl::~wxTreeListCtrl() m_model->DecRef(); } +wxWindowList wxTreeListCtrl::GetCompositeWindowParts() const +{ + wxWindowList parts; + parts.push_back(m_view); + return parts; +} + // ---------------------------------------------------------------------------- // Columns // ----------------------------------------------------------------------------