wxTreeEvent is declared in one header, not 3 of them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
5ea4780630
commit
c193b707eb
@ -142,89 +142,6 @@ protected:
|
||||
wxTreeItemId m_pItem;
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// wxTreeEvent - the event generated by the tree control
|
||||
// -----------------------------------------------------------------------------
|
||||
class WXDLLEXPORT wxTreeEvent : public wxNotifyEvent
|
||||
{
|
||||
friend class wxTreeCtrl;
|
||||
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; }
|
||||
|
||||
// for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events, get the previously
|
||||
// selected item
|
||||
wxTreeItemId GetOldItem() const { return m_itemOld; }
|
||||
|
||||
// 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; }
|
||||
|
||||
// for implementation usage only
|
||||
bool WasVetoed() const { return m_code; }
|
||||
|
||||
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 },
|
||||
|
||||
// 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 },
|
||||
|
||||
// GetItem() returns the item that was activated (double click, enter, space)
|
||||
#define EVT_TREE_ITEM_ACTIVATED(id, fn) { wxEVT_COMMAND_TREE_ITEM_ACTIVATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// wxTreeCtrl - the tree control
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
@ -17,8 +17,6 @@
|
||||
#endif
|
||||
|
||||
#include "wx/textctrl.h"
|
||||
#include "wx/control.h"
|
||||
#include "wx/event.h"
|
||||
#include "wx/imaglist.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
@ -408,85 +406,5 @@ protected:
|
||||
DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// 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
|
||||
{
|
||||
friend wxTreeCtrl;
|
||||
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; }
|
||||
|
||||
// for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events, get the previously
|
||||
// selected item
|
||||
wxTreeItemId GetOldItem() const { return m_itemOld; }
|
||||
|
||||
// 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 },
|
||||
|
||||
// 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_
|
||||
|
||||
@ -17,8 +17,6 @@
|
||||
#endif
|
||||
|
||||
#include "wx/textctrl.h"
|
||||
#include "wx/control.h"
|
||||
#include "wx/event.h"
|
||||
#include "wx/imaglist.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
@ -408,85 +406,5 @@ protected:
|
||||
DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// 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
|
||||
{
|
||||
friend wxTreeCtrl;
|
||||
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; }
|
||||
|
||||
// for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events, get the previously
|
||||
// selected item
|
||||
wxTreeItemId GetOldItem() const { return m_itemOld; }
|
||||
|
||||
// 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 },
|
||||
|
||||
// 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_
|
||||
|
||||
@ -20,8 +20,6 @@
|
||||
#pragma interface "treectrl.h"
|
||||
#endif
|
||||
|
||||
#include "wx/control.h"
|
||||
#include "wx/event.h"
|
||||
#include "wx/textctrl.h"
|
||||
|
||||
#ifdef __GNUWIN32__
|
||||
@ -476,92 +474,5 @@ private:
|
||||
DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// 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 wxNotifyEvent
|
||||
{
|
||||
friend wxTreeCtrl;
|
||||
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; }
|
||||
|
||||
// for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events, get the previously
|
||||
// selected item
|
||||
wxTreeItemId GetOldItem() const { return m_itemOld; }
|
||||
|
||||
// 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; }
|
||||
|
||||
// label (for EVT_TREE_{BEGIN|END}_LABEL_EDIT only)
|
||||
const wxString& GetLabel() const { return m_label; }
|
||||
|
||||
private:
|
||||
// TODO we could save some space by using union here
|
||||
int m_code;
|
||||
wxTreeItemId m_item,
|
||||
m_itemOld;
|
||||
wxPoint m_pointDrag;
|
||||
wxString m_label;
|
||||
|
||||
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, GetLabel() returns
|
||||
// the current item label for BEGIN and the would be new one for END.
|
||||
//
|
||||
// Vetoing BEGIN event means that label editing won't happen at all,
|
||||
// vetoing END means that the new value is discarded and the old one kept
|
||||
#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 },
|
||||
|
||||
// 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 },
|
||||
|
||||
// GetItem() returns the item that was activated (double click, enter, space)
|
||||
#define EVT_TREE_ITEM_ACTIVATED(id, fn) { wxEVT_COMMAND_TREE_ITEM_ACTIVATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
|
||||
|
||||
#endif
|
||||
// _WX_TREECTRL_H_
|
||||
|
||||
@ -1,23 +1,122 @@
|
||||
#ifndef _WX_TREECTRL_H_BASE_
|
||||
#define _WX_TREECTRL_H_BASE_
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// headers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#include "wx/control.h"
|
||||
#include "wx/event.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// include the platform-dependent wxTreeCtrl class
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if defined(__WXMSW__)
|
||||
#ifdef __WIN16__
|
||||
#include "wx/generic/treectrl.h"
|
||||
#else
|
||||
#include "wx/msw/treectrl.h"
|
||||
#endif
|
||||
#ifdef __WIN16__
|
||||
#include "wx/generic/treectrl.h"
|
||||
#else
|
||||
#include "wx/msw/treectrl.h"
|
||||
#endif
|
||||
#elif defined(__WXMOTIF__)
|
||||
#include "wx/generic/treectrl.h"
|
||||
#include "wx/generic/treectrl.h"
|
||||
#elif defined(__WXGTK__)
|
||||
#include "wx/generic/treectrl.h"
|
||||
#include "wx/generic/treectrl.h"
|
||||
#elif defined(__WXQT__)
|
||||
#include "wx/qt/treectrl.h"
|
||||
#include "wx/qt/treectrl.h"
|
||||
#elif defined(__WXMAC__)
|
||||
#include "wx/generic/treectrl.h"
|
||||
#include "wx/generic/treectrl.h"
|
||||
#elif defined(__WXSTUBS__)
|
||||
#include "wx/generic/treectrl.h"
|
||||
#include "wx/generic/treectrl.h"
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// 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 wxNotifyEvent
|
||||
{
|
||||
friend wxTreeCtrl;
|
||||
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; }
|
||||
|
||||
// for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events, get the previously
|
||||
// selected item
|
||||
wxTreeItemId GetOldItem() const { return m_itemOld; }
|
||||
|
||||
// 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; }
|
||||
|
||||
// label (for EVT_TREE_{BEGIN|END}_LABEL_EDIT only)
|
||||
const wxString& GetLabel() const { return m_label; }
|
||||
|
||||
private:
|
||||
// TODO we could save some space by using union here
|
||||
int m_code;
|
||||
wxTreeItemId m_item,
|
||||
m_itemOld;
|
||||
wxPoint m_pointDrag;
|
||||
wxString m_label;
|
||||
|
||||
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, GetLabel() returns
|
||||
// the current item label for BEGIN and the would be new one for END.
|
||||
//
|
||||
// Vetoing BEGIN event means that label editing won't happen at all,
|
||||
// vetoing END means that the new value is discarded and the old one kept
|
||||
#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 },
|
||||
|
||||
// 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 },
|
||||
|
||||
// GetItem() returns the item that was activated (double click, enter, space)
|
||||
#define EVT_TREE_ITEM_ACTIVATED(id, fn) { wxEVT_COMMAND_TREE_ITEM_ACTIVATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
|
||||
|
||||
#endif
|
||||
// _WX_TREECTRL_H_BASE_
|
||||
|
||||
@ -293,8 +293,8 @@ void wxGenericTreeItem::GetSize( int &x, int &y, const wxTreeCtrl *theTree )
|
||||
}
|
||||
|
||||
wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
|
||||
const wxTreeCtrl *theTree,
|
||||
int &flags)
|
||||
const wxTreeCtrl *theTree,
|
||||
int &flags)
|
||||
{
|
||||
if ((point.y > m_y) && (point.y < m_y + theTree->GetLineHeight(this)))
|
||||
{
|
||||
@ -321,9 +321,9 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
|
||||
theTree->m_imageListNormal->GetSize(m_image, image_w, image_h);
|
||||
|
||||
if ((image_w != -1) && (point.x <= m_x + image_w + 1))
|
||||
flags|=wxTREE_HITTEST_ONITEMICON;
|
||||
flags|=wxTREE_HITTEST_ONITEMICON;
|
||||
else
|
||||
flags|=wxTREE_HITTEST_ONITEMLABEL;
|
||||
flags|=wxTREE_HITTEST_ONITEMLABEL;
|
||||
|
||||
return this;
|
||||
}
|
||||
@ -935,7 +935,7 @@ void wxTreeCtrl::UnselectAllChildren(wxGenericTreeItem *item)
|
||||
wxArrayGenericTreeItems& children = item->GetChildren();
|
||||
size_t count = children.Count();
|
||||
for ( size_t n = 0; n < count; ++n )
|
||||
UnselectAllChildren(children[n]);
|
||||
UnselectAllChildren(children[n]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -980,7 +980,7 @@ bool wxTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxGenericT
|
||||
wxArrayGenericTreeItems& children = crt_item->GetChildren();
|
||||
size_t count = children.Count();
|
||||
for ( size_t n = 0; n < count; ++n )
|
||||
if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE;
|
||||
if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
@ -1011,8 +1011,8 @@ void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *it
|
||||
}
|
||||
|
||||
void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
|
||||
bool unselect_others,
|
||||
bool extended_select)
|
||||
bool unselect_others,
|
||||
bool extended_select)
|
||||
{
|
||||
wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") );
|
||||
|
||||
@ -1043,7 +1043,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
|
||||
if (unselect_others)
|
||||
{
|
||||
if (is_single) Unselect(); // to speed up thing
|
||||
else UnselectAll();
|
||||
else UnselectAll();
|
||||
}
|
||||
|
||||
// shift press
|
||||
@ -1057,13 +1057,13 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
|
||||
{
|
||||
bool select=TRUE; // the default
|
||||
|
||||
// Check if we need to toggle hilight (ctrl mode)
|
||||
if (!unselect_others)
|
||||
select=!item->HasHilight();
|
||||
// Check if we need to toggle hilight (ctrl mode)
|
||||
if (!unselect_others)
|
||||
select=!item->HasHilight();
|
||||
|
||||
m_current = m_key_current = item;
|
||||
m_current->SetHilight(select);
|
||||
RefreshLine( m_current );
|
||||
m_current->SetHilight(select);
|
||||
RefreshLine( m_current );
|
||||
}
|
||||
|
||||
event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
|
||||
@ -1079,7 +1079,7 @@ void wxTreeCtrl::FillArray(wxGenericTreeItem *item, wxArrayTreeItemIds &array) c
|
||||
wxArrayGenericTreeItems& children = item->GetChildren();
|
||||
size_t count = children.Count();
|
||||
for ( size_t n = 0; n < count; ++n )
|
||||
FillArray(children[n],array);
|
||||
FillArray(children[n],array);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1137,7 +1137,7 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId &item)
|
||||
m_anchor->GetSize( x, y, this );
|
||||
y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
|
||||
int x_pos = GetScrollPos( wxHORIZONTAL );
|
||||
// Item should appear at top
|
||||
// Item should appear at top
|
||||
SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, item_y/PIXELS_PER_UNIT );
|
||||
}
|
||||
else if (item_y+GetLineHeight(gitem) > start_y+client_h)
|
||||
@ -1149,7 +1149,7 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId &item)
|
||||
y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
|
||||
item_y += PIXELS_PER_UNIT+2;
|
||||
int x_pos = GetScrollPos( wxHORIZONTAL );
|
||||
// Item should appear at bottom
|
||||
// Item should appear at bottom
|
||||
SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, (item_y+GetLineHeight(gitem)-client_h)/PIXELS_PER_UNIT );
|
||||
}
|
||||
}
|
||||
@ -1265,7 +1265,7 @@ void wxTreeCtrl::AdjustMyScrollbars()
|
||||
int y = 0;
|
||||
m_anchor->GetSize( x, y, this );
|
||||
//y += GetLineHeight(m_anchor);
|
||||
y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
|
||||
y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
|
||||
int x_pos = GetScrollPos( wxHORIZONTAL );
|
||||
int y_pos = GetScrollPos( wxVERTICAL );
|
||||
SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, y_pos );
|
||||
@ -1392,12 +1392,12 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
|
||||
dc.SetPen( *wxGREY_PEN );
|
||||
dc.SetBrush( *wxWHITE_BRUSH );
|
||||
dc.DrawRectangle( horizX+(m_indent-5), y-4, 11, 9 );
|
||||
|
||||
|
||||
dc.SetPen( *wxBLACK_PEN );
|
||||
dc.DrawLine( horizX+(m_indent-2), y, horizX+(m_indent+3), y );
|
||||
if (!item->IsExpanded())
|
||||
dc.DrawLine( horizX+m_indent, y-2, horizX+m_indent, y+3 );
|
||||
|
||||
|
||||
dc.SetPen( m_dottedPen );
|
||||
}
|
||||
|
||||
@ -1439,19 +1439,19 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
|
||||
wxArrayGenericTreeItems& children = item->GetChildren();
|
||||
size_t n, count = children.Count();
|
||||
for ( n = 0; n < count; ++n )
|
||||
{
|
||||
semiOldY=y;
|
||||
PaintLevel( children[n], dc, level+1, y );
|
||||
}
|
||||
{
|
||||
semiOldY=y;
|
||||
PaintLevel( children[n], dc, level+1, y );
|
||||
}
|
||||
|
||||
// it may happen that the item is expanded but has no items (when you
|
||||
// delete all its children for example) - don't draw the vertical line
|
||||
// in this case
|
||||
if (count > 0)
|
||||
{
|
||||
semiOldY+=GetLineHeight(children[--n])/2;
|
||||
{
|
||||
semiOldY+=GetLineHeight(children[--n])/2;
|
||||
dc.DrawLine( horizX+m_indent, oldY+5, horizX+m_indent, semiOldY );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1588,18 +1588,18 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
|
||||
if (!prev)
|
||||
{
|
||||
prev = GetParent( m_key_current );
|
||||
if (prev)
|
||||
{
|
||||
if (prev)
|
||||
{
|
||||
long cockie = 0;
|
||||
wxTreeItemId current = m_key_current;
|
||||
if (current == GetFirstChild( prev, cockie ))
|
||||
{
|
||||
// otherwise we return to where we came from
|
||||
SelectItem( prev, unselect_others, extended_select );
|
||||
m_key_current=prev.m_pItem;
|
||||
EnsureVisible( prev );
|
||||
m_key_current=prev.m_pItem;
|
||||
EnsureVisible( prev );
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (prev)
|
||||
@ -1614,7 +1614,7 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
|
||||
}
|
||||
|
||||
SelectItem( prev, unselect_others, extended_select );
|
||||
m_key_current=prev.m_pItem;
|
||||
m_key_current=prev.m_pItem;
|
||||
EnsureVisible( prev );
|
||||
}
|
||||
}
|
||||
@ -1645,7 +1645,7 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
|
||||
long cookie = 0;
|
||||
wxTreeItemId child = GetFirstChild( m_key_current, cookie );
|
||||
SelectItem( child, unselect_others, extended_select );
|
||||
m_key_current=child.m_pItem;
|
||||
m_key_current=child.m_pItem;
|
||||
EnsureVisible( child );
|
||||
}
|
||||
else
|
||||
@ -1665,7 +1665,7 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
|
||||
if (next)
|
||||
{
|
||||
SelectItem( next, unselect_others, extended_select );
|
||||
m_key_current=next.m_pItem;
|
||||
m_key_current=next.m_pItem;
|
||||
EnsureVisible( next );
|
||||
}
|
||||
}
|
||||
@ -1777,7 +1777,8 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event )
|
||||
if (onButton)
|
||||
{
|
||||
Toggle( item );
|
||||
if (is_multiple) return;
|
||||
if (is_multiple)
|
||||
return;
|
||||
}
|
||||
|
||||
SelectItem(item, unselect_others, extended_select);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user