X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2effeb9884f5bfbc5d42e1f2b01bd48b4f5f8c6..7a04b644092ff91f8f2c6ecdd191e96285d39a1d:/include/wx/mac/carbon/treectrl.h diff --git a/include/wx/mac/carbon/treectrl.h b/include/wx/mac/carbon/treectrl.h index e7fc77863c..a8c92b288f 100644 --- a/include/wx/mac/carbon/treectrl.h +++ b/include/wx/mac/carbon/treectrl.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: treectrl.h +// Name: wx/mac/carbon/treectrl.h // Purpose: wxTreeCtrl class // Author: Stefan Csomor // Modified by: @@ -12,10 +12,6 @@ #ifndef _WX_TREECTRL_H_ #define _WX_TREECTRL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "treectrl.h" -#endif - #include "wx/control.h" #include "wx/event.h" #include "wx/imaglist.h" @@ -56,7 +52,7 @@ enum { wxTREE_NEXT_CHILD, // Retrieves the first child item. The hItem parameter must be NULL. wxTREE_NEXT_DROPHILITE, // Retrieves the item that is the target of a drag-and-drop operation. wxTREE_NEXT_FIRSTVISIBLE, // Retrieves the first visible item. - wxTREE_NEXT_NEXT, // Retrieves the next sibling item. + wxTREE_NEXT_NEXT, // Retrieves the next sibling item. wxTREE_NEXT_NEXTVISIBLE, // Retrieves the next visible item that follows the specified item. wxTREE_NEXT_PARENT, // Retrieves the parent of the specified item. wxTREE_NEXT_PREVIOUS, // Retrieves the previous sibling item. @@ -64,17 +60,21 @@ enum { wxTREE_NEXT_ROOT // Retrieves the first child item of the root item of which the specified item is a part. }; -// Flags for InsertItem -enum { - wxTREE_INSERT_LAST = -1, - wxTREE_INSERT_FIRST = -2, - wxTREE_INSERT_SORT = -3 -}; +#if WXWIN_COMPATIBILITY_2_6 + // Flags for InsertItem + enum { + wxTREE_INSERT_LAST = -1, + wxTREE_INSERT_FIRST = -2, + wxTREE_INSERT_SORT = -3 + }; +#endif -class WXDLLEXPORT wxTreeItem: public wxObject +class WXDLLIMPEXP_CORE wxTreeItem: public wxObject { - DECLARE_DYNAMIC_CLASS(wxTreeItem) + DECLARE_DYNAMIC_CLASS(wxTreeItem) + public: + long m_mask; long m_itemId; long m_state; @@ -109,7 +109,7 @@ public: inline void SetData(long data) { m_data = data; } }; -class WXDLLEXPORT wxTreeCtrl: public wxControl +class WXDLLIMPEXP_CORE wxTreeCtrl: public wxControl { public: /* @@ -120,7 +120,7 @@ public: // -------- wxTreeCtrl(); - inline wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, + inline wxTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT, @@ -129,7 +129,7 @@ public: { Create(parent, id, pos, size, style, validator, name); } - ~wxTreeCtrl(); + virtual ~wxTreeCtrl(); bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, @@ -141,14 +141,13 @@ public: // accessors // --------- // - int GetCount() const; + virtual unsigned int GetCount() const; // indent int GetIndent() const; void SetIndent(int indent); // image list wxImageList *GetImageList(int which = wxIMAGE_LIST_NORMAL) const; - void SetImageList(wxImageList *imageList, int which = wxIMAGE_LIST_NORMAL); // navigation inside the tree long GetNextItem(long item, int code) const; @@ -177,8 +176,8 @@ public: // convenience function bool IsItemExpanded(long item) { - return (GetItemState(item, wxTREE_STATE_EXPANDED) & - wxTREE_STATE_EXPANDED) != 0; + return (GetItemState(item, wxTREE_STATE_EXPANDED) & + wxTREE_STATE_EXPANDED) != 0; } // bounding rect @@ -190,20 +189,25 @@ public: // ---------- // adding/deleting items bool DeleteItem(long item); - long InsertItem(long parent, wxTreeItem& info, - long insertAfter = wxTREE_INSERT_LAST); - // 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, - long insertAfter = wxTREE_INSERT_LAST); + +#if WXWIN_COMPATIBILITY_2_6 + wxDEPRECATED( long InsertItem(long parent, wxTreeItem& info, + long insertAfter = wxTREE_INSERT_LAST) ); + // If image > -1 and selImage == -1, the same image is used for + // both selected and unselected items. + wxDEPRECATED( long InsertItem(long parent, const wxString& label, + int image = -1, int selImage = -1, + long insertAfter = wxTREE_INSERT_LAST) ); + + // use Expand, Collapse, CollapseAndReset or Toggle + wxDEPRECATED( bool ExpandItem(long item, int action) ); + wxDEPRECATED( void SetImageList(wxImageList *imageList, int which = wxIMAGE_LIST_NORMAL) ); +#endif // WXWIN_COMPATIBILITY_2_6 // changing item state bool ExpandItem(long item) { return ExpandItem(item, wxTREE_EXPAND_EXPAND); } bool CollapseItem(long item) { return ExpandItem(item, wxTREE_EXPAND_COLLAPSE); } 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); @@ -248,22 +252,22 @@ protected: wxEVT_COMMAND_TREE_KEY_DOWN */ -class WXDLLEXPORT wxTreeEvent: public wxCommandEvent +class WXDLLIMPEXP_CORE wxTreeEvent: public wxCommandEvent { - DECLARE_DYNAMIC_CLASS(wxTreeEvent) + DECLARE_DYNAMIC_CLASS(wxTreeEvent) - public: - wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0); +public: + wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0); - int m_code; - wxTreeItem m_item; - long m_oldItem; - wxPoint m_pointDrag; + int m_code; + wxTreeItem m_item; + long m_oldItem; + wxPoint m_pointDrag; - inline long GetOldItem() const { return m_oldItem; } - inline wxTreeItem& GetItem() const { return (wxTreeItem&) m_item; } - inline wxPoint GetPoint() const { return m_pointDrag; } - inline int GetCode() const { return m_code; } + inline long GetOldItem() const { return m_oldItem; } + inline wxTreeItem& GetItem() const { return (wxTreeItem&) m_item; } + inline wxPoint GetPoint() const { return m_pointDrag; } + inline int GetCode() const { return m_code; } }; typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);