From e21a504837179fc2be49f72e03664c8d8cc82148 Mon Sep 17 00:00:00 2001 From: Denis Pershin Date: Sat, 24 Oct 1998 05:52:43 +0000 Subject: [PATCH] Prealpha, prebeta of new wxTreeCtrl for GTK. It is possible to AddRoot, AppendItem... InsertItem and PrependItem is not working... Sample modified to new API. I understand that operator wxTreeItemId::long() exists on MSW wxWindows, but on wxGTK id type is a pointer... 2Vadim: Please test the sample with MSW wxTreeCtrl. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/treectrl.h | 593 +++++++++++++-------- include/wx/gtk1/treectrl.h | 593 +++++++++++++-------- samples/treectrl/treetest.cpp | 8 +- src/gtk/treectrl.cpp | 971 +++++++++++++++------------------- src/gtk1/treectrl.cpp | 971 +++++++++++++++------------------- 5 files changed, 1628 insertions(+), 1508 deletions(-) diff --git a/include/wx/gtk/treectrl.h b/include/wx/gtk/treectrl.h index f560d4bddf..afdd14c5cc 100644 --- a/include/wx/gtk/treectrl.h +++ b/include/wx/gtk/treectrl.h @@ -23,219 +23,363 @@ #include -// WXDLLEXPORT_DATA(extern const char*) wxTreeNameStr; +// the type for "untyped" data +typedef long wxDataType; -#define wxTREE_MASK_HANDLE 0x0001 -#define wxTREE_MASK_STATE 0x0002 -#define wxTREE_MASK_TEXT 0x0004 -#define wxTREE_MASK_IMAGE 0x0008 -#define wxTREE_MASK_SELECTED_IMAGE 0x0010 -#define wxTREE_MASK_CHILDREN 0x0020 -#define wxTREE_MASK_DATA 0x0040 +// fwd decl +class wxImageList; +struct wxTreeViewItem; -#define wxTREE_STATE_BOLD 0x0001 -#define wxTREE_STATE_DROPHILITED 0x0002 -#define wxTREE_STATE_EXPANDED 0x0004 -#define wxTREE_STATE_EXPANDEDONCE 0x0008 -#define wxTREE_STATE_FOCUSED 0x0010 -#define wxTREE_STATE_SELECTED 0x0020 -#define wxTREE_STATE_CUT 0x0040 +// a callback function used for sorting tree items, it should return -1 if the +// first item precedes the second, +1 if the second precedes the first or 0 if +// they're equivalent +class wxTreeItemData; +typedef int (*wxTreeItemCmpFunc)(wxTreeItemData *item1, wxTreeItemData *item2); -#define wxTREE_HITTEST_ABOVE 0x0001 // Above the client area. -#define wxTREE_HITTEST_BELOW 0x0002 // Below the client area. -#define wxTREE_HITTEST_NOWHERE 0x0004 // In the client area but below the last item. -#define wxTREE_HITTEST_ONITEMBUTTON 0x0010 // On the button associated with an item. -#define wxTREE_HITTEST_ONITEMICON 0x0020 // On the bitmap associated with an item. -#define wxTREE_HITTEST_ONITEMINDENT 0x0040 // In the indentation associated with an item. -#define wxTREE_HITTEST_ONITEMLABEL 0x0080 // On the label (string) associated with an item. -#define wxTREE_HITTEST_ONITEMRIGHT 0x0100 // In the area to the right of an item. -#define wxTREE_HITTEST_ONITEMSTATEICON 0x0200 // On the state icon for a tree view item that is in a user-defined state. -#define wxTREE_HITTEST_TOLEFT 0x0400 // To the right of the client area. -#define wxTREE_HITTEST_TORIGHT 0x0800 // To the left of the client area. +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- -#define wxTREE_HITTEST_ONITEM (wxTREE_HITTEST_ONITEMICON | wxTREE_HITTEST_ONITEMLABEL | wxTREE_HITTEST_ONITEMSTATEICON) +// values for the `flags' parameter of wxTreeCtrl::HitTest() which determine +// where exactly the specified point is situated: + // above the client area. +static const int wxTREE_HITTEST_ABOVE = 0x0001; + // below the client area. +static const int wxTREE_HITTEST_BELOW = 0x0002; + // in the client area but below the last item. +static const int wxTREE_HITTEST_NOWHERE = 0x0004; + // on the button associated with an item. +static const int wxTREE_HITTEST_ONITEMBUTTON = 0x0010; + // on the bitmap associated with an item. +static const int wxTREE_HITTEST_ONITEMICON = 0x0020; + // in the indentation associated with an item. +static const int wxTREE_HITTEST_ONITEMINDENT = 0x0040; + // on the label (string) associated with an item. +static const int wxTREE_HITTEST_ONITEMLABEL = 0x0080; + // in the area to the right of an item. +static const int wxTREE_HITTEST_ONITEMRIGHT = 0x0100; + // on the state icon for a tree view item that is in a user-defined state. +static const int wxTREE_HITTEST_ONITEMSTATEICON = 0x0200; + // to the right of the client area. +static const int wxTREE_HITTEST_TOLEFT = 0x0400; + // to the left of the client area. +static const int wxTREE_HITTEST_TORIGHT = 0x0800; + // anywhere on the item +static const int wxTREE_HITTEST_ONITEM = wxTREE_HITTEST_ONITEMICON | + wxTREE_HITTEST_ONITEMLABEL | + wxTREE_HITTEST_ONITEMSTATEICON; -// Flags for GetNextItem -enum { - wxTREE_NEXT_CARET, // Retrieves the currently selected item. - 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_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. - wxTREE_NEXT_PREVIOUSVISIBLE, // Retrieves the first visible item that precedes the specified item. - wxTREE_NEXT_ROOT // Retrieves the first child item of the root item of which the specified item is a part. -}; +// NB: all the following flags are for compatbility only and will be removed in +// next versions -// Flags for ExpandItem -enum { +// flags for deprecated `Expand(int action)' +enum +{ wxTREE_EXPAND_EXPAND, wxTREE_EXPAND_COLLAPSE, wxTREE_EXPAND_COLLAPSE_RESET, wxTREE_EXPAND_TOGGLE }; -// Flags for InsertItem +// flags for deprecated InsertItem() variant #define wxTREE_INSERT_FIRST 0xFFFF0001 #define wxTREE_INSERT_LAST 0xFFFF0002 -#define wxTREE_INSERT_SORT 0xFFFF0003 -class WXDLLEXPORT wxTreeItem: public wxObject -{ - DECLARE_DYNAMIC_CLASS(wxTreeItem) +// ---------------------------------------------------------------------------- +// wxTreeItemId identifies an element of the tree. In this implementation, it's +// just a trivial wrapper around GTK GtkTreeItem *. It's opaque for the +// application. +// ---------------------------------------------------------------------------- +class WXDLLEXPORT wxTreeItemId { public: - long m_mask; - long m_itemId; - long m_state; - long m_stateMask; - wxString m_text; - int m_image; - int m_selectedImage; - int m_children; - long m_data; + // ctors + wxTreeItemId() { m_itemId = NULL; } - wxTreeItem(); + // default copy ctor/assignment operator are ok for us -// Accessors - inline long GetMask() const { return m_mask; } - inline long GetItemId() const { return m_itemId; } - inline long GetState() const { return m_state; } - inline long GetStateMask() const { return m_stateMask; } - inline wxString GetText() const { return m_text; } - inline int GetImage() const { return m_image; } - inline int GetSelectedImage() const { return m_selectedImage; } - inline int GetChildren() const { return m_children; } - inline long GetData() const { return m_data; } + // accessors + // is this a valid tree item? + bool IsOk() const { return m_itemId != NULL; } - inline void SetMask(long mask) { m_mask = mask; } - inline void SetItemId(long id) { m_itemId = m_itemId = id; } - inline void SetState(long state) { m_state = state; } - inline void SetStateMask(long stateMask) { m_stateMask = stateMask; } - inline void GetText(const wxString& text) { m_text = text; } - inline void SetImage(int image) { m_image = image; } - inline void GetSelectedImage(int selImage) { m_selectedImage = selImage; } - inline void SetChildren(int children) { m_children = children; } - inline void SetData(long data) { m_data = data; } + // conversion to/from either real (system-dependent) tree item id or + // to "long" which used to be the type for tree item ids in previous + // versions of wxWindows + + // for wxTreeCtrl usage only + wxTreeItemId(GtkTreeItem *itemId) { m_itemId = itemId; } + operator GtkTreeItem *() const { return m_itemId; } + +protected: + GtkTreeItem *m_itemId; +}; + +// ---------------------------------------------------------------------------- +// wxTreeItemData is some (arbitrary) user class associated with some item. The +// main advantage of having this class (compared to old untyped interface) is +// that wxTreeItemData's are destroyed automatically by the tree and, as this +// class has virtual dtor, it means that the memory will be automatically +// freed. OTOH, we don't just use wxObject instead of wxTreeItemData because +// the size of this class is critical: in any real application, each tree leaf +// will have wxTreeItemData associated with it and number of leaves may be +// quite big. +// +// Because the objects of this class are deleted by the tree, they should +// always be allocated on the heap! +// ---------------------------------------------------------------------------- +class WXDLLEXPORT wxTreeItemData { +friend class wxTreeCtrl; +public: + // creation/destruction + // -------------------- + // default ctor + wxTreeItemData() { } + + // default copy ctor/assignment operator are ok + // dtor is virtual and all the items are deleted by the tree control + // when it's deleted, so you normally don't have to care about freeing + // memory allocated in your wxTreeItemData-derived class + virtual ~wxTreeItemData() { } + + // accessor: get the item associated with us + const wxTreeItemId& GetItemId() const { return m_itemId; } + +protected: + wxTreeItemId m_itemId; }; class WXDLLEXPORT wxTreeCtrl: public wxControl { public: - /* - * Public interface - */ - // creation // -------- - wxTreeCtrl(); - - inline wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, - 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") { + wxTreeCtrl() { Init(); } + + wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, + 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") { Create(parent, id, pos, size, style, validator, name); } - ~wxTreeCtrl(); - - bool Create(wxWindow *parent, wxWindowID id = -1, - 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 - // --------- - // - 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); + virtual ~wxTreeCtrl(); - // navigation inside the tree - long GetNextItem(long item, int code) const; - bool ItemHasChildren(long item) const; - long GetChild(long item) const; - long GetParent(long item) const; - long GetFirstVisibleItem() const; - long GetNextVisibleItem(long item) const; - long GetSelection() const; - long GetRootItem() const; + bool Create(wxWindow *parent, wxWindowID id = -1, + 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"); - // generic function for (g|s)etting item attributes - bool GetItem(wxTreeItem& info) const; - bool SetItem(wxTreeItem& info); - // item state - int GetItemState(long item, long stateMask) const; - bool SetItemState(long item, long state, long stateMask); - // item image - bool SetItemImage(long item, int image, int selImage); - // item text - wxString GetItemText(long item) const; - void SetItemText(long item, const wxString& str); - // custom data associated with the item - long GetItemData(long item) const; - bool SetItemData(long item, long data); - // convenience function - bool IsItemExpanded(long item) { - return (GetItemState(item, wxTREE_STATE_EXPANDED) & - wxTREE_STATE_EXPANDED) != 0; - } + // accessors + // --------- + + // get the total number of items in the control + size_t GetCount() const; + + // indent is the number of pixels the children are indented relative to + // the parents position. SetIndent() also redraws the control + // immediately. + unsigned int GetIndent() const; + void SetIndent(unsigned int indent); + + // image list: these functions allow to associate an image list with + // the control and retrieve it. Note that 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. + // + // The normal image list is for the icons which correspond to the + // normal tree item state (whether it is selected or not). + // Additionally, the application might choose to show a state icon + // which corresponds to an app-defined item state (for example, + // checked/unchecked) which are taken from the state image list. + wxImageList *GetImageList() const; + wxImageList *GetStateImageList() const; + + void SetImageList(wxImageList *imageList); + void SetStateImageList(wxImageList *imageList); + + // Functions to work with tree ctrl items. Unfortunately, they can _not_ be + // member functions of wxTreeItem because they must know the tree the item + // belongs to for Windows implementation and storing the pointer to + // wxTreeCtrl in each wxTreeItem is just too much waste. + + // accessors + // --------- + + // retrieve items label + wxString GetItemText(const wxTreeItemId& item) const; + // get the normal item image + int GetItemImage(const wxTreeItemId& item) const; + // get the selected item image + int GetItemSelectedImage(const wxTreeItemId& item) const; + // get the data associated with the item + wxTreeItemData *GetItemData(const wxTreeItemId& item) const; + + // modifiers + // --------- + + // set items label + void SetItemText(const wxTreeItemId& item, const wxString& text); + // set the normal item image + void SetItemImage(const wxTreeItemId& item, int image); + // set the selected item image + void SetItemSelectedImage(const wxTreeItemId& item, int image); + // associate some data with the item + void SetItemData(const wxTreeItemId& item, wxTreeItemData *data); + + // item status inquiries + // --------------------- + + // is the item visible (it might be outside the view or not expanded)? + bool IsVisible(const wxTreeItemId& item) const; + // does the item has any children? + bool ItemHasChildren(const wxTreeItemId& item) const; + // is the item expanded (only makes sense if HasChildren())? + bool IsExpanded(const wxTreeItemId& item) const; + // is this item currently selected (the same as has focus)? + bool IsSelected(const wxTreeItemId& item) const; + + // navigation + // ---------- + + // wxTreeItemId.IsOk() will return FALSE if there is no such item + + // get the root tree item + wxTreeItemId GetRootItem() const; + + // get the item currently selected (may return NULL if no selection) + wxTreeItemId GetSelection() const; + + // get the parent of this item (may return NULL if root) + wxTreeItemId GetParent(const wxTreeItemId& item) const; + + // for this enumeration function you must pass in a "cookie" parameter + // which is opaque for the application but is necessary for the library + // to make these functions reentrant (i.e. allow more than one + // enumeration on one and the same object simultaneously). Of course, + // the "cookie" passed to GetFirstChild() and GetNextChild() should be + // the same! + + // get the first child of this item + wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& cookie) const; + // get the next child + wxTreeItemId GetNextChild(const wxTreeItemId& item, long& cookie) const; + + // get the next sibling of this item + wxTreeItemId GetNextSibling(const wxTreeItemId& item) const; + // get the previous sibling + wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const; + + // get first visible item + wxTreeItemId GetFirstVisibleItem() const; + // get the next visible item: item must be visible itself! + // see IsVisible() and wxTreeCtrl::GetFirstVisibleItem() + wxTreeItemId GetNextVisible(const wxTreeItemId& item) const; + // get the previous visible item: item must be visible itself! + wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const; - // bounding rect - bool GetItemRect(long item, wxRectangle& rect, bool textOnly = FALSE) const; - // - wxTextCtrl* GetEditControl() const; - // operations // ---------- - // 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); - // 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); - bool ScrollTo(long item); - bool DeleteAllItems(); - bool DeleteChildren(long item); + // add the root node to the tree + wxTreeItemId AddRoot(const wxString& text, + int image = -1, int selectedImage = -1, + wxTreeItemData *data = NULL); - // Edit the label (tree must have the focus) - wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl)); + // insert a new item in as the first child of the parent + wxTreeItemId PrependItem(const wxTreeItemId& parent, + const wxString& text, + int image = -1, int selectedImage = -1, + wxTreeItemData *data = NULL); - // End label editing, optionally cancelling the edit - bool EndEditLabel(bool cancel); + // insert a new item after a given one + wxTreeItemId InsertItem(const wxTreeItemId& parent, + const wxTreeItemId& idPrevious, + const wxString& text, + int image = -1, int selectedImage = -1, + wxTreeItemData *data = NULL); - long HitTest(const wxPoint& point, int& flags); - // wxImageList *CreateDragImage(long item); - bool SortChildren(long item); - bool EnsureVisible(long item); + // insert a new item in as the last child of the parent + wxTreeItemId AppendItem(const wxTreeItemId& parent, + const wxString& text, + int image = -1, int selectedImage = -1, + wxTreeItemData *data = NULL); - void SendExpanding(long item); - void SendExpanded(long item); - void SendCollapsing(long item); - void SendCollapsed(long item); - void SendSelChanging(long item); - void SendSelChanged(long item); + // delete this item and associated data if any + void Delete(const wxTreeItemId& item); + // delete all items from the tree + void DeleteAllItems(); + + // expand this item + void Expand(const wxTreeItemId& item); + // collapse the item without removing its children + void Collapse(const wxTreeItemId& item); + // collapse the item and remove all children + void CollapseAndReset(const wxTreeItemId& item); + // toggles the current state + void Toggle(const wxTreeItemId& item); + + // remove the selection from currently selected item (if any) + void Unselect(); + // select this item + void SelectItem(const wxTreeItemId& item); + // make sure this item is visible (expanding the parent item and/or + // scrolling to this item if necessary) + void EnsureVisible(const wxTreeItemId& item); + // scroll to this item (but don't expand its parent) + void ScrollTo(const wxTreeItemId& item); + + // start editing the item label: this (temporarily) replaces the item + // with a one line edit control. The item will be selected if it hadn't + // been before. textCtrlClass parameter allows you to create an edit + // control of arbitrary user-defined class deriving from wxTextCtrl. + wxTextCtrl* EditLabel(const wxTreeItemId& item, + wxClassInfo* textCtrlClass = CLASSINFO(wxTextCtrl)); + // returns the same pointer as StartEdit() if the item is being edited, + // NULL otherwise (it's assumed that no more than one item may be + // edited simultaneously) + wxTextCtrl* GetEditControl() const; + // end editing and accept or discard the changes to item label + void EndEditLabel(const wxTreeItemId& item, bool discardChanges = FALSE); + + // sort the children of this item using the specified callback function + // (it should return -1, 0 or +1 as usual), if it's not specified + // alphabetical comparaison is performed. + // + // NB: this function is not reentrant! + void SortChildren(const wxTreeItemId& item, + wxTreeItemCmpFunc *cmpFunction = NULL); + + // deprecated + // ---------- + + // these methods are deprecated and will be removed in future versions of + // wxWindows, they're here for compatibility only, don't use them in new + // code (the comments indicate why these methods are now useless and how to + // replace them) + + // use Expand, Collapse, CollapseAndReset or Toggle + void ExpandItem(const wxTreeItemId& item, int action); + + // use AddRoot, PrependItem or AppendItem + wxTreeItemId InsertItem(const wxTreeItemId& parent, + const wxString& text, + int image = -1, int selImage = -1, + long insertAfter = wxTREE_INSERT_LAST); + + // use Set/GetImageList and Set/GetStateImageList + wxImageList *GetImageList(int) const + { return GetImageList(); } + void SetImageList(wxImageList *imageList, int) + { SetImageList(imageList); } + + void SendExpanding(const wxTreeItemId& item); + void SendExpanded(const wxTreeItemId& item); + void SendCollapsing(const wxTreeItemId& item); + void SendCollapsed(const wxTreeItemId& item); + void SendSelChanging(const wxTreeItemId& item); + void SendSelChanged(const wxTreeItemId& item); protected: GtkTree *m_tree; GtkTreeItem *m_anchor; @@ -245,62 +389,99 @@ protected: long m_curitemId; - GtkTreeItem *findGtkTreeItem(long item) const; +// GtkTreeItem *findGtkTreeItem(wxTreeCtrlId &id) const; + + // the common part of all ctors + void Init(); + // insert a new item in as the last child of the parent + wxTreeItemId p_InsertItem(GtkTreeItem *p, + const wxString& text, + int image, int selectedImage, + wxTreeItemData *data); + DECLARE_DYNAMIC_CLASS(wxTreeCtrl) }; -/* - wxEVT_COMMAND_TREE_BEGIN_DRAG, - wxEVT_COMMAND_TREE_BEGIN_RDRAG, - wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, - wxEVT_COMMAND_TREE_END_LABEL_EDIT, - wxEVT_COMMAND_TREE_DELETE_ITEM, - wxEVT_COMMAND_TREE_GET_INFO, - wxEVT_COMMAND_TREE_SET_INFO, - wxEVT_COMMAND_TREE_ITEM_EXPANDED, - wxEVT_COMMAND_TREE_ITEM_EXPANDING, - wxEVT_COMMAND_TREE_ITEM_COLLAPSED, - wxEVT_COMMAND_TREE_ITEM_COLLAPSING, - wxEVT_COMMAND_TREE_SEL_CHANGED, - wxEVT_COMMAND_TREE_SEL_CHANGING, - wxEVT_COMMAND_TREE_KEY_DOWN -*/ - -class WXDLLEXPORT wxTreeEvent: public wxCommandEvent +// ---------------------------------------------------------------------------- +// wxTreeEvent is a special class for all events associated with tree controls +// +// NB: note that not all accessors make sense for all events, see the event +// descriptions below +// ---------------------------------------------------------------------------- +class WXDLLEXPORT wxTreeEvent : public wxCommandEvent { - DECLARE_DYNAMIC_CLASS(wxTreeEvent) +friend wxTreeCtrl; +public: + wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0); - public: - wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0); + // accessors + // get the item on which the operation was performed or the newly + // selected item for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events + wxTreeItemId GetItem() const { return m_item; } - int m_code; - wxTreeItem m_item; - long m_oldItem; - wxPoint m_pointDrag; + // for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events, get the previously + // selected item + wxTreeItemId GetOldItem() const { return m_itemOld; } - 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; } + // the point where the mouse was when the drag operation started (for + // wxEVT_COMMAND_TREE_BEGIN_(R)DRAG events only) + wxPoint GetPoint() const { return m_pointDrag; } + + // keyboard code (for wxEVT_COMMAND_TREE_KEY_DOWN only) + int GetCode() const { return m_code; } + + // set return code for wxEVT_COMMAND_TREE_ITEM_{EXPAND|COLLAPS}ING events + // call this to forbid the change in item status + void Veto() { m_code = TRUE; } + +private: + // @@ we could save some space by using union here + int m_code; + wxTreeItemId m_item, + m_itemOld; + wxPoint m_pointDrag; + + DECLARE_DYNAMIC_CLASS(wxTreeEvent) }; typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&); +// ---------------------------------------------------------------------------- +// macros for handling tree control events +// ---------------------------------------------------------------------------- + +// GetItem() returns the item being dragged, GetPoint() the mouse coords #define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, #define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, + +// GetItem() returns the itme whose label is being edited #define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, #define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, -#define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, + +// provide/update information about GetItem() item #define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, #define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, + +// GetItem() is the item being expanded/collapsed, the "ING" versions can use #define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, #define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, #define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, #define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, + +// GetOldItem() is the item which had the selection previously, GetItem() is +// the item which acquires selection #define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, + +// GetCode() returns the key code +// NB: this is the only message for which GetItem() is invalid (you may get the +// item from GetSelection()) #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, +// GetItem() returns the item being deleted, the associated data (if any) will +// be deleted just after the return of this event handler (if any) +#define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, + #endif // _WX_TREECTRL_H_ diff --git a/include/wx/gtk1/treectrl.h b/include/wx/gtk1/treectrl.h index f560d4bddf..afdd14c5cc 100644 --- a/include/wx/gtk1/treectrl.h +++ b/include/wx/gtk1/treectrl.h @@ -23,219 +23,363 @@ #include -// WXDLLEXPORT_DATA(extern const char*) wxTreeNameStr; +// the type for "untyped" data +typedef long wxDataType; -#define wxTREE_MASK_HANDLE 0x0001 -#define wxTREE_MASK_STATE 0x0002 -#define wxTREE_MASK_TEXT 0x0004 -#define wxTREE_MASK_IMAGE 0x0008 -#define wxTREE_MASK_SELECTED_IMAGE 0x0010 -#define wxTREE_MASK_CHILDREN 0x0020 -#define wxTREE_MASK_DATA 0x0040 +// fwd decl +class wxImageList; +struct wxTreeViewItem; -#define wxTREE_STATE_BOLD 0x0001 -#define wxTREE_STATE_DROPHILITED 0x0002 -#define wxTREE_STATE_EXPANDED 0x0004 -#define wxTREE_STATE_EXPANDEDONCE 0x0008 -#define wxTREE_STATE_FOCUSED 0x0010 -#define wxTREE_STATE_SELECTED 0x0020 -#define wxTREE_STATE_CUT 0x0040 +// a callback function used for sorting tree items, it should return -1 if the +// first item precedes the second, +1 if the second precedes the first or 0 if +// they're equivalent +class wxTreeItemData; +typedef int (*wxTreeItemCmpFunc)(wxTreeItemData *item1, wxTreeItemData *item2); -#define wxTREE_HITTEST_ABOVE 0x0001 // Above the client area. -#define wxTREE_HITTEST_BELOW 0x0002 // Below the client area. -#define wxTREE_HITTEST_NOWHERE 0x0004 // In the client area but below the last item. -#define wxTREE_HITTEST_ONITEMBUTTON 0x0010 // On the button associated with an item. -#define wxTREE_HITTEST_ONITEMICON 0x0020 // On the bitmap associated with an item. -#define wxTREE_HITTEST_ONITEMINDENT 0x0040 // In the indentation associated with an item. -#define wxTREE_HITTEST_ONITEMLABEL 0x0080 // On the label (string) associated with an item. -#define wxTREE_HITTEST_ONITEMRIGHT 0x0100 // In the area to the right of an item. -#define wxTREE_HITTEST_ONITEMSTATEICON 0x0200 // On the state icon for a tree view item that is in a user-defined state. -#define wxTREE_HITTEST_TOLEFT 0x0400 // To the right of the client area. -#define wxTREE_HITTEST_TORIGHT 0x0800 // To the left of the client area. +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- -#define wxTREE_HITTEST_ONITEM (wxTREE_HITTEST_ONITEMICON | wxTREE_HITTEST_ONITEMLABEL | wxTREE_HITTEST_ONITEMSTATEICON) +// values for the `flags' parameter of wxTreeCtrl::HitTest() which determine +// where exactly the specified point is situated: + // above the client area. +static const int wxTREE_HITTEST_ABOVE = 0x0001; + // below the client area. +static const int wxTREE_HITTEST_BELOW = 0x0002; + // in the client area but below the last item. +static const int wxTREE_HITTEST_NOWHERE = 0x0004; + // on the button associated with an item. +static const int wxTREE_HITTEST_ONITEMBUTTON = 0x0010; + // on the bitmap associated with an item. +static const int wxTREE_HITTEST_ONITEMICON = 0x0020; + // in the indentation associated with an item. +static const int wxTREE_HITTEST_ONITEMINDENT = 0x0040; + // on the label (string) associated with an item. +static const int wxTREE_HITTEST_ONITEMLABEL = 0x0080; + // in the area to the right of an item. +static const int wxTREE_HITTEST_ONITEMRIGHT = 0x0100; + // on the state icon for a tree view item that is in a user-defined state. +static const int wxTREE_HITTEST_ONITEMSTATEICON = 0x0200; + // to the right of the client area. +static const int wxTREE_HITTEST_TOLEFT = 0x0400; + // to the left of the client area. +static const int wxTREE_HITTEST_TORIGHT = 0x0800; + // anywhere on the item +static const int wxTREE_HITTEST_ONITEM = wxTREE_HITTEST_ONITEMICON | + wxTREE_HITTEST_ONITEMLABEL | + wxTREE_HITTEST_ONITEMSTATEICON; -// Flags for GetNextItem -enum { - wxTREE_NEXT_CARET, // Retrieves the currently selected item. - 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_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. - wxTREE_NEXT_PREVIOUSVISIBLE, // Retrieves the first visible item that precedes the specified item. - wxTREE_NEXT_ROOT // Retrieves the first child item of the root item of which the specified item is a part. -}; +// NB: all the following flags are for compatbility only and will be removed in +// next versions -// Flags for ExpandItem -enum { +// flags for deprecated `Expand(int action)' +enum +{ wxTREE_EXPAND_EXPAND, wxTREE_EXPAND_COLLAPSE, wxTREE_EXPAND_COLLAPSE_RESET, wxTREE_EXPAND_TOGGLE }; -// Flags for InsertItem +// flags for deprecated InsertItem() variant #define wxTREE_INSERT_FIRST 0xFFFF0001 #define wxTREE_INSERT_LAST 0xFFFF0002 -#define wxTREE_INSERT_SORT 0xFFFF0003 -class WXDLLEXPORT wxTreeItem: public wxObject -{ - DECLARE_DYNAMIC_CLASS(wxTreeItem) +// ---------------------------------------------------------------------------- +// wxTreeItemId identifies an element of the tree. In this implementation, it's +// just a trivial wrapper around GTK GtkTreeItem *. It's opaque for the +// application. +// ---------------------------------------------------------------------------- +class WXDLLEXPORT wxTreeItemId { public: - long m_mask; - long m_itemId; - long m_state; - long m_stateMask; - wxString m_text; - int m_image; - int m_selectedImage; - int m_children; - long m_data; + // ctors + wxTreeItemId() { m_itemId = NULL; } - wxTreeItem(); + // default copy ctor/assignment operator are ok for us -// Accessors - inline long GetMask() const { return m_mask; } - inline long GetItemId() const { return m_itemId; } - inline long GetState() const { return m_state; } - inline long GetStateMask() const { return m_stateMask; } - inline wxString GetText() const { return m_text; } - inline int GetImage() const { return m_image; } - inline int GetSelectedImage() const { return m_selectedImage; } - inline int GetChildren() const { return m_children; } - inline long GetData() const { return m_data; } + // accessors + // is this a valid tree item? + bool IsOk() const { return m_itemId != NULL; } - inline void SetMask(long mask) { m_mask = mask; } - inline void SetItemId(long id) { m_itemId = m_itemId = id; } - inline void SetState(long state) { m_state = state; } - inline void SetStateMask(long stateMask) { m_stateMask = stateMask; } - inline void GetText(const wxString& text) { m_text = text; } - inline void SetImage(int image) { m_image = image; } - inline void GetSelectedImage(int selImage) { m_selectedImage = selImage; } - inline void SetChildren(int children) { m_children = children; } - inline void SetData(long data) { m_data = data; } + // conversion to/from either real (system-dependent) tree item id or + // to "long" which used to be the type for tree item ids in previous + // versions of wxWindows + + // for wxTreeCtrl usage only + wxTreeItemId(GtkTreeItem *itemId) { m_itemId = itemId; } + operator GtkTreeItem *() const { return m_itemId; } + +protected: + GtkTreeItem *m_itemId; +}; + +// ---------------------------------------------------------------------------- +// wxTreeItemData is some (arbitrary) user class associated with some item. The +// main advantage of having this class (compared to old untyped interface) is +// that wxTreeItemData's are destroyed automatically by the tree and, as this +// class has virtual dtor, it means that the memory will be automatically +// freed. OTOH, we don't just use wxObject instead of wxTreeItemData because +// the size of this class is critical: in any real application, each tree leaf +// will have wxTreeItemData associated with it and number of leaves may be +// quite big. +// +// Because the objects of this class are deleted by the tree, they should +// always be allocated on the heap! +// ---------------------------------------------------------------------------- +class WXDLLEXPORT wxTreeItemData { +friend class wxTreeCtrl; +public: + // creation/destruction + // -------------------- + // default ctor + wxTreeItemData() { } + + // default copy ctor/assignment operator are ok + // dtor is virtual and all the items are deleted by the tree control + // when it's deleted, so you normally don't have to care about freeing + // memory allocated in your wxTreeItemData-derived class + virtual ~wxTreeItemData() { } + + // accessor: get the item associated with us + const wxTreeItemId& GetItemId() const { return m_itemId; } + +protected: + wxTreeItemId m_itemId; }; class WXDLLEXPORT wxTreeCtrl: public wxControl { public: - /* - * Public interface - */ - // creation // -------- - wxTreeCtrl(); - - inline wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, - 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") { + wxTreeCtrl() { Init(); } + + wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, + 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") { Create(parent, id, pos, size, style, validator, name); } - ~wxTreeCtrl(); - - bool Create(wxWindow *parent, wxWindowID id = -1, - 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 - // --------- - // - 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); + virtual ~wxTreeCtrl(); - // navigation inside the tree - long GetNextItem(long item, int code) const; - bool ItemHasChildren(long item) const; - long GetChild(long item) const; - long GetParent(long item) const; - long GetFirstVisibleItem() const; - long GetNextVisibleItem(long item) const; - long GetSelection() const; - long GetRootItem() const; + bool Create(wxWindow *parent, wxWindowID id = -1, + 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"); - // generic function for (g|s)etting item attributes - bool GetItem(wxTreeItem& info) const; - bool SetItem(wxTreeItem& info); - // item state - int GetItemState(long item, long stateMask) const; - bool SetItemState(long item, long state, long stateMask); - // item image - bool SetItemImage(long item, int image, int selImage); - // item text - wxString GetItemText(long item) const; - void SetItemText(long item, const wxString& str); - // custom data associated with the item - long GetItemData(long item) const; - bool SetItemData(long item, long data); - // convenience function - bool IsItemExpanded(long item) { - return (GetItemState(item, wxTREE_STATE_EXPANDED) & - wxTREE_STATE_EXPANDED) != 0; - } + // accessors + // --------- + + // get the total number of items in the control + size_t GetCount() const; + + // indent is the number of pixels the children are indented relative to + // the parents position. SetIndent() also redraws the control + // immediately. + unsigned int GetIndent() const; + void SetIndent(unsigned int indent); + + // image list: these functions allow to associate an image list with + // the control and retrieve it. Note that 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. + // + // The normal image list is for the icons which correspond to the + // normal tree item state (whether it is selected or not). + // Additionally, the application might choose to show a state icon + // which corresponds to an app-defined item state (for example, + // checked/unchecked) which are taken from the state image list. + wxImageList *GetImageList() const; + wxImageList *GetStateImageList() const; + + void SetImageList(wxImageList *imageList); + void SetStateImageList(wxImageList *imageList); + + // Functions to work with tree ctrl items. Unfortunately, they can _not_ be + // member functions of wxTreeItem because they must know the tree the item + // belongs to for Windows implementation and storing the pointer to + // wxTreeCtrl in each wxTreeItem is just too much waste. + + // accessors + // --------- + + // retrieve items label + wxString GetItemText(const wxTreeItemId& item) const; + // get the normal item image + int GetItemImage(const wxTreeItemId& item) const; + // get the selected item image + int GetItemSelectedImage(const wxTreeItemId& item) const; + // get the data associated with the item + wxTreeItemData *GetItemData(const wxTreeItemId& item) const; + + // modifiers + // --------- + + // set items label + void SetItemText(const wxTreeItemId& item, const wxString& text); + // set the normal item image + void SetItemImage(const wxTreeItemId& item, int image); + // set the selected item image + void SetItemSelectedImage(const wxTreeItemId& item, int image); + // associate some data with the item + void SetItemData(const wxTreeItemId& item, wxTreeItemData *data); + + // item status inquiries + // --------------------- + + // is the item visible (it might be outside the view or not expanded)? + bool IsVisible(const wxTreeItemId& item) const; + // does the item has any children? + bool ItemHasChildren(const wxTreeItemId& item) const; + // is the item expanded (only makes sense if HasChildren())? + bool IsExpanded(const wxTreeItemId& item) const; + // is this item currently selected (the same as has focus)? + bool IsSelected(const wxTreeItemId& item) const; + + // navigation + // ---------- + + // wxTreeItemId.IsOk() will return FALSE if there is no such item + + // get the root tree item + wxTreeItemId GetRootItem() const; + + // get the item currently selected (may return NULL if no selection) + wxTreeItemId GetSelection() const; + + // get the parent of this item (may return NULL if root) + wxTreeItemId GetParent(const wxTreeItemId& item) const; + + // for this enumeration function you must pass in a "cookie" parameter + // which is opaque for the application but is necessary for the library + // to make these functions reentrant (i.e. allow more than one + // enumeration on one and the same object simultaneously). Of course, + // the "cookie" passed to GetFirstChild() and GetNextChild() should be + // the same! + + // get the first child of this item + wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& cookie) const; + // get the next child + wxTreeItemId GetNextChild(const wxTreeItemId& item, long& cookie) const; + + // get the next sibling of this item + wxTreeItemId GetNextSibling(const wxTreeItemId& item) const; + // get the previous sibling + wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const; + + // get first visible item + wxTreeItemId GetFirstVisibleItem() const; + // get the next visible item: item must be visible itself! + // see IsVisible() and wxTreeCtrl::GetFirstVisibleItem() + wxTreeItemId GetNextVisible(const wxTreeItemId& item) const; + // get the previous visible item: item must be visible itself! + wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const; - // bounding rect - bool GetItemRect(long item, wxRectangle& rect, bool textOnly = FALSE) const; - // - wxTextCtrl* GetEditControl() const; - // operations // ---------- - // 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); - // 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); - bool ScrollTo(long item); - bool DeleteAllItems(); - bool DeleteChildren(long item); + // add the root node to the tree + wxTreeItemId AddRoot(const wxString& text, + int image = -1, int selectedImage = -1, + wxTreeItemData *data = NULL); - // Edit the label (tree must have the focus) - wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl)); + // insert a new item in as the first child of the parent + wxTreeItemId PrependItem(const wxTreeItemId& parent, + const wxString& text, + int image = -1, int selectedImage = -1, + wxTreeItemData *data = NULL); - // End label editing, optionally cancelling the edit - bool EndEditLabel(bool cancel); + // insert a new item after a given one + wxTreeItemId InsertItem(const wxTreeItemId& parent, + const wxTreeItemId& idPrevious, + const wxString& text, + int image = -1, int selectedImage = -1, + wxTreeItemData *data = NULL); - long HitTest(const wxPoint& point, int& flags); - // wxImageList *CreateDragImage(long item); - bool SortChildren(long item); - bool EnsureVisible(long item); + // insert a new item in as the last child of the parent + wxTreeItemId AppendItem(const wxTreeItemId& parent, + const wxString& text, + int image = -1, int selectedImage = -1, + wxTreeItemData *data = NULL); - void SendExpanding(long item); - void SendExpanded(long item); - void SendCollapsing(long item); - void SendCollapsed(long item); - void SendSelChanging(long item); - void SendSelChanged(long item); + // delete this item and associated data if any + void Delete(const wxTreeItemId& item); + // delete all items from the tree + void DeleteAllItems(); + + // expand this item + void Expand(const wxTreeItemId& item); + // collapse the item without removing its children + void Collapse(const wxTreeItemId& item); + // collapse the item and remove all children + void CollapseAndReset(const wxTreeItemId& item); + // toggles the current state + void Toggle(const wxTreeItemId& item); + + // remove the selection from currently selected item (if any) + void Unselect(); + // select this item + void SelectItem(const wxTreeItemId& item); + // make sure this item is visible (expanding the parent item and/or + // scrolling to this item if necessary) + void EnsureVisible(const wxTreeItemId& item); + // scroll to this item (but don't expand its parent) + void ScrollTo(const wxTreeItemId& item); + + // start editing the item label: this (temporarily) replaces the item + // with a one line edit control. The item will be selected if it hadn't + // been before. textCtrlClass parameter allows you to create an edit + // control of arbitrary user-defined class deriving from wxTextCtrl. + wxTextCtrl* EditLabel(const wxTreeItemId& item, + wxClassInfo* textCtrlClass = CLASSINFO(wxTextCtrl)); + // returns the same pointer as StartEdit() if the item is being edited, + // NULL otherwise (it's assumed that no more than one item may be + // edited simultaneously) + wxTextCtrl* GetEditControl() const; + // end editing and accept or discard the changes to item label + void EndEditLabel(const wxTreeItemId& item, bool discardChanges = FALSE); + + // sort the children of this item using the specified callback function + // (it should return -1, 0 or +1 as usual), if it's not specified + // alphabetical comparaison is performed. + // + // NB: this function is not reentrant! + void SortChildren(const wxTreeItemId& item, + wxTreeItemCmpFunc *cmpFunction = NULL); + + // deprecated + // ---------- + + // these methods are deprecated and will be removed in future versions of + // wxWindows, they're here for compatibility only, don't use them in new + // code (the comments indicate why these methods are now useless and how to + // replace them) + + // use Expand, Collapse, CollapseAndReset or Toggle + void ExpandItem(const wxTreeItemId& item, int action); + + // use AddRoot, PrependItem or AppendItem + wxTreeItemId InsertItem(const wxTreeItemId& parent, + const wxString& text, + int image = -1, int selImage = -1, + long insertAfter = wxTREE_INSERT_LAST); + + // use Set/GetImageList and Set/GetStateImageList + wxImageList *GetImageList(int) const + { return GetImageList(); } + void SetImageList(wxImageList *imageList, int) + { SetImageList(imageList); } + + void SendExpanding(const wxTreeItemId& item); + void SendExpanded(const wxTreeItemId& item); + void SendCollapsing(const wxTreeItemId& item); + void SendCollapsed(const wxTreeItemId& item); + void SendSelChanging(const wxTreeItemId& item); + void SendSelChanged(const wxTreeItemId& item); protected: GtkTree *m_tree; GtkTreeItem *m_anchor; @@ -245,62 +389,99 @@ protected: long m_curitemId; - GtkTreeItem *findGtkTreeItem(long item) const; +// GtkTreeItem *findGtkTreeItem(wxTreeCtrlId &id) const; + + // the common part of all ctors + void Init(); + // insert a new item in as the last child of the parent + wxTreeItemId p_InsertItem(GtkTreeItem *p, + const wxString& text, + int image, int selectedImage, + wxTreeItemData *data); + DECLARE_DYNAMIC_CLASS(wxTreeCtrl) }; -/* - wxEVT_COMMAND_TREE_BEGIN_DRAG, - wxEVT_COMMAND_TREE_BEGIN_RDRAG, - wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, - wxEVT_COMMAND_TREE_END_LABEL_EDIT, - wxEVT_COMMAND_TREE_DELETE_ITEM, - wxEVT_COMMAND_TREE_GET_INFO, - wxEVT_COMMAND_TREE_SET_INFO, - wxEVT_COMMAND_TREE_ITEM_EXPANDED, - wxEVT_COMMAND_TREE_ITEM_EXPANDING, - wxEVT_COMMAND_TREE_ITEM_COLLAPSED, - wxEVT_COMMAND_TREE_ITEM_COLLAPSING, - wxEVT_COMMAND_TREE_SEL_CHANGED, - wxEVT_COMMAND_TREE_SEL_CHANGING, - wxEVT_COMMAND_TREE_KEY_DOWN -*/ - -class WXDLLEXPORT wxTreeEvent: public wxCommandEvent +// ---------------------------------------------------------------------------- +// wxTreeEvent is a special class for all events associated with tree controls +// +// NB: note that not all accessors make sense for all events, see the event +// descriptions below +// ---------------------------------------------------------------------------- +class WXDLLEXPORT wxTreeEvent : public wxCommandEvent { - DECLARE_DYNAMIC_CLASS(wxTreeEvent) +friend wxTreeCtrl; +public: + wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0); - public: - wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0); + // accessors + // get the item on which the operation was performed or the newly + // selected item for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events + wxTreeItemId GetItem() const { return m_item; } - int m_code; - wxTreeItem m_item; - long m_oldItem; - wxPoint m_pointDrag; + // for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events, get the previously + // selected item + wxTreeItemId GetOldItem() const { return m_itemOld; } - 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; } + // the point where the mouse was when the drag operation started (for + // wxEVT_COMMAND_TREE_BEGIN_(R)DRAG events only) + wxPoint GetPoint() const { return m_pointDrag; } + + // keyboard code (for wxEVT_COMMAND_TREE_KEY_DOWN only) + int GetCode() const { return m_code; } + + // set return code for wxEVT_COMMAND_TREE_ITEM_{EXPAND|COLLAPS}ING events + // call this to forbid the change in item status + void Veto() { m_code = TRUE; } + +private: + // @@ we could save some space by using union here + int m_code; + wxTreeItemId m_item, + m_itemOld; + wxPoint m_pointDrag; + + DECLARE_DYNAMIC_CLASS(wxTreeEvent) }; typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&); +// ---------------------------------------------------------------------------- +// macros for handling tree control events +// ---------------------------------------------------------------------------- + +// GetItem() returns the item being dragged, GetPoint() the mouse coords #define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, #define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, + +// GetItem() returns the itme whose label is being edited #define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, #define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, -#define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, + +// provide/update information about GetItem() item #define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, #define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, + +// GetItem() is the item being expanded/collapsed, the "ING" versions can use #define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, #define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, #define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, #define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, + +// GetOldItem() is the item which had the selection previously, GetItem() is +// the item which acquires selection #define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, + +// GetCode() returns the key code +// NB: this is the only message for which GetItem() is invalid (you may get the +// item from GetSelection()) #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, +// GetItem() returns the item being deleted, the associated data (if any) will +// be deleted just after the return of this event handler (if any) +#define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL }, + #endif // _WX_TREECTRL_H_ diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index e5fd1c4b56..94a72b0d55 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -109,7 +109,7 @@ bool MyApp::OnInit() frame->m_treeCtrl->SetImageList(wxGetApp().m_imageListNormal, wxIMAGE_LIST_NORMAL); - long rootId = frame->m_treeCtrl->InsertItem(0, "Root", 0); + wxTreeItemId rootId = frame->m_treeCtrl->AddRoot("Root", 0); char buf[20]; int i; @@ -119,20 +119,20 @@ bool MyApp::OnInit() { sprintf(buf, "Folder child %d", i); str = buf; - long id = frame->m_treeCtrl->InsertItem(rootId, str, 0); + wxTreeItemId id = frame->m_treeCtrl->AppendItem(rootId, str, 0); int j; for ( j = 0; j < 5; j++) { sprintf(buf, "File child %d", j); str = buf; - frame->m_treeCtrl->InsertItem(id, str, 1); + frame->m_treeCtrl->AppendItem(id, str, 1); } } for ( i = 0; i < 10; i++) { sprintf(buf, "File child %d", i); str = buf; - frame->m_treeCtrl->InsertItem(rootId, str, 1); + frame->m_treeCtrl->AppendItem(rootId, str, 1); } frame->CreateStatusBar(3); diff --git a/src/gtk/treectrl.cpp b/src/gtk/treectrl.cpp index 69d424f523..5248a0741f 100644 --- a/src/gtk/treectrl.cpp +++ b/src/gtk/treectrl.cpp @@ -6,7 +6,7 @@ // Created: 07/05/98 // RCS-ID: $Id$ // Copyright: (c) Denis Pershin -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -25,74 +25,67 @@ #endif #include "wx/gtk/treectrl.h" +#include #include "wx/log.h" #include -static void wxConvertToGtkTreeItem(wxTreeCtrl *owner, wxTreeItem& info, GtkTreeItem **gtkItem); -static void wxConvertFromGtkTreeItem(wxTreeItem& info, GtkTreeItem *gtkItem); +//static void wxConvertToGtkTreeItem(wxTreeCtrl *owner, wxTreeItem& info, GtkTreeItem **gtkItem); +//static void wxConvertFromGtkTreeItem(wxTreeItem& info, GtkTreeItem *gtkItem); static void gtk_treectrl_count_callback (GtkWidget *widget, gpointer data); // static void gtk_treectrl_next_callback (GtkWidget *widget, gpointer data); // static void gtk_treectrl_next_visible_callback (GtkWidget *widget, gpointer data); // static void gtk_treectrl_next_selected_callback (GtkWidget *widget, gpointer data); -static void gtk_treeitem_expand_callback(GtkWidget *WXUNUSED(widget), wxTreeItem *treeitem); -static void gtk_treeitem_collapse_callback( GtkWidget *WXUNUSED(widget), wxTreeItem *treeitem); -static void gtk_treeitem_select_callback( GtkWidget *WXUNUSED(widget), wxTreeItem *treeitem); +static void gtk_treeitem_expand_callback(GtkWidget *widget, wxTreeItemId *treeitem); +static void gtk_treeitem_collapse_callback(GtkWidget *widget, wxTreeItemId *treeitem); +static void gtk_treeitem_select_callback(GtkWidget *widget, wxTreeItemId *treeitem); -static void gtk_treeitem_expand_callback(GtkWidget *widget, wxTreeItem *treeitem) -{ +static void gtk_treeitem_expand_callback(GtkWidget *widget, wxTreeItemId *treeitem) { wxTreeCtrl *owner = (wxTreeCtrl *)gtk_object_get_data(GTK_OBJECT(widget), "owner"); if (owner == NULL) return; - long id = (long)gtk_object_get_data(GTK_OBJECT(widget), "id"); - owner->SendExpanding(id); - owner->SendExpanded(id); +// long id = (long)gtk_object_get_data(GTK_OBJECT(widget), "id"); + owner->SendExpanding(GTK_TREE_ITEM(widget)); + owner->SendExpanded(GTK_TREE_ITEM(widget)); }; -static void gtk_treeitem_collapse_callback(GtkWidget *widget, wxTreeItem *treeitem) -{ +static void gtk_treeitem_collapse_callback(GtkWidget *widget, wxTreeItemId *treeitem) { wxTreeCtrl *owner = (wxTreeCtrl *)gtk_object_get_data(GTK_OBJECT(widget), "owner"); if (owner == NULL) return; - long id = (long)gtk_object_get_data(GTK_OBJECT(widget), "id"); - owner->SendCollapsing(id); - owner->SendCollapsed(id); +// long id = (long)gtk_object_get_data(GTK_OBJECT(widget), "id"); + owner->SendCollapsing(GTK_TREE_ITEM(widget)); + owner->SendCollapsed(GTK_TREE_ITEM(widget)); }; -static void gtk_treeitem_select_callback(GtkWidget *widget, wxTreeItem *treeitem) -{ +static void gtk_treeitem_select_callback(GtkWidget *widget, wxTreeItemId *treeitem) { wxTreeCtrl *owner = (wxTreeCtrl *)gtk_object_get_data(GTK_OBJECT(widget), "owner"); if (owner == NULL) return; - long id = (long)gtk_object_get_data(GTK_OBJECT(widget), "id"); - owner->SendSelChanging(id); - owner->SendSelChanged(id); +// long id = (long)gtk_object_get_data(GTK_OBJECT(widget), "id"); + owner->SendSelChanging(GTK_TREE_ITEM(widget)); + owner->SendSelChanged(GTK_TREE_ITEM(widget)); } #if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) - IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) + #endif -wxTreeCtrl::wxTreeCtrl() -{ +void wxTreeCtrl::Init() { m_imageListNormal = NULL; m_imageListState = NULL; m_textCtrl = NULL; - m_curitemId = 1; } -bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator, const wxString& name) -{ - m_imageListNormal = NULL; - m_imageListState = NULL; - m_textCtrl = NULL; - m_curitemId = 1; +bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, + const wxSize& size, long style, + const wxValidator& validator, const wxString& name) { + Init(); int x = pos.x; int y = pos.y; @@ -114,24 +107,30 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con m_needParent = TRUE; +printf("precreate\n"); PreCreation( parent, id, pos, size, style, name ); - m_widget = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(m_widget), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +printf("1\n"); + m_widget = gtk_scrolled_window_new(NULL, NULL); +printf("2\n"); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(m_widget), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + +printf("3\n"); m_tree = GTK_TREE(gtk_tree_new()); +printf("4\n"); gtk_container_add(GTK_CONTAINER(m_widget), GTK_WIDGET(m_tree)); +printf("5\n"); +// gtk_widget_set_parent(GTK_WIDGET(m_tree), m_widget); +printf("6\n"); gtk_widget_show(GTK_WIDGET(m_tree)); - wxSystemSettings settings; - SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW)); - SetForegroundColour(parent->GetForegroundColour()); - SetName(name); SetValidator(validator); +printf("postcreate\n"); PostCreation(); gtk_widget_realize(GTK_WIDGET(m_tree)); @@ -141,14 +140,13 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con return TRUE; } -wxTreeCtrl::~wxTreeCtrl() -{ - wxDELETE(m_textCtrl); +wxTreeCtrl::~wxTreeCtrl(void) { + if (m_textCtrl) + delete m_textCtrl; } // Attributes -static void gtk_treectrl_count_callback (GtkWidget *widget, gpointer data) -{ +static void gtk_treectrl_count_callback (GtkWidget *widget, gpointer data) { int count = (*((int *)data)); count++; @@ -156,8 +154,7 @@ static void gtk_treectrl_count_callback (GtkWidget *widget, gpointer data) gtk_container_foreach(GTK_CONTAINER(widget), gtk_treectrl_count_callback, data); } -int wxTreeCtrl::GetCount() const -{ +size_t wxTreeCtrl::GetCount() const { int count = 0; if (m_anchor != NULL) @@ -165,125 +162,394 @@ int wxTreeCtrl::GetCount() const return count; } -int wxTreeCtrl::GetIndent() const -{ +unsigned int wxTreeCtrl::GetIndent() const { return m_tree->indent_value; } -void wxTreeCtrl::SetIndent(int indent) -{ +void wxTreeCtrl::SetIndent(unsigned int indent) { m_tree->indent_value = indent; } -wxImageList *wxTreeCtrl::GetImageList(int which) const -{ - if (which == wxIMAGE_LIST_NORMAL) { - return m_imageListNormal; - } - else - if (which == wxIMAGE_LIST_STATE) { - return m_imageListState; - } - return NULL; +wxImageList *wxTreeCtrl::GetImageList() const { + return m_imageListNormal; } -void wxTreeCtrl::SetImageList(wxImageList *imageList, int which) -{ - if (which == wxIMAGE_LIST_NORMAL) - m_imageListNormal = imageList; - else - if (which == wxIMAGE_LIST_STATE) - m_imageListState = imageList; +wxImageList *wxTreeCtrl::GetStateImageList() const { + return m_imageListState; } -long wxTreeCtrl::GetNextItem(long item, int code) const -{ - switch (code) { - case wxTREE_NEXT_CARET: -// flag = TVGN_CARET; - break; - case wxTREE_NEXT_CHILD: -// flag = TVGN_CHILD; - break; - case wxTREE_NEXT_DROPHILITE: -// flag = TVGN_DROPHILITE; - break; - case wxTREE_NEXT_FIRSTVISIBLE: -// flag = TVGN_FIRSTVISIBLE; - break; - case wxTREE_NEXT_NEXT: -// flag = TVGN_NEXT; - break; - case wxTREE_NEXT_NEXTVISIBLE: -// flag = TVGN_NEXTVISIBLE; - break; - case wxTREE_NEXT_PARENT: -// flag = TVGN_PARENT; - break; - case wxTREE_NEXT_PREVIOUS: -// flag = TVGN_PREVIOUS; - break; - case wxTREE_NEXT_PREVIOUSVISIBLE: -// flag = TVGN_PREVIOUSVISIBLE; - break; - case wxTREE_NEXT_ROOT: -// flag = TVGN_ROOT; - break; - - default : - break; - } -// return (long) TreeView_GetNextItem( (HWND) GetHWND(), (HTREEITEM) item, flag); - return 0; +void wxTreeCtrl::SetImageList(wxImageList *imageList) { + m_imageListNormal = imageList; } -bool wxTreeCtrl::ItemHasChildren(long item) const -{ - GtkTreeItem *p; +void wxTreeCtrl::SetStateImageList(wxImageList *imageList) { + m_imageListState = imageList; +} + +wxString wxTreeCtrl::GetItemText(const wxTreeItemId &item) const { + char *t; + + if (!item.IsOk()) + return wxString(""); + + GtkLabel *l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "w_label")); + gtk_label_get(l, &t); + + return t; +} + +int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const { + if (!item.IsOk()) + return (-1); + + return (int)gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "image"); +} + +int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const { + if (!item.IsOk()) + return (-1); + + return (int)gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "selectedImage"); +} + +wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const { + if (!item.IsOk()) + return NULL; + + return (wxTreeItemData *)gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "data"); +} + +void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text) { + if (!item.IsOk()) + return; + + GtkLabel *l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "w_label")); + gtk_label_set(l, text); +} + +void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image) { + if (!item.IsOk()) + return; + + gtk_object_set_data(GTK_OBJECT((GtkTreeItem *)item), "image", (void *)image); +} + +void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image) { + if (!item.IsOk()) + return; + + gtk_object_set_data(GTK_OBJECT((GtkTreeItem *)item), "selectedImage", (void *)image); +} + +void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data) { + if (!item.IsOk()) + return; + + gtk_object_set_data(GTK_OBJECT((GtkTreeItem *)item), "data", data); +} + +bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const { +#warning "Need to implement IsVisible" + return FALSE; +} + +bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const { int count = 0; - p = findGtkTreeItem(item); - - gtk_container_foreach(GTK_CONTAINER(p), gtk_treectrl_count_callback, &count); + gtk_container_foreach(GTK_CONTAINER((GtkTreeItem *)item), gtk_treectrl_count_callback, &count); return (count != 0); } -static GtkTreeItem *findItem(GtkTreeItem *p, long id) -{ - GtkTreeItem *q; +bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const { + return (((GtkTreeItem *)item)->expanded != 0); +} - if (((long)gtk_object_get_data(GTK_OBJECT(p), "id")) == id) - return p; +bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const { +#warning "Need to implement IsSelected" + return FALSE; +} - if (p->subtree == NULL) - return NULL; +wxTreeItemId wxTreeCtrl::GetRootItem() const { + return m_anchor; +} - GtkTree *tree = GTK_TREE(p->subtree); +wxTreeItemId wxTreeCtrl::GetSelection() const { +#warning "Need to complete gtk_treectrl_next_selected_callback" + GtkTreeItem *next = NULL; - GList *list = gtk_container_children(GTK_CONTAINER(tree)); - guint len = g_list_length(list); + GList *list = gtk_container_children(GTK_CONTAINER(m_anchor)); + next = GTK_TREE_ITEM(list->data); +// gtk_container_foreach(GTK_CONTAINER(m_anchor), gtk_treectrl_next_selected_callback, &next); - for (guint i=0; idata)) - continue; - q = GTK_TREE_ITEM(l->data); - GtkTreeItem *ret = findItem(q, id); - if (ret != NULL) - return ret; - } + return next; +} + +wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const { +#warning "data 'parent' is missing!!!" + if (item.IsOk()) + return (GtkTreeItem *)gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "parent"); return NULL; } -GtkTreeItem *wxTreeCtrl::findGtkTreeItem(long id) const -{ - return findItem(m_anchor, id); +wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const { +#warning "Need to implement GetFirstChild" + return NULL; } -long wxTreeCtrl::GetChild(long item) const -{ +wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const { +#warning "Need to implement GetNextChild" + return NULL; +} + +wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const { +#warning "Need to implement GetNextSibling" + return NULL; +} + +wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const { +#warning "Need to implement GetPrevSibling" + return NULL; +} + +wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const { +#warning "Need to implement GetFirstVisibleItem" + return NULL; +} + +wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const { +#warning "Need to implement GetNextVisible" + return NULL; +} + +wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const { +#warning "Need to implement GetPrevVisible" + return NULL; +} + +wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text, int image, + int selectedImage, wxTreeItemData *data) { + return p_InsertItem(0, text, image, selectedImage, data); +} + +wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent, + const wxString& text, int image, int selectedImage, + wxTreeItemData *data) { +#warning "Need to implement PrependItem" + return NULL; +} + +wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent, + const wxTreeItemId& idPrevious, const wxString& text, + int image, int selectedImage, wxTreeItemData *data) { +#warning "Need to implement InsertItem" + return NULL; +} + +wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent, + const wxString& text, int image, int selectedImage, + wxTreeItemData *data) { + return p_InsertItem(parent, text, image, selectedImage, data); +} + +wxTreeItemId wxTreeCtrl::p_InsertItem(GtkTreeItem *p, + const wxString& text, int image, int selectedImage, + wxTreeItemData *data) { + GtkTreeItem *item; + +printf("begin insert\n"); + + item = GTK_TREE_ITEM(gtk_tree_item_new()); + + GtkHBox *m_box = GTK_HBOX(gtk_hbox_new(FALSE, 0)); + gtk_container_add (GTK_CONTAINER (item), GTK_WIDGET(m_box)); + + gtk_object_set_data(GTK_OBJECT(item), "w_box", m_box); + + const wxBitmap *bmp; + const wxImageList *list; + if ((list = GetImageList(wxIMAGE_LIST_NORMAL)) != NULL) + if ((bmp = list->GetBitmap(image)) != NULL) + if (bmp->Ok()) { + GdkBitmap *mask = NULL; + if (bmp->GetMask()) + mask = bmp->GetMask()->GetBitmap(); + GtkPixmap *m_image_widget = GTK_PIXMAP(gtk_pixmap_new(bmp->GetPixmap(), mask)); + gtk_misc_set_alignment (GTK_MISC (m_image_widget), 0.0, 0.5); + gtk_box_pack_start(GTK_BOX(m_box), GTK_WIDGET(m_image_widget), FALSE, FALSE, 0); + gtk_object_set_data(GTK_OBJECT(item), "w_image", (void *)m_image_widget); + gtk_object_set_data(GTK_OBJECT(item), "image", (void *)image); + gtk_widget_show (GTK_WIDGET(m_image_widget)); + } + GtkLabel *m_label_widget = GTK_LABEL(gtk_label_new ((char *)(const char *)text)); + gtk_misc_set_alignment (GTK_MISC (m_label_widget), 0.5, 0.5); + gtk_box_pack_start(GTK_BOX(m_box), GTK_WIDGET(m_label_widget), FALSE, FALSE, 0); + gtk_object_set_data(GTK_OBJECT(item), "w_label", m_label_widget); + gtk_widget_show (GTK_WIDGET(m_label_widget)); + + gtk_widget_show(GTK_WIDGET(m_box)); + + gtk_object_set_data(GTK_OBJECT(item), "owner", this); + + if (p != 0) { + if (p->subtree == NULL) { + GtkTree *tree = GTK_TREE(gtk_tree_new()); + gtk_tree_item_set_subtree(GTK_TREE_ITEM(p), GTK_WIDGET(tree)); + gtk_widget_show(GTK_WIDGET(tree)); + p->expanded = 1; + } + + gtk_container_add(GTK_CONTAINER(p->subtree), GTK_WIDGET(item)); + } else { +printf("Adding root\n"); +printf("m_tree = %p\n", m_tree); + m_anchor = item; + gtk_container_add(GTK_CONTAINER(m_tree), GTK_WIDGET(item)); + } + +/* + if ((info.m_mask & wxTREE_MASK_CHILDREN) != 0) { + GtkTree *tree = GTK_TREE(gtk_tree_new()); + gtk_tree_item_set_subtree(GTK_TREE_ITEM(item), GTK_WIDGET(tree)); + gtk_widget_show(GTK_WIDGET(tree)); + } +*/ + + gtk_object_set_data(GTK_OBJECT(item), "data", data); + + gtk_widget_show(GTK_WIDGET(item)); + + gtk_signal_connect(GTK_OBJECT(item), "select", + GTK_SIGNAL_FUNC(gtk_treeitem_select_callback), (gpointer)this ); + + gtk_signal_connect(GTK_OBJECT(item), "deselect", + GTK_SIGNAL_FUNC(gtk_treeitem_select_callback), (gpointer)this ); + + gtk_signal_connect(GTK_OBJECT(item), "expand", + GTK_SIGNAL_FUNC(gtk_treeitem_expand_callback), (gpointer)this ); + gtk_signal_connect(GTK_OBJECT(item), "collapse", + GTK_SIGNAL_FUNC(gtk_treeitem_collapse_callback), (gpointer)this ); + + return item; +} + +void wxTreeCtrl::Delete(const wxTreeItemId& item) { + if (!item.IsOk()) + return; + + GtkTreeItem *parent = GTK_TREE_ITEM(GTK_WIDGET((GtkTreeItem *)item)->parent); + if (parent == NULL) + return; + + gtk_container_remove(GTK_CONTAINER(parent), GTK_WIDGET((GtkTreeItem *)item)); + + return; +} + +void wxTreeCtrl::DeleteAllItems() { + gtk_tree_item_remove_subtree(m_anchor); +} + +void wxTreeCtrl::Expand(const wxTreeItemId& item) { + if (!item.IsOk()) + return; + + gtk_tree_item_expand(GTK_TREE_ITEM((GtkTreeItem *)item)); +} + +void wxTreeCtrl::Collapse(const wxTreeItemId& item) { + if (!item.IsOk()) + return; + + gtk_tree_item_collapse(GTK_TREE_ITEM((GtkTreeItem *)item)); +} + +void wxTreeCtrl::CollapseAndReset(const wxTreeItemId& item) { + if (!item.IsOk()) + return; + + gtk_tree_item_collapse(GTK_TREE_ITEM((GtkTreeItem *)item)); + gtk_tree_item_remove_subtree(GTK_TREE_ITEM((GtkTreeItem *)item)); +} + +void wxTreeCtrl::Toggle(const wxTreeItemId& item) { + if (!item.IsOk()) + return; + + if (((GtkTreeItem *)item)->expanded) + gtk_tree_item_collapse(GTK_TREE_ITEM((GtkTreeItem *)item)); + else + gtk_tree_item_expand(GTK_TREE_ITEM((GtkTreeItem *)item)); +} + +void wxTreeCtrl::Unselect() { +#warning "Need to implement Unselect" +} + +void wxTreeCtrl::SelectItem(const wxTreeItemId& item) { + if (!item.IsOk()) + return; + + gtk_tree_item_select((GtkTreeItem *)item); +} + +void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item) { +#warning "Need to implement EnsureVisible" +} + +void wxTreeCtrl::ScrollTo(const wxTreeItemId& item) { +#warning "Need to implement ScrollTo" +} + +wxTextCtrl* wxTreeCtrl::EditLabel(const wxTreeItemId& item, + wxClassInfo* textControlClass) { + wxASSERT( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)) ); +#warning "Need to implement EditLabel" + return m_textCtrl; +} + +wxTextCtrl* wxTreeCtrl::GetEditControl() const { + return m_textCtrl; +} + +void wxTreeCtrl::EndEditLabel(const wxTreeItemId& item, bool discardChanges) { +#warning "Need to implement EndEditLabel" +} + +void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action) { + switch (action) { + case wxTREE_EXPAND_EXPAND: + Expand(item); + break; + + case wxTREE_EXPAND_COLLAPSE: + Collapse(item); + break; + + case wxTREE_EXPAND_COLLAPSE_RESET: + CollapseAndReset(item); + break; + + case wxTREE_EXPAND_TOGGLE: + Toggle(item); + break; + + default: + wxFAIL_MSG("unknown action in wxTreeCtrl::ExpandItem"); + } +} + +wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent, + const wxString& text, int image, int selImage, + long insertAfter) { +// InsertItem(parent, insertAfter, text, image, selImage); + #warning "Need to implement InsertItem" + return NULL; +} + +/* Old functions +long wxTreeCtrl::GetChild(long item) const { GtkTreeItem *p; GtkTreeItem *next = NULL; @@ -297,19 +563,7 @@ long wxTreeCtrl::GetChild(long item) const return (-1); } -long wxTreeCtrl::GetParent(long item) const -{ - GtkTreeItem *p; - - p = findGtkTreeItem(item); - if (p != NULL) - return (long)gtk_object_get_data(GTK_OBJECT(p), "parent"); - - return (-1); -} - -long wxTreeCtrl::GetFirstVisibleItem() const -{ +long wxTreeCtrl::GetFirstVisibleItem(void) const { GtkTreeItem *next = NULL; GList *list = gtk_container_children(GTK_CONTAINER(m_anchor)); @@ -322,8 +576,7 @@ long wxTreeCtrl::GetFirstVisibleItem() const return (-1); } -long wxTreeCtrl::GetNextVisibleItem(long item) const -{ +long wxTreeCtrl::GetNextVisibleItem(long item) const { GtkTreeItem *p; GtkTreeItem *next = NULL; @@ -338,33 +591,13 @@ long wxTreeCtrl::GetNextVisibleItem(long item) const return (-1); } -long wxTreeCtrl::GetSelection() const -{ - GtkTreeItem *next = NULL; - - GList *list = gtk_container_children(GTK_CONTAINER(m_anchor)); - next = GTK_TREE_ITEM(list->data);; -// gtk_container_foreach(GTK_CONTAINER(m_anchor), gtk_treectrl_next_selected_callback, &next); - - if (next != NULL) - return (long)gtk_object_get_data(GTK_OBJECT(next), "id"); - - return (-1); -} - -long wxTreeCtrl::GetRootItem() const -{ - return (long)gtk_object_get_data(GTK_OBJECT(m_anchor), "id"); -} - -bool wxTreeCtrl::GetItem(wxTreeItem& info) const -{ +bool wxTreeCtrl::GetItem(wxTreeItem& info) const { GtkTreeItem *p; p = findGtkTreeItem(info.m_itemId); if (p == NULL) { - wxLogError("TreeCtrl::GetItem failed."); + wxLogSysError("TreeCtrl::GetItem failed"); return FALSE; } @@ -373,14 +606,13 @@ bool wxTreeCtrl::GetItem(wxTreeItem& info) const return TRUE; } -bool wxTreeCtrl::SetItem(wxTreeItem& info) -{ +bool wxTreeCtrl::SetItem(wxTreeItem& info) { GtkTreeItem *p; p = findGtkTreeItem(info.m_itemId); if (p == NULL) { - wxLogError("TreeCtrl::SetItem failed."); + wxLogSysError("TreeCtrl::SetItem failed"); return FALSE; } @@ -389,8 +621,7 @@ bool wxTreeCtrl::SetItem(wxTreeItem& info) return TRUE; } -int wxTreeCtrl::GetItemState(long item, long stateMask) const -{ +int wxTreeCtrl::GetItemState(long item, long stateMask) const { wxTreeItem info; info.m_mask = wxTREE_MASK_STATE ; @@ -403,8 +634,7 @@ int wxTreeCtrl::GetItemState(long item, long stateMask) const return info.m_state; } -bool wxTreeCtrl::SetItemState(long item, long state, long stateMask) -{ +bool wxTreeCtrl::SetItemState(long item, long state, long stateMask) { wxTreeItem info; info.m_mask = wxTREE_MASK_STATE ; @@ -414,113 +644,11 @@ bool wxTreeCtrl::SetItemState(long item, long state, long stateMask) return SetItem(info); } - -bool wxTreeCtrl::SetItemImage(long item, int image, int selImage) -{ - wxTreeItem info; - - info.m_mask = wxTREE_MASK_IMAGE ; - info.m_image = image; - if (selImage > -1) { - info.m_selectedImage = selImage; - info.m_mask |= wxTREE_MASK_SELECTED_IMAGE; - } - info.m_itemId = item; - - return SetItem(info); -} - -wxString wxTreeCtrl::GetItemText(long item) const -{ - wxTreeItem info; - - info.m_mask = wxTREE_MASK_TEXT ; - info.m_itemId = item; - - if (!GetItem(info)) - return wxString(""); - return info.m_text; -} - -void wxTreeCtrl::SetItemText(long item, const wxString& str) -{ - wxTreeItem info; - - info.m_mask = wxTREE_MASK_TEXT ; - info.m_itemId = item; - info.m_text = str; - - SetItem(info); -} - -long wxTreeCtrl::GetItemData(long item) const -{ - wxTreeItem info; - - info.m_mask = wxTREE_MASK_DATA ; - info.m_itemId = item; - - if (!GetItem(info)) - return 0; - return info.m_data; -} - -bool wxTreeCtrl::SetItemData(long item, long data) -{ - wxTreeItem info; - - info.m_mask = wxTREE_MASK_DATA ; - info.m_itemId = item; - info.m_data = data; - - return SetItem(info); -} - -bool wxTreeCtrl::GetItemRect(long item, wxRectangle& rect, bool textOnly) const -{ -/* - RECT rect2; - - *(HTREEITEM*)& rect2 = (HTREEITEM) item; - bool success = (::SendMessage((HWND) GetHWND(), TVM_GETITEMRECT, (WPARAM)textOnly, - (LPARAM)&rect2) != 0); - - rect.x = rect2.left; - rect.y = rect2.top; - rect.width = rect2.right - rect2.left; - rect.height = rect2.bottom - rect2.left; - return success; */ - wxFAIL_MSG("Not implemented"); - - return FALSE; -} - -wxTextCtrl* wxTreeCtrl::GetEditControl() const -{ - return m_textCtrl; -} // Operations -bool wxTreeCtrl::DeleteItem(long item) -{ - GtkTreeItem *p; - - p = findGtkTreeItem(item); - if (p == NULL) - return FALSE; - - GtkTreeItem *parent = GTK_TREE_ITEM(GTK_WIDGET(p)->parent); - if (parent == NULL) - return FALSE; - - gtk_container_remove(GTK_CONTAINER(parent), GTK_WIDGET(p)); - - return TRUE; -} - -bool wxTreeCtrl::DeleteChildren(long item) -{ +/* +bool wxTreeCtrl::DeleteChildren(long item) { GtkTreeItem *p; p = findGtkTreeItem(item); @@ -531,46 +659,10 @@ bool wxTreeCtrl::DeleteChildren(long item) return TRUE; } +*/ -bool wxTreeCtrl::ExpandItem(long item, int action) -{ - GtkTreeItem *p; - - p = findGtkTreeItem(item); - - if (p == NULL) - return FALSE; - - switch (action) { - case wxTREE_EXPAND_EXPAND: - gtk_tree_item_expand(GTK_TREE_ITEM(p)); - break; - - case wxTREE_EXPAND_COLLAPSE: - gtk_tree_item_collapse(GTK_TREE_ITEM(p)); - break; - - case wxTREE_EXPAND_COLLAPSE_RESET: - gtk_tree_item_collapse(GTK_TREE_ITEM(p)); - gtk_tree_item_remove_subtree(GTK_TREE_ITEM(p)); - break; - - case wxTREE_EXPAND_TOGGLE: - if (p->expanded) - gtk_tree_item_collapse(GTK_TREE_ITEM(p)); - else - gtk_tree_item_expand(GTK_TREE_ITEM(p)); - break; - - default: - wxFAIL_MSG("unknown action in wxTreeCtrl::ExpandItem"); - } - - return TRUE; -} - -long wxTreeCtrl::InsertItem(long parent, wxTreeItem& info, long insertAfter) -{ +/* +long wxTreeCtrl::InsertItem(long parent, wxTreeItem& info, long insertAfter) { GtkTreeItem *p; GtkTreeItem *item = NULL; @@ -633,262 +725,49 @@ long wxTreeCtrl::InsertItem(long parent, const wxString& label, int image, return InsertItem(parent, info, insertAfter); } - -bool wxTreeCtrl::SelectItem(long item) -{ - GtkTreeItem *p; - - p = findGtkTreeItem(item); - if (p == NULL) - return FALSE; - - gtk_tree_item_select(p); - return TRUE; -} - -bool wxTreeCtrl::ScrollTo(long item) -{ - wxFAIL_MSG("Not implemented"); - - return FALSE; // Still unimplemented -} - -bool wxTreeCtrl::DeleteAllItems() -{ - gtk_tree_item_remove_subtree(m_anchor); - return TRUE; -} - -wxTextCtrl* wxTreeCtrl::EditLabel(long item, wxClassInfo* textControlClass) -{ - wxASSERT( (textControlClass->IsKindOf(CLASSINFO(wxTextCtrl))) ); - -/* - HWND hWnd = (HWND) TreeView_EditLabel((HWND) GetHWND(), item); - - if (m_textCtrl) - { - m_textCtrl->UnsubclassWin(); - m_textCtrl->SetHWND(0); - delete m_textCtrl; - m_textCtrl = NULL; - } - - m_textCtrl = (wxTextCtrl*) textControlClass->CreateObject(); - m_textCtrl->SetHWND((WXHWND) hWnd); - m_textCtrl->SubclassWin((WXHWND) hWnd); - -*/ - wxFAIL_MSG("Not implemented"); - - return m_textCtrl; -} - -// End label editing, optionally cancelling the edit -bool wxTreeCtrl::EndEditLabel(bool cancel) -{ -/* - bool success = (TreeView_EndEditLabelNow((HWND) GetHWND(), cancel) != 0); - - if (m_textCtrl) - { - m_textCtrl->UnsubclassWin(); - m_textCtrl->SetHWND(0); - delete m_textCtrl; - m_textCtrl = NULL; - } - return success; -*/ - wxFAIL_MSG("Not implemented"); - - return FALSE; -} - -long wxTreeCtrl::HitTest(const wxPoint& point, int& flags) -{ -/* - TV_HITTESTINFO hitTestInfo; - hitTestInfo.pt.x = (int) point.x; - hitTestInfo.pt.y = (int) point.y; - - TreeView_HitTest((HWND) GetHWND(), & hitTestInfo); - - flags = 0; - if ( hitTestInfo.flags & TVHT_ABOVE ) - flags |= wxTREE_HITTEST_ABOVE; - if ( hitTestInfo.flags & TVHT_BELOW ) - flags |= wxTREE_HITTEST_BELOW; - if ( hitTestInfo.flags & TVHT_NOWHERE ) - flags |= wxTREE_HITTEST_NOWHERE; - if ( hitTestInfo.flags & TVHT_ONITEMBUTTON ) - flags |= wxTREE_HITTEST_ONITEMBUTTON; - if ( hitTestInfo.flags & TVHT_ONITEMICON ) - flags |= wxTREE_HITTEST_ONITEMICON; - if ( hitTestInfo.flags & TVHT_ONITEMINDENT ) - flags |= wxTREE_HITTEST_ONITEMINDENT; - if ( hitTestInfo.flags & TVHT_ONITEMLABEL ) - flags |= wxTREE_HITTEST_ONITEMLABEL; - if ( hitTestInfo.flags & TVHT_ONITEMRIGHT ) - flags |= wxTREE_HITTEST_ONITEMRIGHT; - if ( hitTestInfo.flags & TVHT_ONITEMSTATEICON ) - flags |= wxTREE_HITTEST_ONITEMSTATEICON; - if ( hitTestInfo.flags & TVHT_TOLEFT ) - flags |= wxTREE_HITTEST_TOLEFT; - if ( hitTestInfo.flags & TVHT_TORIGHT ) - flags |= wxTREE_HITTEST_TORIGHT; - - return (long) hitTestInfo.hItem ; -*/ - wxFAIL_MSG("Not implemented"); - - return 0; -} - -/* -wxImageList *wxTreeCtrl::CreateDragImage(long item) -{ -} */ -bool wxTreeCtrl::SortChildren(long item) -{ - wxFAIL_MSG("Not implemented"); - - return FALSE; // Still unimplemented -} - -bool wxTreeCtrl::EnsureVisible(long item) -{ - wxFAIL_MSG("Not implemented"); - - return FALSE; // Still unimplemented -} - -void wxTreeCtrl::SendExpanding(long item) -{ +void wxTreeCtrl::SendExpanding(const wxTreeItemId& item) { wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId()); event.SetEventObject(this); ProcessEvent(event); } -void wxTreeCtrl::SendExpanded(long item) -{ +void wxTreeCtrl::SendExpanded(const wxTreeItemId& item) { wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_EXPANDED, GetId()); event.SetEventObject(this); ProcessEvent(event); } -void wxTreeCtrl::SendCollapsing(long item) -{ +void wxTreeCtrl::SendCollapsing(const wxTreeItemId& item) { wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId()); event.SetEventObject(this); ProcessEvent(event); } -void wxTreeCtrl::SendCollapsed(long item) -{ +void wxTreeCtrl::SendCollapsed(const wxTreeItemId& item) { wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSED, GetId()); event.SetEventObject(this); ProcessEvent(event); } -void wxTreeCtrl::SendSelChanging(long item) -{ +void wxTreeCtrl::SendSelChanging(const wxTreeItemId& item) { wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGED, GetId()); event.SetEventObject(this); ProcessEvent(event); } -void wxTreeCtrl::SendSelChanged(long item) -{ +void wxTreeCtrl::SendSelChanged(const wxTreeItemId& item) { wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, GetId()); event.SetEventObject(this); ProcessEvent(event); } -// Tree item structure -wxTreeItem::wxTreeItem() -{ - m_mask = 0; - m_itemId = 0; - m_state = 0; - m_stateMask = 0; - m_image = -1; - m_selectedImage = -1; - m_children = 0; - m_data = 0; -} - -// If getFullInfo is TRUE, we explicitly query for more info if we haven't got it all. - -static void wxConvertFromGtkTreeItem(wxTreeItem& info, GtkTreeItem *gtkItem) -{ - GtkLabel *l; - char *t; - - info.m_data = (long)gtk_object_get_data(GTK_OBJECT(gtkItem), "data"); - info.m_itemId = (long)gtk_object_get_data(GTK_OBJECT(gtkItem), "id"); - info.m_image = (int)gtk_object_get_data(GTK_OBJECT(gtkItem), "image"); - info.m_selectedImage = (int)gtk_object_get_data(GTK_OBJECT(gtkItem), "selectedImage"); - - info.m_mask = 0; - info.m_state = 0; - info.m_stateMask = 0; - l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT(gtkItem), "label")); - gtk_label_get(l, &t); - info.m_text = t; -} - -static void wxConvertToGtkTreeItem(wxTreeCtrl *owner, wxTreeItem& info, GtkTreeItem **gtkItem) -{ - GtkTreeItem *item = (*gtkItem); - - if (item == NULL) { - item = GTK_TREE_ITEM(gtk_tree_item_new()); - - GtkHBox *m_box = GTK_HBOX(gtk_hbox_new(FALSE, 0)); - gtk_container_add (GTK_CONTAINER (item), GTK_WIDGET(m_box)); - - gtk_object_set_data(GTK_OBJECT(item), "box", m_box); - - const wxBitmap *bmp; - const wxImageList *list; - if (owner != NULL) - if ((list = owner->GetImageList(wxIMAGE_LIST_NORMAL)) != NULL) - if ((bmp = list->GetBitmap(info.m_image)) != NULL) - if (bmp->Ok()) { - GdkBitmap *mask = NULL; - if (bmp->GetMask()) - mask = bmp->GetMask()->GetBitmap(); - GtkPixmap *m_image_widget = GTK_PIXMAP(gtk_pixmap_new(bmp->GetPixmap(), mask)); - gtk_misc_set_alignment (GTK_MISC (m_image_widget), 0.0, 0.5); - gtk_box_pack_start(GTK_BOX(m_box), GTK_WIDGET(m_image_widget), FALSE, FALSE, 0); - gtk_object_set_data(GTK_OBJECT(item), "image", m_image_widget); - gtk_widget_show (GTK_WIDGET(m_image_widget)); - } - - GtkLabel *m_label_widget = GTK_LABEL(gtk_label_new ((char *)(const char *)info.m_text)); - gtk_misc_set_alignment (GTK_MISC (m_label_widget), 0.5, 0.5); - - gtk_box_pack_start(GTK_BOX(m_box), GTK_WIDGET(m_label_widget), FALSE, FALSE, 0); - gtk_object_set_data(GTK_OBJECT(item), "label", m_label_widget); - - gtk_widget_show (GTK_WIDGET(m_label_widget)); - - gtk_widget_show(GTK_WIDGET(m_box)); - gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer)info.m_itemId); - gtk_object_set_data(GTK_OBJECT(item), "owner", owner); - (*gtkItem) = item; - } -} - // Tree event IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxCommandEvent) -wxTreeEvent::wxTreeEvent(wxEventType commandType, int id) - : wxCommandEvent(commandType, id) -{ +wxTreeEvent::wxTreeEvent(wxEventType commandType, int id): + wxCommandEvent(commandType, id) { m_code = 0; - m_oldItem = 0; + m_itemOld = 0; } - diff --git a/src/gtk1/treectrl.cpp b/src/gtk1/treectrl.cpp index 69d424f523..5248a0741f 100644 --- a/src/gtk1/treectrl.cpp +++ b/src/gtk1/treectrl.cpp @@ -6,7 +6,7 @@ // Created: 07/05/98 // RCS-ID: $Id$ // Copyright: (c) Denis Pershin -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -25,74 +25,67 @@ #endif #include "wx/gtk/treectrl.h" +#include #include "wx/log.h" #include -static void wxConvertToGtkTreeItem(wxTreeCtrl *owner, wxTreeItem& info, GtkTreeItem **gtkItem); -static void wxConvertFromGtkTreeItem(wxTreeItem& info, GtkTreeItem *gtkItem); +//static void wxConvertToGtkTreeItem(wxTreeCtrl *owner, wxTreeItem& info, GtkTreeItem **gtkItem); +//static void wxConvertFromGtkTreeItem(wxTreeItem& info, GtkTreeItem *gtkItem); static void gtk_treectrl_count_callback (GtkWidget *widget, gpointer data); // static void gtk_treectrl_next_callback (GtkWidget *widget, gpointer data); // static void gtk_treectrl_next_visible_callback (GtkWidget *widget, gpointer data); // static void gtk_treectrl_next_selected_callback (GtkWidget *widget, gpointer data); -static void gtk_treeitem_expand_callback(GtkWidget *WXUNUSED(widget), wxTreeItem *treeitem); -static void gtk_treeitem_collapse_callback( GtkWidget *WXUNUSED(widget), wxTreeItem *treeitem); -static void gtk_treeitem_select_callback( GtkWidget *WXUNUSED(widget), wxTreeItem *treeitem); +static void gtk_treeitem_expand_callback(GtkWidget *widget, wxTreeItemId *treeitem); +static void gtk_treeitem_collapse_callback(GtkWidget *widget, wxTreeItemId *treeitem); +static void gtk_treeitem_select_callback(GtkWidget *widget, wxTreeItemId *treeitem); -static void gtk_treeitem_expand_callback(GtkWidget *widget, wxTreeItem *treeitem) -{ +static void gtk_treeitem_expand_callback(GtkWidget *widget, wxTreeItemId *treeitem) { wxTreeCtrl *owner = (wxTreeCtrl *)gtk_object_get_data(GTK_OBJECT(widget), "owner"); if (owner == NULL) return; - long id = (long)gtk_object_get_data(GTK_OBJECT(widget), "id"); - owner->SendExpanding(id); - owner->SendExpanded(id); +// long id = (long)gtk_object_get_data(GTK_OBJECT(widget), "id"); + owner->SendExpanding(GTK_TREE_ITEM(widget)); + owner->SendExpanded(GTK_TREE_ITEM(widget)); }; -static void gtk_treeitem_collapse_callback(GtkWidget *widget, wxTreeItem *treeitem) -{ +static void gtk_treeitem_collapse_callback(GtkWidget *widget, wxTreeItemId *treeitem) { wxTreeCtrl *owner = (wxTreeCtrl *)gtk_object_get_data(GTK_OBJECT(widget), "owner"); if (owner == NULL) return; - long id = (long)gtk_object_get_data(GTK_OBJECT(widget), "id"); - owner->SendCollapsing(id); - owner->SendCollapsed(id); +// long id = (long)gtk_object_get_data(GTK_OBJECT(widget), "id"); + owner->SendCollapsing(GTK_TREE_ITEM(widget)); + owner->SendCollapsed(GTK_TREE_ITEM(widget)); }; -static void gtk_treeitem_select_callback(GtkWidget *widget, wxTreeItem *treeitem) -{ +static void gtk_treeitem_select_callback(GtkWidget *widget, wxTreeItemId *treeitem) { wxTreeCtrl *owner = (wxTreeCtrl *)gtk_object_get_data(GTK_OBJECT(widget), "owner"); if (owner == NULL) return; - long id = (long)gtk_object_get_data(GTK_OBJECT(widget), "id"); - owner->SendSelChanging(id); - owner->SendSelChanged(id); +// long id = (long)gtk_object_get_data(GTK_OBJECT(widget), "id"); + owner->SendSelChanging(GTK_TREE_ITEM(widget)); + owner->SendSelChanged(GTK_TREE_ITEM(widget)); } #if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) - IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) + #endif -wxTreeCtrl::wxTreeCtrl() -{ +void wxTreeCtrl::Init() { m_imageListNormal = NULL; m_imageListState = NULL; m_textCtrl = NULL; - m_curitemId = 1; } -bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator, const wxString& name) -{ - m_imageListNormal = NULL; - m_imageListState = NULL; - m_textCtrl = NULL; - m_curitemId = 1; +bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, + const wxSize& size, long style, + const wxValidator& validator, const wxString& name) { + Init(); int x = pos.x; int y = pos.y; @@ -114,24 +107,30 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con m_needParent = TRUE; +printf("precreate\n"); PreCreation( parent, id, pos, size, style, name ); - m_widget = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(m_widget), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +printf("1\n"); + m_widget = gtk_scrolled_window_new(NULL, NULL); +printf("2\n"); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(m_widget), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + +printf("3\n"); m_tree = GTK_TREE(gtk_tree_new()); +printf("4\n"); gtk_container_add(GTK_CONTAINER(m_widget), GTK_WIDGET(m_tree)); +printf("5\n"); +// gtk_widget_set_parent(GTK_WIDGET(m_tree), m_widget); +printf("6\n"); gtk_widget_show(GTK_WIDGET(m_tree)); - wxSystemSettings settings; - SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW)); - SetForegroundColour(parent->GetForegroundColour()); - SetName(name); SetValidator(validator); +printf("postcreate\n"); PostCreation(); gtk_widget_realize(GTK_WIDGET(m_tree)); @@ -141,14 +140,13 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con return TRUE; } -wxTreeCtrl::~wxTreeCtrl() -{ - wxDELETE(m_textCtrl); +wxTreeCtrl::~wxTreeCtrl(void) { + if (m_textCtrl) + delete m_textCtrl; } // Attributes -static void gtk_treectrl_count_callback (GtkWidget *widget, gpointer data) -{ +static void gtk_treectrl_count_callback (GtkWidget *widget, gpointer data) { int count = (*((int *)data)); count++; @@ -156,8 +154,7 @@ static void gtk_treectrl_count_callback (GtkWidget *widget, gpointer data) gtk_container_foreach(GTK_CONTAINER(widget), gtk_treectrl_count_callback, data); } -int wxTreeCtrl::GetCount() const -{ +size_t wxTreeCtrl::GetCount() const { int count = 0; if (m_anchor != NULL) @@ -165,125 +162,394 @@ int wxTreeCtrl::GetCount() const return count; } -int wxTreeCtrl::GetIndent() const -{ +unsigned int wxTreeCtrl::GetIndent() const { return m_tree->indent_value; } -void wxTreeCtrl::SetIndent(int indent) -{ +void wxTreeCtrl::SetIndent(unsigned int indent) { m_tree->indent_value = indent; } -wxImageList *wxTreeCtrl::GetImageList(int which) const -{ - if (which == wxIMAGE_LIST_NORMAL) { - return m_imageListNormal; - } - else - if (which == wxIMAGE_LIST_STATE) { - return m_imageListState; - } - return NULL; +wxImageList *wxTreeCtrl::GetImageList() const { + return m_imageListNormal; } -void wxTreeCtrl::SetImageList(wxImageList *imageList, int which) -{ - if (which == wxIMAGE_LIST_NORMAL) - m_imageListNormal = imageList; - else - if (which == wxIMAGE_LIST_STATE) - m_imageListState = imageList; +wxImageList *wxTreeCtrl::GetStateImageList() const { + return m_imageListState; } -long wxTreeCtrl::GetNextItem(long item, int code) const -{ - switch (code) { - case wxTREE_NEXT_CARET: -// flag = TVGN_CARET; - break; - case wxTREE_NEXT_CHILD: -// flag = TVGN_CHILD; - break; - case wxTREE_NEXT_DROPHILITE: -// flag = TVGN_DROPHILITE; - break; - case wxTREE_NEXT_FIRSTVISIBLE: -// flag = TVGN_FIRSTVISIBLE; - break; - case wxTREE_NEXT_NEXT: -// flag = TVGN_NEXT; - break; - case wxTREE_NEXT_NEXTVISIBLE: -// flag = TVGN_NEXTVISIBLE; - break; - case wxTREE_NEXT_PARENT: -// flag = TVGN_PARENT; - break; - case wxTREE_NEXT_PREVIOUS: -// flag = TVGN_PREVIOUS; - break; - case wxTREE_NEXT_PREVIOUSVISIBLE: -// flag = TVGN_PREVIOUSVISIBLE; - break; - case wxTREE_NEXT_ROOT: -// flag = TVGN_ROOT; - break; - - default : - break; - } -// return (long) TreeView_GetNextItem( (HWND) GetHWND(), (HTREEITEM) item, flag); - return 0; +void wxTreeCtrl::SetImageList(wxImageList *imageList) { + m_imageListNormal = imageList; } -bool wxTreeCtrl::ItemHasChildren(long item) const -{ - GtkTreeItem *p; +void wxTreeCtrl::SetStateImageList(wxImageList *imageList) { + m_imageListState = imageList; +} + +wxString wxTreeCtrl::GetItemText(const wxTreeItemId &item) const { + char *t; + + if (!item.IsOk()) + return wxString(""); + + GtkLabel *l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "w_label")); + gtk_label_get(l, &t); + + return t; +} + +int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const { + if (!item.IsOk()) + return (-1); + + return (int)gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "image"); +} + +int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const { + if (!item.IsOk()) + return (-1); + + return (int)gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "selectedImage"); +} + +wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const { + if (!item.IsOk()) + return NULL; + + return (wxTreeItemData *)gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "data"); +} + +void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text) { + if (!item.IsOk()) + return; + + GtkLabel *l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "w_label")); + gtk_label_set(l, text); +} + +void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image) { + if (!item.IsOk()) + return; + + gtk_object_set_data(GTK_OBJECT((GtkTreeItem *)item), "image", (void *)image); +} + +void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image) { + if (!item.IsOk()) + return; + + gtk_object_set_data(GTK_OBJECT((GtkTreeItem *)item), "selectedImage", (void *)image); +} + +void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data) { + if (!item.IsOk()) + return; + + gtk_object_set_data(GTK_OBJECT((GtkTreeItem *)item), "data", data); +} + +bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const { +#warning "Need to implement IsVisible" + return FALSE; +} + +bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const { int count = 0; - p = findGtkTreeItem(item); - - gtk_container_foreach(GTK_CONTAINER(p), gtk_treectrl_count_callback, &count); + gtk_container_foreach(GTK_CONTAINER((GtkTreeItem *)item), gtk_treectrl_count_callback, &count); return (count != 0); } -static GtkTreeItem *findItem(GtkTreeItem *p, long id) -{ - GtkTreeItem *q; +bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const { + return (((GtkTreeItem *)item)->expanded != 0); +} - if (((long)gtk_object_get_data(GTK_OBJECT(p), "id")) == id) - return p; +bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const { +#warning "Need to implement IsSelected" + return FALSE; +} - if (p->subtree == NULL) - return NULL; +wxTreeItemId wxTreeCtrl::GetRootItem() const { + return m_anchor; +} - GtkTree *tree = GTK_TREE(p->subtree); +wxTreeItemId wxTreeCtrl::GetSelection() const { +#warning "Need to complete gtk_treectrl_next_selected_callback" + GtkTreeItem *next = NULL; - GList *list = gtk_container_children(GTK_CONTAINER(tree)); - guint len = g_list_length(list); + GList *list = gtk_container_children(GTK_CONTAINER(m_anchor)); + next = GTK_TREE_ITEM(list->data); +// gtk_container_foreach(GTK_CONTAINER(m_anchor), gtk_treectrl_next_selected_callback, &next); - for (guint i=0; idata)) - continue; - q = GTK_TREE_ITEM(l->data); - GtkTreeItem *ret = findItem(q, id); - if (ret != NULL) - return ret; - } + return next; +} + +wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const { +#warning "data 'parent' is missing!!!" + if (item.IsOk()) + return (GtkTreeItem *)gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "parent"); return NULL; } -GtkTreeItem *wxTreeCtrl::findGtkTreeItem(long id) const -{ - return findItem(m_anchor, id); +wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const { +#warning "Need to implement GetFirstChild" + return NULL; } -long wxTreeCtrl::GetChild(long item) const -{ +wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const { +#warning "Need to implement GetNextChild" + return NULL; +} + +wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const { +#warning "Need to implement GetNextSibling" + return NULL; +} + +wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const { +#warning "Need to implement GetPrevSibling" + return NULL; +} + +wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const { +#warning "Need to implement GetFirstVisibleItem" + return NULL; +} + +wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const { +#warning "Need to implement GetNextVisible" + return NULL; +} + +wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const { +#warning "Need to implement GetPrevVisible" + return NULL; +} + +wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text, int image, + int selectedImage, wxTreeItemData *data) { + return p_InsertItem(0, text, image, selectedImage, data); +} + +wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent, + const wxString& text, int image, int selectedImage, + wxTreeItemData *data) { +#warning "Need to implement PrependItem" + return NULL; +} + +wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent, + const wxTreeItemId& idPrevious, const wxString& text, + int image, int selectedImage, wxTreeItemData *data) { +#warning "Need to implement InsertItem" + return NULL; +} + +wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent, + const wxString& text, int image, int selectedImage, + wxTreeItemData *data) { + return p_InsertItem(parent, text, image, selectedImage, data); +} + +wxTreeItemId wxTreeCtrl::p_InsertItem(GtkTreeItem *p, + const wxString& text, int image, int selectedImage, + wxTreeItemData *data) { + GtkTreeItem *item; + +printf("begin insert\n"); + + item = GTK_TREE_ITEM(gtk_tree_item_new()); + + GtkHBox *m_box = GTK_HBOX(gtk_hbox_new(FALSE, 0)); + gtk_container_add (GTK_CONTAINER (item), GTK_WIDGET(m_box)); + + gtk_object_set_data(GTK_OBJECT(item), "w_box", m_box); + + const wxBitmap *bmp; + const wxImageList *list; + if ((list = GetImageList(wxIMAGE_LIST_NORMAL)) != NULL) + if ((bmp = list->GetBitmap(image)) != NULL) + if (bmp->Ok()) { + GdkBitmap *mask = NULL; + if (bmp->GetMask()) + mask = bmp->GetMask()->GetBitmap(); + GtkPixmap *m_image_widget = GTK_PIXMAP(gtk_pixmap_new(bmp->GetPixmap(), mask)); + gtk_misc_set_alignment (GTK_MISC (m_image_widget), 0.0, 0.5); + gtk_box_pack_start(GTK_BOX(m_box), GTK_WIDGET(m_image_widget), FALSE, FALSE, 0); + gtk_object_set_data(GTK_OBJECT(item), "w_image", (void *)m_image_widget); + gtk_object_set_data(GTK_OBJECT(item), "image", (void *)image); + gtk_widget_show (GTK_WIDGET(m_image_widget)); + } + GtkLabel *m_label_widget = GTK_LABEL(gtk_label_new ((char *)(const char *)text)); + gtk_misc_set_alignment (GTK_MISC (m_label_widget), 0.5, 0.5); + gtk_box_pack_start(GTK_BOX(m_box), GTK_WIDGET(m_label_widget), FALSE, FALSE, 0); + gtk_object_set_data(GTK_OBJECT(item), "w_label", m_label_widget); + gtk_widget_show (GTK_WIDGET(m_label_widget)); + + gtk_widget_show(GTK_WIDGET(m_box)); + + gtk_object_set_data(GTK_OBJECT(item), "owner", this); + + if (p != 0) { + if (p->subtree == NULL) { + GtkTree *tree = GTK_TREE(gtk_tree_new()); + gtk_tree_item_set_subtree(GTK_TREE_ITEM(p), GTK_WIDGET(tree)); + gtk_widget_show(GTK_WIDGET(tree)); + p->expanded = 1; + } + + gtk_container_add(GTK_CONTAINER(p->subtree), GTK_WIDGET(item)); + } else { +printf("Adding root\n"); +printf("m_tree = %p\n", m_tree); + m_anchor = item; + gtk_container_add(GTK_CONTAINER(m_tree), GTK_WIDGET(item)); + } + +/* + if ((info.m_mask & wxTREE_MASK_CHILDREN) != 0) { + GtkTree *tree = GTK_TREE(gtk_tree_new()); + gtk_tree_item_set_subtree(GTK_TREE_ITEM(item), GTK_WIDGET(tree)); + gtk_widget_show(GTK_WIDGET(tree)); + } +*/ + + gtk_object_set_data(GTK_OBJECT(item), "data", data); + + gtk_widget_show(GTK_WIDGET(item)); + + gtk_signal_connect(GTK_OBJECT(item), "select", + GTK_SIGNAL_FUNC(gtk_treeitem_select_callback), (gpointer)this ); + + gtk_signal_connect(GTK_OBJECT(item), "deselect", + GTK_SIGNAL_FUNC(gtk_treeitem_select_callback), (gpointer)this ); + + gtk_signal_connect(GTK_OBJECT(item), "expand", + GTK_SIGNAL_FUNC(gtk_treeitem_expand_callback), (gpointer)this ); + gtk_signal_connect(GTK_OBJECT(item), "collapse", + GTK_SIGNAL_FUNC(gtk_treeitem_collapse_callback), (gpointer)this ); + + return item; +} + +void wxTreeCtrl::Delete(const wxTreeItemId& item) { + if (!item.IsOk()) + return; + + GtkTreeItem *parent = GTK_TREE_ITEM(GTK_WIDGET((GtkTreeItem *)item)->parent); + if (parent == NULL) + return; + + gtk_container_remove(GTK_CONTAINER(parent), GTK_WIDGET((GtkTreeItem *)item)); + + return; +} + +void wxTreeCtrl::DeleteAllItems() { + gtk_tree_item_remove_subtree(m_anchor); +} + +void wxTreeCtrl::Expand(const wxTreeItemId& item) { + if (!item.IsOk()) + return; + + gtk_tree_item_expand(GTK_TREE_ITEM((GtkTreeItem *)item)); +} + +void wxTreeCtrl::Collapse(const wxTreeItemId& item) { + if (!item.IsOk()) + return; + + gtk_tree_item_collapse(GTK_TREE_ITEM((GtkTreeItem *)item)); +} + +void wxTreeCtrl::CollapseAndReset(const wxTreeItemId& item) { + if (!item.IsOk()) + return; + + gtk_tree_item_collapse(GTK_TREE_ITEM((GtkTreeItem *)item)); + gtk_tree_item_remove_subtree(GTK_TREE_ITEM((GtkTreeItem *)item)); +} + +void wxTreeCtrl::Toggle(const wxTreeItemId& item) { + if (!item.IsOk()) + return; + + if (((GtkTreeItem *)item)->expanded) + gtk_tree_item_collapse(GTK_TREE_ITEM((GtkTreeItem *)item)); + else + gtk_tree_item_expand(GTK_TREE_ITEM((GtkTreeItem *)item)); +} + +void wxTreeCtrl::Unselect() { +#warning "Need to implement Unselect" +} + +void wxTreeCtrl::SelectItem(const wxTreeItemId& item) { + if (!item.IsOk()) + return; + + gtk_tree_item_select((GtkTreeItem *)item); +} + +void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item) { +#warning "Need to implement EnsureVisible" +} + +void wxTreeCtrl::ScrollTo(const wxTreeItemId& item) { +#warning "Need to implement ScrollTo" +} + +wxTextCtrl* wxTreeCtrl::EditLabel(const wxTreeItemId& item, + wxClassInfo* textControlClass) { + wxASSERT( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)) ); +#warning "Need to implement EditLabel" + return m_textCtrl; +} + +wxTextCtrl* wxTreeCtrl::GetEditControl() const { + return m_textCtrl; +} + +void wxTreeCtrl::EndEditLabel(const wxTreeItemId& item, bool discardChanges) { +#warning "Need to implement EndEditLabel" +} + +void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action) { + switch (action) { + case wxTREE_EXPAND_EXPAND: + Expand(item); + break; + + case wxTREE_EXPAND_COLLAPSE: + Collapse(item); + break; + + case wxTREE_EXPAND_COLLAPSE_RESET: + CollapseAndReset(item); + break; + + case wxTREE_EXPAND_TOGGLE: + Toggle(item); + break; + + default: + wxFAIL_MSG("unknown action in wxTreeCtrl::ExpandItem"); + } +} + +wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent, + const wxString& text, int image, int selImage, + long insertAfter) { +// InsertItem(parent, insertAfter, text, image, selImage); + #warning "Need to implement InsertItem" + return NULL; +} + +/* Old functions +long wxTreeCtrl::GetChild(long item) const { GtkTreeItem *p; GtkTreeItem *next = NULL; @@ -297,19 +563,7 @@ long wxTreeCtrl::GetChild(long item) const return (-1); } -long wxTreeCtrl::GetParent(long item) const -{ - GtkTreeItem *p; - - p = findGtkTreeItem(item); - if (p != NULL) - return (long)gtk_object_get_data(GTK_OBJECT(p), "parent"); - - return (-1); -} - -long wxTreeCtrl::GetFirstVisibleItem() const -{ +long wxTreeCtrl::GetFirstVisibleItem(void) const { GtkTreeItem *next = NULL; GList *list = gtk_container_children(GTK_CONTAINER(m_anchor)); @@ -322,8 +576,7 @@ long wxTreeCtrl::GetFirstVisibleItem() const return (-1); } -long wxTreeCtrl::GetNextVisibleItem(long item) const -{ +long wxTreeCtrl::GetNextVisibleItem(long item) const { GtkTreeItem *p; GtkTreeItem *next = NULL; @@ -338,33 +591,13 @@ long wxTreeCtrl::GetNextVisibleItem(long item) const return (-1); } -long wxTreeCtrl::GetSelection() const -{ - GtkTreeItem *next = NULL; - - GList *list = gtk_container_children(GTK_CONTAINER(m_anchor)); - next = GTK_TREE_ITEM(list->data);; -// gtk_container_foreach(GTK_CONTAINER(m_anchor), gtk_treectrl_next_selected_callback, &next); - - if (next != NULL) - return (long)gtk_object_get_data(GTK_OBJECT(next), "id"); - - return (-1); -} - -long wxTreeCtrl::GetRootItem() const -{ - return (long)gtk_object_get_data(GTK_OBJECT(m_anchor), "id"); -} - -bool wxTreeCtrl::GetItem(wxTreeItem& info) const -{ +bool wxTreeCtrl::GetItem(wxTreeItem& info) const { GtkTreeItem *p; p = findGtkTreeItem(info.m_itemId); if (p == NULL) { - wxLogError("TreeCtrl::GetItem failed."); + wxLogSysError("TreeCtrl::GetItem failed"); return FALSE; } @@ -373,14 +606,13 @@ bool wxTreeCtrl::GetItem(wxTreeItem& info) const return TRUE; } -bool wxTreeCtrl::SetItem(wxTreeItem& info) -{ +bool wxTreeCtrl::SetItem(wxTreeItem& info) { GtkTreeItem *p; p = findGtkTreeItem(info.m_itemId); if (p == NULL) { - wxLogError("TreeCtrl::SetItem failed."); + wxLogSysError("TreeCtrl::SetItem failed"); return FALSE; } @@ -389,8 +621,7 @@ bool wxTreeCtrl::SetItem(wxTreeItem& info) return TRUE; } -int wxTreeCtrl::GetItemState(long item, long stateMask) const -{ +int wxTreeCtrl::GetItemState(long item, long stateMask) const { wxTreeItem info; info.m_mask = wxTREE_MASK_STATE ; @@ -403,8 +634,7 @@ int wxTreeCtrl::GetItemState(long item, long stateMask) const return info.m_state; } -bool wxTreeCtrl::SetItemState(long item, long state, long stateMask) -{ +bool wxTreeCtrl::SetItemState(long item, long state, long stateMask) { wxTreeItem info; info.m_mask = wxTREE_MASK_STATE ; @@ -414,113 +644,11 @@ bool wxTreeCtrl::SetItemState(long item, long state, long stateMask) return SetItem(info); } - -bool wxTreeCtrl::SetItemImage(long item, int image, int selImage) -{ - wxTreeItem info; - - info.m_mask = wxTREE_MASK_IMAGE ; - info.m_image = image; - if (selImage > -1) { - info.m_selectedImage = selImage; - info.m_mask |= wxTREE_MASK_SELECTED_IMAGE; - } - info.m_itemId = item; - - return SetItem(info); -} - -wxString wxTreeCtrl::GetItemText(long item) const -{ - wxTreeItem info; - - info.m_mask = wxTREE_MASK_TEXT ; - info.m_itemId = item; - - if (!GetItem(info)) - return wxString(""); - return info.m_text; -} - -void wxTreeCtrl::SetItemText(long item, const wxString& str) -{ - wxTreeItem info; - - info.m_mask = wxTREE_MASK_TEXT ; - info.m_itemId = item; - info.m_text = str; - - SetItem(info); -} - -long wxTreeCtrl::GetItemData(long item) const -{ - wxTreeItem info; - - info.m_mask = wxTREE_MASK_DATA ; - info.m_itemId = item; - - if (!GetItem(info)) - return 0; - return info.m_data; -} - -bool wxTreeCtrl::SetItemData(long item, long data) -{ - wxTreeItem info; - - info.m_mask = wxTREE_MASK_DATA ; - info.m_itemId = item; - info.m_data = data; - - return SetItem(info); -} - -bool wxTreeCtrl::GetItemRect(long item, wxRectangle& rect, bool textOnly) const -{ -/* - RECT rect2; - - *(HTREEITEM*)& rect2 = (HTREEITEM) item; - bool success = (::SendMessage((HWND) GetHWND(), TVM_GETITEMRECT, (WPARAM)textOnly, - (LPARAM)&rect2) != 0); - - rect.x = rect2.left; - rect.y = rect2.top; - rect.width = rect2.right - rect2.left; - rect.height = rect2.bottom - rect2.left; - return success; */ - wxFAIL_MSG("Not implemented"); - - return FALSE; -} - -wxTextCtrl* wxTreeCtrl::GetEditControl() const -{ - return m_textCtrl; -} // Operations -bool wxTreeCtrl::DeleteItem(long item) -{ - GtkTreeItem *p; - - p = findGtkTreeItem(item); - if (p == NULL) - return FALSE; - - GtkTreeItem *parent = GTK_TREE_ITEM(GTK_WIDGET(p)->parent); - if (parent == NULL) - return FALSE; - - gtk_container_remove(GTK_CONTAINER(parent), GTK_WIDGET(p)); - - return TRUE; -} - -bool wxTreeCtrl::DeleteChildren(long item) -{ +/* +bool wxTreeCtrl::DeleteChildren(long item) { GtkTreeItem *p; p = findGtkTreeItem(item); @@ -531,46 +659,10 @@ bool wxTreeCtrl::DeleteChildren(long item) return TRUE; } +*/ -bool wxTreeCtrl::ExpandItem(long item, int action) -{ - GtkTreeItem *p; - - p = findGtkTreeItem(item); - - if (p == NULL) - return FALSE; - - switch (action) { - case wxTREE_EXPAND_EXPAND: - gtk_tree_item_expand(GTK_TREE_ITEM(p)); - break; - - case wxTREE_EXPAND_COLLAPSE: - gtk_tree_item_collapse(GTK_TREE_ITEM(p)); - break; - - case wxTREE_EXPAND_COLLAPSE_RESET: - gtk_tree_item_collapse(GTK_TREE_ITEM(p)); - gtk_tree_item_remove_subtree(GTK_TREE_ITEM(p)); - break; - - case wxTREE_EXPAND_TOGGLE: - if (p->expanded) - gtk_tree_item_collapse(GTK_TREE_ITEM(p)); - else - gtk_tree_item_expand(GTK_TREE_ITEM(p)); - break; - - default: - wxFAIL_MSG("unknown action in wxTreeCtrl::ExpandItem"); - } - - return TRUE; -} - -long wxTreeCtrl::InsertItem(long parent, wxTreeItem& info, long insertAfter) -{ +/* +long wxTreeCtrl::InsertItem(long parent, wxTreeItem& info, long insertAfter) { GtkTreeItem *p; GtkTreeItem *item = NULL; @@ -633,262 +725,49 @@ long wxTreeCtrl::InsertItem(long parent, const wxString& label, int image, return InsertItem(parent, info, insertAfter); } - -bool wxTreeCtrl::SelectItem(long item) -{ - GtkTreeItem *p; - - p = findGtkTreeItem(item); - if (p == NULL) - return FALSE; - - gtk_tree_item_select(p); - return TRUE; -} - -bool wxTreeCtrl::ScrollTo(long item) -{ - wxFAIL_MSG("Not implemented"); - - return FALSE; // Still unimplemented -} - -bool wxTreeCtrl::DeleteAllItems() -{ - gtk_tree_item_remove_subtree(m_anchor); - return TRUE; -} - -wxTextCtrl* wxTreeCtrl::EditLabel(long item, wxClassInfo* textControlClass) -{ - wxASSERT( (textControlClass->IsKindOf(CLASSINFO(wxTextCtrl))) ); - -/* - HWND hWnd = (HWND) TreeView_EditLabel((HWND) GetHWND(), item); - - if (m_textCtrl) - { - m_textCtrl->UnsubclassWin(); - m_textCtrl->SetHWND(0); - delete m_textCtrl; - m_textCtrl = NULL; - } - - m_textCtrl = (wxTextCtrl*) textControlClass->CreateObject(); - m_textCtrl->SetHWND((WXHWND) hWnd); - m_textCtrl->SubclassWin((WXHWND) hWnd); - -*/ - wxFAIL_MSG("Not implemented"); - - return m_textCtrl; -} - -// End label editing, optionally cancelling the edit -bool wxTreeCtrl::EndEditLabel(bool cancel) -{ -/* - bool success = (TreeView_EndEditLabelNow((HWND) GetHWND(), cancel) != 0); - - if (m_textCtrl) - { - m_textCtrl->UnsubclassWin(); - m_textCtrl->SetHWND(0); - delete m_textCtrl; - m_textCtrl = NULL; - } - return success; -*/ - wxFAIL_MSG("Not implemented"); - - return FALSE; -} - -long wxTreeCtrl::HitTest(const wxPoint& point, int& flags) -{ -/* - TV_HITTESTINFO hitTestInfo; - hitTestInfo.pt.x = (int) point.x; - hitTestInfo.pt.y = (int) point.y; - - TreeView_HitTest((HWND) GetHWND(), & hitTestInfo); - - flags = 0; - if ( hitTestInfo.flags & TVHT_ABOVE ) - flags |= wxTREE_HITTEST_ABOVE; - if ( hitTestInfo.flags & TVHT_BELOW ) - flags |= wxTREE_HITTEST_BELOW; - if ( hitTestInfo.flags & TVHT_NOWHERE ) - flags |= wxTREE_HITTEST_NOWHERE; - if ( hitTestInfo.flags & TVHT_ONITEMBUTTON ) - flags |= wxTREE_HITTEST_ONITEMBUTTON; - if ( hitTestInfo.flags & TVHT_ONITEMICON ) - flags |= wxTREE_HITTEST_ONITEMICON; - if ( hitTestInfo.flags & TVHT_ONITEMINDENT ) - flags |= wxTREE_HITTEST_ONITEMINDENT; - if ( hitTestInfo.flags & TVHT_ONITEMLABEL ) - flags |= wxTREE_HITTEST_ONITEMLABEL; - if ( hitTestInfo.flags & TVHT_ONITEMRIGHT ) - flags |= wxTREE_HITTEST_ONITEMRIGHT; - if ( hitTestInfo.flags & TVHT_ONITEMSTATEICON ) - flags |= wxTREE_HITTEST_ONITEMSTATEICON; - if ( hitTestInfo.flags & TVHT_TOLEFT ) - flags |= wxTREE_HITTEST_TOLEFT; - if ( hitTestInfo.flags & TVHT_TORIGHT ) - flags |= wxTREE_HITTEST_TORIGHT; - - return (long) hitTestInfo.hItem ; -*/ - wxFAIL_MSG("Not implemented"); - - return 0; -} - -/* -wxImageList *wxTreeCtrl::CreateDragImage(long item) -{ -} */ -bool wxTreeCtrl::SortChildren(long item) -{ - wxFAIL_MSG("Not implemented"); - - return FALSE; // Still unimplemented -} - -bool wxTreeCtrl::EnsureVisible(long item) -{ - wxFAIL_MSG("Not implemented"); - - return FALSE; // Still unimplemented -} - -void wxTreeCtrl::SendExpanding(long item) -{ +void wxTreeCtrl::SendExpanding(const wxTreeItemId& item) { wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId()); event.SetEventObject(this); ProcessEvent(event); } -void wxTreeCtrl::SendExpanded(long item) -{ +void wxTreeCtrl::SendExpanded(const wxTreeItemId& item) { wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_EXPANDED, GetId()); event.SetEventObject(this); ProcessEvent(event); } -void wxTreeCtrl::SendCollapsing(long item) -{ +void wxTreeCtrl::SendCollapsing(const wxTreeItemId& item) { wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId()); event.SetEventObject(this); ProcessEvent(event); } -void wxTreeCtrl::SendCollapsed(long item) -{ +void wxTreeCtrl::SendCollapsed(const wxTreeItemId& item) { wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSED, GetId()); event.SetEventObject(this); ProcessEvent(event); } -void wxTreeCtrl::SendSelChanging(long item) -{ +void wxTreeCtrl::SendSelChanging(const wxTreeItemId& item) { wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGED, GetId()); event.SetEventObject(this); ProcessEvent(event); } -void wxTreeCtrl::SendSelChanged(long item) -{ +void wxTreeCtrl::SendSelChanged(const wxTreeItemId& item) { wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, GetId()); event.SetEventObject(this); ProcessEvent(event); } -// Tree item structure -wxTreeItem::wxTreeItem() -{ - m_mask = 0; - m_itemId = 0; - m_state = 0; - m_stateMask = 0; - m_image = -1; - m_selectedImage = -1; - m_children = 0; - m_data = 0; -} - -// If getFullInfo is TRUE, we explicitly query for more info if we haven't got it all. - -static void wxConvertFromGtkTreeItem(wxTreeItem& info, GtkTreeItem *gtkItem) -{ - GtkLabel *l; - char *t; - - info.m_data = (long)gtk_object_get_data(GTK_OBJECT(gtkItem), "data"); - info.m_itemId = (long)gtk_object_get_data(GTK_OBJECT(gtkItem), "id"); - info.m_image = (int)gtk_object_get_data(GTK_OBJECT(gtkItem), "image"); - info.m_selectedImage = (int)gtk_object_get_data(GTK_OBJECT(gtkItem), "selectedImage"); - - info.m_mask = 0; - info.m_state = 0; - info.m_stateMask = 0; - l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT(gtkItem), "label")); - gtk_label_get(l, &t); - info.m_text = t; -} - -static void wxConvertToGtkTreeItem(wxTreeCtrl *owner, wxTreeItem& info, GtkTreeItem **gtkItem) -{ - GtkTreeItem *item = (*gtkItem); - - if (item == NULL) { - item = GTK_TREE_ITEM(gtk_tree_item_new()); - - GtkHBox *m_box = GTK_HBOX(gtk_hbox_new(FALSE, 0)); - gtk_container_add (GTK_CONTAINER (item), GTK_WIDGET(m_box)); - - gtk_object_set_data(GTK_OBJECT(item), "box", m_box); - - const wxBitmap *bmp; - const wxImageList *list; - if (owner != NULL) - if ((list = owner->GetImageList(wxIMAGE_LIST_NORMAL)) != NULL) - if ((bmp = list->GetBitmap(info.m_image)) != NULL) - if (bmp->Ok()) { - GdkBitmap *mask = NULL; - if (bmp->GetMask()) - mask = bmp->GetMask()->GetBitmap(); - GtkPixmap *m_image_widget = GTK_PIXMAP(gtk_pixmap_new(bmp->GetPixmap(), mask)); - gtk_misc_set_alignment (GTK_MISC (m_image_widget), 0.0, 0.5); - gtk_box_pack_start(GTK_BOX(m_box), GTK_WIDGET(m_image_widget), FALSE, FALSE, 0); - gtk_object_set_data(GTK_OBJECT(item), "image", m_image_widget); - gtk_widget_show (GTK_WIDGET(m_image_widget)); - } - - GtkLabel *m_label_widget = GTK_LABEL(gtk_label_new ((char *)(const char *)info.m_text)); - gtk_misc_set_alignment (GTK_MISC (m_label_widget), 0.5, 0.5); - - gtk_box_pack_start(GTK_BOX(m_box), GTK_WIDGET(m_label_widget), FALSE, FALSE, 0); - gtk_object_set_data(GTK_OBJECT(item), "label", m_label_widget); - - gtk_widget_show (GTK_WIDGET(m_label_widget)); - - gtk_widget_show(GTK_WIDGET(m_box)); - gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer)info.m_itemId); - gtk_object_set_data(GTK_OBJECT(item), "owner", owner); - (*gtkItem) = item; - } -} - // Tree event IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxCommandEvent) -wxTreeEvent::wxTreeEvent(wxEventType commandType, int id) - : wxCommandEvent(commandType, id) -{ +wxTreeEvent::wxTreeEvent(wxEventType commandType, int id): + wxCommandEvent(commandType, id) { m_code = 0; - m_oldItem = 0; + m_itemOld = 0; } -