X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52af3158e974b042008474268570f3bdb7ce95ee..48889bca6f8b2504f78c0f47b32f5e95c64d915d:/samples/menu/menu.cpp diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index a9f4b67837..f4820fb1d1 100644 --- a/samples/menu/menu.cpp +++ b/samples/menu/menu.cpp @@ -59,6 +59,10 @@ #include "copy.xpm" #endif +#ifndef __WXMSW__ + #include "../sample.xpm" +#endif + // ---------------------------------------------------------------------------- // classes // ---------------------------------------------------------------------------- @@ -256,6 +260,8 @@ enum Menu_Popup_ToBeChecked, Menu_Popup_Submenu, + Menu_PopupChoice, + Menu_Max }; @@ -369,6 +375,8 @@ bool MyApp::OnInit() MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY, _T("wxWidgets menu sample")) { + SetIcon(wxICON(sample)); + #if USE_LOG_WINDOW m_textctrl = NULL; #endif @@ -386,49 +394,67 @@ MyFrame::MyFrame() 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_FIND); - stockSubMenu->Append(wxID_REPLACE); - stockSubMenu->Append(wxID_BACKWARD); 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_UP); + 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_PRINT); stockSubMenu->Append(wxID_PREVIEW); + stockSubMenu->Append(wxID_PRINT); stockSubMenu->Append(wxID_PROPERTIES); - stockSubMenu->Append(wxID_EXIT); 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); @@ -654,7 +680,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { (void)wxMessageBox(_T("wxWidgets menu sample\n(c) 1999-2001 Vadim Zeitlin"), _T("About wxWidgets menu sample"), - wxICON_INFORMATION); + wxOK | wxICON_INFORMATION); } void MyFrame::OnDeleteMenu(wxCommandEvent& WXUNUSED(event)) @@ -858,8 +884,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()); } } @@ -1004,27 +1031,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))