Remove malloc.h

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

diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index 9892db42c536b42c357ecbc53ad90ef40c40df0b..21e93d7d8b00db341a19d60ec92c5d1ee8059c82 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();
 


@@ -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);


@@ -73,10 +73,9 @@ 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 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,18 +85,23 @@ 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 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 +109,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 +118,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:


@@ -146,14 +152,25 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 

-    void OnTogButtons(wxCommandEvent& event)   { TogStyle(wxTR_HAS_BUTTONS); }
-    void OnTogTwist(wxCommandEvent& event)     { TogStyle(wxTR_TWIST_BUTTONS); }
-    void OnTogLines(wxCommandEvent& event)     { TogStyle(wxTR_NO_LINES); }
-    void OnTogEdit(wxCommandEvent& event)      { TogStyle(wxTR_EDIT_LABELS); }
-    void OnTogHideRoot(wxCommandEvent& event)  { TogStyle(wxTR_HIDE_ROOT); }
-    void OnTogRootLines(wxCommandEvent& event) { TogStyle(wxTR_LINES_AT_ROOT); }
-    void OnTogBorder(wxCommandEvent& event)    { TogStyle(wxTR_ROW_LINES); }
-    void OnTogFullHighlight(wxCommandEvent& event)    { TogStyle(wxTR_FULL_ROW_HIGHLIGHT); }
+    void OnTogButtons(wxCommandEvent& event)
+        { TogStyle(event.GetId(), wxTR_HAS_BUTTONS); }
+    void OnTogTwist(wxCommandEvent& event)
+        { TogStyle(event.GetId(), wxTR_TWIST_BUTTONS); }
+    void OnTogLines(wxCommandEvent& event)
+        { TogStyle(event.GetId(), wxTR_NO_LINES); }
+    void OnTogEdit(wxCommandEvent& event)
+        { TogStyle(event.GetId(), wxTR_EDIT_LABELS); }
+    void OnTogHideRoot(wxCommandEvent& event)
+        { TogStyle(event.GetId(), wxTR_HIDE_ROOT); }
+    void OnTogRootLines(wxCommandEvent& event)
+        { TogStyle(event.GetId(), wxTR_LINES_AT_ROOT); }
+    void OnTogBorder(wxCommandEvent& event)
+        { TogStyle(event.GetId(), wxTR_ROW_LINES); }
+    void OnTogFullHighlight(wxCommandEvent& event)
+        { TogStyle(event.GetId(), wxTR_FULL_ROW_HIGHLIGHT); }
+
+    void OnResetStyle(wxCommandEvent& WXUNUSED(event))
+        { CreateTreeWithDefStyle(); }

 
     void OnSetFgColour(wxCommandEvent& event);
     void OnSetBgColour(wxCommandEvent& event);
 
     void OnSetFgColour(wxCommandEvent& event);
     void OnSetBgColour(wxCommandEvent& event);


@@ -165,6 +182,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);


@@ -175,8 +193,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);
 


@@ -184,8 +202,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);


@@ -198,19 +216,25 @@ public:
 
     void OnToggleIcon(wxCommandEvent& event);
 
 
     void OnToggleIcon(wxCommandEvent& event);
 

+    void OnIdle(wxIdleEvent& event);

     void OnSize(wxSizeEvent& event);
 
 private:
     void OnSize(wxSizeEvent& event);
 
 private:

-    void TogStyle(long flag);
+    void TogStyle(int id, long flag);
+
+    void DoSort(bool reverse = false);

 
 

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

 
 

-    void Resize(const wxSize& size);
+    void CreateTreeWithDefStyle();
+    void CreateTree(long style);

 
     MyTreeCtrl *m_treeCtrl;
 
     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);

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -218,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,


@@ -230,6 +254,7 @@ enum
     TreeTest_TogFullHighlight,
     TreeTest_SetFgColour,
     TreeTest_SetBgColour,
     TreeTest_TogFullHighlight,
     TreeTest_SetFgColour,
     TreeTest_SetBgColour,

+    TreeTest_ResetStyle,

     TreeTest_Dump,
     TreeTest_DumpSelected,
     TreeTest_Count,
     TreeTest_Dump,
     TreeTest_DumpSelected,
     TreeTest_Count,


@@ -258,5 +283,6 @@ enum
     TreeTest_ToggleIcon,
     TreeTest_Select,
     TreeTest_Unselect,
     TreeTest_ToggleIcon,
     TreeTest_Select,
     TreeTest_Unselect,

+    TreeTest_SelectRoot,

     TreeTest_Ctrl = 1000
 };
     TreeTest_Ctrl = 1000
 };