several mingw32 compilation fixes

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

diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index c3ce883347030cd30fba39fce38e406fe813601d..0c0cd5739568b5b76265b694fdd5e7bd1972ab39 100644 (file)
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -34,7 +34,10 @@ public:
     enum
     {
         TreeCtrlIcon_File,
     enum
     {
         TreeCtrlIcon_File,

-        TreeCtrlIcon_Folder
+        TreeCtrlIcon_FileSelected,
+        TreeCtrlIcon_Folder,
+        TreeCtrlIcon_FolderSelected,
+        TreeCtrlIcon_FolderOpened

     };
 
     MyTreeCtrl() { }
     };
 
     MyTreeCtrl() { }


@@ -65,12 +68,21 @@ public:
     void AddTestItemsToTree(size_t numChildren, size_t depth);
 
     void DoSortChildren(const wxTreeItemId& item, bool reverse = FALSE)
     void AddTestItemsToTree(size_t numChildren, size_t depth);
 
     void DoSortChildren(const wxTreeItemId& item, bool reverse = FALSE)

-    { m_reverseSort = reverse; wxTreeCtrl::SortChildren(item); }
+        { m_reverseSort = reverse; wxTreeCtrl::SortChildren(item); }

     void DoEnsureVisible() { EnsureVisible(m_lastItem); }
 
     void DoEnsureVisible() { EnsureVisible(m_lastItem); }
 

+    void DoToggleIcon(const wxTreeItemId& item);
+

 protected:
     virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2);
 
 protected:
     virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2);
 

+    // is this the test item which we use in several event handlers?
+    bool IsTestItem(const wxTreeItemId& item)
+    {
+        // the test item is the first child folder
+        return GetParent(item) == GetRootItem() && !GetPrevSibling(item);
+    }
+

 private:
     void AddItemsRecursively(const wxTreeItemId& idParent,
                              size_t nChildren,
 private:
     void AddItemsRecursively(const wxTreeItemId& idParent,
                              size_t nChildren,


@@ -102,6 +114,11 @@ public:
     void OnAbout(wxCommandEvent& event);
 
     void OnDump(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnDump(wxCommandEvent& event);

+#ifndef NO_MULTIPLE_SELECTION
+    void OnDumpSelected(wxCommandEvent& event);
+    void OnSelect(wxCommandEvent& event);
+    void OnUnselect(wxCommandEvent& event);
+#endif // NO_MULTIPLE_SELECTION

     void OnDelete(wxCommandEvent& event);
     void OnDeleteChildren(wxCommandEvent& event);
     void OnDeleteAll(wxCommandEvent& event);
     void OnDelete(wxCommandEvent& event);
     void OnDeleteChildren(wxCommandEvent& event);
     void OnDeleteAll(wxCommandEvent& event);


@@ -113,18 +130,24 @@ public:
 
     void OnEnsureVisible(wxCommandEvent& event);
 
 
     void OnEnsureVisible(wxCommandEvent& event);
 

+    void OnCount(wxCommandEvent& event);
+    void OnCountRec(wxCommandEvent& event);
+

     void OnRename(wxCommandEvent& event);
     void OnSort(wxCommandEvent& event) { DoSort(); }
     void OnSortRev(wxCommandEvent& event) { DoSort(TRUE); }
 
     void OnAddItem(wxCommandEvent& event);
     void OnRename(wxCommandEvent& event);
     void OnSort(wxCommandEvent& event) { DoSort(); }
     void OnSortRev(wxCommandEvent& event) { DoSort(TRUE); }
 
     void OnAddItem(wxCommandEvent& event);

-    
+    void OnInsertItem(wxCommandEvent& event);
+

     void OnIncIndent(wxCommandEvent& event);
     void OnDecIndent(wxCommandEvent& event);
 
     void OnIncSpacing(wxCommandEvent& event);
     void OnDecSpacing(wxCommandEvent& event);
 
     void OnIncIndent(wxCommandEvent& event);
     void OnDecIndent(wxCommandEvent& event);
 
     void OnIncSpacing(wxCommandEvent& event);
     void OnDecSpacing(wxCommandEvent& event);
 

+    void OnToggleIcon(wxCommandEvent& event);
+

 private:
     void DoSort(bool reverse = FALSE);
 
 private:
     void DoSort(bool reverse = FALSE);
 


@@ -141,6 +164,9 @@ enum
     TreeTest_Quit,
     TreeTest_About,
     TreeTest_Dump,
     TreeTest_Quit,
     TreeTest_About,
     TreeTest_Dump,

+    TreeTest_DumpSelected,
+    TreeTest_Count,
+    TreeTest_CountRec,

     TreeTest_Sort,
     TreeTest_SortRev,
     TreeTest_Bold,
     TreeTest_Sort,
     TreeTest_SortRev,
     TreeTest_Bold,


@@ -153,9 +179,13 @@ enum
     TreeTest_CollapseAndReset,
     TreeTest_EnsureVisible,
     TreeTest_AddItem,
     TreeTest_CollapseAndReset,
     TreeTest_EnsureVisible,
     TreeTest_AddItem,

+    TreeTest_InsertItem,

     TreeTest_IncIndent,
     TreeTest_DecIndent,
     TreeTest_IncSpacing,
     TreeTest_DecSpacing,
     TreeTest_IncIndent,
     TreeTest_DecIndent,
     TreeTest_IncSpacing,
     TreeTest_DecSpacing,

-    TreeTest_Ctrl = 100
+    TreeTest_ToggleIcon,
+    TreeTest_Select,
+    TreeTest_Unselect,
+    TreeTest_Ctrl = 1000

 };
 };