X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ef022bdffb620a8887eb5d162de4e2d816d72e0..25a1459592a6770de301d320b1c9091e9b1077e4:/samples/menu/menu.cpp diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index 7aab9c528d..942d2df319 100644 --- a/samples/menu/menu.cpp +++ b/samples/menu/menu.cpp @@ -18,19 +18,20 @@ // ---------------------------------------------------------------------------- // For compilers that support precompilation, includes "wx/wx.h". -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP - #include - #include - #include - #include - #include - #include + #include "wx/app.h" + #include "wx/frame.h" + #include "wx/menu.h" + #include "wx/msgdlg.h" + #include "wx/log.h" + #include "wx/textctrl.h" + #include "wx/textdlg.h" #endif #if !wxUSE_MENUS @@ -40,13 +41,6 @@ #include "copy.xpm" -#ifdef __WXUNIVERSAL__ - #include "wx/univ/theme.h" - - WX_USE_THEME(win32); - WX_USE_THEME(gtk); -#endif // __WXUNIVERSAL__ - // ---------------------------------------------------------------------------- // classes // ---------------------------------------------------------------------------- @@ -94,13 +88,27 @@ protected: void OnGetLabelMenu(wxCommandEvent& event); void OnSetLabelMenu(wxCommandEvent& event); - void OnRightUp(wxMouseEvent& event); +#ifdef __WXMSW__ + void OnContextMenu(wxContextMenuEvent& event) + { ShowContextMenu(ScreenToClient(event.GetPosition())); } +#else + void OnRightUp(wxMouseEvent& event) + { ShowContextMenu(event.GetPosition()); } +#endif + + void OnMenuOpen(wxMenuEvent& event) + { LogMenuOpenOrClose(event, _T("opened")); } + void OnMenuClose(wxMenuEvent& event) + { LogMenuOpenOrClose(event, _T("closed")); } void OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event); void OnSize(wxSizeEvent& event); private: + void LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what); + void ShowContextMenu(const wxPoint& pos); + wxMenu *CreateDummyMenu(wxString *title); wxMenuItem *GetLastMenuItem() const; @@ -214,7 +222,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_UPDATE_UI(Menu_Menu_Check, MyFrame::OnUpdateCheckMenuItemUI) +#ifdef __WXMSW__ + EVT_CONTEXT_MENU(MyFrame::OnContextMenu) +#else EVT_RIGHT_UP(MyFrame::OnRightUp) +#endif + + EVT_MENU_OPEN(MyFrame::OnMenuOpen) + EVT_MENU_CLOSE(MyFrame::OnMenuClose) EVT_SIZE(MyFrame::OnSize) END_EVENT_TABLE() @@ -258,8 +273,9 @@ bool MyApp::OnInit() // Define my frame constructor MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1, "wxWindows menu sample", - wxDefaultPosition, wxSize(300, 200)) + wxDefaultPosition, wxSize(400, 250)) { + m_textctrl = NULL; m_menu = NULL; m_countDummy = 0; m_logOld = NULL; @@ -346,12 +362,14 @@ MyFrame::MyFrame() wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE); m_textctrl->SetEditable(FALSE); + + wxLog::SetTimestamp(NULL); m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_textctrl)); - wxLogMessage(_T("Brief explanations: the commands or the \"Menu\" menu\n") + wxLogMessage(_T("Brief explanations: the commands or the \"Menu\" menu ") _T("append/insert/delete items to/from the last menu.\n") - _T("The commands from \"Menubar\" menu work with the\n") - _T("menubar itself.\n") + _T("The commands from \"Menubar\" menu work with the ") + _T("menubar itself.\n\n") _T("Right click the band below to test popup menus.\n")); } @@ -375,7 +393,7 @@ wxMenu *MyFrame::CreateDummyMenu(wxString *title) if ( title ) { - title->Printf("Dummy menu &%d", ++m_countDummy); + title->Printf(wxT("Dummy menu &%d"), ++m_countDummy); } return menu; @@ -389,7 +407,7 @@ wxMenuItem *MyFrame::GetLastMenuItem() const wxMenuItemList::Node *node = menu->GetMenuItems().GetLast(); if ( !node ) { - wxLogWarning("No last item in the last menu!"); + wxLogWarning(wxT("No last item in the last menu!")); return NULL; } @@ -405,10 +423,10 @@ void MyFrame::LogMenuEvent(const wxCommandEvent& event) if ( !GetMenuBar()->FindItem(id) ) return; - wxString msg = wxString::Format("Menu command %d", id); + wxString msg = wxString::Format(wxT("Menu command %d"), id); if ( GetMenuBar()->FindItem(id)->IsCheckable() ) { - msg += wxString::Format(" (the item is currently %schecked)", + msg += wxString::Format(wxT(" (the item is currently %schecked)"), event.IsChecked() ? "" : "not "); } @@ -431,14 +449,9 @@ void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { -#ifdef __WXUNIVERSAL__ - // wxMessageBox not implemented yet - wxLogMessage("wxWindows menu sample\n© 1999-2001 Vadim Zeitlin"); -#else (void)wxMessageBox("wxWindows menu sample\n© 1999-2001 Vadim Zeitlin", "About wxWindows menu sample", wxICON_INFORMATION); -#endif } void MyFrame::OnDeleteMenu(wxCommandEvent& WXUNUSED(event)) @@ -449,7 +462,7 @@ void MyFrame::OnDeleteMenu(wxCommandEvent& WXUNUSED(event)) if ( count == 2 ) { // don't let delete the first 2 menus - wxLogError("Can't delete any more menus"); + wxLogError(wxT("Can't delete any more menus")); } else { @@ -500,7 +513,9 @@ void MyFrame::OnGetLabelMenu(wxCommandEvent& WXUNUSED(event)) wxMenuBar *mbar = GetMenuBar(); size_t count = mbar->GetMenuCount(); - wxLogMessage("The label of the last menu item is '%s'", + wxCHECK_RET( count, _T("no last menu?") ); + + wxLogMessage(wxT("The label of the last menu item is '%s'"), mbar->GetLabelTop(count - 1).c_str()); } @@ -509,12 +524,25 @@ void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event)) wxMenuBar *mbar = GetMenuBar(); size_t count = mbar->GetMenuCount(); - mbar->SetLabelTop(count - 1, "Dummy label &0"); + wxCHECK_RET( count, _T("no last menu?") ); + + wxString label = wxGetTextFromUser + ( + _T("Enter new label: "), + _T("Change last menu text"), + mbar->GetLabelTop(count - 1), + this + ); + + if ( !label.empty() ) + { + mbar->SetLabelTop(count - 1, label); + } } void MyFrame::OnDummy(wxCommandEvent& event) { - wxLogMessage("Dummy item #%d", event.GetId() - Menu_Dummy_First + 1); + wxLogMessage(wxT("Dummy item #%d"), event.GetId() - Menu_Dummy_First + 1); } void MyFrame::OnAppendMenuItem(wxCommandEvent& WXUNUSED(event)) @@ -545,7 +573,7 @@ void MyFrame::OnDeleteMenuItem(wxCommandEvent& WXUNUSED(event)) size_t count = menu->GetMenuItemCount(); if ( !count ) { - wxLogWarning("No items to delete!"); + wxLogWarning(wxT("No items to delete!")); } else { @@ -595,7 +623,7 @@ void MyFrame::OnGetLabelMenuItem(wxCommandEvent& WXUNUSED(event)) if ( item ) { - wxLogMessage("The label of the last menu item is '%s'", + wxLogMessage(wxT("The label of the last menu item is '%s'"), item->GetLabel().c_str()); } } @@ -606,7 +634,18 @@ void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event)) if ( item ) { - item->SetText("Dummy menu item text"); + wxString label = wxGetTextFromUser + ( + _T("Enter new label: "), + _T("Change last menu item text"), + item->GetLabel(), + this + ); + + if ( !label.empty() ) + { + item->SetText(label); + } } } @@ -685,7 +724,7 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event)) } } -void MyFrame::OnRightUp(wxMouseEvent &event) +void MyFrame::ShowContextMenu(const wxPoint& pos) { wxMenu menu("Test popup"); @@ -701,7 +740,7 @@ void MyFrame::OnRightUp(wxMouseEvent &event) menu.Check(Menu_Popup_ToBeChecked, TRUE); menu.Enable(Menu_Popup_ToBeGreyed, FALSE); - PopupMenu(&menu, event.GetX(), event.GetY()); + PopupMenu(&menu, pos.x, pos.y); // test for destroying items in popup menus #if 0 // doesn't work in wxGTK! @@ -711,8 +750,17 @@ void MyFrame::OnRightUp(wxMouseEvent &event) #endif // 0 } +void MyFrame::LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what) +{ + wxLogStatus(this, _T("A %smenu has been %s."), + event.IsPopup() ? _T("popup ") : _T(""), what); +} + void MyFrame::OnSize(wxSizeEvent& event) { + if ( !m_textctrl ) + return; + // leave a band below for popup menu testing wxSize size = GetClientSize(); m_textctrl->SetSize(0, 0, size.x, (3*size.y)/4);