Fix nonsensical checked menu item label and behaviour

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index d1e20a7c324cdd306088bb84ba231c770f4d4eba..121e74cf53d8df7536d1f5bc3b31b348c531b753 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -414,7 +414,7 @@ MyFrame::MyFrame()
 
     wxMenu* subMenu = new wxMenu;
     subMenu->Append(Menu_SubMenu_Normal, _T("&Normal submenu item"), _T("Disabled submenu item"));
 
     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"));
     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"));


@@ -994,7 +994,6 @@ void MyFrame::OnUpdateSubMenuNormal(wxUpdateUIEvent& event)
 void MyFrame::OnUpdateSubMenuCheck(wxUpdateUIEvent& event)
 {
     event.Enable(true);
 void MyFrame::OnUpdateSubMenuCheck(wxUpdateUIEvent& event)
 {
     event.Enable(true);

-    event.Check(true);

 }
 
 void MyFrame::OnUpdateSubMenuRadio(wxUpdateUIEvent& event)
 }
 
 void MyFrame::OnUpdateSubMenuRadio(wxUpdateUIEvent& event)