#ifndef _WX_TREEBASE_H_
#define _WX_TREEBASE_H_
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "treebase.h"
#endif
#include "wx/window.h" // for wxClientData
#include "wx/event.h"
+#include "wx/dynarray.h"
// ----------------------------------------------------------------------------
// wxTreeItemId identifies an element of the tree. In this implementation, it's
wxTreeItemId m_pItem;
};
-WX_DEFINE_EXPORTED_ARRAY(wxTreeItemId, wxArrayTreeItemIds);
+WX_DEFINE_EXPORTED_ARRAY_LONG(wxTreeItemId, wxArrayTreeItemIds);
// ----------------------------------------------------------------------------
// constants
wxTreeItemIcon_Max
};
-enum wxButtonImage // effectively the same as wxTreeItemIcon
-{
- wxCLOSED_BUTTON = 0, // closed, not selected
- wxCLOSED_BUTTON_SELECTED, // closed, selected
- wxOPEN_BUTTON, // open, not selected
- wxOPEN_BUTTON_SELECTED // open, selected
-};
-
/*
* wxTreeCtrl flags
*/
// TODO: maybe renumber these?
-#define wxTR_NO_BUTTONS 0x0000 // for convenience
-#define wxTR_HAS_BUTTONS 0x0004 // generates a +/- button
-#define wxTR_TWIST_BUTTONS 0x0008 // twister buttons
-#define wxTR_NO_LINES 0x0100 // don't generate level connectors
-#define wxTR_MAC_BUTTONS wxTR_TWIST_BUTTONS // backward compatibility
-
-#define wxTR_SINGLE 0x0000 // for convenience
-#define wxTR_MULTIPLE 0x0020 // can select multiple items
-#define wxTR_EXTENDED 0x0040 // TODO: allow extended selection
-
-#define wxTR_EDIT_LABELS 0x0200 // can edit item labels
-#define wxTR_LINES_AT_ROOT 0x0010 // specific to wxMSW
-#define wxTR_HIDE_ROOT 0x0800 // don't display root node
-#define wxTR_ROW_LINES 0x0400 // put border around items
-#define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080 // what it says
+#define wxTR_NO_BUTTONS 0x0000 // for convenience
+#define wxTR_HAS_BUTTONS 0x0001 // generates a +/- button
+#define wxTR_TWIST_BUTTONS 0x0002 // generates a twister button
+#define wxTR_NO_LINES 0x0004 // don't generate level connectors
+#define wxTR_LINES_AT_ROOT 0x0008 // connect top-level nodes
+#define wxTR_MAC_BUTTONS wxTR_TWIST_BUTTONS // backward compatibility
+#define wxTR_AQUA_BUTTONS 0x0010 // used internally
+
+#define wxTR_SINGLE 0x0000 // for convenience
+#define wxTR_MULTIPLE 0x0020 // can select multiple items
+#define wxTR_EXTENDED 0x0040 // TODO: allow extended selection
+#define wxTR_FULL_ROW_HIGHLIGHT 0x2000 // highlight full horizontal space
+
+#define wxTR_EDIT_LABELS 0x0200 // can edit item labels
+#define wxTR_ROW_LINES 0x0400 // put border around items
+#define wxTR_HIDE_ROOT 0x0800 // don't display root node
+#define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080 // what it says
// TODO: different default styles for wxGTK, wxMotif, whatever?
#ifdef __WXMAC__
class WXDLLEXPORT wxTreeEvent : public wxNotifyEvent
{
- friend class WXDLLEXPORT wxTreeCtrl;
- friend class WXDLLEXPORT wxGenericTreeCtrl;
-
public:
wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
// 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; }
+ void SetItem(const wxTreeItemId& item) { m_item = item; }
// for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events, get the previously
// selected item
wxTreeItemId GetOldItem() const { return m_itemOld; }
+ void SetOldItem(const wxTreeItemId& item) { m_itemOld = item; }
// the point where the mouse was when the drag operation started (for
// wxEVT_COMMAND_TREE_BEGIN_(R)DRAG events only) or click position
wxPoint GetPoint() const { return m_pointDrag; }
+ void SetPoint(const wxPoint& pt) { m_pointDrag = pt; }
- // keyboard code (for wxEVT_COMMAND_TREE_KEY_DOWN only)
- int GetCode() const { return m_code; }
+ // keyboard data (for wxEVT_COMMAND_TREE_KEY_DOWN only)
+ const wxKeyEvent& GetKeyEvent() const { return m_evtKey; }
+ int GetKeyCode() const { return m_evtKey.GetKeyCode(); }
+ void SetKeyEvent(const wxKeyEvent& evt) { m_evtKey = evt; }
// label (for EVT_TREE_{BEGIN|END}_LABEL_EDIT only)
const wxString& GetLabel() const { return m_label; }
+ void SetLabel(const wxString& label) { m_label = label; }
+
+ // edit cancel flag (for EVT_TREE_{BEGIN|END}_LABEL_EDIT only)
+ bool IsEditCancelled() const { return m_editCancelled; }
+ void SetEditCanceled(bool editCancelled) { m_editCancelled = editCancelled; }
+
+#if WXWIN_COMPATIBILITY_2_2
+ // for compatibility only, don't use
+ int GetCode() const { return m_evtKey.GetKeyCode(); }
+#endif // WXWIN_COMPATIBILITY_2_2
private:
- // we could probably save some space by using union here
- int m_code;
+ // not all of the members are used (or initialized) for all events
+ wxKeyEvent m_evtKey;
wxTreeItemId m_item,
m_itemOld;
wxPoint m_pointDrag;
wxString m_label;
+ bool m_editCancelled;
+
+ friend class WXDLLEXPORT wxTreeCtrl;
+ friend class WXDLLEXPORT wxGenericTreeCtrl;
+
+ DECLARE_DYNAMIC_CLASS(wxTreeEvent);
};
typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
#define EVT_TREE_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL ),
#define EVT_TREE_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL ),
-// GetCode() returns the key code
+// GetKeyCode() 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) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL ),
projects / wxWidgets.git / blobdiff