X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6d90fb9ce285df92a22124bad344f48f1603c95..6511d3078ecd1b1673de4a050a5130de971f77ab:/samples/menu/menu.cpp diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index 456932c45f..2c617aaba9 100644 --- a/samples/menu/menu.cpp +++ b/samples/menu/menu.cpp @@ -39,7 +39,25 @@ #error "menu sample requires wxUSE_MENUS=1" #endif // wxUSE_MENUS +// 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__) + #define USE_CONTEXT_MENU 0 +#else + #define USE_CONTEXT_MENU 1 +#endif + +// this sample is usefull when new port is developed +// and usually new port has majority of flags turned off +#if wxUSE_LOG && wxUSE_TEXTCTRL + #define USE_LOG_WINDOW 1 +#else + #define USE_LOG_WINDOW 0 +#endif + +#if wxUSE_OWNER_DRAWN #include "copy.xpm" +#endif // ---------------------------------------------------------------------------- // classes @@ -64,7 +82,9 @@ public: protected: void OnQuit(wxCommandEvent& event); +#if USE_LOG_WINDOW void OnClearLog(wxCommandEvent& event); +#endif void OnAbout(wxCommandEvent& event); @@ -77,9 +97,13 @@ protected: void OnCheckMenuItem(wxCommandEvent& event); void OnEnableMenuItem(wxCommandEvent& event); void OnGetLabelMenuItem(wxCommandEvent& event); +#if wxUSE_TEXTDLG void OnSetLabelMenuItem(wxCommandEvent& event); +#endif void OnGetMenuItemInfo(wxCommandEvent& event); +#if wxUSE_TEXTDLG void OnFindMenuItem(wxCommandEvent& event); +#endif void OnAppendMenu(wxCommandEvent& event); void OnInsertMenu(wxCommandEvent& event); @@ -88,13 +112,19 @@ protected: void OnEnableMenu(wxCommandEvent& event); void OnGetLabelMenu(wxCommandEvent& event); void OnSetLabelMenu(wxCommandEvent& event); +#if wxUSE_TEXTDLG void OnFindMenu(wxCommandEvent& event); +#endif void OnTestNormal(wxCommandEvent& event); void OnTestCheck(wxCommandEvent& event); void OnTestRadio(wxCommandEvent& event); -#ifdef __WXMSW__ + void OnUpdateSubMenuNormal(wxUpdateUIEvent& event); + void OnUpdateSubMenuCheck(wxUpdateUIEvent& event); + void OnUpdateSubMenuRadio(wxUpdateUIEvent& event); + +#if USE_CONTEXT_MENU void OnContextMenu(wxContextMenuEvent& event) { ShowContextMenu(ScreenToClient(event.GetPosition())); } #else @@ -103,9 +133,17 @@ protected: #endif void OnMenuOpen(wxMenuEvent& event) - { LogMenuOpenOrClose(event, _T("opened")); } + { +#if USE_LOG_WINDOW + LogMenuOpenOrClose(event, _T("opened")); event.Skip(); +#endif + } void OnMenuClose(wxMenuEvent& event) - { LogMenuOpenOrClose(event, _T("closed")); } + { +#if USE_LOG_WINDOW + LogMenuOpenOrClose(event, _T("closed")); event.Skip(); +#endif + } void OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event); @@ -125,8 +163,10 @@ private: // the count of dummy menus already created size_t m_countDummy; +#if USE_LOG_WINDOW // the control used for logging wxTextCtrl *m_textctrl; +#endif // the previous log target wxLog *m_logOld; @@ -159,8 +199,10 @@ private: enum { - Menu_File_Quit = 100, + Menu_File_Quit = wxID_EXIT, +#if USE_LOG_WINDOW Menu_File_ClearLog, +#endif Menu_MenuBar_Toggle = 200, Menu_MenuBar_Append, @@ -168,8 +210,10 @@ enum Menu_MenuBar_Delete, Menu_MenuBar_Enable, Menu_MenuBar_GetLabel, +#if wxUSE_TEXTDLG Menu_MenuBar_SetLabel, Menu_MenuBar_FindMenu, +#endif Menu_Menu_Append = 300, Menu_Menu_AppendSub, @@ -178,9 +222,13 @@ enum Menu_Menu_Enable, Menu_Menu_Check, Menu_Menu_GetLabel, +#if wxUSE_TEXTDLG Menu_Menu_SetLabel, +#endif Menu_Menu_GetInfo, +#if wxUSE_TEXTDLG Menu_Menu_FindItem, +#endif Menu_Test_Normal = 400, Menu_Test_Check, @@ -188,13 +236,20 @@ enum Menu_Test_Radio2, Menu_Test_Radio3, + Menu_SubMenu = 450, + Menu_SubMenu_Normal, + Menu_SubMenu_Check, + Menu_SubMenu_Radio1, + Menu_SubMenu_Radio2, + Menu_SubMenu_Radio3, + Menu_Dummy_First = 500, Menu_Dummy_Second, Menu_Dummy_Third, Menu_Dummy_Fourth, Menu_Dummy_Last, - Menu_Help_About = 1000, + Menu_Help_About = wxID_ABOUT, Menu_Popup_ToBeDeleted = 2000, Menu_Popup_ToBeGreyed, @@ -210,7 +265,9 @@ enum BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Menu_File_Quit, MyFrame::OnQuit) +#if USE_LOG_WINDOW EVT_MENU(Menu_File_ClearLog, MyFrame::OnClearLog) +#endif EVT_MENU(Menu_Help_About, MyFrame::OnAbout) @@ -220,8 +277,10 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Menu_MenuBar_Delete, MyFrame::OnDeleteMenu) EVT_MENU(Menu_MenuBar_Enable, MyFrame::OnEnableMenu) EVT_MENU(Menu_MenuBar_GetLabel, MyFrame::OnGetLabelMenu) +#if wxUSE_TEXTDLG EVT_MENU(Menu_MenuBar_SetLabel, MyFrame::OnSetLabelMenu) EVT_MENU(Menu_MenuBar_FindMenu, MyFrame::OnFindMenu) +#endif EVT_MENU(Menu_Menu_Append, MyFrame::OnAppendMenuItem) EVT_MENU(Menu_Menu_AppendSub, MyFrame::OnAppendSubMenu) @@ -230,9 +289,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Menu_Menu_Enable, MyFrame::OnEnableMenuItem) EVT_MENU(Menu_Menu_Check, MyFrame::OnCheckMenuItem) EVT_MENU(Menu_Menu_GetLabel, MyFrame::OnGetLabelMenuItem) +#if wxUSE_TEXTDLG EVT_MENU(Menu_Menu_SetLabel, MyFrame::OnSetLabelMenuItem) +#endif EVT_MENU(Menu_Menu_GetInfo, MyFrame::OnGetMenuItemInfo) +#if wxUSE_TEXTDLG EVT_MENU(Menu_Menu_FindItem, MyFrame::OnFindMenuItem) +#endif EVT_MENU(Menu_Test_Normal, MyFrame::OnTestNormal) EVT_MENU(Menu_Test_Check, MyFrame::OnTestCheck) @@ -240,11 +303,17 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Menu_Test_Radio2, MyFrame::OnTestRadio) EVT_MENU(Menu_Test_Radio3, MyFrame::OnTestRadio) + EVT_UPDATE_UI(Menu_SubMenu_Normal, MyFrame::OnUpdateSubMenuNormal) + EVT_UPDATE_UI(Menu_SubMenu_Check, MyFrame::OnUpdateSubMenuCheck) + EVT_UPDATE_UI(Menu_SubMenu_Radio1, MyFrame::OnUpdateSubMenuRadio) + EVT_UPDATE_UI(Menu_SubMenu_Radio2, MyFrame::OnUpdateSubMenuRadio) + EVT_UPDATE_UI(Menu_SubMenu_Radio3, MyFrame::OnUpdateSubMenuRadio) + EVT_MENU_RANGE(Menu_Dummy_First, Menu_Dummy_Last, MyFrame::OnDummy) EVT_UPDATE_UI(Menu_Menu_Check, MyFrame::OnUpdateCheckMenuItemUI) -#ifdef __WXMSW__ +#if USE_CONTEXT_MENU EVT_CONTEXT_MENU(MyFrame::OnContextMenu) #else EVT_RIGHT_UP(MyFrame::OnRightUp) @@ -257,7 +326,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler) - EVT_MENU(-1, MyEvtHandler::OnMenuEvent) + EVT_MENU(wxID_ANY, MyEvtHandler::OnMenuEvent) END_EVENT_TABLE() // ============================================================================ @@ -277,15 +346,15 @@ bool MyApp::OnInit() // Create the main frame window MyFrame* frame = new MyFrame; - frame->Show(TRUE); + frame->Show(true); #if wxUSE_STATUSBAR - frame->SetStatusText("Welcome to wxWindows menu sample"); + frame->SetStatusText(_T("Welcome to wxWidgets menu sample")); #endif // wxUSE_STATUSBAR SetTopWindow(frame); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -294,10 +363,11 @@ bool MyApp::OnInit() // Define my frame constructor MyFrame::MyFrame() - : wxFrame((wxFrame *)NULL, -1, "wxWindows menu sample", - wxDefaultPosition, wxSize(400, 250)) + : wxFrame((wxFrame *)NULL, wxID_ANY, _T("wxWidgets menu sample")) { +#if USE_LOG_WINDOW m_textctrl = NULL; +#endif m_menu = NULL; m_countDummy = 0; m_logOld = NULL; @@ -309,85 +379,97 @@ MyFrame::MyFrame() // create the menubar wxMenu *fileMenu = new wxMenu; +#if USE_LOG_WINDOW wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog, - "Clear &log\tCtrl-L"); + _T("Clear &log\tCtrl-L")); +#if wxUSE_OWNER_DRAWN item->SetBitmap(copy_xpm); +#endif fileMenu->Append(item); fileMenu->AppendSeparator(); - fileMenu->Append(Menu_File_Quit, "E&xit\tAlt-X", "Quit menu sample"); +#endif + fileMenu->Append(Menu_File_Quit, _T("E&xit\tAlt-X"), _T("Quit menu sample")); wxMenu *menubarMenu = new wxMenu; - menubarMenu->Append(Menu_MenuBar_Append, "&Append menu\tCtrl-A", - "Append a menu to the menubar"); - menubarMenu->Append(Menu_MenuBar_Insert, "&Insert menu\tCtrl-I", - "Insert a menu into the menubar"); - menubarMenu->Append(Menu_MenuBar_Delete, "&Delete menu\tCtrl-D", - "Delete the last menu from the menubar"); - menubarMenu->Append(Menu_MenuBar_Toggle, "&Toggle menu\tCtrl-T", - "Toggle the first menu in the menubar", TRUE); + menubarMenu->Append(Menu_MenuBar_Append, _T("&Append menu\tCtrl-A"), + _T("Append a menu to the menubar")); + menubarMenu->Append(Menu_MenuBar_Insert, _T("&Insert menu\tCtrl-I"), + _T("Insert a menu into the menubar")); + menubarMenu->Append(Menu_MenuBar_Delete, _T("&Delete menu\tCtrl-D"), + _T("Delete the last menu from the menubar")); + menubarMenu->Append(Menu_MenuBar_Toggle, _T("&Toggle menu\tCtrl-T"), + _T("Toggle the first menu in the menubar"), true); menubarMenu->AppendSeparator(); - menubarMenu->Append(Menu_MenuBar_Enable, "&Enable menu\tCtrl-E", - "Enable or disable the last menu", TRUE); + menubarMenu->Append(Menu_MenuBar_Enable, _T("&Enable menu\tCtrl-E"), + _T("Enable or disable the last menu"), true); menubarMenu->AppendSeparator(); - menubarMenu->Append(Menu_MenuBar_GetLabel, "&Get menu label\tCtrl-G", - "Get the label of the last menu"); - menubarMenu->Append(Menu_MenuBar_SetLabel, "&Set menu label\tCtrl-S", - "Change the label of the last menu"); + menubarMenu->Append(Menu_MenuBar_GetLabel, _T("&Get menu label\tCtrl-G"), + _T("Get the label of the last menu")); +#if wxUSE_TEXTDLG + menubarMenu->Append(Menu_MenuBar_SetLabel, _T("&Set menu label\tCtrl-S"), + _T("Change the label of the last menu")); menubarMenu->AppendSeparator(); - menubarMenu->Append(Menu_MenuBar_FindMenu, "&Find menu from label\tCtrl-F", - "Find a menu by searching for its label"); + menubarMenu->Append(Menu_MenuBar_FindMenu, _T("&Find menu from label\tCtrl-F"), + _T("Find a menu by searching for its label")); +#endif + + 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->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")); + + menubarMenu->Append(Menu_SubMenu, _T("Submenu"), subMenu); wxMenu *menuMenu = new wxMenu; - menuMenu->Append(Menu_Menu_Append, "&Append menu item\tAlt-A", - "Append a menu item to the last menu"); - menuMenu->Append(Menu_Menu_AppendSub, "&Append sub menu\tAlt-S", - "Append a sub menu to the last menu"); - menuMenu->Append(Menu_Menu_Insert, "&Insert menu item\tAlt-I", - "Insert a menu item in head of the last menu"); - menuMenu->Append(Menu_Menu_Delete, "&Delete menu item\tAlt-D", - "Delete the last menu item from the last menu"); - menuMenu->AppendSeparator(); - menuMenu->Append(Menu_Menu_Enable, "&Enable menu item\tAlt-E", - "Enable or disable the last menu item", TRUE); - menuMenu->Append(Menu_Menu_Check, "&Check menu item\tAlt-C", - "Check or uncheck the last menu item", TRUE); + menuMenu->Append(Menu_Menu_Append, _T("&Append menu item\tAlt-A"), + _T("Append a menu item to the last menu")); + menuMenu->Append(Menu_Menu_AppendSub, _T("&Append sub menu\tAlt-S"), + _T("Append a sub menu to the last menu")); + menuMenu->Append(Menu_Menu_Insert, _T("&Insert menu item\tAlt-I"), + _T("Insert a menu item in head of the last menu")); + menuMenu->Append(Menu_Menu_Delete, _T("&Delete menu item\tAlt-D"), + _T("Delete the last menu item from the last menu")); menuMenu->AppendSeparator(); - menuMenu->Append(Menu_Menu_GetLabel, "&Get menu item label\tAlt-G", - "Get the label of the last menu item"); - menuMenu->Append(Menu_Menu_SetLabel, "&Set menu item label\tAlt-S", - "Change the label of the last menu item"); + menuMenu->Append(Menu_Menu_Enable, _T("&Enable menu item\tAlt-E"), + _T("Enable or disable the last menu item"), true); + menuMenu->Append(Menu_Menu_Check, _T("&Check menu item\tAlt-C"), + _T("Check or uncheck the last menu item"), true); menuMenu->AppendSeparator(); - menuMenu->Append(Menu_Menu_GetInfo, "Get menu item in&fo\tAlt-F", - "Show the state of the last menu item"); + 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->AppendSeparator(); - menuMenu->Append(Menu_Menu_FindItem, "Find menu item from label", - "Find a menu item by searching for its label"); + menuMenu->Append(Menu_Menu_FindItem, _T("Find menu item from label"), + _T("Find a menu item by searching for its label")); +#endif wxMenu *testMenu = new wxMenu; - testMenu->Append(Menu_Test_Normal, "&Normal item"); + testMenu->Append(Menu_Test_Normal, _T("&Normal item")); testMenu->AppendSeparator(); - testMenu->AppendCheckItem(Menu_Test_Check, "&Check item"); + testMenu->AppendCheckItem(Menu_Test_Check, _T("&Check item")); testMenu->AppendSeparator(); - testMenu->AppendRadioItem(Menu_Test_Radio1, "Radio item &1"); - testMenu->AppendRadioItem(Menu_Test_Radio2, "Radio item &2"); - testMenu->AppendRadioItem(Menu_Test_Radio3, "Radio item &3"); + testMenu->AppendRadioItem(Menu_Test_Radio1, _T("Radio item &1")); + testMenu->AppendRadioItem(Menu_Test_Radio2, _T("Radio item &2")); + testMenu->AppendRadioItem(Menu_Test_Radio3, _T("Radio item &3")); wxMenu *helpMenu = new wxMenu; - helpMenu->Append(Menu_Help_About, "&About\tF1", "About menu sample"); + helpMenu->Append(Menu_Help_About, _T("&About\tF1"), _T("About menu sample")); wxMenuBar* menuBar = new wxMenuBar( wxMB_DOCKABLE ); - menuBar->Append(fileMenu, "&File"); - menuBar->Append(menubarMenu, "Menu&bar"); - menuBar->Append(menuMenu, "&Menu"); - menuBar->Append(testMenu, "&Test"); - menuBar->Append(helpMenu, "&Help"); + menuBar->Append(fileMenu, _T("&File")); + menuBar->Append(menubarMenu, _T("Menu&bar")); + menuBar->Append(menuMenu, _T("&Menu")); + menuBar->Append(testMenu, _T("&Test")); + menuBar->Append(helpMenu, _T("&Help")); // these items should be initially checked - menuBar->Check(Menu_MenuBar_Toggle, TRUE); - menuBar->Check(Menu_MenuBar_Enable, TRUE); - menuBar->Check(Menu_Menu_Enable, TRUE); - menuBar->Check(Menu_Menu_Check, FALSE); + menuBar->Check(Menu_MenuBar_Toggle, true); + menuBar->Check(Menu_MenuBar_Enable, true); + menuBar->Check(Menu_Menu_Enable, true); + menuBar->Check(Menu_Menu_Check, false); // associate the menu bar with the frame SetMenuBar(menuBar); @@ -395,11 +477,12 @@ MyFrame::MyFrame() // intercept all menu events and log them in this custom event handler PushEventHandler(new MyEvtHandler(this)); +#if USE_LOG_WINDOW // create the log text window - m_textctrl = new wxTextCtrl(this, -1, _T(""), + m_textctrl = new wxTextCtrl(this, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE); - m_textctrl->SetEditable(FALSE); + m_textctrl->SetEditable(false); wxLog::SetTimestamp(NULL); m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_textctrl)); @@ -409,6 +492,7 @@ MyFrame::MyFrame() _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")); +#endif } MyFrame::~MyFrame() @@ -416,22 +500,24 @@ MyFrame::~MyFrame() delete m_menu; // delete the event handler installed in ctor - PopEventHandler(TRUE); + PopEventHandler(true); +#if USE_LOG_WINDOW // restore old logger delete wxLog::SetActiveTarget(m_logOld); +#endif } wxMenu *MyFrame::CreateDummyMenu(wxString *title) { wxMenu *menu = new wxMenu; - menu->Append(Menu_Dummy_First, "&First item\tCtrl-F1"); + menu->Append(Menu_Dummy_First, _T("&First item\tCtrl-F1")); menu->AppendSeparator(); - menu->Append(Menu_Dummy_Second, "&Second item\tCtrl-F2", "", TRUE); + menu->AppendCheckItem(Menu_Dummy_Second, _T("&Second item\tCtrl-F2")); if ( title ) { - title->Printf(wxT("Dummy menu &%u"), (unsigned)++m_countDummy); + title->Printf(_T("Dummy menu &%u"), (unsigned)++m_countDummy); } return menu; @@ -442,10 +528,10 @@ wxMenuItem *MyFrame::GetLastMenuItem() const wxMenuBar *menubar = GetMenuBar(); wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1); - wxMenuItemList::Node *node = menu->GetMenuItems().GetLast(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetLast(); if ( !node ) { - wxLogWarning(wxT("No last item in the last menu!")); + wxLogWarning(_T("No last item in the last menu!")); return NULL; } @@ -461,11 +547,11 @@ void MyFrame::LogMenuEvent(const wxCommandEvent& event) if ( !GetMenuBar()->FindItem(id) ) return; - wxString msg = wxString::Format(wxT("Menu command %d"), id); + wxString msg = wxString::Format(_T("Menu command %d"), id); if ( GetMenuBar()->FindItem(id)->IsCheckable() ) { - msg += wxString::Format(wxT(" (the item is currently %schecked)"), - event.IsChecked() ? "" : "not "); + msg += wxString::Format(_T(" (the item is currently %schecked)"), + event.IsChecked() ? _T("") : _T("not ")); } wxLogMessage(msg); @@ -477,18 +563,20 @@ void MyFrame::LogMenuEvent(const wxCommandEvent& event) void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); } +#if USE_LOG_WINDOW void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event)) { m_textctrl->Clear(); } +#endif void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - (void)wxMessageBox("wxWindows menu sample\n© 1999-2001 Vadim Zeitlin", - "About wxWindows menu sample", + (void)wxMessageBox(_T("wxWidgets menu sample\n(c) 1999-2001 Vadim Zeitlin"), + _T("About wxWidgets menu sample"), wxICON_INFORMATION); } @@ -500,7 +588,7 @@ void MyFrame::OnDeleteMenu(wxCommandEvent& WXUNUSED(event)) if ( count == 2 ) { // don't let delete the first 2 menus - wxLogError(wxT("Can't delete any more menus")); + wxLogError(_T("Can't delete any more menus")); } else { @@ -533,7 +621,7 @@ void MyFrame::OnToggleMenu(wxCommandEvent& WXUNUSED(event)) else { // restore it - mbar->Insert(0, m_menu, "&File"); + mbar->Insert(0, m_menu, _T("&File")); m_menu = NULL; } } @@ -553,10 +641,11 @@ void MyFrame::OnGetLabelMenu(wxCommandEvent& WXUNUSED(event)) wxCHECK_RET( count, _T("no last menu?") ); - wxLogMessage(wxT("The label of the last menu item is '%s'"), + wxLogMessage(_T("The label of the last menu item is '%s'"), mbar->GetLabelTop(count - 1).c_str()); } +#if wxUSE_TEXTDLG void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event)) { wxMenuBar *mbar = GetMenuBar(); @@ -589,7 +678,7 @@ void MyFrame::OnFindMenu(wxCommandEvent& WXUNUSED(event)) ( _T("Enter label to search for: "), _T("Find menu"), - "", + _T(""), this ); @@ -599,18 +688,19 @@ void MyFrame::OnFindMenu(wxCommandEvent& WXUNUSED(event)) if (index == wxNOT_FOUND) { - wxLogWarning(wxT("No menu with label '%s'"), label.c_str()); + wxLogWarning(_T("No menu with label '%s'"), label.c_str()); } else { - wxLogMessage(wxT("Menu %d has label '%s'"), index, label.c_str()); + wxLogMessage(_T("Menu %d has label '%s'"), index, label.c_str()); } } } +#endif void MyFrame::OnDummy(wxCommandEvent& event) { - wxLogMessage(wxT("Dummy item #%d"), event.GetId() - Menu_Dummy_First + 1); + wxLogMessage(_T("Dummy item #%d"), event.GetId() - Menu_Dummy_First + 1); } void MyFrame::OnAppendMenuItem(wxCommandEvent& WXUNUSED(event)) @@ -619,18 +709,18 @@ void MyFrame::OnAppendMenuItem(wxCommandEvent& WXUNUSED(event)) wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1); menu->AppendSeparator(); - menu->Append(Menu_Dummy_Third, "&Third dummy item\tCtrl-F3", - "Checkable item", TRUE); + menu->Append(Menu_Dummy_Third, _T("&Third dummy item\tCtrl-F3"), + _T("Checkable item"), true); } void MyFrame::OnAppendSubMenu(wxCommandEvent& WXUNUSED(event)) { wxMenuBar *menubar = GetMenuBar(); - wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1); + wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 2); - menu->Append(Menu_Dummy_Last, "&Dummy sub menu", - CreateDummyMenu(NULL), "Dummy sub menu help"); + menu->Append(Menu_Dummy_Last, _T("&Dummy sub menu"), + CreateDummyMenu(NULL), _T("Dummy sub menu help")); } void MyFrame::OnDeleteMenuItem(wxCommandEvent& WXUNUSED(event)) @@ -641,7 +731,7 @@ void MyFrame::OnDeleteMenuItem(wxCommandEvent& WXUNUSED(event)) size_t count = menu->GetMenuItemCount(); if ( !count ) { - wxLogWarning(wxT("No items to delete!")); + wxLogWarning(_T("No items to delete!")); } else { @@ -655,8 +745,8 @@ void MyFrame::OnInsertMenuItem(wxCommandEvent& WXUNUSED(event)) wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1); menu->Insert(0, wxMenuItem::New(menu, Menu_Dummy_Fourth, - "Fourth dummy item\tCtrl-F4")); - menu->Insert(1, wxMenuItem::New(menu, wxID_SEPARATOR, "")); + _T("Fourth dummy item\tCtrl-F4"))); + menu->Insert(1, wxMenuItem::New(menu, wxID_SEPARATOR, _T(""))); } void MyFrame::OnEnableMenuItem(wxCommandEvent& WXUNUSED(event)) @@ -691,11 +781,12 @@ void MyFrame::OnGetLabelMenuItem(wxCommandEvent& WXUNUSED(event)) if ( item ) { - wxLogMessage(wxT("The label of the last menu item is '%s'"), + wxLogMessage(_T("The label of the last menu item is '%s'"), item->GetLabel().c_str()); } } +#if wxUSE_TEXTDLG void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event)) { wxMenuItem *item = GetLastMenuItem(); @@ -716,6 +807,7 @@ void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event)) } } } +#endif void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event)) { @@ -724,29 +816,29 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event)) if ( item ) { wxString msg; - msg << "The item is " << (item->IsEnabled() ? "enabled" - : "disabled") - << '\n'; + msg << _T("The item is ") << (item->IsEnabled() ? _T("enabled") + : _T("disabled")) + << _T('\n'); if ( item->IsCheckable() ) { - msg << "It is checkable and " << (item->IsChecked() ? "" : "un") - << "checked\n"; + msg << _T("It is checkable and ") << (item->IsChecked() ? _T("") : _T("un")) + << _T("checked\n"); } #if wxUSE_ACCEL wxAcceleratorEntry *accel = item->GetAccel(); if ( accel ) { - msg << "Its accelerator is "; + msg << _T("Its accelerator is "); int flags = accel->GetFlags(); if ( flags & wxACCEL_ALT ) - msg << wxT("Alt-"); + msg << _T("Alt-"); if ( flags & wxACCEL_CTRL ) - msg << wxT("Ctrl-"); + msg << _T("Ctrl-"); if ( flags & wxACCEL_SHIFT ) - msg << wxT("Shift-"); + msg << _T("Shift-"); int code = accel->GetKeyCode(); switch ( code ) @@ -763,7 +855,7 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event)) case WXK_F10: case WXK_F11: case WXK_F12: - msg << wxT('F') << code - WXK_F1 + 1; + msg << _T('F') << code - WXK_F1 + 1; break; // if there are any other keys wxGetAccelFromString() may return, @@ -777,14 +869,14 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event)) break; } - wxFAIL_MSG( wxT("unknown keyboard accel") ); + wxFAIL_MSG( _T("unknown keyboard accel") ); } delete accel; } else { - msg << "It doesn't have an accelerator"; + msg << _T("It doesn't have an accelerator"); } #endif // wxUSE_ACCEL @@ -792,6 +884,7 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event)) } } +#if wxUSE_TEXTDLG void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event)) { wxMenuBar *mbar = GetMenuBar(); @@ -803,46 +896,48 @@ void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event)) ( _T("Enter label to search for: "), _T("Find menu item"), - "", + _T(""), this ); if ( !label.empty() ) { - size_t menuindex = 0; + size_t menuindex; int index = wxNOT_FOUND; - + for (menuindex = 0; (menuindex < count) && (index == wxNOT_FOUND); ++menuindex) { index = mbar->FindMenuItem(mbar->GetMenu(menuindex)->GetTitle(), label); } if (index == wxNOT_FOUND) { - wxLogWarning(wxT("No menu item with label '%s'"), label.c_str()); + wxLogWarning(_T("No menu item with label '%s'"), label.c_str()); } else { - wxLogMessage(wxT("Menu item %d in menu %d has label '%s'"), - index, menuindex, label.c_str()); + wxLogMessage(_T("Menu item %d in menu %lu has label '%s'"), + index, (unsigned long)menuindex, label.c_str()); } } } +#endif void MyFrame::ShowContextMenu(const wxPoint& pos) { - wxMenu menu("Test popup"); + wxMenu menu(_T("Test popup")); - menu.Append(Menu_Help_About, "&About"); - menu.Append(Menu_Popup_Submenu, "&Submenu", CreateDummyMenu(NULL)); - menu.Append(Menu_Popup_ToBeDeleted, "To be &deleted"); - menu.Append(Menu_Popup_ToBeChecked, "To be &checked", "", TRUE); - menu.Append(Menu_Popup_ToBeGreyed, "To be &greyed"); + 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, "E&xit"); + 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); + menu.Check(Menu_Popup_ToBeChecked, true); + menu.Enable(Menu_Popup_ToBeGreyed, false); PopupMenu(&menu, pos.x, pos.y); @@ -854,7 +949,7 @@ void MyFrame::ShowContextMenu(const wxPoint& pos) #endif // 0 } -void MyFrame::OnTestNormal(wxCommandEvent& event) +void MyFrame::OnTestNormal(wxCommandEvent& WXUNUSED(event)) { wxLogMessage(_T("Normal item selected")); } @@ -871,20 +966,50 @@ void MyFrame::OnTestRadio(wxCommandEvent& event) event.GetId() - Menu_Test_Radio1 + 1); } +#if USE_LOG_WINDOW void MyFrame::LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what) { - wxLogStatus(this, _T("A %smenu has been %s."), - event.IsPopup() ? _T("popup ") : _T(""), what); + wxString msg; + msg << _T("A ") + << ( event.IsPopup() ? _T("popup ") : _T("") ) + << _T("menu has been ") + << what + << _T("."); + + wxLogStatus(this, msg.c_str()); +} +#endif + +void MyFrame::OnUpdateSubMenuNormal(wxUpdateUIEvent& event) +{ + event.Enable(false); +} + +void MyFrame::OnUpdateSubMenuCheck(wxUpdateUIEvent& event) +{ + event.Enable(true); + event.Check(true); } -void MyFrame::OnSize(wxSizeEvent& event) +void MyFrame::OnUpdateSubMenuRadio(wxUpdateUIEvent& event) { + int which = (event.GetId() - Menu_SubMenu_Radio1 + 1); + if (which == 2) + event.Check(true); + else + event.Check(false); +} + +void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event)) +{ +#if USE_LOG_WINDOW 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); +#endif // this is really ugly but we have to do it as we can't just call // event.Skip() because wxFrameBase would make the text control fill the