X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cf73271dd6f442a98e86b559d4a55c37e25b99f..c781c31638cc5ae06eb325567323f131e8183a75:/include/wx/mac/carbon/treectrl.h diff --git a/include/wx/mac/carbon/treectrl.h b/include/wx/mac/carbon/treectrl.h index 306a0105a5..e7fc77863c 100644 --- a/include/wx/mac/carbon/treectrl.h +++ b/include/wx/mac/carbon/treectrl.h @@ -64,14 +64,6 @@ enum { wxTREE_NEXT_ROOT // Retrieves the first child item of the root item of which the specified item is a part. }; -// Flags for ExpandItem -enum { - wxTREE_EXPAND_EXPAND, - wxTREE_EXPAND_COLLAPSE, - wxTREE_EXPAND_COLLAPSE_RESET, - wxTREE_EXPAND_TOGGLE -}; - // Flags for InsertItem enum { wxTREE_INSERT_LAST = -1, @@ -123,11 +115,11 @@ public: /* * Public interface */ - + // creation // -------- wxTreeCtrl(); - + inline wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -138,14 +130,14 @@ public: Create(parent, id, pos, size, style, validator, name); } ~wxTreeCtrl(); - - bool Create(wxWindow *parent, wxWindowID id = -1, + + bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxTreeCtrl"); - + // accessors // --------- // @@ -183,17 +175,17 @@ public: long GetItemData(long item) const; bool SetItemData(long item, long data); // convenience function - bool IsItemExpanded(long item) - { - return (GetItemState(item, wxTREE_STATE_EXPANDED) & + bool IsItemExpanded(long item) + { + return (GetItemState(item, wxTREE_STATE_EXPANDED) & wxTREE_STATE_EXPANDED) != 0; } // bounding rect - bool GetItemRect(long item, wxRect& rect, bool textOnly = FALSE) const; + bool GetItemRect(long item, wxRect& rect, bool textOnly = false) const; // wxTextCtrl* GetEditControl() const; - + // operations // ---------- // adding/deleting items @@ -203,7 +195,7 @@ public: // If image > -1 and selImage == -1, the same image is used for // both selected and unselected items. long InsertItem(long parent, const wxString& label, - int image = -1, int selImage = -1, + int image = -1, int selImage = -1, long insertAfter = wxTREE_INSERT_LAST); // changing item state @@ -212,8 +204,8 @@ public: bool ToggleItem(long item) { return ExpandItem(item, wxTREE_EXPAND_TOGGLE); } // common interface for {Expand|Collapse|Toggle}Item bool ExpandItem(long item, int action); - - // + + // bool SelectItem(long item); bool ScrollTo(long item); bool DeleteAllItems(); @@ -228,7 +220,7 @@ public: // wxImageList *CreateDragImage(long item); bool SortChildren(long item); bool EnsureVisible(long item); - + void Command(wxCommandEvent& event) { ProcessCommand(event); }; protected: