projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forward WM_{CUT,COPY,PASTE} from edit control to wxComboBox in wxMSW too.
[wxWidgets.git]
/
include
/
wx
/
treectrl.h
diff --git
a/include/wx/treectrl.h
b/include/wx/treectrl.h
index fe8b7f1fb62ed8bc3d2c8aa82650872023f7c544..5bc63827fc6993ff069ad0bbc2a64332356108db 100644
(file)
--- a/
include/wx/treectrl.h
+++ b/
include/wx/treectrl.h
@@
-22,7
+22,7
@@
#include "wx/control.h"
#include "wx/treebase.h"
#include "wx/control.h"
#include "wx/treebase.h"
-#include "wx/textctrl.h" // wxTextCtrl::ms_classinfo used through CLASSINFO macro
+#include "wx/textctrl.h" // wxTextCtrl::ms_classinfo used through
wx
CLASSINFO macro
class WXDLLIMPEXP_FWD_CORE wxImageList;
class WXDLLIMPEXP_FWD_CORE wxImageList;
@@
-33,20
+33,7
@@
class WXDLLIMPEXP_FWD_CORE wxImageList;
class WXDLLIMPEXP_CORE wxTreeCtrlBase : public wxControl
{
public:
class WXDLLIMPEXP_CORE wxTreeCtrlBase : public wxControl
{
public:
- wxTreeCtrlBase()
- {
- m_imageListNormal =
- m_imageListState = NULL;
- m_ownsImageListNormal =
- m_ownsImageListState = false;
-
- // arbitrary default
- m_spacing = 18;
-
- // quick DoGetBestSize calculation
- m_quickBestSize = true;
- }
-
+ wxTreeCtrlBase();
virtual ~wxTreeCtrlBase();
// accessors
virtual ~wxTreeCtrlBase();
// accessors
@@
-214,6
+201,13
@@
public:
// equivalent to GetSelection() if not wxTR_MULTIPLE
virtual wxTreeItemId GetFocusedItem() const = 0;
// equivalent to GetSelection() if not wxTR_MULTIPLE
virtual wxTreeItemId GetFocusedItem() const = 0;
+
+ // Clears the currently focused item
+ virtual void ClearFocusedItem() = 0;
+ // Sets the currently focused item. Item should be valid
+ virtual void SetFocusedItem(const wxTreeItemId& item) = 0;
+
+
// get the parent of this item (may return NULL if root)
virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const = 0;
// get the parent of this item (may return NULL if root)
virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const = 0;
@@
-346,7
+340,7
@@
public:
// been before. textCtrlClass parameter allows you to create an edit
// control of arbitrary user-defined class deriving from wxTextCtrl.
virtual wxTextCtrl *EditLabel(const wxTreeItemId& item,
// been before. textCtrlClass parameter allows you to create an edit
// control of arbitrary user-defined class deriving from wxTextCtrl.
virtual wxTextCtrl *EditLabel(const wxTreeItemId& item,
- wxClassInfo* textCtrlClass = CLASSINFO(wxTextCtrl)) = 0;
+ wxClassInfo* textCtrlClass =
wx
CLASSINFO(wxTextCtrl)) = 0;
// 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)
// 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)
@@
-445,6
+439,13
@@
protected:
bool m_quickBestSize;
bool m_quickBestSize;
+private:
+ // Intercept Escape and Return keys to ensure that our in-place edit
+ // control always gets them before they're used for dialog navigation or
+ // anything else.
+ void OnCharHook(wxKeyEvent& event);
+
+
wxDECLARE_NO_COPY_CLASS(wxTreeCtrlBase);
};
wxDECLARE_NO_COPY_CLASS(wxTreeCtrlBase);
};
@@
-454,8
+455,6
@@
protected:
#if defined(__WXUNIVERSAL__)
#include "wx/generic/treectlg.h"
#if defined(__WXUNIVERSAL__)
#include "wx/generic/treectlg.h"
-#elif defined(__WXPALMOS__)
- #include "wx/generic/treectlg.h"
#elif defined(__WXMSW__)
#include "wx/msw/treectrl.h"
#elif defined(__WXMOTIF__)
#elif defined(__WXMSW__)
#include "wx/msw/treectrl.h"
#elif defined(__WXMOTIF__)