X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98f297837a2f2ba63ec7d1c8c8fbf9cae490744a..05e0b047d879cdbfade7f2ab346c0acdf3e29f96:/samples/menu/menu.cpp?ds=sidebyside diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index 3a87b4dc18..fd01886676 100644 --- a/samples/menu/menu.cpp +++ b/samples/menu/menu.cpp @@ -41,7 +41,7 @@ // not all ports have support for EVT_CONTEXT_MENU yet, don't define // USE_CONTEXT_MENU for those which don't -#if defined(__WXMOTIF__) || defined(__WXPM__) +#if defined(__WXMOTIF__) || defined(__WXPM__) || defined(__WXX11__) || defined(__WXMGL__) #define USE_CONTEXT_MENU 0 #else #define USE_CONTEXT_MENU 1 @@ -55,7 +55,7 @@ #define USE_LOG_WINDOW 0 #endif -#if wxUSE_OWNER_DRAWN +#if wxUSE_OWNER_DRAWN || defined(__WXGTK__) #include "copy.xpm" #endif @@ -84,7 +84,8 @@ protected: void OnQuit(wxCommandEvent& event); #if USE_LOG_WINDOW void OnClearLog(wxCommandEvent& event); -#endif + void OnClearLogUpdateUI(wxUpdateUIEvent& event); +#endif // USE_LOG_WINDOW void OnAbout(wxCommandEvent& event); @@ -200,7 +201,7 @@ enum { Menu_File_Quit = wxID_EXIT, #if USE_LOG_WINDOW - Menu_File_ClearLog, + Menu_File_ClearLog = 100, #endif Menu_MenuBar_Toggle = 200, @@ -255,6 +256,8 @@ enum Menu_Popup_ToBeChecked, Menu_Popup_Submenu, + Menu_PopupChoice, + Menu_Max }; @@ -266,6 +269,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Menu_File_Quit, MyFrame::OnQuit) #if USE_LOG_WINDOW EVT_MENU(Menu_File_ClearLog, MyFrame::OnClearLog) + EVT_UPDATE_UI(Menu_File_ClearLog, MyFrame::OnClearLogUpdateUI) #endif EVT_MENU(Menu_Help_About, MyFrame::OnAbout) @@ -342,6 +346,9 @@ IMPLEMENT_APP(MyApp) // main frame bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // Create the main frame window MyFrame* frame = new MyFrame; @@ -378,15 +385,87 @@ MyFrame::MyFrame() // create the menubar wxMenu *fileMenu = new wxMenu; + wxMenu *stockSubMenu = new wxMenu; + stockSubMenu->Append(wxID_ADD); + stockSubMenu->Append(wxID_APPLY); + stockSubMenu->Append(wxID_BACKWARD); + stockSubMenu->Append(wxID_BOLD); + stockSubMenu->Append(wxID_BOTTOM); + stockSubMenu->Append(wxID_CANCEL); + stockSubMenu->Append(wxID_CDROM); + stockSubMenu->Append(wxID_CLEAR); + stockSubMenu->Append(wxID_CLOSE); + stockSubMenu->Append(wxID_CONVERT); + stockSubMenu->Append(wxID_COPY); + stockSubMenu->Append(wxID_CUT); + stockSubMenu->Append(wxID_DELETE); + stockSubMenu->Append(wxID_DOWN); + stockSubMenu->Append(wxID_EXECUTE); + stockSubMenu->Append(wxID_EXIT); + stockSubMenu->Append(wxID_FIND); + stockSubMenu->Append(wxID_FIRST); + stockSubMenu->Append(wxID_FLOPPY); + stockSubMenu->Append(wxID_FORWARD); + stockSubMenu->Append(wxID_HARDDISK); + stockSubMenu->Append(wxID_HELP); + stockSubMenu->Append(wxID_HOME); + stockSubMenu->Append(wxID_INDENT); + stockSubMenu->Append(wxID_INDEX); + stockSubMenu->Append(wxID_INFO); + stockSubMenu->Append(wxID_ITALIC); + stockSubMenu->Append(wxID_JUMP_TO); + stockSubMenu->Append(wxID_JUSTIFY_CENTER); + stockSubMenu->Append(wxID_JUSTIFY_FILL); + stockSubMenu->Append(wxID_JUSTIFY_LEFT); + stockSubMenu->Append(wxID_JUSTIFY_RIGHT); + stockSubMenu->Append(wxID_LAST); + stockSubMenu->Append(wxID_NETWORK); + stockSubMenu->Append(wxID_NEW); + stockSubMenu->Append(wxID_NO); + stockSubMenu->Append(wxID_OK); + stockSubMenu->Append(wxID_OPEN); + stockSubMenu->Append(wxID_PASTE); + stockSubMenu->Append(wxID_PREFERENCES); + stockSubMenu->Append(wxID_PREVIEW); + stockSubMenu->Append(wxID_PRINT); + stockSubMenu->Append(wxID_PROPERTIES); + stockSubMenu->Append(wxID_REDO); + stockSubMenu->Append(wxID_REFRESH); + stockSubMenu->Append(wxID_REMOVE); + stockSubMenu->Append(wxID_REPLACE); + stockSubMenu->Append(wxID_REVERT_TO_SAVED); + stockSubMenu->Append(wxID_SAVE); + stockSubMenu->Append(wxID_SAVEAS); + stockSubMenu->Append(wxID_SELECT_COLOR); + stockSubMenu->Append(wxID_SELECT_FONT); + stockSubMenu->Append(wxID_SORT_ASCENDING); + stockSubMenu->Append(wxID_SORT_DESCENDING); + stockSubMenu->Append(wxID_SPELL_CHECK); + stockSubMenu->Append(wxID_STOP); + stockSubMenu->Append(wxID_STRIKETHROUGH); + stockSubMenu->Append(wxID_TOP); + stockSubMenu->Append(wxID_UNDELETE); + stockSubMenu->Append(wxID_UNDERLINE); + stockSubMenu->Append(wxID_UNDO); + stockSubMenu->Append(wxID_UNINDENT); + stockSubMenu->Append(wxID_UP); + stockSubMenu->Append(wxID_YES); + stockSubMenu->Append(wxID_ZOOM_100); + stockSubMenu->Append(wxID_ZOOM_FIT); + stockSubMenu->Append(wxID_ZOOM_IN); + stockSubMenu->Append(wxID_ZOOM_OUT); + fileMenu->AppendSubMenu(stockSubMenu, _T("&Standard items demo")); + #if USE_LOG_WINDOW wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog, _T("Clear &log\tCtrl-L")); -#if wxUSE_OWNER_DRAWN +#if wxUSE_OWNER_DRAWN || defined(__WXGTK__) item->SetBitmap(copy_xpm); #endif fileMenu->Append(item); fileMenu->AppendSeparator(); -#endif +#endif // USE_LOG_WINDOW + fileMenu->Append(Menu_File_Quit, _T("E&xit\tAlt-X"), _T("Quit menu sample")); wxMenu *menubarMenu = new wxMenu; @@ -414,7 +493,7 @@ MyFrame::MyFrame() wxMenu* subMenu = new wxMenu; subMenu->Append(Menu_SubMenu_Normal, _T("&Normal submenu item"), _T("Disabled submenu item")); - subMenu->AppendCheckItem(Menu_SubMenu_Check, _T("&Unchecked submenu item"), _T("Unchecked submenu item")); + subMenu->AppendCheckItem(Menu_SubMenu_Check, _T("&Check submenu item"), _T("Check submenu item")); subMenu->AppendRadioItem(Menu_SubMenu_Radio1, _T("Radio item &1"), _T("Radio item")); subMenu->AppendRadioItem(Menu_SubMenu_Radio2, _T("Radio item &2"), _T("Radio item")); subMenu->AppendRadioItem(Menu_SubMenu_Radio3, _T("Radio item &3"), _T("Radio item")); @@ -438,8 +517,10 @@ MyFrame::MyFrame() menuMenu->AppendSeparator(); menuMenu->Append(Menu_Menu_GetInfo, _T("Get menu item in&fo\tAlt-F"), _T("Show the state of the last menu item")); +#if wxUSE_TEXTDLG menuMenu->Append(Menu_Menu_SetLabel, _T("Set menu item label\tAlt-L"), _T("Set the label of a menu item")); +#endif #if wxUSE_TEXTDLG menuMenu->AppendSeparator(); menuMenu->Append(Menu_Menu_FindItem, _T("Find menu item from label"), @@ -480,12 +561,12 @@ MyFrame::MyFrame() #if USE_LOG_WINDOW // create the log text window - m_textctrl = new wxTextCtrl(this, wxID_ANY, _T(""), + m_textctrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE); m_textctrl->SetEditable(false); - wxLog::SetTimestamp(NULL); + wxLog::DisableTimestamp(); m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_textctrl)); wxLogMessage(_T("Brief explanations: the commands or the \"Menu\" menu ") @@ -494,6 +575,9 @@ MyFrame::MyFrame() _T("menubar itself.\n\n") _T("Right click the band below to test popup menus.\n")); #endif +#ifdef __POCKETPC__ + EnableContextMenu(); +#endif } MyFrame::~MyFrame() @@ -545,11 +629,13 @@ wxMenuItem *MyFrame::GetLastMenuItem() const void MyFrame::LogMenuEvent(const wxCommandEvent& event) { int id = event.GetId(); - if ( !GetMenuBar()->FindItem(id) ) - return; wxString msg = wxString::Format(_T("Menu command %d"), id); - if ( GetMenuBar()->FindItem(id)->IsCheckable() ) + + // catch all checkable menubar items and also the check item from the popup + // menu + wxMenuItem *item = GetMenuBar()->FindItem(id); + if ( (item && item->IsCheckable()) || id == Menu_Popup_ToBeChecked ) { msg += wxString::Format(_T(" (the item is currently %schecked)"), event.IsChecked() ? _T("") : _T("not ")); @@ -568,11 +654,21 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) } #if USE_LOG_WINDOW + void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event)) { m_textctrl->Clear(); } -#endif + +void MyFrame::OnClearLogUpdateUI(wxUpdateUIEvent& event) +{ + // if we only enable this item when the log window is empty, we never see + // it in the disable state as a message is logged whenever the menu is + // opened, so we disable it if there is not "much" text in the window + event.Enable( m_textctrl->GetNumberOfLines() > 5 ); +} + +#endif // USE_LOG_WINDOW void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { @@ -643,7 +739,7 @@ void MyFrame::OnGetLabelMenu(wxCommandEvent& WXUNUSED(event)) wxCHECK_RET( count, _T("no last menu?") ); wxLogMessage(_T("The label of the last menu item is '%s'"), - mbar->GetLabelTop(count - 1).c_str()); + mbar->GetMenuLabel(count - 1).c_str()); } #if wxUSE_TEXTDLG @@ -658,13 +754,13 @@ void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event)) ( _T("Enter new label: "), _T("Change last menu text"), - mbar->GetLabelTop(count - 1), + mbar->GetMenuLabel(count - 1), this ); if ( !label.empty() ) { - mbar->SetLabelTop(count - 1, label); + mbar->SetMenuLabel(count - 1, label); } } @@ -679,7 +775,7 @@ void MyFrame::OnFindMenu(wxCommandEvent& WXUNUSED(event)) ( _T("Enter label to search for: "), _T("Find menu"), - _T(""), + wxEmptyString, this ); @@ -747,7 +843,7 @@ void MyFrame::OnInsertMenuItem(wxCommandEvent& WXUNUSED(event)) menu->Insert(0, wxMenuItem::New(menu, Menu_Dummy_Fourth, _T("Fourth dummy item\tCtrl-F4"))); - menu->Insert(1, wxMenuItem::New(menu, wxID_SEPARATOR, _T(""))); + menu->Insert(1, wxMenuItem::New(menu, wxID_SEPARATOR)); } void MyFrame::OnEnableMenuItem(wxCommandEvent& WXUNUSED(event)) @@ -782,8 +878,9 @@ void MyFrame::OnGetLabelMenuItem(wxCommandEvent& WXUNUSED(event)) if ( item ) { + wxString label = item->GetItemLabel(); wxLogMessage(_T("The label of the last menu item is '%s'"), - item->GetLabel().c_str()); + label.c_str()); } } @@ -798,14 +895,14 @@ void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event)) ( _T("Enter new label: "), _T("Change last menu item text"), - item->GetLabel(), + item->GetItemLabel(), this ); label.Replace( _T("\\t"), _T("\t") ); if ( !label.empty() ) { - item->SetText(label); + item->SetItemLabel(label); } } } @@ -898,7 +995,7 @@ void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event)) ( _T("Enter label to search for: "), _T("Find menu item"), - _T(""), + wxEmptyString, this ); @@ -926,29 +1023,52 @@ void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event)) void MyFrame::ShowContextMenu(const wxPoint& pos) { - wxMenu menu(_T("Test popup")); - - menu.Append(Menu_Help_About, _T("&About")); - menu.Append(Menu_Popup_Submenu, _T("&Submenu"), CreateDummyMenu(NULL)); - menu.Append(Menu_Popup_ToBeDeleted, _T("To be &deleted")); - menu.AppendCheckItem(Menu_Popup_ToBeChecked, _T("To be &checked")); - menu.Append(Menu_Popup_ToBeGreyed, _T("To be &greyed"), - _T("This menu item should be initially greyed out")); - menu.AppendSeparator(); - menu.Append(Menu_File_Quit, _T("E&xit")); - - menu.Delete(Menu_Popup_ToBeDeleted); - menu.Check(Menu_Popup_ToBeChecked, true); - menu.Enable(Menu_Popup_ToBeGreyed, false); + wxMenu menu; - PopupMenu(&menu, pos.x, pos.y); - - // test for destroying items in popup menus + if ( wxGetKeyState(WXK_SHIFT) ) + { + // when Shift is pressed, demonstrate the use of a simple function + // returning the id of the item selected in the popup menu + menu.SetTitle("Choose one of:"); + static const char *choices[] = { "Apple", "Banana", "Cherry" }; + for ( size_t n = 0; n < WXSIZEOF(choices); n++ ) + menu.Append(Menu_PopupChoice + n, choices[n]); + + const int rc = GetPopupMenuSelectionFromUser(menu, pos); + if ( rc == wxID_NONE ) + { + wxLogMessage("No selection"); + } + else + { + wxLogMessage("You have selected \"%s\"", + choices[rc - Menu_PopupChoice]); + } + } + else // normal case, shift not pressed + { + menu.Append(Menu_Help_About, _T("&About")); + menu.Append(Menu_Popup_Submenu, _T("&Submenu"), CreateDummyMenu(NULL)); + menu.Append(Menu_Popup_ToBeDeleted, _T("To be &deleted")); + menu.AppendCheckItem(Menu_Popup_ToBeChecked, _T("To be &checked")); + menu.Append(Menu_Popup_ToBeGreyed, _T("To be &greyed"), + _T("This menu item should be initially greyed out")); + menu.AppendSeparator(); + menu.Append(Menu_File_Quit, _T("E&xit")); + + menu.Delete(Menu_Popup_ToBeDeleted); + menu.Check(Menu_Popup_ToBeChecked, true); + menu.Enable(Menu_Popup_ToBeGreyed, false); + + PopupMenu(&menu, pos); + + // test for destroying items in popup menus #if 0 // doesn't work in wxGTK! - menu.Destroy(Menu_Popup_Submenu); + menu.Destroy(Menu_Popup_Submenu); - PopupMenu( &menu, event.GetX(), event.GetY() ); + PopupMenu( &menu, event.GetX(), event.GetY() ); #endif // 0 + } } void MyFrame::OnTestNormal(wxCommandEvent& WXUNUSED(event)) @@ -990,7 +1110,6 @@ void MyFrame::OnUpdateSubMenuNormal(wxUpdateUIEvent& event) void MyFrame::OnUpdateSubMenuCheck(wxUpdateUIEvent& event) { event.Enable(true); - event.Check(true); } void MyFrame::OnUpdateSubMenuRadio(wxUpdateUIEvent& event)