X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab73fe8d1dc54cb83e3a18868db770c96760fbb6..b2b0bee6d822b05fea419e8bf24ab4009cb17ac4:/samples/menu/menu.cpp diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index 6d19fa4af4..10e6268e48 100644 --- a/samples/menu/menu.cpp +++ b/samples/menu/menu.cpp @@ -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; @@ -379,56 +386,56 @@ MyFrame::MyFrame() wxMenu *fileMenu = new wxMenu; wxMenu *stockSubMenu = new wxMenu; - stockSubMenu->Append(wxID_ADD, "wxID_ADD"); - stockSubMenu->Append(wxID_APPLY, "wxID_APPLY"); - stockSubMenu->Append(wxID_BOLD, "wxID_BOLD"); - stockSubMenu->Append(wxID_CANCEL, "wxID_CANCEL"); - stockSubMenu->Append(wxID_CLEAR, "wxID_CLEAR"); - stockSubMenu->Append(wxID_CLOSE, "wxID_CLOSE"); - stockSubMenu->Append(wxID_COPY, "wxID_COPY"); - stockSubMenu->Append(wxID_CUT, "wxID_CUT"); - stockSubMenu->Append(wxID_DELETE, "wxID_DELETE"); - stockSubMenu->Append(wxID_FIND, "wxID_FIND"); - stockSubMenu->Append(wxID_REPLACE, "wxID_REPLACE"); - stockSubMenu->Append(wxID_BACKWARD, "wxID_BACKWARD"); - stockSubMenu->Append(wxID_DOWN, "wxID_DOWN"); - stockSubMenu->Append(wxID_FORWARD, "wxID_FORWARD"); - stockSubMenu->Append(wxID_UP, "wxID_UP"); - stockSubMenu->Append(wxID_HELP, "wxID_HELP"); - stockSubMenu->Append(wxID_HOME, "wxID_HOME"); - stockSubMenu->Append(wxID_INDENT, "wxID_INDENT"); - stockSubMenu->Append(wxID_INDEX, "wxID_INDEX"); - stockSubMenu->Append(wxID_ITALIC, "wxID_ITALIC"); - stockSubMenu->Append(wxID_JUSTIFY_CENTER, "wxID_JUSTIFY_CENTER"); - stockSubMenu->Append(wxID_JUSTIFY_FILL, "wxID_JUSTIFY_FILL"); - stockSubMenu->Append(wxID_JUSTIFY_LEFT, "wxID_JUSTIFY_LEFT"); - stockSubMenu->Append(wxID_JUSTIFY_RIGHT, "wxID_JUSTIFY_RIGHT"); - stockSubMenu->Append(wxID_NEW, "wxID_NEW"); - stockSubMenu->Append(wxID_NO, "wxID_NO"); - stockSubMenu->Append(wxID_OK, "wxID_OK"); - stockSubMenu->Append(wxID_OPEN, "wxID_OPEN"); - stockSubMenu->Append(wxID_PASTE, "wxID_PASTE"); - stockSubMenu->Append(wxID_PREFERENCES, "wxID_PREFERENCES"); - stockSubMenu->Append(wxID_PRINT, "wxID_PRINT"); - stockSubMenu->Append(wxID_PREVIEW, "wxID_PREVIEW"); - stockSubMenu->Append(wxID_PROPERTIES, "wxID_PROPERTIES"); - stockSubMenu->Append(wxID_EXIT, "wxID_EXIT"); - stockSubMenu->Append(wxID_REDO, "wxID_REDO"); - stockSubMenu->Append(wxID_REFRESH, "wxID_REFRESH"); - stockSubMenu->Append(wxID_REMOVE, "wxID_REMOVE"); - stockSubMenu->Append(wxID_REVERT_TO_SAVED, "wxID_REVERT_TO_SAVED"); - stockSubMenu->Append(wxID_SAVE, "wxID_SAVE"); - stockSubMenu->Append(wxID_SAVEAS, "wxID_SAVEAS"); - stockSubMenu->Append(wxID_STOP, "wxID_STOP"); - stockSubMenu->Append(wxID_UNDELETE, "wxID_UNDELETE"); - stockSubMenu->Append(wxID_UNDERLINE, "wxID_UNDERLINE"); - stockSubMenu->Append(wxID_UNDO, "wxID_UNDO"); - stockSubMenu->Append(wxID_UNINDENT, "wxID_UNINDENT"); - stockSubMenu->Append(wxID_YES, "wxID_YES"); - stockSubMenu->Append(wxID_ZOOM_100, "wxID_ZOOM_100"); - stockSubMenu->Append(wxID_ZOOM_FIT, "wxID_ZOOM_FIT"); - stockSubMenu->Append(wxID_ZOOM_IN, "wxID_ZOOM_IN"); - stockSubMenu->Append(wxID_ZOOM_OUT, "wxID_ZOOM_OUT"); + stockSubMenu->Append(wxID_ADD); + stockSubMenu->Append(wxID_APPLY); + stockSubMenu->Append(wxID_BOLD); + stockSubMenu->Append(wxID_CANCEL); + stockSubMenu->Append(wxID_CLEAR); + stockSubMenu->Append(wxID_CLOSE); + stockSubMenu->Append(wxID_COPY); + stockSubMenu->Append(wxID_CUT); + stockSubMenu->Append(wxID_DELETE); + stockSubMenu->Append(wxID_FIND); + stockSubMenu->Append(wxID_REPLACE); + stockSubMenu->Append(wxID_BACKWARD); + stockSubMenu->Append(wxID_DOWN); + stockSubMenu->Append(wxID_FORWARD); + stockSubMenu->Append(wxID_UP); + stockSubMenu->Append(wxID_HELP); + stockSubMenu->Append(wxID_HOME); + stockSubMenu->Append(wxID_INDENT); + stockSubMenu->Append(wxID_INDEX); + stockSubMenu->Append(wxID_ITALIC); + stockSubMenu->Append(wxID_JUSTIFY_CENTER); + stockSubMenu->Append(wxID_JUSTIFY_FILL); + stockSubMenu->Append(wxID_JUSTIFY_LEFT); + stockSubMenu->Append(wxID_JUSTIFY_RIGHT); + 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_PRINT); + stockSubMenu->Append(wxID_PREVIEW); + stockSubMenu->Append(wxID_PROPERTIES); + stockSubMenu->Append(wxID_EXIT); + stockSubMenu->Append(wxID_REDO); + stockSubMenu->Append(wxID_REFRESH); + stockSubMenu->Append(wxID_REMOVE); + stockSubMenu->Append(wxID_REVERT_TO_SAVED); + stockSubMenu->Append(wxID_SAVE); + stockSubMenu->Append(wxID_SAVEAS); + stockSubMenu->Append(wxID_STOP); + stockSubMenu->Append(wxID_UNDELETE); + stockSubMenu->Append(wxID_UNDERLINE); + stockSubMenu->Append(wxID_UNDO); + stockSubMenu->Append(wxID_UNINDENT); + 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 @@ -541,7 +548,7 @@ MyFrame::MyFrame() 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 ") @@ -629,11 +636,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)) { @@ -704,7 +721,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 @@ -719,13 +736,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); } } @@ -843,8 +860,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()); } } @@ -859,14 +877,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); } } } @@ -989,27 +1007,50 @@ void MyFrame::ShowContextMenu(const wxPoint& pos) { wxMenu menu; - 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.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))