Convert line-endings to proper style

[wxWidgets.git] / samples / treectrl / treetest.h

diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index 656a997efe3cbb5503a4fcadd538083f9ffff8b6..21e93d7d8b00db341a19d60ec92c5d1ee8059c82 100644 (file)
--- 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);
     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);
 
     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 OnEndLabelEdit(wxTreeEvent& event);
     void OnDeleteItem(wxTreeEvent& event);
     void OnContextMenu(wxContextMenuEvent& event);

+    void OnItemMenu(wxTreeEvent& event);

     void OnGetInfo(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);
     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 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,
     void OnRMouseDClick(wxMouseEvent& event);
 
     void GetItemsRecursively(const wxTreeItemId& idParent,


@@ -227,7 +230,9 @@ private:
     void CreateTree(long style);
 
     MyTreeCtrl *m_treeCtrl;
     void CreateTree(long style);
 
     MyTreeCtrl *m_treeCtrl;

+#if wxUSE_LOG

     wxTextCtrl *m_textCtrl;
     wxTextCtrl *m_textCtrl;

+#endif // wxUSE_LOG

 
     void DoSetBold(bool bold = true);
 
 
     void DoSetBold(bool bold = true);
 


@@ -237,9 +242,9 @@ private:
 // menu and control ids
 enum
 {
 // 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,
     TreeTest_TogTwist,
     TreeTest_TogLines,
     TreeTest_TogEdit,