X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f93a7508ea292a0ba836eefcccf20a716eaf135..1f464296deff25be95f9e2b7c68566919aa17da2:/include/wx/msw/treectrl.h diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h index d671445587..59fa744586 100644 --- a/include/wx/msw/treectrl.h +++ b/include/wx/msw/treectrl.h @@ -192,8 +192,7 @@ public: wxDEPRECATED( void ExpandItem(const wxTreeItemId& item, int action) ); // use Set/GetImageList and Set/GetStateImageList -// This appears to hide base class GetImageList() -// wxDEPRECATED( wxImageList *GetImageList(int) const ); + // Use base class GetImageList() wxDEPRECATED( void SetImageList(wxImageList *imageList, int) ); // use Set/GetItemImage directly @@ -252,16 +251,6 @@ protected: wxTextCtrl *m_textCtrl; // text control in which it is edited wxTreeItemId m_idEdited; // the item being edited -private: - // the common part of all ctors - void Init(); - - // helper functions - inline bool DoGetItem(wxTreeViewItem *tvItem) const; - inline void DoSetItem(wxTreeViewItem *tvItem); - - inline void DoExpand(const wxTreeItemId& item, int flag); - virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent, size_t pos, const wxString& text, @@ -274,6 +263,16 @@ private: wxTreeItemData *data = NULL); virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags); +private: + // the common part of all ctors + void Init(); + + // helper functions + inline bool DoGetItem(wxTreeViewItem *tvItem) const; + inline void DoSetItem(wxTreeViewItem *tvItem); + + inline void DoExpand(const wxTreeItemId& item, int flag); + int DoGetItemImageFromData(const wxTreeItemId& item, wxTreeItemIcon which) const; void DoSetItemImageFromData(const wxTreeItemId& item,