X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc631754fcf1cf679aa0fcf9f4d74c59459b46ae..71a77e77d1738cd48d7505efda59ab8110d88766:/samples/treectrl/treetest.cpp diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index 53c0c887bc..229a9badb8 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -6,33 +6,30 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation - #pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP - #include "wx/wx.h" - #include "wx/log.h" + #include "wx/wx.h" + #include "wx/log.h" #endif #include "wx/colordlg.h" +#include "wx/numdlg.h" +#include "wx/artprov.h" #include "wx/image.h" #include "wx/imaglist.h" #include "wx/treectrl.h" - -#include "math.h" +#include "wx/math.h" +#include "wx/renderer.h" #ifdef __WIN32__ // this is not supported by native control @@ -47,10 +44,21 @@ #include "icon4.xpm" #include "icon5.xpm" -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) -#include "mondrian.xpm" +#include "state1.xpm" +#include "state2.xpm" +#include "state3.xpm" +#include "state4.xpm" +#include "state5.xpm" + +#include "unchecked.xpm" +#include "checked.xpm" + +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" #endif +static const int NUM_CHILDREN_PER_LEVEL = 5; +static const int NUM_LEVELS = 2; // verify that the item is ok and insult the user if it is not #define CHECK_ITEM( item ) if ( !item.IsOk() ) { \ @@ -69,6 +77,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MENU_LINK(Quit) MENU_LINK(About) + MENU_LINK(ClearLog) MENU_LINK(TogButtons) MENU_LINK(TogTwist) @@ -82,12 +91,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MENU_LINK(SetBgColour) MENU_LINK(ResetStyle) + MENU_LINK(Highlight) MENU_LINK(Dump) #ifndef NO_MULTIPLE_SELECTION MENU_LINK(DumpSelected) MENU_LINK(Select) MENU_LINK(Unselect) MENU_LINK(ToggleSel) + MENU_LINK(SelectChildren) #endif // NO_MULTIPLE_SELECTION MENU_LINK(Rename) MENU_LINK(Count) @@ -101,10 +112,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MENU_LINK(DeleteAll) MENU_LINK(Recreate) MENU_LINK(ToggleImages) + MENU_LINK(ToggleStates) + MENU_LINK(ToggleAlternateImages) + MENU_LINK(ToggleAlternateStates) MENU_LINK(ToggleButtons) MENU_LINK(SetImageSize) MENU_LINK(CollapseAndReset) MENU_LINK(EnsureVisible) + MENU_LINK(SetFocus) MENU_LINK(AddItem) MENU_LINK(InsertItem) MENU_LINK(IncIndent) @@ -112,7 +127,22 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MENU_LINK(IncSpacing) MENU_LINK(DecSpacing) MENU_LINK(ToggleIcon) + MENU_LINK(ToggleState) MENU_LINK(SelectRoot) + MENU_LINK(SetFocusedRoot) + MENU_LINK(ClearFocused) + + MENU_LINK(ShowFirstVisible) +#ifdef wxHAS_LAST_VISIBLE + MENU_LINK(ShowLastVisible) +#endif // wxHAS_LAST_VISIBLE + MENU_LINK(ShowNextVisible) + MENU_LINK(ShowPrevVisible) + MENU_LINK(ShowParent) + MENU_LINK(ShowPrevSibling) + MENU_LINK(ShowNextSibling) + MENU_LINK(ScrollTo) + MENU_LINK(SelectLast) #undef MENU_LINK END_EVENT_TABLE() @@ -136,13 +166,23 @@ BEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl) EVT_TREE_ITEM_EXPANDING(TreeTest_Ctrl, MyTreeCtrl::OnItemExpanding) EVT_TREE_ITEM_COLLAPSED(TreeTest_Ctrl, MyTreeCtrl::OnItemCollapsed) EVT_TREE_ITEM_COLLAPSING(TreeTest_Ctrl, MyTreeCtrl::OnItemCollapsing) - //EVT_TREE_ITEM_RIGHT_CLICK(TreeTest_Ctrl, MyTreeCtrl::OnItemRightClick) - EVT_CONTEXT_MENU(MyTreeCtrl::OnContextMenu) EVT_TREE_SEL_CHANGED(TreeTest_Ctrl, MyTreeCtrl::OnSelChanged) EVT_TREE_SEL_CHANGING(TreeTest_Ctrl, MyTreeCtrl::OnSelChanging) EVT_TREE_KEY_DOWN(TreeTest_Ctrl, MyTreeCtrl::OnTreeKeyDown) EVT_TREE_ITEM_ACTIVATED(TreeTest_Ctrl, MyTreeCtrl::OnItemActivated) + EVT_TREE_STATE_IMAGE_CLICK(TreeTest_Ctrl, MyTreeCtrl::OnItemStateClick) + + // so many different ways to handle right mouse button clicks... + EVT_CONTEXT_MENU(MyTreeCtrl::OnContextMenu) + // EVT_TREE_ITEM_MENU is the preferred event for creating context menus + // on a tree control, because it includes the point of the click or item, + // meaning that no additional placement calculations are required. + EVT_TREE_ITEM_MENU(TreeTest_Ctrl, MyTreeCtrl::OnItemMenu) + EVT_TREE_ITEM_RIGHT_CLICK(TreeTest_Ctrl, MyTreeCtrl::OnItemRClick) + + EVT_RIGHT_DOWN(MyTreeCtrl::OnRMouseDown) + EVT_RIGHT_UP(MyTreeCtrl::OnRMouseUp) EVT_RIGHT_DCLICK(MyTreeCtrl::OnRMouseDClick) END_EVENT_TABLE() @@ -150,21 +190,26 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // Create the main frame window MyFrame *frame = new MyFrame(wxT("wxTreeCtrl Test"), 50, 50, 450, 600); // Show the frame - frame->Show(TRUE); - SetTopWindow(frame); + frame->Show(true); - return TRUE; + return true; } // My frame constructor MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) - : wxFrame((wxFrame *)NULL, -1, title, wxPoint(x, y), wxSize(w, h)), - m_treeCtrl(NULL), m_textCtrl(NULL) + : wxFrame((wxFrame *)NULL, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)), + m_treeCtrl(NULL) +#if wxUSE_LOG + , m_textCtrl(NULL) +#endif // wxUSE_LOG { // This reduces flicker effects - even better would be to define // OnEraseBackground to do nothing. When the tree control's scrollbars are @@ -172,7 +217,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) SetBackgroundColour(wxColour(255, 255, 255)); // Give it an icon - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); #if wxUSE_MENUS // Make a menubar @@ -181,24 +226,29 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) *tree_menu = new wxMenu, *item_menu = new wxMenu; - file_menu->Append(TreeTest_About, wxT("&About...")); + file_menu->Append(TreeTest_ClearLog, wxT("&Clear log\tCtrl-L")); + file_menu->AppendSeparator(); + file_menu->Append(TreeTest_About, wxT("&About")); file_menu->AppendSeparator(); file_menu->Append(TreeTest_Quit, wxT("E&xit\tAlt-X")); - style_menu->Append(TreeTest_TogButtons, wxT("Toggle &normal buttons"), wxT(""), TRUE); - style_menu->Append(TreeTest_TogTwist, wxT("Toggle &twister buttons"), wxT(""), TRUE); - style_menu->Append(TreeTest_ToggleButtons, wxT("Toggle image &buttons"), wxT(""), TRUE); + style_menu->AppendCheckItem(TreeTest_TogButtons, wxT("Toggle &normal buttons")); + style_menu->AppendCheckItem(TreeTest_TogTwist, wxT("Toggle &twister buttons")); + style_menu->AppendCheckItem(TreeTest_ToggleButtons, wxT("Toggle image &buttons")); style_menu->AppendSeparator(); - style_menu->Append(TreeTest_TogLines, wxT("Toggle &connecting lines"), wxT(""), TRUE); - style_menu->Append(TreeTest_TogRootLines, wxT("Toggle &lines at root"), wxT(""), TRUE); - style_menu->Append(TreeTest_TogHideRoot, wxT("Toggle &hidden root"), wxT(""), TRUE); - style_menu->Append(TreeTest_TogBorder, wxT("Toggle &item border"), wxT(""), TRUE); - style_menu->Append(TreeTest_TogFullHighlight, wxT("Toggle &full row highlight"), wxT(""), TRUE); - style_menu->Append(TreeTest_TogEdit, wxT("Toggle &edit mode"), wxT(""), TRUE); + style_menu->AppendCheckItem(TreeTest_TogLines, wxT("Toggle &connecting lines")); + style_menu->AppendCheckItem(TreeTest_TogRootLines, wxT("Toggle &lines at root")); + style_menu->AppendCheckItem(TreeTest_TogHideRoot, wxT("Toggle &hidden root")); + style_menu->AppendCheckItem(TreeTest_TogBorder, wxT("Toggle &item border")); + style_menu->AppendCheckItem(TreeTest_TogFullHighlight, wxT("Toggle &full row highlight")); + style_menu->AppendCheckItem(TreeTest_TogEdit, wxT("Toggle &edit mode")); #ifndef NO_MULTIPLE_SELECTION - style_menu->Append(TreeTest_ToggleSel, wxT("Toggle &selection mode"), wxT(""), TRUE); + style_menu->AppendCheckItem(TreeTest_ToggleSel, wxT("Toggle &selection mode\tCtrl-S")); #endif // NO_MULTIPLE_SELECTION - style_menu->Append(TreeTest_ToggleImages, wxT("Toggle show ima&ges"), wxT(""), TRUE); + style_menu->AppendCheckItem(TreeTest_ToggleImages, wxT("Toggle show ima&ges")); + style_menu->AppendCheckItem(TreeTest_ToggleStates, wxT("Toggle show st&ates")); + style_menu->AppendCheckItem(TreeTest_ToggleAlternateImages, wxT("Toggle alternate images")); + style_menu->AppendCheckItem(TreeTest_ToggleAlternateStates, wxT("Toggle alternate state images")); style_menu->Append(TreeTest_SetImageSize, wxT("Set image si&ze...")); style_menu->AppendSeparator(); style_menu->Append(TreeTest_SetFgColour, wxT("Set &foreground colour...")); @@ -215,6 +265,10 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) tree_menu->Append(TreeTest_DeleteChildren, wxT("Delete &children")); tree_menu->Append(TreeTest_DeleteAll, wxT("Delete &all items")); tree_menu->Append(TreeTest_SelectRoot, wxT("Select root item")); + tree_menu->AppendSeparator(); + tree_menu->Append(TreeTest_SetFocusedRoot, wxT("Set focus to root item")); + tree_menu->Append(TreeTest_ClearFocused, wxT("Reset focus")); + tree_menu->AppendSeparator(); tree_menu->Append(TreeTest_Count, wxT("Count children of current item")); tree_menu->Append(TreeTest_CountRec, wxT("Recursively count children of current item")); @@ -223,6 +277,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) tree_menu->Append(TreeTest_SortRev, wxT("Sort in reversed order")); tree_menu->AppendSeparator(); tree_menu->Append(TreeTest_EnsureVisible, wxT("Make the last item &visible")); + tree_menu->Append(TreeTest_SetFocus, wxT("Set &focus to the tree")); tree_menu->AppendSeparator(); tree_menu->Append(TreeTest_IncIndent, wxT("Add 5 points to indentation\tAlt-I")); tree_menu->Append(TreeTest_DecIndent, wxT("Reduce indentation by 5 points\tAlt-R")); @@ -238,12 +293,30 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) item_menu->Append(TreeTest_ClearBold, wxT("Make item ¬ bold")); item_menu->AppendSeparator(); item_menu->Append(TreeTest_ToggleIcon, wxT("Toggle the item's &icon")); + item_menu->Append(TreeTest_ToggleState, wxT("Toggle the item's &state")); + item_menu->AppendSeparator(); + item_menu->Append(TreeTest_ShowFirstVisible, wxT("Show &first visible")); +#ifdef wxHAS_LAST_VISIBLE + item_menu->Append(TreeTest_ShowLastVisible, wxT("Show &last visible")); +#endif // wxHAS_LAST_VISIBLE + item_menu->Append(TreeTest_ShowNextVisible, wxT("Show &next visible")); + item_menu->Append(TreeTest_ShowPrevVisible, wxT("Show &previous visible")); + item_menu->AppendSeparator(); + item_menu->Append(TreeTest_ShowParent, "Show pa&rent"); + item_menu->Append(TreeTest_ShowPrevSibling, "Show &previous sibling"); + item_menu->Append(TreeTest_ShowNextSibling, "Show &next sibling"); + item_menu->AppendSeparator(); + item_menu->Append(TreeTest_ScrollTo, "Scroll &to item", + "Scroll to the last by one top level child"); + item_menu->Append(TreeTest_SelectLast, "Select &last item", + "Select the last item"); #ifndef NO_MULTIPLE_SELECTION item_menu->AppendSeparator(); item_menu->Append(TreeTest_DumpSelected, wxT("Dump selected items\tAlt-D")); item_menu->Append(TreeTest_Select, wxT("Select current item\tAlt-S")); item_menu->Append(TreeTest_Unselect, wxT("Unselect everything\tAlt-U")); + item_menu->Append(TreeTest_SelectChildren, wxT("Select all children\tCtrl-A")); #endif // NO_MULTIPLE_SELECTION wxMenuBar *menu_bar = new wxMenuBar; @@ -254,20 +327,28 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) SetMenuBar(menu_bar); #endif // wxUSE_MENUS + m_panel = new wxPanel(this); + +#if wxUSE_LOG // create the controls - m_textCtrl = new wxTextCtrl(this, -1, wxT(""), + m_textCtrl = new wxTextCtrl(m_panel, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER); +#endif // wxUSE_LOG CreateTreeWithDefStyle(); - menu_bar->Check(TreeTest_ToggleImages, TRUE); + menu_bar->Check(TreeTest_ToggleImages, true); + menu_bar->Check(TreeTest_ToggleStates, true); + menu_bar->Check(TreeTest_ToggleAlternateImages, false); + menu_bar->Check(TreeTest_ToggleAlternateStates, false); #if wxUSE_STATUSBAR // create a status bar CreateStatusBar(2); #endif // wxUSE_STATUSBAR +#if wxUSE_LOG #ifdef __WXMOTIF__ // For some reason, we get a memcpy crash in wxLogStream::DoLogStream // on gcc/wxMotif, if we use wxLogTextCtl. Maybe it's just gcc? @@ -277,11 +358,14 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) wxLogTextCtrl *logWindow = new wxLogTextCtrl(m_textCtrl); delete wxLog::SetActiveTarget(logWindow); #endif +#endif // wxUSE_LOG } MyFrame::~MyFrame() { +#if wxUSE_LOG delete wxLog::SetActiveTarget(NULL); +#endif // wxUSE_LOG } void MyFrame::CreateTreeWithDefStyle() @@ -309,9 +393,12 @@ void MyFrame::CreateTreeWithDefStyle() void MyFrame::CreateTree(long style) { - m_treeCtrl = new MyTreeCtrl(this, TreeTest_Ctrl, + m_treeCtrl = new MyTreeCtrl(m_panel, TreeTest_Ctrl, wxDefaultPosition, wxDefaultSize, style); + + GetMenuBar()->Enable(TreeTest_SelectRoot, !(style & wxTR_HIDE_ROOT)); + Resize(); } @@ -337,14 +424,20 @@ void MyFrame::OnIdle(wxIdleEvent& event) if ( m_treeCtrl ) { wxTreeItemId idRoot = m_treeCtrl->GetRootItem(); + wxString status; + if (idRoot.IsOk()) + { + wxTreeItemId idLast = m_treeCtrl->GetLastChild(idRoot); + status = wxString::Format( + wxT("Root/last item is %svisible/%svisible"), + m_treeCtrl->IsVisible(idRoot) ? wxT("") : wxT("not "), + idLast.IsOk() && m_treeCtrl->IsVisible(idLast) + ? wxT("") : wxT("not ")); + } + else + status = wxT("No root item"); - SetStatusText(wxString::Format - ( - _T("Root/last item is %svisible/%svisible"), - m_treeCtrl->IsVisible(idRoot) ? _T("") : _T("not "), - m_treeCtrl->IsVisible(m_treeCtrl->GetLastChild(idRoot)) - ? _T("") : _T("not ") - ), 1); + SetStatusText(status, 1); } #endif // wxUSE_STATUSBAR @@ -353,7 +446,11 @@ void MyFrame::OnIdle(wxIdleEvent& event) void MyFrame::OnSize(wxSizeEvent& event) { - if ( m_treeCtrl && m_textCtrl ) + if ( m_treeCtrl +#if wxUSE_LOG + && m_textCtrl +#endif // wxUSE_LOG + ) { Resize(); } @@ -364,13 +461,17 @@ void MyFrame::OnSize(wxSizeEvent& event) void MyFrame::Resize() { wxSize size = GetClientSize(); - m_treeCtrl->SetSize(0, 0, size.x, 2*size.y/3); - m_textCtrl->SetSize(0, 2*size.y/3, size.x, size.y/3); + m_treeCtrl->SetSize(0, 0, size.x, size.y +#if wxUSE_LOG + *2/3); + m_textCtrl->SetSize(0, 2*size.y/3, size.x, size.y/3 +#endif + ); } void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) @@ -381,9 +482,14 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) wxOK | wxICON_INFORMATION, this); } +void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event)) +{ + m_textCtrl->Clear(); +} + void MyFrame::OnRename(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -392,7 +498,7 @@ void MyFrame::OnRename(wxCommandEvent& WXUNUSED(event)) static wxString s_text; s_text = wxGetTextFromUser(wxT("New name: "), wxT("Tree sample question"), s_text, this); - if ( !s_text.IsEmpty() ) + if ( !s_text.empty() ) { m_treeCtrl->SetItemText(item, s_text); } @@ -404,18 +510,18 @@ void MyFrame::OnRename(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); - int i = m_treeCtrl->GetChildrenCount( item, FALSE ); + int i = m_treeCtrl->GetChildrenCount( item, false ); wxLogMessage(wxT("%d children"), i); } void MyFrame::OnCountRec(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -426,16 +532,36 @@ void MyFrame::OnCountRec(wxCommandEvent& WXUNUSED(event)) void MyFrame::DoSort(bool reverse) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); m_treeCtrl->DoSortChildren(item, reverse); } +void MyFrame::OnHighlight(wxCommandEvent& WXUNUSED(event)) +{ + wxTreeItemId id = m_treeCtrl->GetFocusedItem(); + + CHECK_ITEM( id ); + + wxRect r; + if ( !m_treeCtrl->GetBoundingRect(id, r, true /* text, not full row */) ) + { + wxLogMessage(wxT("Failed to get bounding item rect")); + return; + } + + wxClientDC dc(m_treeCtrl); + dc.SetBrush(*wxRED); + dc.SetPen(*wxTRANSPARENT_PEN); + dc.DrawRectangle(r); + m_treeCtrl->Update(); +} + void MyFrame::OnDump(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId root = m_treeCtrl->GetSelection(); + wxTreeItemId root = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( root ); @@ -454,7 +580,7 @@ void MyFrame::OnDumpSelected(wxCommandEvent& WXUNUSED(event)) wxArrayTreeItemIds array; size_t count = m_treeCtrl->GetSelections(array); - wxLogMessage(wxT("%u items selected"), count); + wxLogMessage(wxT("%u items selected"), unsigned(count)); for ( size_t n = 0; n < count; n++ ) { @@ -464,12 +590,24 @@ void MyFrame::OnDumpSelected(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnSelect(wxCommandEvent& WXUNUSED(event)) { - m_treeCtrl->SelectItem(m_treeCtrl->GetSelection()); + m_treeCtrl->SelectItem(m_treeCtrl->GetFocusedItem()); } void MyFrame::OnSelectRoot(wxCommandEvent& WXUNUSED(event)) { - m_treeCtrl->SelectItem(m_treeCtrl->GetRootItem()); + if ( !m_treeCtrl->HasFlag(wxTR_HIDE_ROOT) ) + m_treeCtrl->SelectItem(m_treeCtrl->GetRootItem()); +} + +void MyFrame::OnSetFocusedRoot(wxCommandEvent& WXUNUSED(event)) +{ + if ( !m_treeCtrl->HasFlag(wxTR_HIDE_ROOT) ) + m_treeCtrl->SetFocusedItem(m_treeCtrl->GetRootItem()); +} + +void MyFrame::OnClearFocused(wxCommandEvent& WXUNUSED(event)) +{ + m_treeCtrl->ClearFocusedItem(); } void MyFrame::OnUnselect(wxCommandEvent& WXUNUSED(event)) @@ -477,11 +615,20 @@ void MyFrame::OnUnselect(wxCommandEvent& WXUNUSED(event)) m_treeCtrl->UnselectAll(); } +void MyFrame::OnSelectChildren(wxCommandEvent& WXUNUSED(event)) +{ + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); + if ( !item.IsOk() ) + item = m_treeCtrl->GetRootItem(); + + m_treeCtrl->SelectChildren(item); +} + #endif // NO_MULTIPLE_SELECTION void MyFrame::DoSetBold(bool bold) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -490,7 +637,7 @@ void MyFrame::DoSetBold(bool bold) void MyFrame::OnDelete(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -499,7 +646,7 @@ void MyFrame::OnDelete(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnDeleteChildren(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -514,7 +661,7 @@ void MyFrame::OnDeleteAll(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnRecreate(wxCommandEvent& event) { OnDeleteAll(event); - m_treeCtrl->AddTestItemsToTree(5, 2); + m_treeCtrl->AddTestItemsToTree(NUM_CHILDREN_PER_LEVEL, NUM_LEVELS); } void MyFrame::OnSetImageSize(wxCommandEvent& WXUNUSED(event)) @@ -527,7 +674,7 @@ void MyFrame::OnSetImageSize(wxCommandEvent& WXUNUSED(event)) return; m_treeCtrl->CreateImageList(size); - wxGetApp().SetShowImages(TRUE); + wxGetApp().SetShowImages(true); } void MyFrame::OnToggleImages(wxCommandEvent& WXUNUSED(event)) @@ -535,27 +682,62 @@ void MyFrame::OnToggleImages(wxCommandEvent& WXUNUSED(event)) if ( wxGetApp().ShowImages() ) { m_treeCtrl->CreateImageList(-1); - wxGetApp().SetShowImages(FALSE); + wxGetApp().SetShowImages(false); } else { m_treeCtrl->CreateImageList(0); - wxGetApp().SetShowImages(TRUE); + wxGetApp().SetShowImages(true); + } +} + +void MyFrame::OnToggleStates(wxCommandEvent& WXUNUSED(event)) +{ + if ( wxGetApp().ShowStates() ) + { + m_treeCtrl->CreateStateImageList(true); + wxGetApp().SetShowStates(false); + } + else + { + m_treeCtrl->CreateStateImageList(false); + wxGetApp().SetShowStates(true); } } +void MyFrame::OnToggleAlternateImages(wxCommandEvent& WXUNUSED(event)) +{ + bool alternateImages = m_treeCtrl->AlternateImages(); + + m_treeCtrl->SetAlternateImages(!alternateImages); + m_treeCtrl->CreateImageList(0); +} + +void MyFrame::OnToggleAlternateStates(wxCommandEvent& WXUNUSED(event)) +{ + bool alternateStates = m_treeCtrl->AlternateStates(); + + m_treeCtrl->SetAlternateStates(!alternateStates); + m_treeCtrl->CreateStateImageList(); + + // normal states < alternate states + // so we must reset broken states + if ( alternateStates ) + m_treeCtrl->ResetBrokenStateImages(); +} + void MyFrame::OnToggleButtons(wxCommandEvent& WXUNUSED(event)) { #if USE_GENERIC_TREECTRL || !defined(__WXMSW__) if ( wxGetApp().ShowButtons() ) { m_treeCtrl->CreateButtonsImageList(-1); - wxGetApp().SetShowButtons(FALSE); + wxGetApp().SetShowButtons(false); } else { m_treeCtrl->CreateButtonsImageList(15); - wxGetApp().SetShowButtons(TRUE); + wxGetApp().SetShowButtons(true); } #endif } @@ -570,6 +752,11 @@ void MyFrame::OnEnsureVisible(wxCommandEvent& WXUNUSED(event)) m_treeCtrl->DoEnsureVisible(); } +void MyFrame::OnSetFocus(wxCommandEvent& WXUNUSED(event)) +{ + m_treeCtrl->SetFocus(); +} + void MyFrame::OnInsertItem(wxCommandEvent& WXUNUSED(event)) { int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_File : -1; @@ -606,36 +793,122 @@ void MyFrame::OnIncSpacing(wxCommandEvent& WXUNUSED(event)) { unsigned int indent = m_treeCtrl->GetSpacing(); if (indent < 100) + { m_treeCtrl->SetSpacing( indent+5 ); + m_treeCtrl->Refresh(); + } } void MyFrame::OnDecSpacing(wxCommandEvent& WXUNUSED(event)) { unsigned int indent = m_treeCtrl->GetSpacing(); if (indent > 10) + { m_treeCtrl->SetSpacing( indent-5 ); + m_treeCtrl->Refresh(); + } } void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); m_treeCtrl->DoToggleIcon(item); } +void MyFrame::OnToggleState(wxCommandEvent& WXUNUSED(event)) +{ + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); + + CHECK_ITEM( item ); + + m_treeCtrl->DoToggleState(item); +} + +void MyFrame::DoShowFirstOrLast(TreeFunc0_t pfn, const wxString& label) +{ + const wxTreeItemId item = (m_treeCtrl->*pfn)(); + + if ( !item.IsOk() ) + { + wxLogMessage("There is no %s item", label); + } + else + { + wxLogMessage("The %s item is \"%s\"", + label, m_treeCtrl->GetItemText(item)); + } +} + +void MyFrame::DoShowRelativeItem(TreeFunc1_t pfn, const wxString& label) +{ + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); + + CHECK_ITEM( item ); + + if ((pfn == (TreeFunc1_t) &wxTreeCtrl::GetPrevVisible + || pfn == (TreeFunc1_t) &wxTreeCtrl::GetNextVisible) + && !m_treeCtrl->IsVisible(item)) + { + wxLogMessage("The selected item must be visible."); + return; + } + + wxTreeItemId new_item = (m_treeCtrl->*pfn)(item); + + if ( !new_item.IsOk() ) + { + wxLogMessage("There is no %s item", label); + } + else + { + wxLogMessage("The %s item is \"%s\"", + label, m_treeCtrl->GetItemText(new_item)); + } +} + +void MyFrame::OnScrollTo(wxCommandEvent& WXUNUSED(event)) +{ + // scroll to the last but one top level child + wxTreeItemId item = m_treeCtrl->GetPrevSibling( + m_treeCtrl->GetLastChild( + m_treeCtrl->GetRootItem())); + CHECK_ITEM( item ); + + m_treeCtrl->ScrollTo(item); +} + +void MyFrame::OnSelectLast(wxCommandEvent& WXUNUSED(event)) +{ + // select the very last item of the tree + wxTreeItemId item = m_treeCtrl->GetRootItem(); + for ( ;; ) + { + wxTreeItemId itemChild = m_treeCtrl->GetLastChild(item); + if ( !itemChild.IsOk() ) + break; + + item = itemChild; + } + + CHECK_ITEM( item ); + + m_treeCtrl->SelectItem(item); +} + void MyFrame::OnSetFgColour(wxCommandEvent& WXUNUSED(event)) { wxColour col = wxGetColourFromUser(this, m_treeCtrl->GetForegroundColour()); - if ( col.Ok() ) + if ( col.IsOk() ) m_treeCtrl->SetForegroundColour(col); } void MyFrame::OnSetBgColour(wxCommandEvent& WXUNUSED(event)) { wxColour col = wxGetColourFromUser(this, m_treeCtrl->GetBackgroundColour()); - if ( col.Ok() ) + if ( col.IsOk() ) m_treeCtrl->SetBackgroundColour(col); } @@ -649,14 +922,17 @@ IMPLEMENT_DYNAMIC_CLASS(MyTreeCtrl, wxTreeCtrl) MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style) - : wxTreeCtrl(parent, id, pos, size, style) + : wxTreeCtrl(parent, id, pos, size, style), + m_alternateImages(false), + m_alternateStates(false) { - m_reverseSort = FALSE; + m_reverseSort = false; CreateImageList(); + CreateStateImageList(); // Add some items to the tree - AddTestItemsToTree(5, 2); + AddTestItemsToTree(NUM_CHILDREN_PER_LEVEL, NUM_LEVELS); } void MyTreeCtrl::CreateImageList(int size) @@ -672,20 +948,34 @@ void MyTreeCtrl::CreateImageList(int size) m_imageSize = size; // Make an image list containing small icons - wxImageList *images = new wxImageList(size, size, TRUE); + wxImageList *images = new wxImageList(size, size, true); // should correspond to TreeCtrlIcon_xxx enum wxBusyCursor wait; wxIcon icons[5]; - icons[0] = wxIcon(icon1_xpm); - icons[1] = wxIcon(icon2_xpm); - icons[2] = wxIcon(icon3_xpm); - icons[3] = wxIcon(icon4_xpm); - icons[4] = wxIcon(icon5_xpm); - int sizeOrig = icons[0].GetWidth(); + if (m_alternateImages) + { + icons[TreeCtrlIcon_File] = wxIcon(icon1_xpm); + icons[TreeCtrlIcon_FileSelected] = wxIcon(icon2_xpm); + icons[TreeCtrlIcon_Folder] = wxIcon(icon3_xpm); + icons[TreeCtrlIcon_FolderSelected] = wxIcon(icon4_xpm); + icons[TreeCtrlIcon_FolderOpened] = wxIcon(icon5_xpm); + } + else + { + wxSize iconSize(size, size); + + icons[TreeCtrlIcon_File] = + icons[TreeCtrlIcon_FileSelected] = wxArtProvider::GetIcon(wxART_NORMAL_FILE, wxART_LIST, iconSize); + icons[TreeCtrlIcon_Folder] = + icons[TreeCtrlIcon_FolderSelected] = + icons[TreeCtrlIcon_FolderOpened] = wxArtProvider::GetIcon(wxART_FOLDER, wxART_LIST, iconSize); + } + for ( size_t i = 0; i < WXSIZEOF(icons); i++ ) { + int sizeOrig = icons[0].GetWidth(); if ( size == sizeOrig ) { images->Add(icons[i]); @@ -699,6 +989,54 @@ void MyTreeCtrl::CreateImageList(int size) AssignImageList(images); } +void MyTreeCtrl::CreateStateImageList(bool del) +{ + if ( del ) + { + SetStateImageList(NULL); + return; + } + + wxImageList *states; + wxBusyCursor wait; + + if (m_alternateStates) + { + wxIcon icons[5]; + icons[0] = wxIcon(state1_xpm); // yellow + icons[1] = wxIcon(state2_xpm); // green + icons[2] = wxIcon(state3_xpm); // red + icons[3] = wxIcon(state4_xpm); // blue + icons[4] = wxIcon(state5_xpm); // black + + int width = icons[0].GetWidth(), + height = icons[0].GetHeight(); + + // Make an state image list containing small icons + states = new wxImageList(width, height, true); + + for ( size_t i = 0; i < WXSIZEOF(icons); i++ ) + states->Add(icons[i]); + } + else + { + wxIcon icons[2]; + icons[0] = wxIcon(unchecked_xpm); + icons[1] = wxIcon(checked_xpm); + + int width = icons[0].GetWidth(), + height = icons[0].GetHeight(); + + // Make an state image list containing small icons + states = new wxImageList(width, height, true); + + for ( size_t i = 0; i < WXSIZEOF(icons); i++ ) + states->Add(icons[i]); + } + + AssignStateImageList(states); +} + #if USE_GENERIC_TREECTRL || !defined(__WXMSW__) void MyTreeCtrl::CreateButtonsImageList(int size) { @@ -709,17 +1047,30 @@ void MyTreeCtrl::CreateButtonsImageList(int size) } // Make an image list containing small icons - wxImageList *images = new wxImageList(size, size, TRUE); + wxImageList *images = new wxImageList(size, size, true); // should correspond to TreeCtrlIcon_xxx enum wxBusyCursor wait; wxIcon icons[4]; - icons[0] = wxIcon(icon3_xpm); // closed - icons[1] = wxIcon(icon3_xpm); // closed, selected - icons[2] = wxIcon(icon5_xpm); // open - icons[3] = wxIcon(icon5_xpm); // open, selected - for ( size_t i = 0; i < WXSIZEOF(icons); i++ ) + if (m_alternateImages) + { + icons[0] = wxIcon(icon3_xpm); // closed + icons[1] = wxIcon(icon3_xpm); // closed, selected + icons[2] = wxIcon(icon5_xpm); // open + icons[3] = wxIcon(icon5_xpm); // open, selected + } + else + { + wxSize iconSize(size, size); + + icons[0] = // closed + icons[1] = wxArtProvider::GetIcon(wxART_FOLDER, wxART_LIST, iconSize); // closed, selected + icons[2] = // open + icons[3] = wxArtProvider::GetIcon(wxART_FOLDER_OPEN, wxART_LIST, iconSize);// open, selected + } + + for ( size_t i = 0; i < WXSIZEOF(icons); i++ ) { int sizeOrig = icons[i].GetWidth(); if ( size == sizeOrig ) @@ -739,10 +1090,6 @@ void MyTreeCtrl::CreateButtonsImageList(int WXUNUSED(size)) #endif } -MyTreeCtrl::~MyTreeCtrl() -{ -} - int MyTreeCtrl::OnCompareItems(const wxTreeItemId& item1, const wxTreeItemId& item2) { @@ -771,9 +1118,9 @@ void MyTreeCtrl::AddItemsRecursively(const wxTreeItemId& idParent, { // at depth 1 elements won't have any more children if ( hasChildren ) - str.Printf(wxT("%s child %d"), wxT("Folder"), n + 1); + str.Printf(wxT("%s child %u"), wxT("Folder"), unsigned(n + 1)); else - str.Printf(wxT("%s child %d.%d"), wxT("File"), folder, n + 1); + str.Printf(wxT("%s child %u.%u"), wxT("File"), unsigned(folder), unsigned(n + 1)); // here we pass to AppendItem() normal and selected item images (we // suppose that selected image follows the normal one in the enum) @@ -790,6 +1137,9 @@ void MyTreeCtrl::AddItemsRecursively(const wxTreeItemId& idParent, wxTreeItemId id = AppendItem(idParent, str, image, imageSel, new MyTreeItemData(str)); + if ( wxGetApp().ShowStates() ) + SetItemState(id, 0); + // and now we also set the expanded one (only for the folders) if ( hasChildren && wxGetApp().ShowImages() ) { @@ -816,7 +1166,7 @@ void MyTreeCtrl::AddTestItemsToTree(size_t numChildren, wxTreeItemId rootId = AddRoot(wxT("Root"), image, image, new MyTreeItemData(wxT("Root item"))); - if ( image != -1 ) + if ( !HasFlag(wxTR_HIDE_ROOT) && image != -1 ) { SetItemImage(rootId, TreeCtrlIcon_FolderOpened, wxTreeItemIcon_Expanded); } @@ -824,16 +1174,21 @@ void MyTreeCtrl::AddTestItemsToTree(size_t numChildren, AddItemsRecursively(rootId, numChildren, depth, 0); // set some colours/fonts for testing - SetItemFont(rootId, *wxITALIC_FONT); + if ( !HasFlag(wxTR_HIDE_ROOT) ) + SetItemFont(rootId, *wxITALIC_FONT); wxTreeItemIdValue cookie; wxTreeItemId id = GetFirstChild(rootId, cookie); SetItemTextColour(id, *wxBLUE); id = GetNextChild(rootId, cookie); - id = GetNextChild(rootId, cookie); - SetItemTextColour(id, *wxRED); - SetItemBackgroundColour(id, *wxLIGHT_GREY); + if ( id ) + id = GetNextChild(rootId, cookie); + if ( id ) + { + SetItemTextColour(id, *wxRED); + SetItemBackgroundColour(id, *wxLIGHT_GREY); + } } void MyTreeCtrl::GetItemsRecursively(const wxTreeItemId& idParent, @@ -860,18 +1215,78 @@ void MyTreeCtrl::GetItemsRecursively(const wxTreeItemId& idParent, void MyTreeCtrl::DoToggleIcon(const wxTreeItemId& item) { - int image = GetItemImage(item) == TreeCtrlIcon_Folder ? TreeCtrlIcon_File - : TreeCtrlIcon_Folder; + int image = GetItemImage(item) == TreeCtrlIcon_Folder + ? TreeCtrlIcon_File + : TreeCtrlIcon_Folder; + SetItemImage(item, image, wxTreeItemIcon_Normal); + + image = GetItemImage(item, wxTreeItemIcon_Selected) == TreeCtrlIcon_FolderSelected + ? TreeCtrlIcon_FileSelected + : TreeCtrlIcon_FolderSelected; + SetItemImage(item, image, wxTreeItemIcon_Selected); +} + +void MyTreeCtrl::DoToggleState(const wxTreeItemId& item) +{ + if ( m_alternateStates ) + { + // sets random state unlike current + int state = GetItemState(item); + int nState; + + srand (time(NULL)); + do { + nState = rand() % GetStateImageList()->GetImageCount(); + } while (nState == state); + + SetItemState(item, nState); + } + else + { + // we have only 2 checkbox states, so next state will be reversed + SetItemState(item, wxTREE_ITEMSTATE_NEXT); + } +} + +void MyTreeCtrl::DoResetBrokenStateImages(const wxTreeItemId& idParent, + wxTreeItemIdValue cookie, int state) +{ + wxTreeItemId id; + + if ( !cookie ) + id = GetFirstChild(idParent, cookie); + else + id = GetNextChild(idParent, cookie); + + if ( !id.IsOk() ) + return; + + int curState = GetItemState(id); + if ( curState != wxTREE_ITEMSTATE_NONE && curState > state ) + SetItemState(id, state); + + if (ItemHasChildren(id)) + DoResetBrokenStateImages(id, 0, state); - SetItemImage(item, image); + DoResetBrokenStateImages(idParent, cookie, state); } +void MyTreeCtrl::LogEvent(const wxChar *name, const wxTreeEvent& event) +{ + wxTreeItemId item = event.GetItem(); + wxString text; + if ( item.IsOk() ) + text << wxT('"') << GetItemText(item).c_str() << wxT('"'); + else + text = wxT("invalid item"); + wxLogMessage(wxT("%s(%s)"), name, text.c_str()); +} // avoid repetition #define TREE_EVENT_HANDLER(name) \ void MyTreeCtrl::name(wxTreeEvent& event) \ { \ - wxLogMessage(wxT(#name)); \ + LogEvent(wxT(#name), event); \ SetLastItem(wxTreeItemId()); \ event.Skip(); \ } @@ -913,8 +1328,6 @@ void LogKeyEvent(const wxChar *name, const wxKeyEvent& event) case WXK_MENU: key = wxT("MENU"); break; case WXK_PAUSE: key = wxT("PAUSE"); break; case WXK_CAPITAL: key = wxT("CAPITAL"); break; - case WXK_PRIOR: key = wxT("PRIOR"); break; - case WXK_NEXT: key = wxT("NEXT"); break; case WXK_END: key = wxT("END"); break; case WXK_HOME: key = wxT("HOME"); break; case WXK_LEFT: key = wxT("LEFT"); break; @@ -983,7 +1396,6 @@ void LogKeyEvent(const wxChar *name, const wxKeyEvent& event) case WXK_NUMPAD_UP: key = wxT("NUMPAD_UP"); break; case WXK_NUMPAD_RIGHT: key = wxT("NUMPAD_RIGHT"); break; case WXK_NUMPAD_DOWN: key = wxT("NUMPAD_DOWN"); break; - case WXK_NUMPAD_PRIOR: key = wxT("NUMPAD_PRIOR"); break; case WXK_NUMPAD_PAGEUP: key = wxT("NUMPAD_PAGEUP"); break; case WXK_NUMPAD_PAGEDOWN: key = wxT("NUMPAD_PAGEDOWN"); break; case WXK_NUMPAD_END: key = wxT("NUMPAD_END"); break; @@ -999,7 +1411,7 @@ void LogKeyEvent(const wxChar *name, const wxKeyEvent& event) default: { - if ( wxIsprint((int)keycode) ) + if ( keycode < 128 && wxIsprint((int)keycode) ) key.Printf(wxT("'%c'"), (char)keycode); else if ( keycode > 0 && keycode < 27 ) key.Printf(_("Ctrl-%c"), wxT('A') + keycode - 1); @@ -1032,8 +1444,12 @@ void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event) { m_draggedItem = event.GetItem(); - wxLogMessage(wxT("OnBeginDrag: started dragging %s"), - GetItemText(m_draggedItem).c_str()); + wxPoint clientpt = event.GetPoint(); + wxPoint screenpt = ClientToScreen(clientpt); + + wxLogMessage(wxT("OnBeginDrag: started dragging %s at screen coords (%i,%i)"), + GetItemText(m_draggedItem).c_str(), + screenpt.x, screenpt.y); event.Allow(); } @@ -1075,7 +1491,10 @@ void MyTreeCtrl::OnEndDrag(wxTreeEvent& event) // Finally, we only copy one item here but we might copy the entire tree if // we were dragging a folder. int image = wxGetApp().ShowImages() ? TreeCtrlIcon_File : -1; - AppendItem(itemDst, text, image); + wxTreeItemId id = AppendItem(itemDst, text, image); + + if ( wxGetApp().ShowStates() ) + SetItemState(id, GetItemState(itemSrc)); } void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event) @@ -1090,6 +1509,11 @@ void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event) event.Veto(); } + else if ( itemId == GetRootItem() ) + { + // test that it is possible to change the text of the item being edited + SetItemText(itemId, wxT("Editing root item")); + } } void MyTreeCtrl::OnEndLabelEdit(wxTreeEvent& event) @@ -1133,40 +1557,39 @@ void MyTreeCtrl::OnItemActivated(wxTreeEvent& event) wxLogMessage(wxT("OnItemActivated")); } -void MyTreeCtrl::OnItemRightClick(wxTreeEvent& event) +void MyTreeCtrl::OnItemStateClick(wxTreeEvent& event) +{ + // toggle item state + wxTreeItemId itemId = event.GetItem(); + DoToggleState(itemId); + + wxLogMessage(wxT("Item \"%s\" state changed to %d"), + GetItemText(itemId), GetItemState(itemId)); +} + +void MyTreeCtrl::OnItemMenu(wxTreeEvent& event) { - ShowMenu(event.GetItem(), event.GetPoint()); + wxTreeItemId itemId = event.GetItem(); + wxCHECK_RET( itemId.IsOk(), "should have a valid item" ); + + MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId); + wxPoint clientpt = event.GetPoint(); + wxPoint screenpt = ClientToScreen(clientpt); + + wxLogMessage(wxT("OnItemMenu for item \"%s\" at screen coords (%i, %i)"), + item->GetDesc(), screenpt.x, screenpt.y); + + ShowMenu(itemId, clientpt); + event.Skip(); } void MyTreeCtrl::OnContextMenu(wxContextMenuEvent& event) { wxPoint pt = event.GetPosition(); - wxTreeItemId item = GetSelection(); + wxLogMessage(wxT("OnContextMenu at screen coords (%i, %i)"), pt.x, pt.y); - //check if event was generated by keyboard (MSW-specific?) - if (pt.x==-1 && pt.y==-1) //(this is how MSW indicates it) - { - //attempt to guess where to show the menu - if (item.IsOk()) - { - //if an item was clicked, show menu to the right of it - wxRect rect; - GetBoundingRect(item, rect, true); //true = only the label - pt = wxPoint(rect.GetRight(), rect.GetTop()); - } - else - { - pt = wxPoint(0, 0); - } - } - else - { - //event was generated by mouse, use supplied coords - pt = ScreenToClient(pt); - } - - ShowMenu(item, pt); + event.Skip(); } void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt) @@ -1183,24 +1606,58 @@ void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt) #if wxUSE_MENUS wxMenu menu(title); - menu.Append(TreeTest_About, wxT("&About...")); + menu.Append(TreeTest_About, wxT("&About")); + menu.AppendSeparator(); + menu.Append(TreeTest_Highlight, wxT("&Highlight item")); menu.Append(TreeTest_Dump, wxT("&Dump")); PopupMenu(&menu, pt); #endif // wxUSE_MENUS } +void MyTreeCtrl::OnItemRClick(wxTreeEvent& event) +{ + wxTreeItemId itemId = event.GetItem(); + wxCHECK_RET( itemId.IsOk(), "should have a valid item" ); + + MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId); + + wxLogMessage(wxT("Item \"%s\" right clicked"), item->GetDesc()); + + event.Skip(); +} + +void MyTreeCtrl::OnRMouseDown(wxMouseEvent& event) +{ + wxLogMessage(wxT("Right mouse button down")); + + event.Skip(); +} + +void MyTreeCtrl::OnRMouseUp(wxMouseEvent& event) +{ + wxLogMessage(wxT("Right mouse button up")); + + event.Skip(); +} + void MyTreeCtrl::OnRMouseDClick(wxMouseEvent& event) { wxTreeItemId id = HitTest(event.GetPosition()); if ( !id ) + { wxLogMessage(wxT("No item under mouse")); + } else { MyTreeItemData *item = (MyTreeItemData *)GetItemData(id); if ( item ) + { wxLogMessage(wxT("Item '%s' under mouse"), item->GetDesc()); + } } + + event.Skip(); } static inline const wxChar *Bool2String(bool b) @@ -1216,6 +1673,6 @@ void MyTreeItemData::ShowInfo(wxTreeCtrl *tree) Bool2String(tree->IsSelected(GetId())), Bool2String(tree->IsExpanded(GetId())), Bool2String(tree->IsBold(GetId())), - tree->GetChildrenCount(GetId()), - tree->GetChildrenCount(GetId(), FALSE)); + unsigned(tree->GetChildrenCount(GetId())), + unsigned(tree->GetChildrenCount(GetId(), false))); }