X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f4aae6098e054cb96d8d9b124dcb7e7c3c138ee..a356336ecf10e9d218d9d127d39c47c0cce57e2d:/samples/treectrl/treetest.cpp diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index 2645bfdd1b..25ad3816e6 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -27,12 +27,12 @@ #endif #include "wx/colordlg.h" +#include "wx/numdlg.h" #include "wx/image.h" #include "wx/imaglist.h" #include "wx/treectrl.h" - -#include "math.h" +#include "wx/math.h" #ifdef __WIN32__ // this is not supported by native control @@ -46,7 +46,10 @@ #include "icon3.xpm" #include "icon4.xpm" #include "icon5.xpm" + +#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) #include "mondrian.xpm" +#endif // verify that the item is ok and insult the user if it is not @@ -61,6 +64,7 @@ #define MENU_LINK(name) EVT_MENU(TreeTest_##name, MyFrame::On##name) BEGIN_EVENT_TABLE(MyFrame, wxFrame) + EVT_IDLE(MyFrame::OnIdle) EVT_SIZE(MyFrame::OnSize) MENU_LINK(Quit) @@ -108,6 +112,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MENU_LINK(IncSpacing) MENU_LINK(DecSpacing) MENU_LINK(ToggleIcon) + MENU_LINK(SelectRoot) #undef MENU_LINK END_EVENT_TABLE() @@ -131,9 +136,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_TREE_ITEM_RIGHT_CLICK(TreeTest_Ctrl, MyTreeCtrl::OnItemRightClick) - EVT_RIGHT_UP(MyTreeCtrl::OnRMouseUp) + EVT_CONTEXT_MENU(MyTreeCtrl::OnContextMenu) EVT_TREE_SEL_CHANGED(TreeTest_Ctrl, MyTreeCtrl::OnSelChanged) EVT_TREE_SEL_CHANGING(TreeTest_Ctrl, MyTreeCtrl::OnSelChanging) EVT_TREE_KEY_DOWN(TreeTest_Ctrl, MyTreeCtrl::OnTreeKeyDown) @@ -149,17 +154,20 @@ bool MyApp::OnInit() MyFrame *frame = new MyFrame(wxT("wxTreeCtrl Test"), 50, 50, 450, 600); // Show the frame - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); - return TRUE; + return true; } // 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)), - m_treeCtrl(NULL), m_textCtrl(NULL) + : wxFrame((wxFrame *)NULL, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)), + m_treeCtrl(NULL) +#if wxUSE_LOG + , m_textCtrl(NULL) +#endif // wxUSE_LOG { // This reduces flicker effects - even better would be to define // OnEraseBackground to do nothing. When the tree control's scrollbars are @@ -180,20 +188,20 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) file_menu->AppendSeparator(); 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->AppendCheckItem(TreeTest_TogButtons, wxT("Toggle &normal buttons")); + style_menu->AppendCheckItem(TreeTest_TogTwist, wxT("Toggle &twister buttons")); + style_menu->AppendCheckItem(TreeTest_ToggleButtons, wxT("Toggle image &buttons")); 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); + style_menu->AppendCheckItem(TreeTest_TogLines, wxT("Toggle &connecting lines")); + style_menu->AppendCheckItem(TreeTest_TogRootLines, wxT("Toggle &lines at root")); + style_menu->AppendCheckItem(TreeTest_TogHideRoot, wxT("Toggle &hidden root")); + style_menu->AppendCheckItem(TreeTest_TogBorder, wxT("Toggle &item border")); + style_menu->AppendCheckItem(TreeTest_TogFullHighlight, wxT("Toggle &full row highlight")); + style_menu->AppendCheckItem(TreeTest_TogEdit, wxT("Toggle &edit mode")); #ifndef NO_MULTIPLE_SELECTION - style_menu->Append(TreeTest_ToggleSel, wxT("Toggle &selection mode"), _T(""), TRUE); + style_menu->AppendCheckItem(TreeTest_ToggleSel, wxT("Toggle &selection mode")); #endif // NO_MULTIPLE_SELECTION - style_menu->Append(TreeTest_ToggleImages, wxT("Toggle show ima&ges"), _T(""), TRUE); + style_menu->AppendCheckItem(TreeTest_ToggleImages, wxT("Toggle show ima&ges")); style_menu->Append(TreeTest_SetImageSize, wxT("Set image si&ze...")); style_menu->AppendSeparator(); style_menu->Append(TreeTest_SetFgColour, wxT("Set &foreground colour...")); @@ -201,66 +209,71 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) 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->Append(TreeTest_Recreate, wxT("&Recreate the tree")); + tree_menu->Append(TreeTest_CollapseAndReset, wxT("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->Append(TreeTest_AddItem, wxT("Append a &new item")); + 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_Count, "Count children of current item"); - tree_menu->Append(TreeTest_CountRec, "Recursively count children of current item"); + tree_menu->Append(TreeTest_Count, wxT("Count children of current item")); + tree_menu->Append(TreeTest_CountRec, wxT("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->Append(TreeTest_Sort, wxT("Sort children of current item")); + tree_menu->Append(TreeTest_SortRev, wxT("Sort in reversed order")); tree_menu->AppendSeparator(); - tree_menu->Append(TreeTest_EnsureVisible, "Make the last item &visible"); + tree_menu->Append(TreeTest_EnsureVisible, wxT("Make the last item &visible")); tree_menu->AppendSeparator(); - tree_menu->Append(TreeTest_IncIndent, "Add 5 points to indentation\tAlt-I"); - tree_menu->Append(TreeTest_DecIndent, "Reduce indentation by 5 points\tAlt-R"); + 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")); tree_menu->AppendSeparator(); - tree_menu->Append(TreeTest_IncSpacing, "Add 5 points to spacing\tCtrl-I"); - tree_menu->Append(TreeTest_DecSpacing, "Reduce spacing by 5 points\tCtrl-R"); + tree_menu->Append(TreeTest_IncSpacing, wxT("Add 5 points to spacing\tCtrl-I")); + tree_menu->Append(TreeTest_DecSpacing, wxT("Reduce spacing by 5 points\tCtrl-R")); - item_menu->Append(TreeTest_Dump, "&Dump item children"); - item_menu->Append(TreeTest_Rename, "&Rename item..."); + item_menu->Append(TreeTest_Dump, wxT("&Dump item children")); + item_menu->Append(TreeTest_Rename, wxT("&Rename item...")); item_menu->AppendSeparator(); - item_menu->Append(TreeTest_SetBold, "Make item &bold"); - item_menu->Append(TreeTest_ClearBold, "Make item ¬ bold"); + item_menu->Append(TreeTest_SetBold, wxT("Make item &bold")); + item_menu->Append(TreeTest_ClearBold, wxT("Make item ¬ bold")); item_menu->AppendSeparator(); - item_menu->Append(TreeTest_ToggleIcon, "Toggle the item's &icon"); + item_menu->Append(TreeTest_ToggleIcon, wxT("Toggle the item's &icon")); #ifndef NO_MULTIPLE_SELECTION item_menu->AppendSeparator(); - 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"); + 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")); #endif // NO_MULTIPLE_SELECTION 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"); + menu_bar->Append(file_menu, wxT("&File")); + menu_bar->Append(style_menu, wxT("&Style")); + menu_bar->Append(tree_menu, wxT("&Tree")); + menu_bar->Append(item_menu, wxT("&Item")); SetMenuBar(menu_bar); #endif // wxUSE_MENUS +#if wxUSE_LOG // create the controls - m_textCtrl = new wxTextCtrl(this, -1, "", + m_textCtrl = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER); +#endif // wxUSE_LOG CreateTreeWithDefStyle(); - menu_bar->Check(TreeTest_ToggleImages, TRUE); + menu_bar->Check(TreeTest_ToggleImages, true); - // create a status bar with 3 panes - CreateStatusBar(3); - SetStatusText("", 0); +#if wxUSE_STATUSBAR + // 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? @@ -270,11 +283,14 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h) wxLogTextCtrl *logWindow = new wxLogTextCtrl(m_textCtrl); delete wxLog::SetActiveTarget(logWindow); #endif +#endif // wxUSE_LOG } MyFrame::~MyFrame() { +#if wxUSE_LOG delete wxLog::SetActiveTarget(NULL); +#endif // wxUSE_LOG } void MyFrame::CreateTreeWithDefStyle() @@ -324,9 +340,33 @@ void MyFrame::TogStyle(int id, long flag) GetMenuBar()->Check(id, (style & flag) != 0); } +void MyFrame::OnIdle(wxIdleEvent& event) +{ +#if wxUSE_STATUSBAR + if ( m_treeCtrl ) + { + wxTreeItemId idRoot = m_treeCtrl->GetRootItem(); + + SetStatusText(wxString::Format + ( + _T("Root/last item is %svisible/%svisible"), + m_treeCtrl->IsVisible(idRoot) ? _T("") : _T("not "), + m_treeCtrl->IsVisible(m_treeCtrl->GetLastChild(idRoot)) + ? _T("") : _T("not ") + ), 1); + } +#endif // wxUSE_STATUSBAR + + event.Skip(); +} + void MyFrame::OnSize(wxSizeEvent& event) { - if ( m_treeCtrl && m_textCtrl ) + if ( m_treeCtrl +#if wxUSE_LOG + && m_textCtrl +#endif // wxUSE_LOG + ) { Resize(); } @@ -337,20 +377,25 @@ void MyFrame::OnSize(wxSizeEvent& event) void MyFrame::Resize() { wxSize size = GetClientSize(); - m_treeCtrl->SetSize(0, 0, size.x, 2*size.y/3); + m_treeCtrl->SetSize(0, 0, size.x, size.y +#if !wxUSE_LOG + ); +#else + *2/3); m_textCtrl->SetSize(0, 2*size.y/3, size.x, size.y/3); +#endif } void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox("Tree test sample\n" - "(c) Julian Smart 1997, Vadim Zeitlin 1998", - "About tree test", + wxMessageBox(wxT("Tree test sample\n") + wxT("(c) Julian Smart 1997, Vadim Zeitlin 1998"), + wxT("About tree test"), wxOK | wxICON_INFORMATION, this); } @@ -363,9 +408,9 @@ void MyFrame::OnRename(wxCommandEvent& WXUNUSED(event)) // old code - now we edit in place #if 0 static wxString s_text; - s_text = wxGetTextFromUser("New name: ", "Tree sample question", + s_text = wxGetTextFromUser(wxT("New name: "), wxT("Tree sample question"), s_text, this); - if ( !s_text.IsEmpty() ) + if ( !s_text.empty() ) { m_treeCtrl->SetItemText(item, s_text); } @@ -381,7 +426,7 @@ void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event)) CHECK_ITEM( item ); - int i = m_treeCtrl->GetChildrenCount( item, FALSE ); + int i = m_treeCtrl->GetChildrenCount( item, false ); wxLogMessage(wxT("%d children"), i); } @@ -412,7 +457,7 @@ void MyFrame::OnDump(wxCommandEvent& WXUNUSED(event)) CHECK_ITEM( root ); - m_treeCtrl->GetItemsRecursively(root, -1); + m_treeCtrl->GetItemsRecursively(root); } #ifndef NO_MULTIPLE_SELECTION @@ -435,12 +480,17 @@ void MyFrame::OnDumpSelected(wxCommandEvent& WXUNUSED(event)) } } -void MyFrame::OnSelect(wxCommandEvent& event) +void MyFrame::OnSelect(wxCommandEvent& WXUNUSED(event)) { m_treeCtrl->SelectItem(m_treeCtrl->GetSelection()); } -void MyFrame::OnUnselect(wxCommandEvent& event) +void MyFrame::OnSelectRoot(wxCommandEvent& WXUNUSED(event)) +{ + m_treeCtrl->SelectItem(m_treeCtrl->GetRootItem()); +} + +void MyFrame::OnUnselect(wxCommandEvent& WXUNUSED(event)) { m_treeCtrl->UnselectAll(); } @@ -485,55 +535,55 @@ void MyFrame::OnRecreate(wxCommandEvent& event) m_treeCtrl->AddTestItemsToTree(5, 2); } -void MyFrame::OnSetImageSize(wxCommandEvent& event) +void MyFrame::OnSetImageSize(wxCommandEvent& WXUNUSED(event)) { - int size = wxGetNumberFromUser("Enter the size for the images to use", - "Size: ", - "TreeCtrl sample", + int size = wxGetNumberFromUser(wxT("Enter the size for the images to use"), + wxT("Size: "), + wxT("TreeCtrl sample"), m_treeCtrl->ImageSize()); if ( size == -1 ) return; m_treeCtrl->CreateImageList(size); - wxGetApp().SetShowImages(TRUE); + wxGetApp().SetShowImages(true); } -void MyFrame::OnToggleImages(wxCommandEvent& event) +void MyFrame::OnToggleImages(wxCommandEvent& WXUNUSED(event)) { if ( wxGetApp().ShowImages() ) { m_treeCtrl->CreateImageList(-1); - wxGetApp().SetShowImages(FALSE); + wxGetApp().SetShowImages(false); } else { m_treeCtrl->CreateImageList(0); - wxGetApp().SetShowImages(TRUE); + wxGetApp().SetShowImages(true); } } -void MyFrame::OnToggleButtons(wxCommandEvent& event) +void MyFrame::OnToggleButtons(wxCommandEvent& WXUNUSED(event)) { #if USE_GENERIC_TREECTRL || !defined(__WXMSW__) if ( wxGetApp().ShowButtons() ) { m_treeCtrl->CreateButtonsImageList(-1); - wxGetApp().SetShowButtons(FALSE); + wxGetApp().SetShowButtons(false); } else { m_treeCtrl->CreateButtonsImageList(15); - wxGetApp().SetShowButtons(TRUE); + wxGetApp().SetShowButtons(true); } #endif } -void MyFrame::OnCollapseAndReset(wxCommandEvent& event) +void MyFrame::OnCollapseAndReset(wxCommandEvent& WXUNUSED(event)) { m_treeCtrl->CollapseAndReset(m_treeCtrl->GetRootItem()); } -void MyFrame::OnEnsureVisible(wxCommandEvent& event) +void MyFrame::OnEnsureVisible(wxCommandEvent& WXUNUSED(event)) { m_treeCtrl->DoEnsureVisible(); } @@ -541,7 +591,7 @@ void MyFrame::OnEnsureVisible(wxCommandEvent& event) void MyFrame::OnInsertItem(wxCommandEvent& WXUNUSED(event)) { int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_File : -1; - m_treeCtrl->InsertItem(m_treeCtrl->GetRootItem(), image, "2nd item"); + m_treeCtrl->InsertItem(m_treeCtrl->GetRootItem(), image, wxT("2nd item")); } void MyFrame::OnAddItem(wxCommandEvent& WXUNUSED(event)) @@ -619,7 +669,7 @@ MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id, long style) : wxTreeCtrl(parent, id, pos, size, style) { - m_reverseSort = FALSE; + m_reverseSort = false; CreateImageList(); @@ -640,7 +690,7 @@ void MyTreeCtrl::CreateImageList(int size) m_imageSize = size; // Make an image list containing small icons - wxImageList *images = new wxImageList(size, size, TRUE); + wxImageList *images = new wxImageList(size, size, true); // should correspond to TreeCtrlIcon_xxx enum wxBusyCursor wait; @@ -667,9 +717,9 @@ void MyTreeCtrl::CreateImageList(int size) AssignImageList(images); } +#if USE_GENERIC_TREECTRL || !defined(__WXMSW__) void MyTreeCtrl::CreateButtonsImageList(int size) { -#if USE_GENERIC_TREECTRL || !defined(__WXMSW__) if ( size == -1 ) { SetButtonsImageList(NULL); @@ -677,7 +727,7 @@ void MyTreeCtrl::CreateButtonsImageList(int size) } // Make an image list containing small icons - wxImageList *images = new wxImageList(size, size, TRUE); + wxImageList *images = new wxImageList(size, size, true); // should correspond to TreeCtrlIcon_xxx enum wxBusyCursor wait; @@ -696,16 +746,15 @@ void MyTreeCtrl::CreateButtonsImageList(int size) } else { - images->Add(wxBitmap(icons[i].ConvertToImage().Rescale(size, size))); + images->Add(wxBitmap(wxBitmap(icons[i]).ConvertToImage().Rescale(size, size))); } } AssignButtonsImageList(images); -#endif -} - -MyTreeCtrl::~MyTreeCtrl() +#else +void MyTreeCtrl::CreateButtonsImageList(int WXUNUSED(size)) { +#endif } int MyTreeCtrl::OnCompareItems(const wxTreeItemId& item1, @@ -778,9 +827,9 @@ void MyTreeCtrl::AddTestItemsToTree(size_t numChildren, size_t depth) { int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_Folder : -1; - wxTreeItemId rootId = AddRoot("Root", + wxTreeItemId rootId = AddRoot(wxT("Root"), image, image, - new MyTreeItemData("Root item")); + new MyTreeItemData(wxT("Root item"))); if ( image != -1 ) { SetItemImage(rootId, TreeCtrlIcon_FolderOpened, wxTreeItemIcon_Expanded); @@ -791,7 +840,7 @@ void MyTreeCtrl::AddTestItemsToTree(size_t numChildren, // set some colours/fonts for testing SetItemFont(rootId, *wxITALIC_FONT); - long cookie; + wxTreeItemIdValue cookie; wxTreeItemId id = GetFirstChild(rootId, cookie); SetItemTextColour(id, *wxBLUE); @@ -801,23 +850,24 @@ void MyTreeCtrl::AddTestItemsToTree(size_t numChildren, SetItemBackgroundColour(id, *wxLIGHT_GREY); } -void MyTreeCtrl::GetItemsRecursively(const wxTreeItemId& idParent, long cookie) +void MyTreeCtrl::GetItemsRecursively(const wxTreeItemId& idParent, + wxTreeItemIdValue cookie) { wxTreeItemId id; - if( cookie == -1 ) + if ( !cookie ) id = GetFirstChild(idParent, cookie); else id = GetNextChild(idParent, cookie); - if(id <= 0) + if ( !id.IsOk() ) return; wxString text = GetItemText(id); wxLogMessage(text); if (ItemHasChildren(id)) - GetItemsRecursively(id,-1); + GetItemsRecursively(id); GetItemsRecursively(idParent, cookie); } @@ -836,6 +886,7 @@ void MyTreeCtrl::DoToggleIcon(const wxTreeItemId& item) void MyTreeCtrl::name(wxTreeEvent& event) \ { \ wxLogMessage(wxT(#name)); \ + SetLastItem(wxTreeItemId()); \ event.Skip(); \ } @@ -848,10 +899,146 @@ 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 LogKeyEvent(const wxChar *name, const wxKeyEvent& event) +{ + wxString key; + long keycode = event.GetKeyCode(); + { + switch ( keycode ) + { + case WXK_BACK: key = wxT("BACK"); break; + case WXK_TAB: key = wxT("TAB"); break; + case WXK_RETURN: key = wxT("RETURN"); break; + case WXK_ESCAPE: key = wxT("ESCAPE"); break; + case WXK_SPACE: key = wxT("SPACE"); break; + case WXK_DELETE: key = wxT("DELETE"); break; + case WXK_START: key = wxT("START"); break; + case WXK_LBUTTON: key = wxT("LBUTTON"); break; + case WXK_RBUTTON: key = wxT("RBUTTON"); break; + case WXK_CANCEL: key = wxT("CANCEL"); break; + case WXK_MBUTTON: key = wxT("MBUTTON"); break; + case WXK_CLEAR: key = wxT("CLEAR"); break; + case WXK_SHIFT: key = wxT("SHIFT"); break; + case WXK_ALT: key = wxT("ALT"); break; + case WXK_CONTROL: key = wxT("CONTROL"); break; + case WXK_MENU: key = wxT("MENU"); break; + case WXK_PAUSE: key = wxT("PAUSE"); break; + case WXK_CAPITAL: key = wxT("CAPITAL"); break; + case WXK_PRIOR: key = wxT("PRIOR"); break; + case WXK_NEXT: key = wxT("NEXT"); break; + case WXK_END: key = wxT("END"); break; + case WXK_HOME: key = wxT("HOME"); break; + case WXK_LEFT: key = wxT("LEFT"); break; + case WXK_UP: key = wxT("UP"); break; + case WXK_RIGHT: key = wxT("RIGHT"); break; + case WXK_DOWN: key = wxT("DOWN"); break; + case WXK_SELECT: key = wxT("SELECT"); break; + case WXK_PRINT: key = wxT("PRINT"); break; + case WXK_EXECUTE: key = wxT("EXECUTE"); break; + case WXK_SNAPSHOT: key = wxT("SNAPSHOT"); break; + case WXK_INSERT: key = wxT("INSERT"); break; + case WXK_HELP: key = wxT("HELP"); break; + case WXK_NUMPAD0: key = wxT("NUMPAD0"); break; + case WXK_NUMPAD1: key = wxT("NUMPAD1"); break; + case WXK_NUMPAD2: key = wxT("NUMPAD2"); break; + case WXK_NUMPAD3: key = wxT("NUMPAD3"); break; + case WXK_NUMPAD4: key = wxT("NUMPAD4"); break; + case WXK_NUMPAD5: key = wxT("NUMPAD5"); break; + case WXK_NUMPAD6: key = wxT("NUMPAD6"); break; + case WXK_NUMPAD7: key = wxT("NUMPAD7"); break; + case WXK_NUMPAD8: key = wxT("NUMPAD8"); break; + case WXK_NUMPAD9: key = wxT("NUMPAD9"); break; + case WXK_MULTIPLY: key = wxT("MULTIPLY"); break; + case WXK_ADD: key = wxT("ADD"); break; + case WXK_SEPARATOR: key = wxT("SEPARATOR"); break; + case WXK_SUBTRACT: key = wxT("SUBTRACT"); break; + case WXK_DECIMAL: key = wxT("DECIMAL"); break; + case WXK_DIVIDE: key = wxT("DIVIDE"); break; + case WXK_F1: key = wxT("F1"); break; + case WXK_F2: key = wxT("F2"); break; + case WXK_F3: key = wxT("F3"); break; + case WXK_F4: key = wxT("F4"); break; + case WXK_F5: key = wxT("F5"); break; + case WXK_F6: key = wxT("F6"); break; + case WXK_F7: key = wxT("F7"); break; + case WXK_F8: key = wxT("F8"); break; + case WXK_F9: key = wxT("F9"); break; + case WXK_F10: key = wxT("F10"); break; + case WXK_F11: key = wxT("F11"); break; + case WXK_F12: key = wxT("F12"); break; + case WXK_F13: key = wxT("F13"); break; + case WXK_F14: key = wxT("F14"); break; + case WXK_F15: key = wxT("F15"); break; + case WXK_F16: key = wxT("F16"); break; + case WXK_F17: key = wxT("F17"); break; + case WXK_F18: key = wxT("F18"); break; + case WXK_F19: key = wxT("F19"); break; + case WXK_F20: key = wxT("F20"); break; + case WXK_F21: key = wxT("F21"); break; + case WXK_F22: key = wxT("F22"); break; + case WXK_F23: key = wxT("F23"); break; + case WXK_F24: key = wxT("F24"); break; + case WXK_NUMLOCK: key = wxT("NUMLOCK"); break; + case WXK_SCROLL: key = wxT("SCROLL"); break; + case WXK_PAGEUP: key = wxT("PAGEUP"); break; + case WXK_PAGEDOWN: key = wxT("PAGEDOWN"); break; + case WXK_NUMPAD_SPACE: key = wxT("NUMPAD_SPACE"); break; + case WXK_NUMPAD_TAB: key = wxT("NUMPAD_TAB"); break; + case WXK_NUMPAD_ENTER: key = wxT("NUMPAD_ENTER"); break; + case WXK_NUMPAD_F1: key = wxT("NUMPAD_F1"); break; + case WXK_NUMPAD_F2: key = wxT("NUMPAD_F2"); break; + case WXK_NUMPAD_F3: key = wxT("NUMPAD_F3"); break; + case WXK_NUMPAD_F4: key = wxT("NUMPAD_F4"); break; + case WXK_NUMPAD_HOME: key = wxT("NUMPAD_HOME"); break; + case WXK_NUMPAD_LEFT: key = wxT("NUMPAD_LEFT"); break; + case WXK_NUMPAD_UP: key = wxT("NUMPAD_UP"); break; + case WXK_NUMPAD_RIGHT: key = wxT("NUMPAD_RIGHT"); break; + case WXK_NUMPAD_DOWN: key = wxT("NUMPAD_DOWN"); break; + case WXK_NUMPAD_PRIOR: key = wxT("NUMPAD_PRIOR"); break; + case WXK_NUMPAD_PAGEUP: key = wxT("NUMPAD_PAGEUP"); break; + case WXK_NUMPAD_PAGEDOWN: key = wxT("NUMPAD_PAGEDOWN"); break; + case WXK_NUMPAD_END: key = wxT("NUMPAD_END"); break; + case WXK_NUMPAD_BEGIN: key = wxT("NUMPAD_BEGIN"); break; + case WXK_NUMPAD_INSERT: key = wxT("NUMPAD_INSERT"); break; + case WXK_NUMPAD_DELETE: key = wxT("NUMPAD_DELETE"); break; + case WXK_NUMPAD_EQUAL: key = wxT("NUMPAD_EQUAL"); break; + case WXK_NUMPAD_MULTIPLY: key = wxT("NUMPAD_MULTIPLY"); break; + case WXK_NUMPAD_ADD: key = wxT("NUMPAD_ADD"); break; + case WXK_NUMPAD_SEPARATOR: key = wxT("NUMPAD_SEPARATOR"); break; + case WXK_NUMPAD_SUBTRACT: key = wxT("NUMPAD_SUBTRACT"); break; + case WXK_NUMPAD_DECIMAL: key = wxT("NUMPAD_DECIMAL"); break; + + default: + { + if ( wxIsprint((int)keycode) ) + key.Printf(wxT("'%c'"), (char)keycode); + else if ( keycode > 0 && keycode < 27 ) + key.Printf(_("Ctrl-%c"), wxT('A') + keycode - 1); + else + key.Printf(wxT("unknown (%ld)"), keycode); + } + } + } + + wxLogMessage( wxT("%s event: %s (flags = %c%c%c%c)"), + name, + key.c_str(), + event.ControlDown() ? wxT('C') : wxT('-'), + event.AltDown() ? wxT('A') : wxT('-'), + event.ShiftDown() ? wxT('S') : wxT('-'), + event.MetaDown() ? wxT('M') : wxT('-')); +} + +void MyTreeCtrl::OnTreeKeyDown(wxTreeEvent& event) +{ + LogKeyEvent(wxT("Tree key down "), event.GetKeyEvent()); + + event.Skip(); +} + void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event) { // need to explicitly allow drag @@ -880,7 +1067,7 @@ void MyTreeCtrl::OnEndDrag(wxTreeEvent& event) if ( itemDst.IsOk() && !ItemHasChildren(itemDst) ) { // copy to the parent then - itemDst = GetParent(itemDst); + itemDst = GetItemParent(itemDst); } if ( !itemDst.IsOk() ) @@ -926,7 +1113,7 @@ void MyTreeCtrl::OnEndLabelEdit(wxTreeEvent& event) // don't allow anything except letters in the labels if ( !event.GetLabel().IsWord() ) { - wxMessageBox(wxT("The label should contain only letters.")); + wxMessageBox(wxT("The new label should be a single word.")); event.Veto(); } @@ -965,10 +1152,35 @@ void MyTreeCtrl::OnItemRightClick(wxTreeEvent& event) ShowMenu(event.GetItem(), event.GetPoint()); } -void MyTreeCtrl::OnRMouseUp(wxMouseEvent& event) +void MyTreeCtrl::OnContextMenu(wxContextMenuEvent& event) { wxPoint pt = event.GetPosition(); - ShowMenu(HitTest(pt), pt); + wxTreeItemId item = GetSelection(); + wxLogMessage(wxT("OnContextMenu at screen coords (%i, %i)"), pt.x, pt.y); + + //check if event was generated by keyboard (MSW-specific?) + if (pt.x==-1 && pt.y==-1) //(this is how MSW indicates it) + { + //attempt to guess where to show the menu + if (item.IsOk()) + { + //if an item was clicked, show menu to the right of it + wxRect rect; + GetBoundingRect(item, rect, true); //true = only the label + pt = wxPoint(rect.GetRight(), rect.GetTop()); + } + else + { + pt = wxPoint(0, 0); + } + } + else + { + //event was generated by mouse, use supplied coords + pt = ScreenToClient(pt); + } + + ShowMenu(item, pt); } void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt) @@ -976,17 +1188,17 @@ void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt) wxString title; if ( id.IsOk() ) { - title << _T("Menu for ") << GetItemText(id); + title << wxT("Menu for ") << GetItemText(id); } else { - title = _T("Menu for no particular item"); + title = wxT("Menu for no particular item"); } #if wxUSE_MENUS wxMenu menu(title); - menu.Append(TreeTest_About, _T("&About...")); - menu.Append(TreeTest_Dump, _T("&Dump")); + menu.Append(TreeTest_About, wxT("&About...")); + menu.Append(TreeTest_Dump, wxT("&Dump")); PopupMenu(&menu, pt); #endif // wxUSE_MENUS @@ -1019,5 +1231,5 @@ void MyTreeItemData::ShowInfo(wxTreeCtrl *tree) Bool2String(tree->IsExpanded(GetId())), Bool2String(tree->IsBold(GetId())), tree->GetChildrenCount(GetId()), - tree->GetChildrenCount(GetId(), FALSE)); + tree->GetChildrenCount(GetId(), false)); }