X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae8c4b33a3272fba39c405542141e7c486b75136..c3c11581dc3a4c7c6ab5006b73c1ece32b9ca158:/samples/treectrl/treetest.cpp diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index a485998fb4..307b3de575 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -9,30 +9,26 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#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" #ifdef __WIN32__ // this is not supported by native control @@ -46,8 +42,10 @@ #include "icon3.xpm" #include "icon4.xpm" #include "icon5.xpm" -#include "mondrian.xpm" +#ifndef __WXMSW__ + #include "../sample.xpm" +#endif // verify that the item is ok and insult the user if it is not #define CHECK_ITEM( item ) if ( !item.IsOk() ) { \ @@ -61,10 +59,12 @@ #define MENU_LINK(name) EVT_MENU(TreeTest_##name, MyFrame::On##name) BEGIN_EVENT_TABLE(MyFrame, wxFrame) + EVT_IDLE(MyFrame::OnIdle) EVT_SIZE(MyFrame::OnSize) MENU_LINK(Quit) MENU_LINK(About) + MENU_LINK(ClearLog) MENU_LINK(TogButtons) MENU_LINK(TogTwist) @@ -78,6 +78,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MENU_LINK(SetBgColour) MENU_LINK(ResetStyle) + MENU_LINK(Highlight) MENU_LINK(Dump) #ifndef NO_MULTIPLE_SELECTION MENU_LINK(DumpSelected) @@ -97,6 +98,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MENU_LINK(DeleteAll) MENU_LINK(Recreate) MENU_LINK(ToggleImages) + MENU_LINK(ToggleAlternateImages) MENU_LINK(ToggleButtons) MENU_LINK(SetImageSize) MENU_LINK(CollapseAndReset) @@ -108,6 +110,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MENU_LINK(IncSpacing) MENU_LINK(DecSpacing) MENU_LINK(ToggleIcon) + MENU_LINK(SelectRoot) + + MENU_LINK(ShowFirstVisible) +#ifdef wxHAS_LAST_VISIBLE + MENU_LINK(ShowLastVisible) +#endif // wxHAS_LAST_VISIBLE + MENU_LINK(ShowNextVisible) + MENU_LINK(ShowPrevVisible) #undef MENU_LINK END_EVENT_TABLE() @@ -131,13 +141,22 @@ 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) + + // 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() @@ -145,21 +164,27 @@ 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); + frame->Show(true); SetTopWindow(frame); - 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 @@ -167,7 +192,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 @@ -176,24 +201,27 @@ 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_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_ToggleAlternateImages, wxT("Toggle alternate images")); style_menu->Append(TreeTest_SetImageSize, wxT("Set image si&ze...")); style_menu->AppendSeparator(); style_menu->Append(TreeTest_SetFgColour, wxT("Set &foreground colour...")); @@ -209,6 +237,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) tree_menu->Append(TreeTest_Delete, wxT("&Delete this item")); 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_Count, wxT("Count children of current item")); tree_menu->Append(TreeTest_CountRec, wxT("Recursively count children of current item")); @@ -232,6 +261,13 @@ 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->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")); #ifndef NO_MULTIPLE_SELECTION item_menu->AppendSeparator(); @@ -248,19 +284,26 @@ 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_ToggleAlternateImages, false); - // create a status bar with 3 panes - CreateStatusBar(3); - SetStatusText(wxT(""), 0); +#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? @@ -270,11 +313,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() @@ -302,9 +348,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(); } @@ -324,9 +373,39 @@ void MyFrame::TogStyle(int id, long flag) GetMenuBar()->Check(id, (style & flag) != 0); } +void MyFrame::OnIdle(wxIdleEvent& event) +{ +#if wxUSE_STATUSBAR + if ( m_treeCtrl ) + { + wxTreeItemId idRoot = m_treeCtrl->GetRootItem(); + wxString status; + if (idRoot.IsOk()) + { + wxTreeItemId idLast = m_treeCtrl->GetLastChild(idRoot); + status = wxString::Format( + _T("Root/last item is %svisible/%svisible"), + m_treeCtrl->IsVisible(idRoot) ? _T("") : _T("not "), + idLast.IsOk() && m_treeCtrl->IsVisible(idLast) + ? _T("") : _T("not ")); + } + else + status = _T("No root item"); + + SetStatusText(status, 1); + } +#endif // wxUSE_STATUSBAR + + event.Skip(); +} + void MyFrame::OnSize(wxSizeEvent& event) { - if ( m_treeCtrl && m_textCtrl ) + if ( m_treeCtrl +#if wxUSE_LOG + && m_textCtrl +#endif // wxUSE_LOG + ) { Resize(); } @@ -337,13 +416,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)) @@ -354,6 +437,11 @@ 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(); @@ -365,7 +453,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); } @@ -381,7 +469,7 @@ void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event)) CHECK_ITEM( item ); - int i = m_treeCtrl->GetChildrenCount( item, FALSE ); + int i = m_treeCtrl->GetChildrenCount( item, false ); wxLogMessage(wxT("%d children"), i); } @@ -406,13 +494,33 @@ void MyFrame::DoSort(bool reverse) m_treeCtrl->DoSortChildren(item, reverse); } +void MyFrame::OnHighlight(wxCommandEvent& WXUNUSED(event)) +{ + wxTreeItemId id = m_treeCtrl->GetSelection(); + + CHECK_ITEM( id ); + + wxRect r; + if ( !m_treeCtrl->GetBoundingRect(id, r, true /* text, not full row */) ) + { + wxLogMessage(_T("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(); CHECK_ITEM( root ); - m_treeCtrl->GetItemsRecursively(root, -1); + m_treeCtrl->GetItemsRecursively(root); } #ifndef NO_MULTIPLE_SELECTION @@ -427,7 +535,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++ ) { @@ -435,12 +543,18 @@ void MyFrame::OnDumpSelected(wxCommandEvent& WXUNUSED(event)) } } -void MyFrame::OnSelect(wxCommandEvent& event) +void MyFrame::OnSelect(wxCommandEvent& WXUNUSED(event)) { m_treeCtrl->SelectItem(m_treeCtrl->GetSelection()); } -void MyFrame::OnUnselect(wxCommandEvent& event) +void MyFrame::OnSelectRoot(wxCommandEvent& WXUNUSED(event)) +{ + if ( !m_treeCtrl->HasFlag(wxTR_HIDE_ROOT) ) + m_treeCtrl->SelectItem(m_treeCtrl->GetRootItem()); +} + +void MyFrame::OnUnselect(wxCommandEvent& WXUNUSED(event)) { m_treeCtrl->UnselectAll(); } @@ -485,7 +599,7 @@ void MyFrame::OnRecreate(wxCommandEvent& event) m_treeCtrl->AddTestItemsToTree(5, 2); } -void MyFrame::OnSetImageSize(wxCommandEvent& event) +void MyFrame::OnSetImageSize(wxCommandEvent& WXUNUSED(event)) { int size = wxGetNumberFromUser(wxT("Enter the size for the images to use"), wxT("Size: "), @@ -495,45 +609,53 @@ void MyFrame::OnSetImageSize(wxCommandEvent& event) return; m_treeCtrl->CreateImageList(size); - wxGetApp().SetShowImages(TRUE); + wxGetApp().SetShowImages(true); } -void MyFrame::OnToggleImages(wxCommandEvent& event) +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::OnToggleButtons(wxCommandEvent& event) +void MyFrame::OnToggleAlternateImages(wxCommandEvent& WXUNUSED(event)) +{ + bool alternateImages = m_treeCtrl->AlternateImages(); + + m_treeCtrl->SetAlternateImages(!alternateImages); + m_treeCtrl->CreateImageList(0); +} + +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 } -void MyFrame::OnCollapseAndReset(wxCommandEvent& event) +void MyFrame::OnCollapseAndReset(wxCommandEvent& WXUNUSED(event)) { m_treeCtrl->CollapseAndReset(m_treeCtrl->GetRootItem()); } -void MyFrame::OnEnsureVisible(wxCommandEvent& event) +void MyFrame::OnEnsureVisible(wxCommandEvent& WXUNUSED(event)) { m_treeCtrl->DoEnsureVisible(); } @@ -593,6 +715,38 @@ void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event)) m_treeCtrl->DoToggleIcon(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::DoShowNextOrPrev(TreeFunc1_t pfn, const wxString& label) +{ + wxTreeItemId item = m_treeCtrl->GetSelection(); + + CHECK_ITEM( item ); + + if ( !m_treeCtrl->IsVisible(item) ) + { + wxLogMessage("The selected item must be visible."); + return; + } + + item = (m_treeCtrl->*pfn)(item); + + if ( !item.IsOk() ) + wxLogMessage("There is no %s item", label); + else + wxLogMessage("The %s item is \"%s\"", + label, m_treeCtrl->GetItemText(item)); +} + void MyFrame::OnSetFgColour(wxCommandEvent& WXUNUSED(event)) { wxColour col = wxGetColourFromUser(this, m_treeCtrl->GetForegroundColour()); @@ -617,9 +771,10 @@ 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_reverseSort = FALSE; + m_reverseSort = false; CreateImageList(); @@ -640,20 +795,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]); @@ -667,9 +836,9 @@ void MyTreeCtrl::CreateImageList(int size) AssignImageList(images); } +#if USE_GENERIC_TREECTRL || !defined(__WXMSW__) void MyTreeCtrl::CreateButtonsImageList(int size) { -#if USE_GENERIC_TREECTRL || !defined(__WXMSW__) if ( size == -1 ) { SetButtonsImageList(NULL); @@ -677,17 +846,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 ) @@ -701,11 +883,10 @@ void MyTreeCtrl::CreateButtonsImageList(int size) } AssignButtonsImageList(images); -#endif -} - -MyTreeCtrl::~MyTreeCtrl() +#else +void MyTreeCtrl::CreateButtonsImageList(int WXUNUSED(size)) { +#endif } int MyTreeCtrl::OnCompareItems(const wxTreeItemId& item1, @@ -736,9 +917,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) @@ -781,7 +962,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); } @@ -789,9 +970,10 @@ 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); - long cookie; + wxTreeItemIdValue cookie; wxTreeItemId id = GetFirstChild(rootId, cookie); SetItemTextColour(id, *wxBLUE); @@ -801,41 +983,57 @@ void MyTreeCtrl::AddTestItemsToTree(size_t numChildren, SetItemBackgroundColour(id, *wxLIGHT_GREY); } -void MyTreeCtrl::GetItemsRecursively(const wxTreeItemId& idParent, long cookie) +void MyTreeCtrl::GetItemsRecursively(const wxTreeItemId& idParent, + wxTreeItemIdValue cookie) { wxTreeItemId id; - if( cookie == -1 ) + if ( !cookie ) id = GetFirstChild(idParent, cookie); else id = GetNextChild(idParent, cookie); - if(id <= 0) + if ( !id.IsOk() ) return; wxString text = GetItemText(id); wxLogMessage(text); if (ItemHasChildren(id)) - GetItemsRecursively(id,-1); + GetItemsRecursively(id); GetItemsRecursively(idParent, cookie); } void MyTreeCtrl::DoToggleIcon(const wxTreeItemId& item) { - int image = GetItemImage(item) == TreeCtrlIcon_Folder ? TreeCtrlIcon_File - : TreeCtrlIcon_Folder; - - SetItemImage(item, image); + int image = (GetItemImage(item) == TreeCtrlIcon_Folder) + ? TreeCtrlIcon_File + : TreeCtrlIcon_Folder; + SetItemImage(item, image, wxTreeItemIcon_Normal); + + image = (GetItemImage(item) == TreeCtrlIcon_FolderSelected) + ? TreeCtrlIcon_FileSelected + : TreeCtrlIcon_FolderSelected; + SetItemImage(item, image, wxTreeItemIcon_Selected); } +void MyTreeCtrl::LogEvent(const wxChar *name, const wxTreeEvent& event) +{ + wxTreeItemId item = event.GetItem(); + wxString text; + if ( item.IsOk() ) + text << _T('"') << GetItemText(item).c_str() << _T('"'); + else + text = _T("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(_T(#name), event); \ SetLastItem(wxTreeItemId()); \ event.Skip(); \ } @@ -877,8 +1075,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; @@ -947,7 +1143,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; @@ -963,7 +1158,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); @@ -996,8 +1191,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(); } @@ -1054,6 +1253,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, _T("Editing root item")); + } } void MyTreeCtrl::OnEndLabelEdit(wxTreeEvent& event) @@ -1097,40 +1301,26 @@ void MyTreeCtrl::OnItemActivated(wxTreeEvent& event) wxLogMessage(wxT("OnItemActivated")); } -void MyTreeCtrl::OnItemRightClick(wxTreeEvent& event) +void MyTreeCtrl::OnItemMenu(wxTreeEvent& event) { - ShowMenu(event.GetItem(), event.GetPoint()); + wxTreeItemId itemId = event.GetItem(); + MyTreeItemData *item = itemId.IsOk() ? (MyTreeItemData *)GetItemData(itemId) + : NULL; + wxPoint clientpt = event.GetPoint(); + wxPoint screenpt = ClientToScreen(clientpt); + + wxLogMessage(wxT("OnItemMenu for item \"%s\" at screen coords (%i, %i)"), + item ? item->GetDesc() : _T(""), screenpt.x, screenpt.y); + + ShowMenu(itemId, clientpt); + event.Skip(); } void MyTreeCtrl::OnContextMenu(wxContextMenuEvent& event) { wxPoint pt = event.GetPosition(); - wxTreeItemId item = GetSelection(); - wxLogMessage("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); + wxLogMessage(wxT("OnContextMenu at screen coords (%i, %i)"), pt.x, pt.y); } void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt) @@ -1148,12 +1338,40 @@ void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt) #if wxUSE_MENUS wxMenu menu(title); 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(); + MyTreeItemData *item = itemId.IsOk() ? (MyTreeItemData *)GetItemData(itemId) + : NULL; + + wxLogMessage(wxT("Item \"%s\" right clicked"), item ? item->GetDesc() + : _T("")); + + 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()); @@ -1165,6 +1383,8 @@ void MyTreeCtrl::OnRMouseDClick(wxMouseEvent& event) if ( item ) wxLogMessage(wxT("Item '%s' under mouse"), item->GetDesc()); } + + event.Skip(); } static inline const wxChar *Bool2String(bool b) @@ -1180,6 +1400,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))); }