attempt to fix a report about compile problems in generic treectrl

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

diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index 440b43197db4a78136ebaad1bad2c6b4234dfc99..e0299c00459a7d3105a82d81fa42c7ec39aebe47 100644 (file)
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -36,6 +36,7 @@ public:
     TreeCtrlIcon_Folder
   };
 
+  MyTreeCtrl() { }
   MyTreeCtrl(wxWindow *parent, const wxWindowID id,
              const wxPoint& pos, const wxSize& size,
              long style);
@@ -54,13 +55,21 @@ public:
   void OnItemCollapsing(wxTreeEvent& event);
   void OnSelChanged(wxTreeEvent& event);
   void OnSelChanging(wxTreeEvent& event);
-  void OnKeyDown(wxTreeEvent& event);
+  void OnTreeKeyDown(wxTreeEvent& event);
+  void OnItemActivated(wxTreeEvent& event);
 
   void GetItemsRecursively(const wxTreeItemId& idParent, long cookie);
 
   void AddTestItemsToTree(size_t numChildren,
                           size_t depth);
 
+  void DoSortChildren(const wxTreeItemId& item, bool reverse = FALSE)
+    { m_reverseSort = reverse; wxTreeCtrl::SortChildren(item); }
+
+protected:
+  virtual int OnCompareItems(const wxTreeItemId& item1,
+                             const wxTreeItemId& item2);
+
 private:
   void AddItemsRecursively(const wxTreeItemId& idParent,
                            size_t nChildren,
@@ -68,7 +77,13 @@ private:
                            size_t folder);
 
   wxImageList *m_imageListNormal;
+  bool         m_reverseSort;           // flag for OnCompareItems
 
+  // NB: due to an ugly wxMSW hack you _must_ use DECLARE_DYNAMIC_CLASS()
+  //     if you want your overloaded OnCompareItems() to be called.
+  //     OTOH, if you don't want it you may omit the next line - this will
+  //     make default (alphabetical) sorting much faster under wxMSW.
+  DECLARE_DYNAMIC_CLASS(MyTreeCtrl)
   DECLARE_EVENT_TABLE()
 };
 
@@ -85,13 +100,20 @@ public:
   void OnAbout(wxCommandEvent& event);
   void OnDump(wxCommandEvent& event);
   void OnDelete(wxCommandEvent& event);
+  void OnDeleteChildren(wxCommandEvent& event);
   void OnDeleteAll(wxCommandEvent& event);
   void OnRecreate(wxCommandEvent& event);
 
-  void OnSetBold(wxCommandEvent& event) { DoSetBold(TRUE); }
-  void OnClearBold(wxCommandEvent& event) { DoSetBold(FALSE); }
+  void OnSetBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(TRUE); }
+  void OnClearBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(FALSE); }
+
+  void OnRename(wxCommandEvent& event);
+  void OnSort(wxCommandEvent& event) { DoSort(); }
+  void OnSortRev(wxCommandEvent& event) { DoSort(TRUE); }
 
 private:
+  void DoSort(bool reverse = FALSE);
+
   MyTreeCtrl *m_treeCtrl;
 
   void DoSetBold(bool bold = TRUE);
@@ -105,16 +127,14 @@ enum
   TreeTest_Quit,
   TreeTest_About,
   TreeTest_Dump,
+  TreeTest_Sort,
+  TreeTest_SortRev,
   TreeTest_Bold,
   TreeTest_UnBold,
+  TreeTest_Rename,
   TreeTest_Delete,
+  TreeTest_DeleteChildren,
   TreeTest_DeleteAll,
   TreeTest_Recreate,
   TreeTest_Ctrl = 100
-};
-
-enum
-{
-  TreeCtrlIcon_File,
-  TreeCtrlIcon_Folder
-};
+};
\ No newline at end of file