X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c377f1bef4b4e038a2a7ed295d1c2d94d5e0a3d2..1e52188741389278cd99abf79218162c87024ba3:/samples/menu/menu.cpp diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index cda55f4bee..4d02ddac38 100644 --- a/samples/menu/menu.cpp +++ b/samples/menu/menu.cpp @@ -463,7 +463,7 @@ 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!")); @@ -857,7 +857,8 @@ void MyFrame::ShowContextMenu(const wxPoint& pos) menu.Append(Menu_Popup_Submenu, _T("&Submenu"), CreateDummyMenu(NULL)); menu.Append(Menu_Popup_ToBeDeleted, _T("To be &deleted")); menu.Append(Menu_Popup_ToBeChecked, _T("To be &checked"), _T(""), TRUE); - menu.Append(Menu_Popup_ToBeGreyed, _T("To be &greyed")); + 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"));