PCH support.

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

diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index de2e09acb11f5f71a746cfa57d64c8f94df1d87b..24d3320887b9f1fef39b8e0f9f281e351712c499 100644 (file)
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -23,7 +23,7 @@
 class MyApp : public wxApp
 {
 public:
-    MyApp() { m_showImages = TRUE; m_showButtons = FALSE; }
+    MyApp() { m_showImages = true; m_showButtons = false; }
 
     bool OnInit();
 
@@ -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,
@@ -96,7 +99,7 @@ public:
 
     void AddTestItemsToTree(size_t numChildren, size_t depth);
 
-    void DoSortChildren(const wxTreeItemId& item, bool reverse = FALSE)
+    void DoSortChildren(const wxTreeItemId& item, bool reverse = false)
         { m_reverseSort = reverse; wxTreeCtrl::SortChildren(item); }
     void DoEnsureVisible() { if (m_lastItem.IsOk()) EnsureVisible(m_lastItem); }
 
@@ -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()
@@ -190,8 +195,8 @@ public:
     void OnSetImageSize(wxCommandEvent& event);
     void OnCollapseAndReset(wxCommandEvent& event);
 
-    void OnSetBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(TRUE); }
-    void OnClearBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(FALSE); }
+    void OnSetBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(true); }
+    void OnClearBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(false); }
 
     void OnEnsureVisible(wxCommandEvent& event);
 
@@ -200,7 +205,7 @@ public:
 
     void OnRename(wxCommandEvent& event);
     void OnSort(wxCommandEvent& WXUNUSED(event)) { DoSort(); }
-    void OnSortRev(wxCommandEvent& WXUNUSED(event)) { DoSort(TRUE); }
+    void OnSortRev(wxCommandEvent& WXUNUSED(event)) { DoSort(true); }
 
     void OnAddItem(wxCommandEvent& event);
     void OnInsertItem(wxCommandEvent& event);
@@ -219,17 +224,20 @@ public:
 private:
     void TogStyle(int id, long flag);
 
-    void DoSort(bool reverse = FALSE);
+    void DoSort(bool reverse = false);
 
     void Resize();
 
     void CreateTreeWithDefStyle();
     void CreateTree(long style);
 
+    wxPanel *m_panel;
     MyTreeCtrl *m_treeCtrl;
+#if wxUSE_LOG
     wxTextCtrl *m_textCtrl;
+#endif // wxUSE_LOG
 
-    void DoSetBold(bool bold = TRUE);
+    void DoSetBold(bool bold = true);
 
     DECLARE_EVENT_TABLE()
 };
@@ -237,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,