X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98f297837a2f2ba63ec7d1c8c8fbf9cae490744a..3a9f64b77ec4992f5a0bc430050f9154ff4cc032:/samples/menu/menu.cpp diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index 3a87b4dc18..fcc754ac74 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 @@ -378,15 +378,69 @@ MyFrame::MyFrame() // create the menubar wxMenu *fileMenu = new wxMenu; + wxMenu *stockSubMenu = new wxMenu; + 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 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 +468,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 +492,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,7 +536,7 @@ 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); @@ -494,6 +550,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 +604,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 ")); @@ -679,7 +740,7 @@ void MyFrame::OnFindMenu(wxCommandEvent& WXUNUSED(event)) ( _T("Enter label to search for: "), _T("Find menu"), - _T(""), + wxEmptyString, this ); @@ -747,7 +808,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)) @@ -898,7 +959,7 @@ void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event)) ( _T("Enter label to search for: "), _T("Find menu item"), - _T(""), + wxEmptyString, this ); @@ -926,7 +987,7 @@ void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event)) void MyFrame::ShowContextMenu(const wxPoint& pos) { - wxMenu menu(_T("Test popup")); + wxMenu menu; menu.Append(Menu_Help_About, _T("&About")); menu.Append(Menu_Popup_Submenu, _T("&Submenu"), CreateDummyMenu(NULL)); @@ -990,7 +1051,6 @@ void MyFrame::OnUpdateSubMenuNormal(wxUpdateUIEvent& event) void MyFrame::OnUpdateSubMenuCheck(wxUpdateUIEvent& event) { event.Enable(true); - event.Check(true); } void MyFrame::OnUpdateSubMenuRadio(wxUpdateUIEvent& event)