X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cc8c9884d8cc35cce8394a23e2b7dd2c069e246..2adfb497e666354303ea6bb0e468f1e53811ad55:/samples/treectrl/treetest.cpp?ds=inline diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index 5d371764f4..e7cb2cb8f5 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -23,9 +23,10 @@ #ifndef WX_PRECOMP #include "wx/wx.h" + #include "wx/log.h" #endif -#include "wx/log.h" +#include "wx/colordlg.h" #include "wx/image.h" #include "wx/imaglist.h" @@ -33,73 +34,91 @@ #include "math.h" -#ifdef __WXMSW__ - // this is not supported at all under MSW +#ifdef __WIN32__ + // this is not supported by native control #define NO_VARIABLE_HEIGHT - - #define NO_MULTIPLE_SELECTION - - // this is supported (so the next line may be uncommented) but not very - // well :-( - #undef NO_MULTIPLE_SELECTION #endif #include "treetest.h" // under Windows the icons are in the .rc file #ifndef __WXMSW__ - #include "icon1.xpm" - #include "icon2.xpm" - #include "icon3.xpm" - #include "icon4.xpm" - #include "icon5.xpm" - #include "mondrian.xpm" + #include "icon1.xpm" + #include "icon2.xpm" + #include "icon3.xpm" + #include "icon4.xpm" + #include "icon5.xpm" + #include "mondrian.xpm" #endif // verify that the item is ok and insult the user if it is not -#define CHECK_ITEM( item ) if ( !item.IsOk() ) { \ - wxMessageBox("Please select some item first!", \ - "Tree sample error", \ - wxOK | wxICON_EXCLAMATION, \ - this); \ - return; \ +#define CHECK_ITEM( item ) if ( !item.IsOk() ) { \ + wxMessageBox(wxT("Please select some item first!"), \ + wxT("Tree sample error"), \ + wxOK | wxICON_EXCLAMATION, \ + this); \ + return; \ } +#define MENU_LINK(name) EVT_MENU(TreeTest_##name, MyFrame::On##name) + BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_SIZE(MyFrame::OnSize) - EVT_MENU(TreeTest_Quit, MyFrame::OnQuit) - EVT_MENU(TreeTest_About, MyFrame::OnAbout) - EVT_MENU(TreeTest_Dump, MyFrame::OnDump) + MENU_LINK(Quit) + MENU_LINK(About) + + MENU_LINK(TogButtons) + MENU_LINK(TogTwist) + MENU_LINK(TogLines) + MENU_LINK(TogEdit) + MENU_LINK(TogHideRoot) + MENU_LINK(TogRootLines) + MENU_LINK(TogBorder) + MENU_LINK(TogFullHighlight) + MENU_LINK(SetFgColour) + MENU_LINK(SetBgColour) + MENU_LINK(ResetStyle) + + MENU_LINK(Dump) #ifndef NO_MULTIPLE_SELECTION - EVT_MENU(TreeTest_DumpSelected, MyFrame::OnDumpSelected) - EVT_MENU(TreeTest_Select, MyFrame::OnSelect) - EVT_MENU(TreeTest_Unselect, MyFrame::OnUnselect) - EVT_MENU(TreeTest_ToggleSel, MyFrame::OnToggleSel) + MENU_LINK(DumpSelected) + MENU_LINK(Select) + MENU_LINK(Unselect) + MENU_LINK(ToggleSel) #endif // NO_MULTIPLE_SELECTION - EVT_MENU(TreeTest_Rename, MyFrame::OnRename) - EVT_MENU(TreeTest_Count, MyFrame::OnCount) - EVT_MENU(TreeTest_CountRec, MyFrame::OnCountRec) - EVT_MENU(TreeTest_Sort, MyFrame::OnSort) - EVT_MENU(TreeTest_SortRev, MyFrame::OnSortRev) - EVT_MENU(TreeTest_Bold, MyFrame::OnSetBold) - EVT_MENU(TreeTest_UnBold, MyFrame::OnClearBold) - EVT_MENU(TreeTest_Delete, MyFrame::OnDelete) - EVT_MENU(TreeTest_DeleteChildren, MyFrame::OnDeleteChildren) - EVT_MENU(TreeTest_DeleteAll, MyFrame::OnDeleteAll) - EVT_MENU(TreeTest_Recreate, MyFrame::OnRecreate) - EVT_MENU(TreeTest_CollapseAndReset, MyFrame::OnCollapseAndReset) - EVT_MENU(TreeTest_EnsureVisible, MyFrame::OnEnsureVisible) - EVT_MENU(TreeTest_AddItem, MyFrame::OnAddItem) - EVT_MENU(TreeTest_InsertItem, MyFrame::OnInsertItem) - EVT_MENU(TreeTest_IncIndent, MyFrame::OnIncIndent) - EVT_MENU(TreeTest_DecIndent, MyFrame::OnDecIndent) - EVT_MENU(TreeTest_IncSpacing, MyFrame::OnIncSpacing) - EVT_MENU(TreeTest_DecSpacing, MyFrame::OnDecSpacing) - EVT_MENU(TreeTest_ToggleIcon, MyFrame::OnToggleIcon) + MENU_LINK(Rename) + MENU_LINK(Count) + MENU_LINK(CountRec) + MENU_LINK(Sort) + MENU_LINK(SortRev) + MENU_LINK(SetBold) + MENU_LINK(ClearBold) + MENU_LINK(Delete) + MENU_LINK(DeleteChildren) + MENU_LINK(DeleteAll) + MENU_LINK(Recreate) + MENU_LINK(ToggleImages) + MENU_LINK(ToggleButtons) + MENU_LINK(SetImageSize) + MENU_LINK(CollapseAndReset) + MENU_LINK(EnsureVisible) + MENU_LINK(AddItem) + MENU_LINK(InsertItem) + MENU_LINK(IncIndent) + MENU_LINK(DecIndent) + MENU_LINK(IncSpacing) + MENU_LINK(DecSpacing) + MENU_LINK(ToggleIcon) +#undef MENU_LINK + END_EVENT_TABLE() +#if USE_GENERIC_TREECTRL +BEGIN_EVENT_TABLE(MyTreeCtrl, wxGenericTreeCtrl) +#else BEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl) +#endif EVT_TREE_BEGIN_DRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginDrag) EVT_TREE_BEGIN_RDRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginRDrag) EVT_TREE_END_DRAG(TreeTest_Ctrl, MyTreeCtrl::OnEndDrag) @@ -114,6 +133,9 @@ 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_RIGHT_UP(MyTreeCtrl::OnRMouseUp) EVT_TREE_SEL_CHANGED(TreeTest_Ctrl, MyTreeCtrl::OnSelChanged) EVT_TREE_SEL_CHANGING(TreeTest_Ctrl, MyTreeCtrl::OnSelChanging) EVT_TREE_KEY_DOWN(TreeTest_Ctrl, MyTreeCtrl::OnTreeKeyDown) @@ -126,7 +148,7 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { // Create the main frame window - MyFrame *frame = new MyFrame("wxTreeCtrl Test", 50, 50, 450, 340); + MyFrame *frame = new MyFrame(wxT("wxTreeCtrl Test"), 50, 50, 450, 600); // Show the frame frame->Show(TRUE); @@ -149,18 +171,38 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) // Give it an icon SetIcon(wxICON(mondrian)); +#if wxUSE_MENUS // Make a menubar wxMenu *file_menu = new wxMenu, + *style_menu = new wxMenu, *tree_menu = new wxMenu, *item_menu = new wxMenu; - file_menu->Append(TreeTest_About, "&About..."); + file_menu->Append(TreeTest_About, wxT("&About...")); file_menu->AppendSeparator(); - file_menu->Append(TreeTest_Quit, "E&xit\tAlt-X"); - + file_menu->Append(TreeTest_Quit, wxT("E&xit\tAlt-X")); + + style_menu->Append(TreeTest_TogButtons, "Toggle &normal buttons", _T(""), TRUE); + style_menu->Append(TreeTest_TogTwist, "Toggle &twister buttons", _T(""), TRUE); + style_menu->Append(TreeTest_ToggleButtons, "Toggle image &buttons", _T(""), TRUE); + style_menu->AppendSeparator(); + style_menu->Append(TreeTest_TogLines, "Toggle &connecting lines", _T(""), TRUE); + style_menu->Append(TreeTest_TogRootLines, "Toggle &lines at root", _T(""), TRUE); + style_menu->Append(TreeTest_TogHideRoot, "Toggle &hidden root", _T(""), TRUE); + style_menu->Append(TreeTest_TogBorder, "Toggle &item border", _T(""), TRUE); + style_menu->Append(TreeTest_TogFullHighlight, "Toggle &full row highlight", _T(""), TRUE); + style_menu->Append(TreeTest_TogEdit, "Toggle &edit mode", _T(""), TRUE); #ifndef NO_MULTIPLE_SELECTION - tree_menu->Append(TreeTest_ToggleSel, "&Toggle selection mode"); + style_menu->Append(TreeTest_ToggleSel, wxT("Toggle &selection mode"), _T(""), TRUE); #endif // NO_MULTIPLE_SELECTION + style_menu->Append(TreeTest_ToggleImages, wxT("Toggle show ima&ges"), _T(""), TRUE); + style_menu->Append(TreeTest_SetImageSize, wxT("Set image si&ze...")); + style_menu->AppendSeparator(); + style_menu->Append(TreeTest_SetFgColour, wxT("Set &foreground colour...")); + style_menu->Append(TreeTest_SetBgColour, wxT("Set &background colour...")); + style_menu->AppendSeparator(); + style_menu->Append(TreeTest_ResetStyle, wxT("&Reset to default\tF10")); + tree_menu->Append(TreeTest_Recreate, "&Recreate the tree"); tree_menu->Append(TreeTest_CollapseAndReset, "C&ollapse and reset"); tree_menu->AppendSeparator(); @@ -188,10 +230,10 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) item_menu->Append(TreeTest_Rename, "&Rename item..."); item_menu->AppendSeparator(); - item_menu->Append(TreeTest_Bold, "Make item &bold"); - item_menu->Append(TreeTest_UnBold, "Make item ¬ bold"); + item_menu->Append(TreeTest_SetBold, "Make item &bold"); + item_menu->Append(TreeTest_ClearBold, "Make item ¬ bold"); item_menu->AppendSeparator(); - item_menu->Append(TreeTest_ToggleIcon, "Toggle the items &icon"); + item_menu->Append(TreeTest_ToggleIcon, "Toggle the item's &icon"); #ifndef NO_MULTIPLE_SELECTION item_menu->AppendSeparator(); @@ -202,25 +244,21 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) wxMenuBar *menu_bar = new wxMenuBar; menu_bar->Append(file_menu, "&File"); + menu_bar->Append(style_menu, "&Style"); menu_bar->Append(tree_menu, "&Tree"); menu_bar->Append(item_menu, "&Item"); SetMenuBar(menu_bar); +#endif // wxUSE_MENUS - m_treeCtrl = new MyTreeCtrl(this, TreeTest_Ctrl, - wxDefaultPosition, wxDefaultSize, - wxTR_HAS_BUTTONS | - wxTR_EDIT_LABELS | -#ifndef NO_VARIABLE_HEIGHT - wxTR_HAS_VARIABLE_ROW_HEIGHT | -#endif - wxSUNKEN_BORDER); - - m_treeCtrl->SetBackgroundColour(wxColour(204, 205, 79)); - + // create the controls m_textCtrl = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER); + CreateTreeWithDefStyle(); + + menu_bar->Check(TreeTest_ToggleImages, TRUE); + // create a status bar with 3 panes CreateStatusBar(3); SetStatusText("", 0); @@ -241,18 +279,66 @@ MyFrame::~MyFrame() delete wxLog::SetActiveTarget(NULL); } +void MyFrame::CreateTreeWithDefStyle() +{ + long style = wxTR_DEFAULT_STYLE | +#ifndef NO_VARIABLE_HEIGHT + wxTR_HAS_VARIABLE_ROW_HEIGHT | +#endif + wxTR_EDIT_LABELS; + + CreateTree(style | wxSUNKEN_BORDER); + + // as we don't know what wxTR_DEFAULT_STYLE could contain, test for + // everything + wxMenuBar *mbar = GetMenuBar(); + mbar->Check(TreeTest_TogButtons, (style & wxTR_HAS_BUTTONS) != 0); + mbar->Check(TreeTest_TogButtons, (style & wxTR_TWIST_BUTTONS) != 0); + mbar->Check(TreeTest_TogLines, (style & wxTR_NO_LINES) == 0); + mbar->Check(TreeTest_TogRootLines, (style & wxTR_LINES_AT_ROOT) != 0); + mbar->Check(TreeTest_TogHideRoot, (style & wxTR_HIDE_ROOT) != 0); + mbar->Check(TreeTest_TogEdit, (style & wxTR_EDIT_LABELS) != 0); + mbar->Check(TreeTest_TogBorder, (style & wxTR_ROW_LINES) != 0); + mbar->Check(TreeTest_TogFullHighlight, (style & wxTR_FULL_ROW_HIGHLIGHT) != 0); +} + +void MyFrame::CreateTree(long style) +{ + m_treeCtrl = new MyTreeCtrl(this, TreeTest_Ctrl, + wxDefaultPosition, wxDefaultSize, + style); + Resize(); +} + +void MyFrame::TogStyle(int id, long flag) +{ + long style = m_treeCtrl->GetWindowStyle() ^ flag; + + // most treectrl styles can't be changed on the fly using the native + // control and the tree must be recreated +#ifndef __WXMSW__ + m_treeCtrl->SetWindowStyle(style); +#else // MSW + delete m_treeCtrl; + CreateTree(style); +#endif // !MSW/MSW + + GetMenuBar()->Check(id, (style & flag) != 0); +} + void MyFrame::OnSize(wxSizeEvent& event) { if ( m_treeCtrl && m_textCtrl ) { - Resize(GetClientSize()); + Resize(); } event.Skip(); } -void MyFrame::Resize(const wxSize& size) +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); } @@ -333,20 +419,9 @@ void MyFrame::OnDump(wxCommandEvent& WXUNUSED(event)) #ifndef NO_MULTIPLE_SELECTION -void MyFrame::OnToggleSel(wxCommandEvent& WXUNUSED(event)) +void MyFrame::OnToggleSel(wxCommandEvent& event) { - long style = m_treeCtrl->GetWindowStyle(); - if ( style & wxTR_MULTIPLE ) - style &= ~wxTR_MULTIPLE; - else - style |= wxTR_MULTIPLE; - - delete m_treeCtrl; - - m_treeCtrl = new MyTreeCtrl(this, TreeTest_Ctrl, - wxDefaultPosition, wxDefaultSize, - style); - Resize(GetClientSize()); + TogStyle(event.GetId(), wxTR_MULTIPLE); } void MyFrame::OnDumpSelected(wxCommandEvent& WXUNUSED(event)) @@ -358,7 +433,7 @@ void MyFrame::OnDumpSelected(wxCommandEvent& WXUNUSED(event)) for ( size_t n = 0; n < count; n++ ) { - wxLogMessage("\t%s", m_treeCtrl->GetItemText(array.Item(n)).c_str()); + wxLogMessage(wxT("\t%s"), m_treeCtrl->GetItemText(array.Item(n)).c_str()); } } @@ -409,7 +484,50 @@ void MyFrame::OnDeleteAll(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnRecreate(wxCommandEvent& event) { OnDeleteAll(event); - m_treeCtrl->AddTestItemsToTree(3, 2); + m_treeCtrl->AddTestItemsToTree(5, 2); +} + +void MyFrame::OnSetImageSize(wxCommandEvent& event) +{ + int size = wxGetNumberFromUser("Enter the size for the images to use", + "Size: ", + "TreeCtrl sample", + m_treeCtrl->ImageSize()); + if ( size == -1 ) + return; + + m_treeCtrl->CreateImageList(size); + wxGetApp().SetShowImages(TRUE); +} + +void MyFrame::OnToggleImages(wxCommandEvent& event) +{ + if ( wxGetApp().ShowImages() ) + { + m_treeCtrl->CreateImageList(-1); + wxGetApp().SetShowImages(FALSE); + } + else + { + m_treeCtrl->CreateImageList(0); + wxGetApp().SetShowImages(TRUE); + } +} + +void MyFrame::OnToggleButtons(wxCommandEvent& event) +{ +#if USE_GENERIC_TREECTRL || !defined(__WXMSW__) + if ( wxGetApp().ShowButtons() ) + { + m_treeCtrl->CreateButtonsImageList(-1); + wxGetApp().SetShowButtons(FALSE); + } + else + { + m_treeCtrl->CreateButtonsImageList(15); + wxGetApp().SetShowButtons(TRUE); + } +#endif } void MyFrame::OnCollapseAndReset(wxCommandEvent& event) @@ -424,7 +542,8 @@ void MyFrame::OnEnsureVisible(wxCommandEvent& event) void MyFrame::OnInsertItem(wxCommandEvent& WXUNUSED(event)) { - m_treeCtrl->InsertItem(m_treeCtrl->GetRootItem(), 1, "2nd item"); + int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_File : -1; + m_treeCtrl->InsertItem(m_treeCtrl->GetRootItem(), image, "2nd item"); } void MyFrame::OnAddItem(wxCommandEvent& WXUNUSED(event)) @@ -432,7 +551,7 @@ void MyFrame::OnAddItem(wxCommandEvent& WXUNUSED(event)) static int s_num = 0; wxString text; - text.Printf("Item #%d", ++s_num); + text.Printf(wxT("Item #%d"), ++s_num); m_treeCtrl->AppendItem(m_treeCtrl->GetRootItem(), text /*, @@ -476,62 +595,135 @@ void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event)) m_treeCtrl->DoToggleIcon(item); } +void MyFrame::OnSetFgColour(wxCommandEvent& WXUNUSED(event)) +{ + wxColour col = wxGetColourFromUser(this, m_treeCtrl->GetForegroundColour()); + if ( col.Ok() ) + m_treeCtrl->SetForegroundColour(col); +} + +void MyFrame::OnSetBgColour(wxCommandEvent& WXUNUSED(event)) +{ + wxColour col = wxGetColourFromUser(this, m_treeCtrl->GetBackgroundColour()); + if ( col.Ok() ) + m_treeCtrl->SetBackgroundColour(col); +} + // MyTreeCtrl implementation +#if USE_GENERIC_TREECTRL +IMPLEMENT_DYNAMIC_CLASS(MyTreeCtrl, wxGenericTreeCtrl) +#else IMPLEMENT_DYNAMIC_CLASS(MyTreeCtrl, wxTreeCtrl) +#endif MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style) : wxTreeCtrl(parent, id, pos, size, style) { -#ifndef NO_VARIABLE_HEIGHT -#if wxUSE_LIBJPEG - wxImage::AddHandler(new wxJPEGHandler); - wxImage image; + m_reverseSort = FALSE; - image.LoadFile(wxString("horse.jpg"), wxBITMAP_TYPE_JPEG ); -#endif -#endif + CreateImageList(); - m_reverseSort = FALSE; + // Add some items to the tree + AddTestItemsToTree(5, 2); +} + +void MyTreeCtrl::CreateImageList(int size) +{ + if ( size == -1 ) + { + SetImageList(NULL); + return; + } + if ( size == 0 ) + size = m_imageSize; + else + m_imageSize = size; // Make an image list containing small icons - m_imageListNormal = new wxImageList(16, 16, TRUE); + wxImageList *images = new wxImageList(size, size, TRUE); // should correspond to TreeCtrlIcon_xxx enum #if defined(__WXMSW__) && defined(__WIN16__) - // This is required in 16-bit Windows mode only because we can't load a specific (16x16) - // icon image, so it comes out stretched -# ifndef NO_VARIABLE_HEIGHT - m_imageListNormal->Add(image.ConvertToBitmap()); -# else - m_imageListNormal->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE)); -# endif - m_imageListNormal->Add(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE)); - m_imageListNormal->Add(wxBitmap("bitmap3", wxBITMAP_TYPE_BMP_RESOURCE)); - m_imageListNormal->Add(wxBitmap("bitmap4", wxBITMAP_TYPE_BMP_RESOURCE)); - m_imageListNormal->Add(wxBitmap("bitmap5", wxBITMAP_TYPE_BMP_RESOURCE)); -#else -# ifndef NO_VARIABLE_HEIGHT - m_imageListNormal->Add(image.ConvertToBitmap()); -# else - m_imageListNormal->Add(wxICON(icon1)); -# endif - m_imageListNormal->Add(wxICON(icon2)); - m_imageListNormal->Add(wxICON(icon3)); - m_imageListNormal->Add(wxICON(icon4)); - m_imageListNormal->Add(wxICON(icon5)); -#endif + images->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE)); + images->Add(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE)); + images->Add(wxBitmap("bitmap3", wxBITMAP_TYPE_BMP_RESOURCE)); + images->Add(wxBitmap("bitmap4", wxBITMAP_TYPE_BMP_RESOURCE)); + images->Add(wxBitmap("bitmap5", wxBITMAP_TYPE_BMP_RESOURCE)); +#else // !MSW + wxBusyCursor wait; + wxIcon icons[5]; + icons[0] = wxICON(icon1); + icons[1] = wxICON(icon2); + icons[2] = wxICON(icon3); + icons[3] = wxICON(icon4); + icons[4] = wxICON(icon5); + + int sizeOrig = icons[0].GetWidth(); + for ( size_t i = 0; i < WXSIZEOF(icons); i++ ) + { + if ( size == sizeOrig ) + { + images->Add(icons[i]); + } + else + { + images->Add(wxBitmap(wxBitmap(icons[i]).ConvertToImage().Rescale(size, size))); + } + } +#endif // MSW/!MSW - SetImageList(m_imageListNormal); + AssignImageList(images); +} - // Add some items to the tree - AddTestItemsToTree(3, 2); +void MyTreeCtrl::CreateButtonsImageList(int size) +{ +#if USE_GENERIC_TREECTRL || !defined(__WXMSW__) + if ( size == -1 ) + { + SetButtonsImageList(NULL); + return; + } + + // Make an image list containing small icons + wxImageList *images = new wxImageList(size, size, TRUE); + + // should correspond to TreeCtrlIcon_xxx enum +#if defined(__WXMSW__) && defined(__WIN16__) + images->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE)); + images->Add(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE)); + images->Add(wxBitmap("bitmap3", wxBITMAP_TYPE_BMP_RESOURCE)); + images->Add(wxBitmap("bitmap4", wxBITMAP_TYPE_BMP_RESOURCE)); + images->Add(wxBitmap("bitmap5", wxBITMAP_TYPE_BMP_RESOURCE)); +#else // !MSW + wxBusyCursor wait; + wxIcon icons[4]; + icons[0] = wxICON(icon3); // closed + icons[1] = wxICON(icon3); // closed, selected + icons[2] = wxICON(icon5); // open + icons[3] = wxICON(icon5); // open, selected + + for ( size_t i = 0; i < WXSIZEOF(icons); i++ ) + { + int sizeOrig = icons[i].GetWidth(); + if ( size == sizeOrig ) + { + images->Add(icons[i]); + } + else + { + images->Add(wxBitmap(icons[i].ConvertToImage().Rescale(size, size))); + } + } +#endif // MSW/!MSW + + AssignButtonsImageList(images); +#endif } MyTreeCtrl::~MyTreeCtrl() { - delete m_imageListNormal; } int MyTreeCtrl::OnCompareItems(const wxTreeItemId& item1, @@ -562,18 +754,27 @@ void MyTreeCtrl::AddItemsRecursively(const wxTreeItemId& idParent, { // at depth 1 elements won't have any more children if ( hasChildren ) - str.Printf("%s child %d", "Folder", n + 1); + str.Printf(wxT("%s child %d"), wxT("Folder"), n + 1); else - str.Printf("%s child %d.%d", "File", folder, n + 1); + str.Printf(wxT("%s child %d.%d"), wxT("File"), folder, n + 1); // here we pass to AppendItem() normal and selected item images (we // suppose that selected image follows the normal one in the enum) - int image = depth == 1 ? TreeCtrlIcon_File : TreeCtrlIcon_Folder; - wxTreeItemId id = AppendItem(idParent, str, image, image + 1, + int image, imageSel; + if ( wxGetApp().ShowImages() ) + { + image = depth == 1 ? TreeCtrlIcon_File : TreeCtrlIcon_Folder; + imageSel = image + 1; + } + else + { + image = imageSel = -1; + } + wxTreeItemId id = AppendItem(idParent, str, image, imageSel, new MyTreeItemData(str)); // and now we also set the expanded one (only for the folders) - if ( hasChildren ) + if ( hasChildren && wxGetApp().ShowImages() ) { SetItemImage(id, TreeCtrlIcon_FolderOpened, wxTreeItemIcon_Expanded); @@ -594,10 +795,14 @@ void MyTreeCtrl::AddItemsRecursively(const wxTreeItemId& idParent, void MyTreeCtrl::AddTestItemsToTree(size_t numChildren, size_t depth) { + int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_Folder : -1; wxTreeItemId rootId = AddRoot("Root", - TreeCtrlIcon_Folder, TreeCtrlIcon_Folder, + image, image, new MyTreeItemData("Root item")); - SetItemImage(rootId, TreeCtrlIcon_FolderOpened, wxTreeItemIcon_Expanded); + if ( image != -1 ) + { + SetItemImage(rootId, TreeCtrlIcon_FolderOpened, wxTreeItemIcon_Expanded); + } AddItemsRecursively(rootId, numChildren, depth, 0); @@ -645,11 +850,11 @@ void MyTreeCtrl::DoToggleIcon(const wxTreeItemId& item) // avoid repetition -#define TREE_EVENT_HANDLER(name) \ -void MyTreeCtrl::name(wxTreeEvent& event) \ -{ \ - wxLogMessage(#name); \ - event.Skip(); \ +#define TREE_EVENT_HANDLER(name) \ +void MyTreeCtrl::name(wxTreeEvent& event) \ +{ \ + wxLogMessage(wxT(#name)); \ + event.Skip(); \ } TREE_EVENT_HANDLER(OnBeginRDrag) @@ -672,14 +877,14 @@ void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event) { m_draggedItem = event.GetItem(); - wxLogMessage("OnBeginDrag: started dragging %s", + wxLogMessage(wxT("OnBeginDrag: started dragging %s"), GetItemText(m_draggedItem).c_str()); event.Allow(); } else { - wxLogMessage("OnBeginDrag: this item can't be dragged."); + wxLogMessage(wxT("OnBeginDrag: this item can't be dragged.")); } } @@ -698,13 +903,13 @@ void MyTreeCtrl::OnEndDrag(wxTreeEvent& event) if ( !itemDst.IsOk() ) { - wxLogMessage("OnEndDrag: can't drop here."); + wxLogMessage(wxT("OnEndDrag: can't drop here.")); return; } wxString text = GetItemText(itemSrc); - wxLogMessage("OnEndDrag: '%s' copied to '%s'.", + wxLogMessage(wxT("OnEndDrag: '%s' copied to '%s'."), text.c_str(), GetItemText(itemDst).c_str()); // just do append here - we could also insert it just before/after the item @@ -714,18 +919,19 @@ 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. - AppendItem(itemDst, text, TreeCtrlIcon_File); + int image = wxGetApp().ShowImages() ? TreeCtrlIcon_File : -1; + AppendItem(itemDst, text, image); } void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event) { - wxLogMessage("OnBeginLabelEdit"); + wxLogMessage(wxT("OnBeginLabelEdit")); - // for testing, prevent this items label editing + // for testing, prevent this item's label editing wxTreeItemId itemId = event.GetItem(); if ( IsTestItem(itemId) ) { - wxMessageBox("You can't edit this item."); + wxMessageBox(wxT("You can't edit this item.")); event.Veto(); } @@ -733,12 +939,12 @@ void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event) void MyTreeCtrl::OnEndLabelEdit(wxTreeEvent& event) { - wxLogMessage("OnEndLabelEdit"); + wxLogMessage(wxT("OnEndLabelEdit")); // don't allow anything except letters in the labels if ( !event.GetLabel().IsWord() ) { - wxMessageBox("The label should contain only letters."); + wxMessageBox(wxT("The label should contain only letters.")); event.Veto(); } @@ -746,22 +952,22 @@ void MyTreeCtrl::OnEndLabelEdit(wxTreeEvent& event) void MyTreeCtrl::OnItemCollapsing(wxTreeEvent& event) { - wxLogMessage("OnItemCollapsing"); + wxLogMessage(wxT("OnItemCollapsing")); // for testing, prevent the user from collapsing the first child folder wxTreeItemId itemId = event.GetItem(); if ( IsTestItem(itemId) ) { - wxMessageBox("You can't collapse this item."); + wxMessageBox(wxT("You can't collapse this item.")); event.Veto(); } } -void MyTreeCtrl::OnItemActivated(wxTreeEvent&WXUNUSED(event)) +void MyTreeCtrl::OnItemActivated(wxTreeEvent& event) { // show some info about this item - wxTreeItemId itemId = GetSelection(); + wxTreeItemId itemId = event.GetItem(); MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId); if ( item != NULL ) @@ -769,31 +975,63 @@ void MyTreeCtrl::OnItemActivated(wxTreeEvent&WXUNUSED(event)) item->ShowInfo(this); } - wxLogMessage("OnItemActivated"); + wxLogMessage(wxT("OnItemActivated")); +} + +void MyTreeCtrl::OnItemRightClick(wxTreeEvent& event) +{ + ShowMenu(event.GetItem(), event.GetPoint()); +} + +void MyTreeCtrl::OnRMouseUp(wxMouseEvent& event) +{ + wxPoint pt = event.GetPosition(); + ShowMenu(HitTest(pt), pt); +} + +void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt) +{ + wxString title; + if ( id.IsOk() ) + { + title << _T("Menu for ") << GetItemText(id); + } + else + { + title = _T("Menu for no particular item"); + } + +#if wxUSE_MENUS + wxMenu menu(title); + menu.Append(TreeTest_About, _T("&About...")); + menu.Append(TreeTest_Dump, _T("&Dump")); + + PopupMenu(&menu, pt); +#endif // wxUSE_MENUS } void MyTreeCtrl::OnRMouseDClick(wxMouseEvent& event) { wxTreeItemId id = HitTest(event.GetPosition()); if ( !id ) - wxLogMessage("No item under mouse"); + wxLogMessage(wxT("No item under mouse")); else { MyTreeItemData *item = (MyTreeItemData *)GetItemData(id); if ( item ) - wxLogMessage("Item '%s' under mouse", item->GetDesc()); + wxLogMessage(wxT("Item '%s' under mouse"), item->GetDesc()); } } -static inline const char *Bool2String(bool b) +static inline const wxChar *Bool2String(bool b) { - return b ? "" : "not "; + return b ? wxT("") : wxT("not "); } void MyTreeItemData::ShowInfo(wxTreeCtrl *tree) { - wxLogMessage("Item '%s': %sselected, %sexpanded, %sbold,\n" - "%u children (%u immediately under this item).", + wxLogMessage(wxT("Item '%s': %sselected, %sexpanded, %sbold,\n") + wxT("%u children (%u immediately under this item)."), m_desc.c_str(), Bool2String(tree->IsSelected(GetId())), Bool2String(tree->IsExpanded(GetId())),