miscellaneous small enhancements

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

diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index 64879f66416935c309c7788f84e8978b045f1f83..5b93a8113290e4ce11591c1aabe579e4eae9214c 100644 (file)
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -23,18 +23,21 @@
 class MyApp : public wxApp
 {
 public:
 class MyApp : public wxApp
 {
 public:

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

 
     bool OnInit();
 
     void SetShowImages(bool show) { m_showImages = show; }
     bool ShowImages() const { return m_showImages; }
 
 
     bool OnInit();
 
     void SetShowImages(bool show) { m_showImages = show; }
     bool ShowImages() const { return m_showImages; }
 

+    void SetShowStates(bool show) { m_showStates = show; }
+    bool ShowStates() const { return m_showStates; }
+

     void SetShowButtons(bool show) { m_showButtons = show; }
     bool ShowButtons() const { return m_showButtons; }
 
 private:
     void SetShowButtons(bool show) { m_showButtons = show; }
     bool ShowButtons() const { return m_showButtons; }
 
 private:

-    bool m_showImages, m_showButtons;
+    bool m_showImages, m_showStates, m_showButtons;

 };
 
 class MyTreeItemData : public wxTreeItemData
 };
 
 class MyTreeItemData : public wxTreeItemData


@@ -61,11 +64,11 @@ public:
         TreeCtrlIcon_FolderOpened
     };
 
         TreeCtrlIcon_FolderOpened
     };
 

-    MyTreeCtrl() { }
+    MyTreeCtrl() { m_alternateImages = false; m_alternateStates = false; }

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


@@ -74,9 +77,8 @@ public:
     void OnEndLabelEdit(wxTreeEvent& event);
     void OnDeleteItem(wxTreeEvent& event);
     void OnContextMenu(wxContextMenuEvent& event);
     void OnEndLabelEdit(wxTreeEvent& event);
     void OnDeleteItem(wxTreeEvent& 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,6 +88,11 @@ 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 OnItemStateClick(wxTreeEvent& event);
+    void OnItemRClick(wxTreeEvent& event);
+
+    void OnRMouseDown(wxMouseEvent& event);
+    void OnRMouseUp(wxMouseEvent& event);

     void OnRMouseDClick(wxMouseEvent& event);
 
     void GetItemsRecursively(const wxTreeItemId& idParent,
     void OnRMouseDClick(wxMouseEvent& event);
 
     void GetItemsRecursively(const wxTreeItemId& idParent,


@@ -93,14 +100,16 @@ public:
 
     void CreateImageList(int size = 16);
     void CreateButtonsImageList(int size = 11);
 
     void CreateImageList(int size = 16);
     void CreateButtonsImageList(int size = 11);

+    void CreateStateImageList(bool del = false);

 
     void AddTestItemsToTree(size_t numChildren, size_t depth);
 
 
     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); }
     void DoEnsureVisible() { if (m_lastItem.IsOk()) EnsureVisible(m_lastItem); }
 
     void DoToggleIcon(const wxTreeItemId& item);
         { m_reverseSort = reverse; wxTreeCtrl::SortChildren(item); }
     void DoEnsureVisible() { if (m_lastItem.IsOk()) EnsureVisible(m_lastItem); }
 
     void DoToggleIcon(const wxTreeItemId& item);

+    void DoToggleState(const wxTreeItemId& item);

 
     void ShowMenu(wxTreeItemId id, const wxPoint& pt);
 
 
     void ShowMenu(wxTreeItemId id, const wxPoint& pt);
 


@@ -108,6 +117,12 @@ public:
 
     void SetLastItem(wxTreeItemId id) { m_lastItem = id; }
 
 
     void SetLastItem(wxTreeItemId id) { m_lastItem = id; }
 

+    void SetAlternateImages(bool show) { m_alternateImages = show; }
+    bool AlternateImages() const { return m_alternateImages; }
+
+    void SetAlternateStates(bool show) { m_alternateStates = show; }
+    bool AlternateStates() const { return m_alternateStates; }
+

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


@@ -124,10 +139,14 @@ private:
                              size_t depth,
                              size_t folder);
 
                              size_t depth,
                              size_t folder);
 

+    void LogEvent(const wxChar *name, const wxTreeEvent& event);
+

     int          m_imageSize;               // current size of images
     bool         m_reverseSort;             // flag for OnCompareItems
     wxTreeItemId m_lastItem,                // for OnEnsureVisible()
                  m_draggedItem;             // item being dragged right now
     int          m_imageSize;               // current size of images
     bool         m_reverseSort;             // flag for OnCompareItems
     wxTreeItemId m_lastItem,                // for OnEnsureVisible()
                  m_draggedItem;             // item being dragged right now

+    bool         m_alternateImages;
+    bool         m_alternateStates;

 
     // 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.


@@ -148,6 +167,7 @@ public:
     // menu callbacks
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     // menu callbacks
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

+    void OnClearLog(wxCommandEvent& event);

 
     void OnTogButtons(wxCommandEvent& event)
         { TogStyle(event.GetId(), wxTR_HAS_BUTTONS); }
 
     void OnTogButtons(wxCommandEvent& event)
         { TogStyle(event.GetId(), wxTR_HAS_BUTTONS); }


@@ -172,6 +192,7 @@ public:
     void OnSetFgColour(wxCommandEvent& event);
     void OnSetBgColour(wxCommandEvent& event);
 
     void OnSetFgColour(wxCommandEvent& event);
     void OnSetBgColour(wxCommandEvent& event);
 

+    void OnHighlight(wxCommandEvent& event);

     void OnDump(wxCommandEvent& event);
 #ifndef NO_MULTIPLE_SELECTION
     void OnDumpSelected(wxCommandEvent& event);
     void OnDump(wxCommandEvent& event);
 #ifndef NO_MULTIPLE_SELECTION
     void OnDumpSelected(wxCommandEvent& event);


@@ -179,6 +200,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,11 +208,14 @@ public:
     void OnRecreate(wxCommandEvent& event);
     void OnToggleButtons(wxCommandEvent& event);
     void OnToggleImages(wxCommandEvent& event);
     void OnRecreate(wxCommandEvent& event);
     void OnToggleButtons(wxCommandEvent& event);
     void OnToggleImages(wxCommandEvent& event);

+    void OnToggleStates(wxCommandEvent& event);
+    void OnToggleAlternateImages(wxCommandEvent& event);
+    void OnToggleAlternateStates(wxCommandEvent& event);

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


@@ -198,8 +223,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);


@@ -211,6 +236,26 @@ public:
     void OnDecSpacing(wxCommandEvent& event);
 
     void OnToggleIcon(wxCommandEvent& event);
     void OnDecSpacing(wxCommandEvent& event);
 
     void OnToggleIcon(wxCommandEvent& event);

+    void OnToggleState(wxCommandEvent& event);
+
+    void OnShowFirstVisible(wxCommandEvent& WXUNUSED(event))
+        { DoShowFirstOrLast(&wxTreeCtrl::GetFirstVisibleItem, "first visible"); }
+#ifdef wxHAS_LAST_VISIBLE // we don't have it currently but may add later
+    void OnShowLastVisible(wxCommandEvent& WXUNUSED(event))
+        { DoShowFirstOrLast(&wxTreeCtrl::GetLastVisibleItem, "last visible"); }
+#endif // wxHAS_LAST_VISIBLE
+
+    void OnShowNextVisible(wxCommandEvent& WXUNUSED(event))
+        { DoShowRelativeItem(&wxTreeCtrl::GetNextVisible, "next visible"); }
+    void OnShowPrevVisible(wxCommandEvent& WXUNUSED(event))
+        { DoShowRelativeItem(&wxTreeCtrl::GetPrevVisible, "previous visible"); }
+
+    void OnShowParent(wxCommandEvent& WXUNUSED(event))
+        { DoShowRelativeItem(&wxTreeCtrl::GetItemParent, "parent"); }
+    void OnShowPrevSibling(wxCommandEvent& WXUNUSED(event))
+        { DoShowRelativeItem(&wxTreeCtrl::GetPrevSibling, "previous sibling"); }
+    void OnShowNextSibling(wxCommandEvent& WXUNUSED(event))
+        { DoShowRelativeItem(&wxTreeCtrl::GetNextSibling, "next sibling"); }

 
     void OnIdle(wxIdleEvent& event);
     void OnSize(wxSizeEvent& event);
 
     void OnIdle(wxIdleEvent& event);
     void OnSize(wxSizeEvent& event);


@@ -218,17 +263,28 @@ public:
 private:
     void TogStyle(int id, long flag);
 
 private:
     void TogStyle(int id, long flag);
 

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

 
     void Resize();
 
     void CreateTreeWithDefStyle();
     void CreateTree(long style);
 
 
     void Resize();
 
     void CreateTreeWithDefStyle();
     void CreateTree(long style);
 

+    // common parts of OnShowFirst/LastVisible() and OnShowNext/PrevVisible()
+    typedef wxTreeItemId (wxTreeCtrl::*TreeFunc0_t)() const;
+    void DoShowFirstOrLast(TreeFunc0_t pfn, const wxString& label);
+
+    typedef wxTreeItemId (wxTreeCtrl::*TreeFunc1_t)(const wxTreeItemId&) const;
+    void DoShowRelativeItem(TreeFunc1_t pfn, const wxString& label);
+
+
+    wxPanel *m_panel;

     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()
 };


@@ -236,9 +292,10 @@ 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_ClearLog = wxID_CLEAR,
+    TreeTest_TogButtons = wxID_HIGHEST,

     TreeTest_TogTwist,
     TreeTest_TogLines,
     TreeTest_TogEdit,
     TreeTest_TogTwist,
     TreeTest_TogLines,
     TreeTest_TogEdit,


@@ -249,6 +306,7 @@ enum
     TreeTest_SetFgColour,
     TreeTest_SetBgColour,
     TreeTest_ResetStyle,
     TreeTest_SetFgColour,
     TreeTest_SetBgColour,
     TreeTest_ResetStyle,

+    TreeTest_Highlight,

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


@@ -263,6 +321,9 @@ enum
     TreeTest_DeleteAll,
     TreeTest_Recreate,
     TreeTest_ToggleImages,
     TreeTest_DeleteAll,
     TreeTest_Recreate,
     TreeTest_ToggleImages,

+    TreeTest_ToggleStates,
+    TreeTest_ToggleAlternateImages,
+    TreeTest_ToggleAlternateStates,

     TreeTest_ToggleButtons,
     TreeTest_SetImageSize,
     TreeTest_ToggleSel,
     TreeTest_ToggleButtons,
     TreeTest_SetImageSize,
     TreeTest_ToggleSel,


@@ -275,7 +336,16 @@ enum
     TreeTest_IncSpacing,
     TreeTest_DecSpacing,
     TreeTest_ToggleIcon,
     TreeTest_IncSpacing,
     TreeTest_DecSpacing,
     TreeTest_ToggleIcon,

+    TreeTest_ToggleState,

     TreeTest_Select,
     TreeTest_Unselect,
     TreeTest_Select,
     TreeTest_Unselect,

+    TreeTest_SelectRoot,
+    TreeTest_ShowFirstVisible,
+    TreeTest_ShowLastVisible,
+    TreeTest_ShowNextVisible,
+    TreeTest_ShowPrevVisible,
+    TreeTest_ShowParent,
+    TreeTest_ShowPrevSibling,
+    TreeTest_ShowNextSibling,

     TreeTest_Ctrl = 1000
 };
     TreeTest_Ctrl = 1000
 };