Move wxMacCFStringHolder::AsString and etc. to wxBase

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

diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index 653484a3cacfbd29554034c8e2d8afbb7ace9c69..656a997efe3cbb5503a4fcadd538083f9ffff8b6 100644 (file)
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -23,7 +23,7 @@
 class MyApp : public wxApp
 {
 public:
 class MyApp : public wxApp
 {
 public:

-    MyApp() { m_showImages = TRUE; m_showButtons = FALSE; }
+    MyApp() { m_showImages = true; m_showButtons = false; }

 
     bool OnInit();
 
 
     bool OnInit();
 


@@ -73,7 +73,7 @@ public:
     void OnBeginLabelEdit(wxTreeEvent& event);
     void OnEndLabelEdit(wxTreeEvent& event);
     void OnDeleteItem(wxTreeEvent& event);
     void OnBeginLabelEdit(wxTreeEvent& event);
     void OnEndLabelEdit(wxTreeEvent& event);
     void OnDeleteItem(wxTreeEvent& event);

-    void OnRMouseUp(wxMouseEvent& event);
+    void OnContextMenu(wxContextMenuEvent& event);

     void OnGetInfo(wxTreeEvent& event);
     void OnTreeRMouseClick(wxTreeEvent& event);
     void OnItemRightClick(wxTreeEvent& event);
     void OnGetInfo(wxTreeEvent& event);
     void OnTreeRMouseClick(wxTreeEvent& event);
     void OnItemRightClick(wxTreeEvent& event);


@@ -88,16 +88,17 @@ public:
     void OnItemActivated(wxTreeEvent& event);
     void OnRMouseDClick(wxMouseEvent& event);
 
     void OnItemActivated(wxTreeEvent& event);
     void OnRMouseDClick(wxMouseEvent& event);
 

-    void GetItemsRecursively(const wxTreeItemId& idParent, long cookie);
+    void GetItemsRecursively(const wxTreeItemId& idParent,
+                             wxTreeItemIdValue cookie = 0);

 
     void CreateImageList(int size = 16);
     void CreateButtonsImageList(int size = 11);
 
     void AddTestItemsToTree(size_t numChildren, size_t depth);
 
 
     void CreateImageList(int size = 16);
     void CreateButtonsImageList(int size = 11);
 
     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); }
         { m_reverseSort = reverse; wxTreeCtrl::SortChildren(item); }

-    void DoEnsureVisible() { EnsureVisible(m_lastItem); }
+    void DoEnsureVisible() { if (m_lastItem.IsOk()) EnsureVisible(m_lastItem); }

 
     void DoToggleIcon(const wxTreeItemId& item);
 
 
     void DoToggleIcon(const wxTreeItemId& item);
 


@@ -105,6 +106,8 @@ public:
 
     int ImageSize(void) const { return m_imageSize; }
 
 
     int ImageSize(void) const { return m_imageSize; }
 

+    void SetLastItem(wxTreeItemId id) { m_lastItem = id; }
+

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


@@ -112,7 +115,7 @@ protected:
     bool IsTestItem(const wxTreeItemId& item)
     {
         // the test item is the first child folder
     bool IsTestItem(const wxTreeItemId& item)
     {
         // the test item is the first child folder

-        return GetParent(item) == GetRootItem() && !GetPrevSibling(item);
+        return GetItemParent(item) == GetRootItem() && !GetPrevSibling(item);

     }
 
 private:
     }
 
 private:


@@ -176,6 +179,7 @@ public:
     void OnUnselect(wxCommandEvent& event);
     void OnToggleSel(wxCommandEvent& event);
 #endif // NO_MULTIPLE_SELECTION
     void OnUnselect(wxCommandEvent& event);
     void OnToggleSel(wxCommandEvent& event);
 #endif // NO_MULTIPLE_SELECTION

+    void OnSelectRoot(wxCommandEvent& event);

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


@@ -186,8 +190,8 @@ public:
     void OnSetImageSize(wxCommandEvent& event);
     void OnCollapseAndReset(wxCommandEvent& event);
 
     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);
 
 
     void OnEnsureVisible(wxCommandEvent& event);
 


@@ -195,8 +199,8 @@ public:
     void OnCountRec(wxCommandEvent& event);
 
     void OnRename(wxCommandEvent& event);
     void OnCountRec(wxCommandEvent& event);
 
     void OnRename(wxCommandEvent& event);

-    void OnSort(wxCommandEvent& event) { DoSort(); }
-    void OnSortRev(wxCommandEvent& event) { DoSort(TRUE); }
+    void OnSort(wxCommandEvent& WXUNUSED(event)) { DoSort(); }
+    void OnSortRev(wxCommandEvent& WXUNUSED(event)) { DoSort(true); }

 
     void OnAddItem(wxCommandEvent& event);
     void OnInsertItem(wxCommandEvent& event);
 
     void OnAddItem(wxCommandEvent& event);
     void OnInsertItem(wxCommandEvent& event);


@@ -209,12 +213,13 @@ public:
 
     void OnToggleIcon(wxCommandEvent& event);
 
 
     void OnToggleIcon(wxCommandEvent& event);
 

+    void OnIdle(wxIdleEvent& event);

     void OnSize(wxSizeEvent& event);
 
 private:
     void TogStyle(int id, long flag);
 
     void OnSize(wxSizeEvent& event);
 
 private:
     void TogStyle(int id, long flag);
 

-    void DoSort(bool reverse = FALSE);
+    void DoSort(bool reverse = false);

 
     void Resize();
 
 
     void Resize();
 


@@ -224,7 +229,7 @@ private:
     MyTreeCtrl *m_treeCtrl;
     wxTextCtrl *m_textCtrl;
 
     MyTreeCtrl *m_treeCtrl;
     wxTextCtrl *m_textCtrl;
 

-    void DoSetBold(bool bold = TRUE);
+    void DoSetBold(bool bold = true);

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -273,5 +278,6 @@ enum
     TreeTest_ToggleIcon,
     TreeTest_Select,
     TreeTest_Unselect,
     TreeTest_ToggleIcon,
     TreeTest_Select,
     TreeTest_Unselect,

+    TreeTest_SelectRoot,

     TreeTest_Ctrl = 1000
 };
     TreeTest_Ctrl = 1000
 };