X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f95dc4d620ab1da4336df246efdce5224465f3f4..fa699cbaaf217af186cd04dd10d6ec67c8667136:/samples/treectrl/treetest.cpp?ds=inline diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index b3ba5a751d..485e203b54 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". @@ -30,6 +30,7 @@ #include "wx/treectrl.h" #include "wx/math.h" #include "wx/renderer.h" +#include "wx/wupdlock.h" #ifdef __WIN32__ // this is not supported by native control @@ -50,10 +51,16 @@ #include "state4.xpm" #include "state5.xpm" -#ifndef __WXMSW__ +#include "unchecked.xpm" +#include "checked.xpm" + +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif +static const int NUM_CHILDREN_PER_LEVEL = 5; +static const int NUM_LEVELS = 2; + // verify that the item is ok and insult the user if it is not #define CHECK_ITEM( item ) if ( !item.IsOk() ) { \ wxMessageBox(wxT("Please select some item first!"), \ @@ -92,6 +99,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MENU_LINK(Select) MENU_LINK(Unselect) MENU_LINK(ToggleSel) + MENU_LINK(SelectChildren) #endif // NO_MULTIPLE_SELECTION MENU_LINK(Rename) MENU_LINK(Count) @@ -106,13 +114,16 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MENU_LINK(Recreate) MENU_LINK(ToggleImages) MENU_LINK(ToggleStates) + MENU_LINK(ToggleBell) MENU_LINK(ToggleAlternateImages) MENU_LINK(ToggleAlternateStates) MENU_LINK(ToggleButtons) MENU_LINK(SetImageSize) MENU_LINK(CollapseAndReset) MENU_LINK(EnsureVisible) + MENU_LINK(SetFocus) MENU_LINK(AddItem) + MENU_LINK(AddManyItems) MENU_LINK(InsertItem) MENU_LINK(IncIndent) MENU_LINK(DecIndent) @@ -121,6 +132,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MENU_LINK(ToggleIcon) MENU_LINK(ToggleState) MENU_LINK(SelectRoot) + MENU_LINK(SetFocusedRoot) + MENU_LINK(ClearFocused) MENU_LINK(ShowFirstVisible) #ifdef wxHAS_LAST_VISIBLE @@ -128,6 +141,11 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #endif // wxHAS_LAST_VISIBLE MENU_LINK(ShowNextVisible) MENU_LINK(ShowPrevVisible) + MENU_LINK(ShowParent) + MENU_LINK(ShowPrevSibling) + MENU_LINK(ShowNextSibling) + MENU_LINK(ScrollTo) + MENU_LINK(SelectLast) #undef MENU_LINK END_EVENT_TABLE() @@ -183,7 +201,6 @@ bool MyApp::OnInit() // Show the frame frame->Show(true); - SetTopWindow(frame); return true; } @@ -200,7 +217,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) // This reduces flicker effects - even better would be to define // OnEraseBackground to do nothing. When the tree control's scrollbars are // show or hidden, the frame is sent a background erase event. - SetBackgroundColour(wxColour(255, 255, 255)); + SetBackgroundColour(*wxWHITE); // Give it an icon SetIcon(wxICON(sample)); @@ -212,9 +229,11 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) *tree_menu = new wxMenu, *item_menu = new wxMenu; +#if wxUSE_LOG file_menu->Append(TreeTest_ClearLog, wxT("&Clear log\tCtrl-L")); file_menu->AppendSeparator(); - file_menu->Append(TreeTest_About, wxT("&About...")); +#endif // wxUSE_LOG + file_menu->Append(TreeTest_About, wxT("&About")); file_menu->AppendSeparator(); file_menu->Append(TreeTest_Quit, wxT("E&xit\tAlt-X")); @@ -233,6 +252,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) #endif // NO_MULTIPLE_SELECTION style_menu->AppendCheckItem(TreeTest_ToggleImages, wxT("Toggle show ima&ges")); style_menu->AppendCheckItem(TreeTest_ToggleStates, wxT("Toggle show st&ates")); + style_menu->AppendCheckItem(TreeTest_ToggleBell, wxT("Toggle &bell on no match")); style_menu->AppendCheckItem(TreeTest_ToggleAlternateImages, wxT("Toggle alternate images")); style_menu->AppendCheckItem(TreeTest_ToggleAlternateStates, wxT("Toggle alternate state images")); style_menu->Append(TreeTest_SetImageSize, wxT("Set image si&ze...")); @@ -246,11 +266,16 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) tree_menu->Append(TreeTest_CollapseAndReset, wxT("C&ollapse and reset")); tree_menu->AppendSeparator(); tree_menu->Append(TreeTest_AddItem, wxT("Append a &new item")); + tree_menu->Append(TreeTest_AddManyItems, wxT("Appends &many items")); tree_menu->Append(TreeTest_InsertItem, wxT("&Insert a new item")); 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_SetFocusedRoot, wxT("Set focus to root item")); + tree_menu->Append(TreeTest_ClearFocused, wxT("Reset focus")); + 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")); @@ -259,6 +284,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) tree_menu->Append(TreeTest_SortRev, wxT("Sort in reversed order")); tree_menu->AppendSeparator(); tree_menu->Append(TreeTest_EnsureVisible, wxT("Make the last item &visible")); + tree_menu->Append(TreeTest_SetFocus, wxT("Set &focus to the tree")); tree_menu->AppendSeparator(); tree_menu->Append(TreeTest_IncIndent, wxT("Add 5 points to indentation\tAlt-I")); tree_menu->Append(TreeTest_DecIndent, wxT("Reduce indentation by 5 points\tAlt-R")); @@ -282,12 +308,22 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) #endif // wxHAS_LAST_VISIBLE item_menu->Append(TreeTest_ShowNextVisible, wxT("Show &next visible")); item_menu->Append(TreeTest_ShowPrevVisible, wxT("Show &previous visible")); + item_menu->AppendSeparator(); + item_menu->Append(TreeTest_ShowParent, "Show pa&rent"); + item_menu->Append(TreeTest_ShowPrevSibling, "Show &previous sibling"); + item_menu->Append(TreeTest_ShowNextSibling, "Show &next sibling"); + item_menu->AppendSeparator(); + item_menu->Append(TreeTest_ScrollTo, "Scroll &to item", + "Scroll to the last by one top level child"); + item_menu->Append(TreeTest_SelectLast, "Select &last item", + "Select the last item"); #ifndef NO_MULTIPLE_SELECTION item_menu->AppendSeparator(); item_menu->Append(TreeTest_DumpSelected, wxT("Dump selected items\tAlt-D")); item_menu->Append(TreeTest_Select, wxT("Select current item\tAlt-S")); item_menu->Append(TreeTest_Unselect, wxT("Unselect everything\tAlt-U")); + item_menu->Append(TreeTest_SelectChildren, wxT("Select all children\tCtrl-A")); #endif // NO_MULTIPLE_SELECTION wxMenuBar *menu_bar = new wxMenuBar; @@ -305,6 +341,16 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) m_textCtrl = new wxTextCtrl(m_panel, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER); + +#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? + delete wxLog::SetActiveTarget(new wxLogStderr); +#else + // set our text control as the log target + wxLogTextCtrl *logWindow = new wxLogTextCtrl(m_textCtrl); + delete wxLog::SetActiveTarget(logWindow); +#endif #endif // wxUSE_LOG CreateTreeWithDefStyle(); @@ -318,18 +364,6 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) // 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? - delete wxLog::SetActiveTarget(new wxLogStderr); -#else - // set our text control as the log target - wxLogTextCtrl *logWindow = new wxLogTextCtrl(m_textCtrl); - delete wxLog::SetActiveTarget(logWindow); -#endif -#endif // wxUSE_LOG } MyFrame::~MyFrame() @@ -400,13 +434,13 @@ void MyFrame::OnIdle(wxIdleEvent& event) { wxTreeItemId idLast = m_treeCtrl->GetLastChild(idRoot); status = wxString::Format( - _T("Root/last item is %svisible/%svisible"), - m_treeCtrl->IsVisible(idRoot) ? _T("") : _T("not "), + wxT("Root/last item is %svisible/%svisible"), + m_treeCtrl->IsVisible(idRoot) ? wxT("") : wxT("not "), idLast.IsOk() && m_treeCtrl->IsVisible(idLast) - ? _T("") : _T("not ")); + ? wxT("") : wxT("not ")); } else - status = _T("No root item"); + status = wxT("No root item"); SetStatusText(status, 1); } @@ -460,7 +494,7 @@ void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnRename(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -481,7 +515,7 @@ void MyFrame::OnRename(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -492,7 +526,7 @@ void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnCountRec(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -503,7 +537,7 @@ void MyFrame::OnCountRec(wxCommandEvent& WXUNUSED(event)) void MyFrame::DoSort(bool reverse) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -512,14 +546,14 @@ void MyFrame::DoSort(bool reverse) void MyFrame::OnHighlight(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId id = m_treeCtrl->GetSelection(); + wxTreeItemId id = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( id ); wxRect r; if ( !m_treeCtrl->GetBoundingRect(id, r, true /* text, not full row */) ) { - wxLogMessage(_T("Failed to get bounding item rect")); + wxLogMessage(wxT("Failed to get bounding item rect")); return; } @@ -532,7 +566,7 @@ void MyFrame::OnHighlight(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnDump(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId root = m_treeCtrl->GetSelection(); + wxTreeItemId root = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( root ); @@ -561,7 +595,7 @@ void MyFrame::OnDumpSelected(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnSelect(wxCommandEvent& WXUNUSED(event)) { - m_treeCtrl->SelectItem(m_treeCtrl->GetSelection()); + m_treeCtrl->SelectItem(m_treeCtrl->GetFocusedItem()); } void MyFrame::OnSelectRoot(wxCommandEvent& WXUNUSED(event)) @@ -570,16 +604,36 @@ void MyFrame::OnSelectRoot(wxCommandEvent& WXUNUSED(event)) m_treeCtrl->SelectItem(m_treeCtrl->GetRootItem()); } +void MyFrame::OnSetFocusedRoot(wxCommandEvent& WXUNUSED(event)) +{ + if ( !m_treeCtrl->HasFlag(wxTR_HIDE_ROOT) ) + m_treeCtrl->SetFocusedItem(m_treeCtrl->GetRootItem()); +} + +void MyFrame::OnClearFocused(wxCommandEvent& WXUNUSED(event)) +{ + m_treeCtrl->ClearFocusedItem(); +} + void MyFrame::OnUnselect(wxCommandEvent& WXUNUSED(event)) { m_treeCtrl->UnselectAll(); } +void MyFrame::OnSelectChildren(wxCommandEvent& WXUNUSED(event)) +{ + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); + if ( !item.IsOk() ) + item = m_treeCtrl->GetRootItem(); + + m_treeCtrl->SelectChildren(item); +} + #endif // NO_MULTIPLE_SELECTION void MyFrame::DoSetBold(bool bold) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -588,7 +642,7 @@ void MyFrame::DoSetBold(bool bold) void MyFrame::OnDelete(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -597,7 +651,7 @@ void MyFrame::OnDelete(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnDeleteChildren(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -612,7 +666,7 @@ void MyFrame::OnDeleteAll(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnRecreate(wxCommandEvent& event) { OnDeleteAll(event); - m_treeCtrl->AddTestItemsToTree(5, 2); + m_treeCtrl->AddTestItemsToTree(NUM_CHILDREN_PER_LEVEL, NUM_LEVELS); } void MyFrame::OnSetImageSize(wxCommandEvent& WXUNUSED(event)) @@ -656,6 +710,11 @@ void MyFrame::OnToggleStates(wxCommandEvent& WXUNUSED(event)) } } +void MyFrame::OnToggleBell(wxCommandEvent& event) +{ + m_treeCtrl->EnableBellOnNoMatch(event.IsChecked()); +} + void MyFrame::OnToggleAlternateImages(wxCommandEvent& WXUNUSED(event)) { bool alternateImages = m_treeCtrl->AlternateImages(); @@ -670,6 +729,11 @@ void MyFrame::OnToggleAlternateStates(wxCommandEvent& WXUNUSED(event)) m_treeCtrl->SetAlternateStates(!alternateStates); m_treeCtrl->CreateStateImageList(); + + // normal states < alternate states + // so we must reset broken states + if ( alternateStates ) + m_treeCtrl->ResetBrokenStateImages(); } void MyFrame::OnToggleButtons(wxCommandEvent& WXUNUSED(event)) @@ -698,6 +762,11 @@ void MyFrame::OnEnsureVisible(wxCommandEvent& WXUNUSED(event)) m_treeCtrl->DoEnsureVisible(); } +void MyFrame::OnSetFocus(wxCommandEvent& WXUNUSED(event)) +{ + m_treeCtrl->SetFocus(); +} + void MyFrame::OnInsertItem(wxCommandEvent& WXUNUSED(event)) { int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_File : -1; @@ -716,6 +785,17 @@ void MyFrame::OnAddItem(wxCommandEvent& WXUNUSED(event)) MyTreeCtrl::TreeCtrlIcon_File */ ); } +void MyFrame::OnAddManyItems(wxCommandEvent& WXUNUSED(event)) +{ + wxWindowUpdateLocker lockUpdates(this); + + const wxTreeItemId root = m_treeCtrl->GetRootItem(); + for ( int n = 0; n < 1000; n++ ) + { + m_treeCtrl->AppendItem(root, wxString::Format("Item #%03d", n)); + } +} + void MyFrame::OnIncIndent(wxCommandEvent& WXUNUSED(event)) { unsigned int indent = m_treeCtrl->GetIndent(); @@ -734,19 +814,25 @@ void MyFrame::OnIncSpacing(wxCommandEvent& WXUNUSED(event)) { unsigned int indent = m_treeCtrl->GetSpacing(); if (indent < 100) + { m_treeCtrl->SetSpacing( indent+5 ); + m_treeCtrl->Refresh(); + } } void MyFrame::OnDecSpacing(wxCommandEvent& WXUNUSED(event)) { unsigned int indent = m_treeCtrl->GetSpacing(); if (indent > 10) + { m_treeCtrl->SetSpacing( indent-5 ); + m_treeCtrl->Refresh(); + } } void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -755,7 +841,7 @@ void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnToggleState(wxCommandEvent& WXUNUSED(event)) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); @@ -767,44 +853,83 @@ 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) +void MyFrame::DoShowRelativeItem(TreeFunc1_t pfn, const wxString& label) { - wxTreeItemId item = m_treeCtrl->GetSelection(); + wxTreeItemId item = m_treeCtrl->GetFocusedItem(); CHECK_ITEM( item ); - if ( !m_treeCtrl->IsVisible(item) ) + if ((pfn == (TreeFunc1_t) &wxTreeCtrl::GetPrevVisible + || pfn == (TreeFunc1_t) &wxTreeCtrl::GetNextVisible) + && !m_treeCtrl->IsVisible(item)) { wxLogMessage("The selected item must be visible."); return; } - item = (m_treeCtrl->*pfn)(item); + wxTreeItemId new_item = (m_treeCtrl->*pfn)(item); - if ( !item.IsOk() ) + if ( !new_item.IsOk() ) + { wxLogMessage("There is no %s item", label); + } else + { wxLogMessage("The %s item is \"%s\"", - label, m_treeCtrl->GetItemText(item)); + label, m_treeCtrl->GetItemText(new_item)); + } +} + +void MyFrame::OnScrollTo(wxCommandEvent& WXUNUSED(event)) +{ + // scroll to the last but one top level child + wxTreeItemId item = m_treeCtrl->GetPrevSibling( + m_treeCtrl->GetLastChild( + m_treeCtrl->GetRootItem())); + CHECK_ITEM( item ); + + m_treeCtrl->ScrollTo(item); +} + +void MyFrame::OnSelectLast(wxCommandEvent& WXUNUSED(event)) +{ + // select the very last item of the tree + wxTreeItemId item = m_treeCtrl->GetRootItem(); + for ( ;; ) + { + wxTreeItemId itemChild = m_treeCtrl->GetLastChild(item); + if ( !itemChild.IsOk() ) + break; + + item = itemChild; + } + + CHECK_ITEM( item ); + + m_treeCtrl->SelectItem(item); } void MyFrame::OnSetFgColour(wxCommandEvent& WXUNUSED(event)) { wxColour col = wxGetColourFromUser(this, m_treeCtrl->GetForegroundColour()); - if ( col.Ok() ) + if ( col.IsOk() ) m_treeCtrl->SetForegroundColour(col); } void MyFrame::OnSetBgColour(wxCommandEvent& WXUNUSED(event)) { wxColour col = wxGetColourFromUser(this, m_treeCtrl->GetBackgroundColour()); - if ( col.Ok() ) + if ( col.IsOk() ) m_treeCtrl->SetBackgroundColour(col); } @@ -828,7 +953,7 @@ MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id, CreateStateImageList(); // Add some items to the tree - AddTestItemsToTree(5, 2); + AddTestItemsToTree(NUM_CHILDREN_PER_LEVEL, NUM_LEVELS); } void MyTreeCtrl::CreateImageList(int size) @@ -916,40 +1041,18 @@ void MyTreeCtrl::CreateStateImageList(bool del) } else { -#if 0 - int width = ::GetSystemMetrics(SM_CXMENUCHECK), - height = ::GetSystemMetrics(SM_CYMENUCHECK); -#else - int width = 16; - int height = 16; -#endif - - // make an state checkbox image list - states = new wxImageList(width, height, true); - - wxBitmap checkBmp(width, height); - wxRect rect (0, 0, width, height); + wxIcon icons[2]; + icons[0] = wxIcon(unchecked_xpm); + icons[1] = wxIcon(checked_xpm); - wxRendererNative& renderer = wxRendererNative::Get(); - - // create no checked image - { - // first create bitmap in a memory DC - wxMemoryDC memDC(checkBmp); - memDC.Clear(); - // then draw a check mark into it - renderer.DrawCheckBox(this, memDC, rect, 0); - } // select checkBmp out of memDC - - states->Add(checkBmp); + int width = icons[0].GetWidth(), + height = icons[0].GetHeight(); - // create checked image - { - wxMemoryDC memDC(checkBmp); - renderer.DrawCheckBox(this, memDC, rect, wxCONTROL_CHECKED); - } + // Make an state image list containing small icons + states = new wxImageList(width, height, true); - states->Add(checkBmp); + for ( size_t i = 0; i < WXSIZEOF(icons); i++ ) + states->Add(icons[i]); } AssignStateImageList(states); @@ -1100,9 +1203,13 @@ void MyTreeCtrl::AddTestItemsToTree(size_t numChildren, SetItemTextColour(id, *wxBLUE); id = GetNextChild(rootId, cookie); - id = GetNextChild(rootId, cookie); - SetItemTextColour(id, *wxRED); - SetItemBackgroundColour(id, *wxLIGHT_GREY); + if ( id ) + id = GetNextChild(rootId, cookie); + if ( id ) + { + SetItemTextColour(id, *wxRED); + SetItemBackgroundColour(id, *wxLIGHT_GREY); + } } void MyTreeCtrl::GetItemsRecursively(const wxTreeItemId& idParent, @@ -1162,14 +1269,37 @@ void MyTreeCtrl::DoToggleState(const wxTreeItemId& item) } } +void MyTreeCtrl::DoResetBrokenStateImages(const wxTreeItemId& idParent, + wxTreeItemIdValue cookie, int state) +{ + wxTreeItemId id; + + if ( !cookie ) + id = GetFirstChild(idParent, cookie); + else + id = GetNextChild(idParent, cookie); + + if ( !id.IsOk() ) + return; + + int curState = GetItemState(id); + if ( curState != wxTREE_ITEMSTATE_NONE && curState > state ) + SetItemState(id, state); + + if (ItemHasChildren(id)) + DoResetBrokenStateImages(id, 0, state); + + DoResetBrokenStateImages(idParent, cookie, state); +} + 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('"'); + text << wxT('"') << GetItemText(item).c_str() << wxT('"'); else - text = _T("invalid item"); + text = wxT("invalid item"); wxLogMessage(wxT("%s(%s)"), name, text.c_str()); } @@ -1177,7 +1307,7 @@ void MyTreeCtrl::LogEvent(const wxChar *name, const wxTreeEvent& event) #define TREE_EVENT_HANDLER(name) \ void MyTreeCtrl::name(wxTreeEvent& event) \ { \ - LogEvent(_T(#name), event); \ + LogEvent(wxT(#name), event); \ SetLastItem(wxTreeItemId()); \ event.Skip(); \ } @@ -1403,7 +1533,7 @@ void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event) else if ( itemId == GetRootItem() ) { // test that it is possible to change the text of the item being edited - SetItemText(itemId, _T("Editing root item")); + SetItemText(itemId, wxT("Editing root item")); } } @@ -1461,13 +1591,14 @@ void MyTreeCtrl::OnItemStateClick(wxTreeEvent& event) void MyTreeCtrl::OnItemMenu(wxTreeEvent& event) { wxTreeItemId itemId = event.GetItem(); - MyTreeItemData *item = itemId.IsOk() ? (MyTreeItemData *)GetItemData(itemId) - : NULL; + wxCHECK_RET( itemId.IsOk(), "should have a valid item" ); + + MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId); 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); + item->GetDesc(), screenpt.x, screenpt.y); ShowMenu(itemId, clientpt); event.Skip(); @@ -1478,6 +1609,8 @@ void MyTreeCtrl::OnContextMenu(wxContextMenuEvent& event) wxPoint pt = event.GetPosition(); wxLogMessage(wxT("OnContextMenu at screen coords (%i, %i)"), pt.x, pt.y); + + event.Skip(); } void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt) @@ -1494,7 +1627,7 @@ void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt) #if wxUSE_MENUS wxMenu menu(title); - menu.Append(TreeTest_About, wxT("&About...")); + menu.Append(TreeTest_About, wxT("&About")); menu.AppendSeparator(); menu.Append(TreeTest_Highlight, wxT("&Highlight item")); menu.Append(TreeTest_Dump, wxT("&Dump")); @@ -1506,11 +1639,11 @@ void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt) void MyTreeCtrl::OnItemRClick(wxTreeEvent& event) { wxTreeItemId itemId = event.GetItem(); - MyTreeItemData *item = itemId.IsOk() ? (MyTreeItemData *)GetItemData(itemId) - : NULL; + wxCHECK_RET( itemId.IsOk(), "should have a valid item" ); + + MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId); - wxLogMessage(wxT("Item \"%s\" right clicked"), item ? item->GetDesc() - : _T("")); + wxLogMessage(wxT("Item \"%s\" right clicked"), item->GetDesc()); event.Skip(); } @@ -1533,12 +1666,16 @@ void MyTreeCtrl::OnRMouseDClick(wxMouseEvent& event) { wxTreeItemId id = HitTest(event.GetPosition()); if ( !id ) + { wxLogMessage(wxT("No item under mouse")); + } else { MyTreeItemData *item = (MyTreeItemData *)GetItemData(id); if ( item ) + { wxLogMessage(wxT("Item '%s' under mouse"), item->GetDesc()); + } } event.Skip();