From 4af280d8ca41eb4894347a6ac96457a18b6198bc Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 7 Jun 2012 04:43:09 +0000 Subject: [PATCH] Interface fixes for Phoenix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/treelist.h | 47 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/interface/wx/treelist.h b/interface/wx/treelist.h index bace73cb6f..21649a5f71 100644 --- a/interface/wx/treelist.h +++ b/interface/wx/treelist.h @@ -9,6 +9,31 @@ /////////////////////////////////////////////////////////////////////////////// /** + wxTreeListCtrl styles. + + Notice that using wxTL_USER_3STATE implies wxTL_3STATE and wxTL_3STATE in + turn implies wxTL_CHECKBOX. +*/ +enum +{ + wxTL_SINGLE = 0x0000, /// This is the default anyhow. + wxTL_MULTIPLE = 0x0001, /// Allow multiple selection. + wxTL_CHECKBOX = 0x0002, /// Show checkboxes in the first column. + wxTL_3STATE = 0x0004, /// Allow 3rd state in checkboxes. + wxTL_USER_3STATE = 0x0008, /// Allow user to set 3rd state. + + wxTL_DEFAULT_STYLE = wxTL_SINGLE, + wxTL_STYLE_MASK = wxTL_SINGLE | + wxTL_MULTIPLE | + wxTL_CHECKBOX | + wxTL_3STATE | + wxTL_USER_3STATE +}; + + +/** + @class wxTreeListItem + Unique identifier of an item in wxTreeListCtrl. This is an opaque class which can't be used by the application in any other @@ -38,7 +63,10 @@ public: bool IsOk() const; }; + /** + @class wxTreeListItemComparator + Class defining sort order for the items in wxTreeListCtrl. @see wxTreeListCtrl @@ -96,11 +124,13 @@ public: virtual ~wxTreeListItemComparator(); }; + /** Container of multiple items. */ typedef wxVector wxTreeListItems; + /** Special wxTreeListItem value meaning "insert before the first item". @@ -109,6 +139,7 @@ typedef wxVector wxTreeListItems; */ extern const wxTreeListItem wxTLI_FIRST; + /** Special wxTreeListItem value meaning "insert after the last item". @@ -117,7 +148,10 @@ extern const wxTreeListItem wxTLI_FIRST; */ extern const wxTreeListItem wxTLI_LAST; + /** + @class wxTreeListCtrl + A control combining wxTreeCtrl and wxListCtrl features. This is a multi-column tree control optionally supporting images and @@ -843,6 +877,8 @@ public: //@} }; + + /** Event generated by wxTreeListCtrl. @@ -851,6 +887,8 @@ public: class wxTreeListEvent : public wxNotifyEvent { public: + wxTreeListEvent(); + /** Return the item affected by the event. @@ -888,3 +926,12 @@ public: */ #define wxTreeListEventHandler(func) \ wxEVENT_HANDLER_CAST(wxTreeListEventFunction, func) + + +wxEventType wxEVT_COMMAND_TREELIST_SELECTION_CHANGED; +wxEventType wxEVT_COMMAND_TREELIST_ITEM_EXPANDING; +wxEventType wxEVT_COMMAND_TREELIST_ITEM_EXPANDED; +wxEventType wxEVT_COMMAND_TREELIST_ITEM_CHECKED; +wxEventType wxEVT_COMMAND_TREELIST_ITEM_ACTIVATED; +wxEventType wxEVT_COMMAND_TREELIST_ITEM_CONTEXT_MENU; +wxEventType wxEVT_COMMAND_TREELIST_COLUMN_SORTED;