X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89124b1ac2ae4cf73ae804a96fd5b896fd88a177..f1567cddead054974c4a079ed8ee2c798ef998dc:/samples/treectrl/treetest.cpp diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index 4c07872661..2b46734d3f 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -33,18 +33,21 @@ #include "math.h" -//#ifdef __WXMSW__ - #define NO_MULTIPLE_SELECTION +#ifdef __WIN32__ + // this is not supported by native control #define NO_VARIABLE_HEIGHT -//#endif +#endif #include "treetest.h" // under Windows the icons are in the .rc file #ifndef __WXMSW__ - #include "icon1.xpm" - #include "icon2.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 @@ -57,6 +60,8 @@ } 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) @@ -64,8 +69,11 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(TreeTest_DumpSelected, MyFrame::OnDumpSelected) EVT_MENU(TreeTest_Select, MyFrame::OnSelect) EVT_MENU(TreeTest_Unselect, MyFrame::OnUnselect) + EVT_MENU(TreeTest_ToggleSel, MyFrame::OnToggleSel) #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) @@ -74,9 +82,12 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(TreeTest_DeleteChildren, MyFrame::OnDeleteChildren) EVT_MENU(TreeTest_DeleteAll, MyFrame::OnDeleteAll) EVT_MENU(TreeTest_Recreate, MyFrame::OnRecreate) + EVT_MENU(TreeTest_ToggleImages, MyFrame::OnToggleImages) + EVT_MENU(TreeTest_SetImageSize, MyFrame::OnSetImageSize) 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) @@ -87,10 +98,13 @@ END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl) EVT_TREE_BEGIN_DRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginDrag) EVT_TREE_BEGIN_RDRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginRDrag) + EVT_TREE_END_DRAG(TreeTest_Ctrl, MyTreeCtrl::OnEndDrag) EVT_TREE_BEGIN_LABEL_EDIT(TreeTest_Ctrl, MyTreeCtrl::OnBeginLabelEdit) EVT_TREE_END_LABEL_EDIT(TreeTest_Ctrl, MyTreeCtrl::OnEndLabelEdit) EVT_TREE_DELETE_ITEM(TreeTest_Ctrl, MyTreeCtrl::OnDeleteItem) +#if 0 // there are so many of those that logging them causes flicker EVT_TREE_GET_INFO(TreeTest_Ctrl, MyTreeCtrl::OnGetInfo) +#endif EVT_TREE_SET_INFO(TreeTest_Ctrl, MyTreeCtrl::OnSetInfo) EVT_TREE_ITEM_EXPANDED(TreeTest_Ctrl, MyTreeCtrl::OnItemExpanded) EVT_TREE_ITEM_EXPANDING(TreeTest_Ctrl, MyTreeCtrl::OnItemExpanding) @@ -108,7 +122,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("wxTreeCtrl Test", 50, 50, 450, 600); // Show the frame frame->Show(TRUE); @@ -120,7 +134,8 @@ bool MyApp::OnInit() // 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)) + : wxFrame((wxFrame *)NULL, -1, title, wxPoint(x, y), wxSize(w, h)), + m_treeCtrl(NULL), m_textCtrl(NULL) { // This reduces flicker effects - even better would be to define // OnEraseBackground to do nothing. When the tree control's scrollbars are @@ -137,16 +152,25 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) file_menu->Append(TreeTest_About, "&About..."); file_menu->AppendSeparator(); - file_menu->Append(TreeTest_Quit, "E&xit"); + file_menu->Append(TreeTest_Quit, "E&xit\tAlt-X"); +#ifndef NO_MULTIPLE_SELECTION + tree_menu->Append(TreeTest_ToggleSel, "&Toggle selection mode"); +#endif // NO_MULTIPLE_SELECTION + tree_menu->Append(TreeTest_ToggleImages, "&Show images", "", TRUE); + tree_menu->Append(TreeTest_SetImageSize, "Set image si&ze..."); tree_menu->Append(TreeTest_Recreate, "&Recreate the tree"); tree_menu->Append(TreeTest_CollapseAndReset, "C&ollapse and reset"); tree_menu->AppendSeparator(); tree_menu->Append(TreeTest_AddItem, "Append a &new item"); + tree_menu->Append(TreeTest_InsertItem, "&Insert a new item"); tree_menu->Append(TreeTest_Delete, "&Delete this item"); tree_menu->Append(TreeTest_DeleteChildren, "Delete &children"); tree_menu->Append(TreeTest_DeleteAll, "Delete &all items"); tree_menu->AppendSeparator(); + tree_menu->Append(TreeTest_Count, "Count children of current item"); + tree_menu->Append(TreeTest_CountRec, "Recursively count children of current item"); + tree_menu->AppendSeparator(); tree_menu->Append(TreeTest_Sort, "Sort children of current item"); tree_menu->Append(TreeTest_SortRev, "Sort in reversed order"); tree_menu->AppendSeparator(); @@ -172,7 +196,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) item_menu->Append(TreeTest_DumpSelected, "Dump selected items\tAlt-D"); item_menu->Append(TreeTest_Select, "Select current item\tAlt-S"); item_menu->Append(TreeTest_Unselect, "Unselect everything\tAlt-U"); -#endif +#endif // NO_MULTIPLE_SELECTION wxMenuBar *menu_bar = new wxMenuBar; menu_bar->Append(file_menu, "&File"); @@ -180,36 +204,23 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) menu_bar->Append(item_menu, "&Item"); SetMenuBar(menu_bar); + menu_bar->Check(TreeTest_ToggleImages, TRUE); + m_treeCtrl = new MyTreeCtrl(this, TreeTest_Ctrl, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS | -#ifndef NO_MULTIPLE_SELECTION - wxTR_MULTIPLE | -#endif #ifndef NO_VARIABLE_HEIGHT - wxTR_HAS_VARIABLE_ROW_HEIGHT | + wxTR_HAS_VARIABLE_ROW_HEIGHT | #endif - wxSUNKEN_BORDER); - wxTextCtrl *textCtrl = new wxTextCtrl(this, -1, "", + wxSUNKEN_BORDER); + + m_treeCtrl->SetBackgroundColour(wxColour(204, 205, 79)); + + m_textCtrl = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER); - wxLayoutConstraints *c = new wxLayoutConstraints; - c->top.SameAs(this, wxTop); - c->left.SameAs(this, wxLeft); - c->right.SameAs(this, wxRight); - c->height.PercentOf(this, wxHeight, 66); - m_treeCtrl->SetConstraints(c); - - c = new wxLayoutConstraints; - c->top.Below(m_treeCtrl); - c->left.SameAs(this, wxLeft); - c->right.SameAs(this, wxRight); - c->bottom.SameAs(this, wxBottom); - textCtrl->SetConstraints(c); - SetAutoLayout(TRUE); - // create a status bar with 3 panes CreateStatusBar(3); SetStatusText("", 0); @@ -220,7 +231,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) delete wxLog::SetActiveTarget(new wxLogStderr); #else // set our text control as the log target - wxLogTextCtrl *logWindow = new wxLogTextCtrl(textCtrl); + wxLogTextCtrl *logWindow = new wxLogTextCtrl(m_textCtrl); delete wxLog::SetActiveTarget(logWindow); #endif } @@ -230,6 +241,22 @@ MyFrame::~MyFrame() delete wxLog::SetActiveTarget(NULL); } +void MyFrame::OnSize(wxSizeEvent& event) +{ + if ( m_treeCtrl && m_textCtrl ) + { + Resize(GetClientSize()); + } + + event.Skip(); +} + +void MyFrame::Resize(const wxSize& size) +{ + m_treeCtrl->SetSize(0, 0, size.x, 2*size.y/3); + m_textCtrl->SetSize(0, 2*size.y/3, size.x, size.y/3); +} + void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { Close(TRUE); @@ -264,6 +291,28 @@ void MyFrame::OnRename(wxCommandEvent& WXUNUSED(event)) (void)m_treeCtrl->EditLabel(item); } +void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event)) +{ + wxTreeItemId item = m_treeCtrl->GetSelection(); + + CHECK_ITEM( item ); + + int i = m_treeCtrl->GetChildrenCount( item, FALSE ); + + wxLogMessage(wxT("%d children"), i); +} + +void MyFrame::OnCountRec(wxCommandEvent& WXUNUSED(event)) +{ + wxTreeItemId item = m_treeCtrl->GetSelection(); + + CHECK_ITEM( item ); + + int i = m_treeCtrl->GetChildrenCount( item ); + + wxLogMessage(wxT("%d children"), i); +} + void MyFrame::DoSort(bool reverse) { wxTreeItemId item = m_treeCtrl->GetSelection(); @@ -284,12 +333,28 @@ void MyFrame::OnDump(wxCommandEvent& WXUNUSED(event)) #ifndef NO_MULTIPLE_SELECTION +void MyFrame::OnToggleSel(wxCommandEvent& WXUNUSED(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()); +} + void MyFrame::OnDumpSelected(wxCommandEvent& WXUNUSED(event)) { wxArrayTreeItemIds array; size_t count = m_treeCtrl->GetSelections(array); - wxLogMessage(_T("%u items selected"), count); + wxLogMessage(wxT("%u items selected"), count); for ( size_t n = 0; n < count; n++ ) { @@ -347,6 +412,27 @@ void MyFrame::OnRecreate(wxCommandEvent& event) m_treeCtrl->AddTestItemsToTree(3, 2); } +void MyFrame::OnSetImageSize(wxCommandEvent& event) +{ + long size = wxGetNumberFromUser("Enter the size for the images to use", + "Size: ", + "TreeCtrl sample", + 32); + if ( size == -1 ) + return; + + m_treeCtrl->CreateImageList((int)size); + + OnRecreate(event); +} + +void MyFrame::OnToggleImages(wxCommandEvent& event) +{ + wxGetApp().SetShowImages(!wxGetApp().ShowImages()); + + OnRecreate(event); +} + void MyFrame::OnCollapseAndReset(wxCommandEvent& event) { m_treeCtrl->CollapseAndReset(m_treeCtrl->GetRootItem()); @@ -357,6 +443,12 @@ void MyFrame::OnEnsureVisible(wxCommandEvent& event) m_treeCtrl->DoEnsureVisible(); } +void MyFrame::OnInsertItem(wxCommandEvent& WXUNUSED(event)) +{ + int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_File : -1; + m_treeCtrl->InsertItem(m_treeCtrl->GetRootItem(), image, "2nd item"); +} + void MyFrame::OnAddItem(wxCommandEvent& WXUNUSED(event)) { static int s_num = 0; @@ -414,41 +506,59 @@ MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id, long style) : wxTreeCtrl(parent, id, pos, size, style) { -#if (USE_TR_HAS_VARIABLE_ROW_HIGHT && wxUSE_LIBJPEG) - wxImage::AddHandler(new wxJPEGHandler); - wxImage image; + m_reverseSort = FALSE; - image.LoadFile(wxString("horse.jpg"), wxBITMAP_TYPE_JPEG ); -#endif + CreateImageList(); - m_reverseSort = FALSE; + // Add some items to the tree + AddTestItemsToTree(3, 2); +} + +void MyTreeCtrl::CreateImageList(int size) +{ + delete m_imageListNormal; + + if ( size == -1 ) + { + m_imageListNormal = NULL; + + return; + } // Make an image list containing small icons - m_imageListNormal = new wxImageList(16, 16, TRUE); + m_imageListNormal = 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 -# if USE_TR_HAS_VARIABLE_ROW_HIGHT - 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 -# if USE_TR_HAS_VARIABLE_ROW_HIGHT - m_imageListNormal->Add(image.ConvertToBitmap()); -# else - m_imageListNormal->Add(wxICON(icon1)); -# endif - m_imageListNormal->Add(wxICON(icon2)); + 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 ) + { + m_imageListNormal->Add(icons[i]); + } + else + { + m_imageListNormal->Add(wxImage(icons[i]).Rescale(size, size). + ConvertToBitmap()); + } + } #endif SetImageList(m_imageListNormal); - - // Add some items to the tree - AddTestItemsToTree(3, 2); } MyTreeCtrl::~MyTreeCtrl() @@ -477,21 +587,41 @@ void MyTreeCtrl::AddItemsRecursively(const wxTreeItemId& idParent, { if ( depth > 0 ) { + bool hasChildren = depth > 1; + wxString str; for ( size_t n = 0; n < numChildren; n++ ) { // at depth 1 elements won't have any more children - if (depth == 1) - str.Printf("%s child %d.%d", "File", folder, n + 1); - else + if ( hasChildren ) str.Printf("%s child %d", "Folder", n + 1); + else + str.Printf("%s child %d.%d", "File", folder, n + 1); - int image = depth == 1 ? TreeCtrlIcon_File : TreeCtrlIcon_Folder; - wxTreeItemId id = AppendItem(idParent, str, image, image, + // here we pass to AppendItem() normal and selected item images (we + // suppose that selected image follows the normal one in the enum) + 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 && wxGetApp().ShowImages() ) + { + SetItemImage(id, TreeCtrlIcon_FolderOpened, + wxTreeItemIcon_Expanded); + } + // remember the last child for OnEnsureVisible() - if ( depth == 1 && n == numChildren - 1 ) + if ( !hasChildren && n == numChildren - 1 ) { m_lastItem = id; } @@ -505,11 +635,28 @@ 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")); + if ( image != -1 ) + { + SetItemImage(rootId, TreeCtrlIcon_FolderOpened, wxTreeItemIcon_Expanded); + } AddItemsRecursively(rootId, numChildren, depth, 0); + + // set some colours/fonts for testing + SetItemFont(rootId, *wxITALIC_FONT); + + long cookie; + wxTreeItemId id = GetFirstChild(rootId, cookie); + SetItemTextColour(id, *wxBLUE); + + id = GetNextChild(rootId, cookie); + id = GetNextChild(rootId, cookie); + SetItemTextColour(id, *wxRED); + SetItemBackgroundColour(id, *wxLIGHT_GREY); } void MyTreeCtrl::GetItemsRecursively(const wxTreeItemId& idParent, long cookie) @@ -544,12 +691,12 @@ void MyTreeCtrl::DoToggleIcon(const wxTreeItemId& item) // avoid repetition #define TREE_EVENT_HANDLER(name) \ -void MyTreeCtrl::name(wxTreeEvent& WXUNUSED(event)) \ +void MyTreeCtrl::name(wxTreeEvent& event) \ { \ wxLogMessage(#name); \ + event.Skip(); \ } -TREE_EVENT_HANDLER(OnBeginDrag) TREE_EVENT_HANDLER(OnBeginRDrag) TREE_EVENT_HANDLER(OnDeleteItem) TREE_EVENT_HANDLER(OnGetInfo) @@ -559,9 +706,63 @@ TREE_EVENT_HANDLER(OnItemExpanding) TREE_EVENT_HANDLER(OnItemCollapsed) TREE_EVENT_HANDLER(OnSelChanged) TREE_EVENT_HANDLER(OnSelChanging) +TREE_EVENT_HANDLER(OnTreeKeyDown) #undef TREE_EVENT_HANDLER +void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event) +{ + // need to explicitly allow drag + if ( event.GetItem() != GetRootItem() ) + { + m_draggedItem = event.GetItem(); + + wxLogMessage("OnBeginDrag: started dragging %s", + GetItemText(m_draggedItem).c_str()); + + event.Allow(); + } + else + { + wxLogMessage("OnBeginDrag: this item can't be dragged."); + } +} + +void MyTreeCtrl::OnEndDrag(wxTreeEvent& event) +{ + wxTreeItemId itemSrc = m_draggedItem, + itemDst = event.GetItem(); + m_draggedItem = (wxTreeItemId)0l; + + // where to copy the item? + if ( itemDst.IsOk() && !ItemHasChildren(itemDst) ) + { + // copy to the parent then + itemDst = GetParent(itemDst); + } + + if ( !itemDst.IsOk() ) + { + wxLogMessage("OnEndDrag: can't drop here."); + + return; + } + + wxString text = GetItemText(itemSrc); + wxLogMessage("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 + // on which it was dropped, but this requires slightly more work... we also + // completely ignore the client data and icon of the old item but could + // copy them as well. + // + // 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); +} + void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event) { wxLogMessage("OnBeginLabelEdit"); @@ -603,15 +804,10 @@ void MyTreeCtrl::OnItemCollapsing(wxTreeEvent& event) } } -void MyTreeCtrl::OnTreeKeyDown(wxTreeEvent&WXUNUSED(event)) -{ - wxLogMessage("OnTreeKeyDown"); -} - -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 )