return correct item and position from wxTreeEvent::GetItem/Point() (patch 1622166)

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

diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index 18c8b9a65d395b473ec0e663357789d1096966df..f9a2f3bcaa9519c52450a3641fd52270284a6914 100644 (file)
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -1,19 +1,40 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        treetest.h
+// Name:        treectrl.h

 // Purpose:     wxTreeCtrl sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxTreeCtrl sample
 // Author:      Julian Smart
 // 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
 /////////////////////////////////////////////////////////////////////////////
 

+#define USE_GENERIC_TREECTRL 0
+
+#if USE_GENERIC_TREECTRL
+#include "wx/generic/treectlg.h"
+#ifndef wxTreeCtrl
+#define wxTreeCtrl wxGenericTreeCtrl
+#define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl
+#endif
+#endif
+

 // Define a new application type
 class MyApp : public wxApp
 {
 public:
 // Define a new application type
 class MyApp : public wxApp
 {
 public:

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

     bool OnInit();
     bool OnInit();

+
+    void SetShowImages(bool show) { m_showImages = show; }
+    bool ShowImages() const { return m_showImages; }
+
+    void SetShowButtons(bool show) { m_showButtons = show; }
+    bool ShowButtons() const { return m_showButtons; }
+
+private:
+    bool m_showImages, m_showButtons;

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


@@ -22,7 +43,7 @@ public:
     MyTreeItemData(const wxString& desc) : m_desc(desc) { }
 
     void ShowInfo(wxTreeCtrl *tree);
     MyTreeItemData(const wxString& desc) : m_desc(desc) { }
 
     void ShowInfo(wxTreeCtrl *tree);

-    const char *GetDesc() const { return m_desc.c_str(); }
+    const wxChar *GetDesc() const { return m_desc.c_str(); }

 
 private:
     wxString m_desc;
 
 private:
     wxString m_desc;


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


@@ -52,6 +73,8 @@ 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 OnContextMenu(wxContextMenuEvent& event);
+    void OnItemMenu(wxTreeEvent& event);

     void OnGetInfo(wxTreeEvent& event);
     void OnSetInfo(wxTreeEvent& event);
     void OnItemExpanded(wxTreeEvent& event);
     void OnGetInfo(wxTreeEvent& event);
     void OnSetInfo(wxTreeEvent& event);
     void OnItemExpanded(wxTreeEvent& event);


@@ -62,18 +85,32 @@ 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 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);
 

+    void ShowMenu(wxTreeItemId id, const wxPoint& pt);
+
+    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);
 


@@ -81,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:


@@ -90,7 +127,9 @@ private:
                              size_t depth,
                              size_t folder);
 
                              size_t depth,
                              size_t folder);
 

-    wxImageList *m_imageListNormal;
+    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
     bool         m_reverseSort;             // flag for OnCompareItems
     wxTreeItemId m_lastItem,                // for OnEnsureVisible()
                  m_draggedItem;             // item being dragged right now


@@ -115,6 +154,30 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 

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


@@ -122,14 +185,19 @@ 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);

+

     void OnRecreate(wxCommandEvent& event);
     void OnRecreate(wxCommandEvent& event);

+    void OnToggleButtons(wxCommandEvent& event);
+    void OnToggleImages(wxCommandEvent& event);
+    void OnSetImageSize(wxCommandEvent& event);

     void OnCollapseAndReset(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);
 


@@ -137,8 +205,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);


@@ -151,17 +219,26 @@ public:
 
     void OnToggleIcon(wxCommandEvent& event);
 
 
     void OnToggleIcon(wxCommandEvent& event);
 

+    void OnIdle(wxIdleEvent& event);

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

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

 
 

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

 
 

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


@@ -169,21 +246,36 @@ private:
 // menu and control ids
 enum
 {
 // menu and control ids
 enum
 {

-    TreeTest_Quit,
-    TreeTest_About,
+    TreeTest_Quit = wxID_EXIT,
+    TreeTest_About = wxID_ABOUT,
+    TreeTest_TogButtons = wxID_HIGHEST,
+    TreeTest_TogTwist,
+    TreeTest_TogLines,
+    TreeTest_TogEdit,
+    TreeTest_TogHideRoot,
+    TreeTest_TogRootLines,
+    TreeTest_TogBorder,
+    TreeTest_TogFullHighlight,
+    TreeTest_SetFgColour,
+    TreeTest_SetBgColour,
+    TreeTest_ResetStyle,
+    TreeTest_Highlight,

     TreeTest_Dump,
     TreeTest_DumpSelected,
     TreeTest_Count,
     TreeTest_CountRec,
     TreeTest_Sort,
     TreeTest_SortRev,
     TreeTest_Dump,
     TreeTest_DumpSelected,
     TreeTest_Count,
     TreeTest_CountRec,
     TreeTest_Sort,
     TreeTest_SortRev,

-    TreeTest_Bold,
-    TreeTest_UnBold,
+    TreeTest_SetBold,
+    TreeTest_ClearBold,

     TreeTest_Rename,
     TreeTest_Delete,
     TreeTest_DeleteChildren,
     TreeTest_DeleteAll,
     TreeTest_Recreate,
     TreeTest_Rename,
     TreeTest_Delete,
     TreeTest_DeleteChildren,
     TreeTest_DeleteAll,
     TreeTest_Recreate,

+    TreeTest_ToggleImages,
+    TreeTest_ToggleButtons,
+    TreeTest_SetImageSize,

     TreeTest_ToggleSel,
     TreeTest_CollapseAndReset,
     TreeTest_EnsureVisible,
     TreeTest_ToggleSel,
     TreeTest_CollapseAndReset,
     TreeTest_EnsureVisible,


@@ -196,5 +288,6 @@ enum
     TreeTest_ToggleIcon,
     TreeTest_Select,
     TreeTest_Unselect,
     TreeTest_ToggleIcon,
     TreeTest_Select,
     TreeTest_Unselect,

+    TreeTest_SelectRoot,

     TreeTest_Ctrl = 1000
 };
     TreeTest_Ctrl = 1000
 };