1. corrected problem with label updating in wxProgressDialog

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

diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index 67562e087bfc7ac78283bc3e65041370bbdb7dcf..18c8b9a65d395b473ec0e663357789d1096966df 100644 (file)
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -48,6 +48,7 @@ public:
 
     void OnBeginDrag(wxTreeEvent& event);
     void OnBeginRDrag(wxTreeEvent& event);
 
     void OnBeginDrag(wxTreeEvent& event);
     void OnBeginRDrag(wxTreeEvent& event);

+    void OnEndDrag(wxTreeEvent& event);

     void OnBeginLabelEdit(wxTreeEvent& event);
     void OnEndLabelEdit(wxTreeEvent& event);
     void OnDeleteItem(wxTreeEvent& event);
     void OnBeginLabelEdit(wxTreeEvent& event);
     void OnEndLabelEdit(wxTreeEvent& event);
     void OnDeleteItem(wxTreeEvent& event);


@@ -90,8 +91,9 @@ private:
                              size_t folder);
 
     wxImageList *m_imageListNormal;
                              size_t folder);
 
     wxImageList *m_imageListNormal;

-    bool         m_reverseSort;           // flag for OnCompareItems
-    wxTreeItemId m_lastItem;              // for OnEnsureVisible()
+    bool         m_reverseSort;             // flag for OnCompareItems
+    wxTreeItemId m_lastItem,                // for OnEnsureVisible()
+                 m_draggedItem;             // item being dragged right now

 
     // NB: due to an ugly wxMSW hack you _must_ use DECLARE_DYNAMIC_CLASS()
     //     if you want your overloaded OnCompareItems() to be called.
 
     // NB: due to an ugly wxMSW hack you _must_ use DECLARE_DYNAMIC_CLASS()
     //     if you want your overloaded OnCompareItems() to be called.


@@ -118,6 +120,7 @@ public:
     void OnDumpSelected(wxCommandEvent& event);
     void OnSelect(wxCommandEvent& event);
     void OnUnselect(wxCommandEvent& event);
     void OnDumpSelected(wxCommandEvent& event);
     void OnSelect(wxCommandEvent& event);
     void OnUnselect(wxCommandEvent& event);

+    void OnToggleSel(wxCommandEvent& event);

 #endif // NO_MULTIPLE_SELECTION
     void OnDelete(wxCommandEvent& event);
     void OnDeleteChildren(wxCommandEvent& event);
 #endif // NO_MULTIPLE_SELECTION
     void OnDelete(wxCommandEvent& event);
     void OnDeleteChildren(wxCommandEvent& event);


@@ -130,11 +133,15 @@ 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 OnIncIndent(wxCommandEvent& event);
     void OnDecIndent(wxCommandEvent& event);


@@ -144,10 +151,15 @@ public:
 
     void OnToggleIcon(wxCommandEvent& event);
 
 
     void OnToggleIcon(wxCommandEvent& event);
 

+    void OnSize(wxSizeEvent& event);
+

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

+    void Resize(const wxSize& size);
+

     MyTreeCtrl *m_treeCtrl;
     MyTreeCtrl *m_treeCtrl;

+    wxTextCtrl *m_textCtrl;

 
     void DoSetBold(bool bold = TRUE);
 
 
     void DoSetBold(bool bold = TRUE);
 


@@ -161,6 +173,8 @@ enum
     TreeTest_About,
     TreeTest_Dump,
     TreeTest_DumpSelected,
     TreeTest_About,
     TreeTest_Dump,
     TreeTest_DumpSelected,

+    TreeTest_Count,
+    TreeTest_CountRec,

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


@@ -170,9 +184,11 @@ enum
     TreeTest_DeleteChildren,
     TreeTest_DeleteAll,
     TreeTest_Recreate,
     TreeTest_DeleteChildren,
     TreeTest_DeleteAll,
     TreeTest_Recreate,

+    TreeTest_ToggleSel,

     TreeTest_CollapseAndReset,
     TreeTest_EnsureVisible,
     TreeTest_AddItem,
     TreeTest_CollapseAndReset,
     TreeTest_EnsureVisible,
     TreeTest_AddItem,

+    TreeTest_InsertItem,

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