X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89124b1ac2ae4cf73ae804a96fd5b896fd88a177..0dfef5a8124ac0f1bb2aed6ef5ddfa833e8e2c6e:/samples/treectrl/treetest.cpp diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index 4c07872661..2bd8bfa646 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -33,10 +33,13 @@ #include "math.h" -//#ifdef __WXMSW__ +#ifdef __WXMSW__ + // comment out this line to test multiple selection even under MSW (where + // it looks ugly - but works) #define NO_MULTIPLE_SELECTION - #define NO_VARIABLE_HEIGHT -//#endif +#endif + +#define NO_VARIABLE_HEIGHT #include "treetest.h" @@ -44,6 +47,9 @@ #ifndef __WXMSW__ #include "icon1.xpm" #include "icon2.xpm" + #include "icon3.xpm" + #include "icon4.xpm" + #include "icon5.xpm" #include "mondrian.xpm" #endif @@ -66,6 +72,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(TreeTest_Unselect, MyFrame::OnUnselect) #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) @@ -77,6 +85,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) @@ -90,7 +99,9 @@ BEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl) 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) @@ -143,10 +154,14 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) 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(); @@ -185,12 +200,15 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS | #ifndef NO_MULTIPLE_SELECTION - wxTR_MULTIPLE | + wxTR_MULTIPLE | #endif #ifndef NO_VARIABLE_HEIGHT - wxTR_HAS_VARIABLE_ROW_HEIGHT | + wxTR_HAS_VARIABLE_ROW_HEIGHT | #endif - wxSUNKEN_BORDER); + wxSUNKEN_BORDER); + + m_treeCtrl->SetBackgroundColour(wxColour(204, 205, 79)); + wxTextCtrl *textCtrl = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER); @@ -264,6 +282,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(); @@ -289,7 +329,7 @@ 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++ ) { @@ -357,6 +397,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; @@ -414,11 +459,13 @@ MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id, long style) : wxTreeCtrl(parent, id, pos, size, style) { -#if (USE_TR_HAS_VARIABLE_ROW_HIGHT && wxUSE_LIBJPEG) +#ifndef NO_VARIABLE_HEIGHT +#if wxUSE_LIBJPEG wxImage::AddHandler(new wxJPEGHandler); wxImage image; image.LoadFile(wxString("horse.jpg"), wxBITMAP_TYPE_JPEG ); +#endif #endif m_reverseSort = FALSE; @@ -430,19 +477,25 @@ MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id, #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 +# 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 -# if USE_TR_HAS_VARIABLE_ROW_HIGHT +# 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 SetImageList(m_imageListNormal); @@ -477,21 +530,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; } @@ -508,8 +572,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)