From: Vadim Zeitlin Date: Tue, 16 Jul 2013 14:10:29 +0000 (+0000) Subject: No changes, just renamed "pItem" to "item" in wxOSX menu code. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9883583092b589ebb67d67cdc12b4a9bb864eb90 No changes, just renamed "pItem" to "item" in wxOSX menu code. Get rid of this pseudo-Hungarian notation and make the naming of the variables consistent across the whole file. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/osx/menu_osx.cpp b/src/osx/menu_osx.cpp index 8a795e67ce..e7199755d3 100644 --- a/src/osx/menu_osx.cpp +++ b/src/osx/menu_osx.cpp @@ -100,18 +100,18 @@ void wxMenu::SetNoEventsMode( bool noEvents ) // function appends a new item or submenu to the menu // append a new item or submenu to the menu -bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) +bool wxMenu::DoInsertOrAppend(wxMenuItem *item, size_t pos) { - wxASSERT_MSG( pItem != NULL, wxT("can't append NULL item to the menu") ); - GetPeer()->InsertOrAppend( pItem, pos ); + wxASSERT_MSG( item != NULL, wxT("can't append NULL item to the menu") ); + GetPeer()->InsertOrAppend( item, pos ); - if ( pItem->IsSeparator() ) + if ( item->IsSeparator() ) { // nothing to do here } else { - wxMenu *pSubMenu = pItem->GetSubMenu() ; + wxMenu *pSubMenu = item->GetSubMenu() ; if ( pSubMenu != NULL ) { wxASSERT_MSG( pSubMenu->GetHMenu() != NULL , wxT("invalid submenu added")); @@ -121,8 +121,8 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) } else { - if ( pItem->GetId() == idMenuTitle ) - pItem->GetMenu()->Enable( idMenuTitle, false ); + if ( item->GetId() == idMenuTitle ) + item->GetMenu()->Enable( idMenuTitle, false ); } }