X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ce29a28cdae75b54b32629fa14d38532e339959..abceee76ea4d642ccfd3cf91cc139a3fe2b471b7:/samples/treectrl/treetest.cpp diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index 8335f176b7..5d371764f4 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -33,19 +33,26 @@ #include "math.h" -//#ifdef __WXMSW__ - #define NO_MULTIPLE_SELECTION +#ifdef __WXMSW__ + // this is not supported at all under MSW #define NO_VARIABLE_HEIGHT -//#endif + + #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__ -#ifdef NO_VARIABLE_HEIGHT #include "icon1.xpm" -#endif #include "icon2.xpm" + #include "icon3.xpm" + #include "icon4.xpm" + #include "icon5.xpm" #include "mondrian.xpm" #endif @@ -59,6 +66,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) @@ -66,8 +75,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) @@ -79,6 +91,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) 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) @@ -89,10 +102,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) @@ -122,7 +138,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 @@ -139,16 +156,23 @@ 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_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(); @@ -174,7 +198,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"); @@ -186,32 +210,17 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) 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); @@ -222,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 } @@ -232,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); @@ -266,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(); @@ -286,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++ ) { @@ -359,6 +422,11 @@ void MyFrame::OnEnsureVisible(wxCommandEvent& event) m_treeCtrl->DoEnsureVisible(); } +void MyFrame::OnInsertItem(wxCommandEvent& WXUNUSED(event)) +{ + m_treeCtrl->InsertItem(m_treeCtrl->GetRootItem(), 1, "2nd item"); +} + void MyFrame::OnAddItem(wxCommandEvent& WXUNUSED(event)) { static int s_num = 0; @@ -440,6 +508,9 @@ MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id, 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()); @@ -447,6 +518,9 @@ MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id, 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 SetImageList(m_imageListNormal); @@ -481,21 +555,32 @@ 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); + // 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, + wxTreeItemId id = AppendItem(idParent, str, image, image + 1, new MyTreeItemData(str)); + // and now we also set the expanded one (only for the folders) + if ( hasChildren ) + { + 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; } @@ -512,8 +597,21 @@ void MyTreeCtrl::AddTestItemsToTree(size_t numChildren, wxTreeItemId rootId = AddRoot("Root", TreeCtrlIcon_Folder, TreeCtrlIcon_Folder, new MyTreeItemData("Root item")); + 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) @@ -548,12 +646,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) @@ -563,9 +661,62 @@ 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. + AppendItem(itemDst, text, TreeCtrlIcon_File); +} + void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event) { wxLogMessage("OnBeginLabelEdit"); @@ -607,11 +758,6 @@ void MyTreeCtrl::OnItemCollapsing(wxTreeEvent& event) } } -void MyTreeCtrl::OnTreeKeyDown(wxTreeEvent&WXUNUSED(event)) -{ - wxLogMessage("OnTreeKeyDown"); -} - void MyTreeCtrl::OnItemActivated(wxTreeEvent&WXUNUSED(event)) { // show some info about this item