X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b29903d4854625650ae678c0515acc76facba1ee..b0b96f667dbc2fc2d3ebaa342c50bdea10f84a91:/samples/treectrl/treetest.h

diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index 6e328aed69..24d3320887 100644
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -65,7 +65,7 @@ public:
     MyTreeCtrl(wxWindow *parent, const wxWindowID id,
                const wxPoint& pos, const wxSize& size,
                long style);
-    virtual ~MyTreeCtrl();
+    virtual ~MyTreeCtrl(){};
 
     void OnBeginDrag(wxTreeEvent& event);
     void OnBeginRDrag(wxTreeEvent& event);
@@ -74,9 +74,8 @@ public:
     void OnEndLabelEdit(wxTreeEvent& event);
     void OnDeleteItem(wxTreeEvent& event);
     void OnContextMenu(wxContextMenuEvent& event);
+    void OnItemMenu(wxTreeEvent& event);
     void OnGetInfo(wxTreeEvent& event);
-    void OnTreeRMouseClick(wxTreeEvent& event);
-    void OnItemRightClick(wxTreeEvent& event);
     void OnSetInfo(wxTreeEvent& event);
     void OnItemExpanded(wxTreeEvent& event);
     void OnItemExpanding(wxTreeEvent& event);
@@ -86,6 +85,10 @@ public:
     void OnSelChanging(wxTreeEvent& event);
     void OnTreeKeyDown(wxTreeEvent& event);
     void OnItemActivated(wxTreeEvent& event);
+    void OnItemRClick(wxTreeEvent& event);
+
+    void OnRMouseDown(wxMouseEvent& event);
+    void OnRMouseUp(wxMouseEvent& event);
     void OnRMouseDClick(wxMouseEvent& event);
 
     void GetItemsRecursively(const wxTreeItemId& idParent,
@@ -124,6 +127,8 @@ private:
                              size_t depth,
                              size_t folder);
 
+    void LogEvent(const wxChar *name, const wxTreeEvent& event);
+
     int          m_imageSize;               // current size of images
     bool         m_reverseSort;             // flag for OnCompareItems
     wxTreeItemId m_lastItem,                // for OnEnsureVisible()
@@ -226,6 +231,7 @@ private:
     void CreateTreeWithDefStyle();
     void CreateTree(long style);
 
+    wxPanel *m_panel;
     MyTreeCtrl *m_treeCtrl;
 #if wxUSE_LOG
     wxTextCtrl *m_textCtrl;
@@ -239,9 +245,9 @@ private:
 // menu and control ids
 enum
 {
-    TreeTest_Quit,
-    TreeTest_About,
-    TreeTest_TogButtons,
+    TreeTest_Quit = wxID_EXIT,
+    TreeTest_About = wxID_ABOUT,
+    TreeTest_TogButtons = wxID_HIGHEST,
     TreeTest_TogTwist,
     TreeTest_TogLines,
     TreeTest_TogEdit,