X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ed01484e7bcce3d1668b5b76c8bb1beb32e9559..d062e17fca1a1fc0b82b269da4a7ad271075ba2b:/include/wx/generic/treectlg.h diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h index 650d518bc3..7958708b1e 100644 --- a/include/wx/generic/treectlg.h +++ b/include/wx/generic/treectlg.h @@ -16,6 +16,8 @@ #pragma interface "treectlg.h" #endif +#if wxUSE_TREECTRL + #include "wx/defs.h" #include "wx/string.h" #include "wx/object.h" @@ -53,10 +55,15 @@ public: wxGenericTreeCtrl(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, +#ifdef __WXMAC__ + long style = wxTR_MAC_BUTTONS | wxTR_NO_LINES | wxTR_ROW_LINES, +#else long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, +#endif const wxValidator &validator = wxDefaultValidator, const wxString& name = wxTreeCtrlNameStr) { + Init(); Create(parent, id, pos, size, style, validator, name); } @@ -65,7 +72,11 @@ public: bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, +#ifdef __WXMAC__ + long style = wxTR_MAC_BUTTONS | wxTR_NO_LINES | wxTR_ROW_LINES, +#else + long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, +#endif const wxValidator &validator = wxDefaultValidator, const wxString& name = wxTreeCtrlNameStr); @@ -86,9 +97,11 @@ public: void SetSpacing(unsigned int spacing); // image list: these functions allow to associate an image list with - // the control and retrieve it. Note that the control does _not_ delete + // the control and retrieve it. Note that when assigned with + // SetImageList, the control does _not_ delete // the associated image list when it's deleted in order to allow image - // lists to be shared between different controls. + // lists to be shared between different controls. If you use + // AssignImageList, the control _does_ delete the image list. // // The normal image list is for the icons which correspond to the // normal tree item state (whether it is selected or not). @@ -100,6 +113,8 @@ public: void SetImageList(wxImageList *imageList); void SetStateImageList(wxImageList *imageList); + void AssignImageList(wxImageList *imageList); + void AssignStateImageList(wxImageList *imageList); // Functions to work with tree ctrl items. @@ -143,6 +158,9 @@ public: // set the items font (should be of the same height for all items) void SetItemFont(const wxTreeItemId& item, const wxFont& font); + // set the window font + virtual bool SetFont( const wxFont &font ); + // item status inquiries // --------------------- @@ -352,6 +370,8 @@ protected: wxBrush *m_hilightBrush; wxImageList *m_imageListNormal, *m_imageListState; + bool m_ownsImageListNormal, + m_ownsImageListState; int m_dragCount; wxPoint m_dragStart; @@ -405,7 +425,7 @@ private: DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl) }; -#if !defined(__WXMSW__) || defined(__WIN16__) +#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__) /* * wxTreeCtrl has to be a real class or we have problems with * the run-time information. @@ -432,5 +452,7 @@ public: #endif +#endif // wxUSE_TREECTRL + #endif // _GENERIC_TREECTRL_H_