Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Menu label consistency changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-11 17:54:59 +00:00
parent afb6a92fee
commit 52af3158e9
39 changed files with 304 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/os2/menuitem.cpp
View File

@@ -180,7 +180,7 @@ bool wxMenuItem::IsChecked() const
return (uFlag & MIA_CHECKED) == MIA_CHECKED ;
} // end of wxMenuItem::IsChecked
wxString wxMenuItemBase::GetLabelFromText(
wxString wxMenuItemBase::GetLabelText(
const wxString& rsText
)
{
@@ -199,7 +199,7 @@ wxString wxMenuItemBase::GetLabelFromText(
sLabel += *zPc;
}
return sLabel;
} // end of wxMenuItemBase::GetLabelFromText
} // end of wxMenuItemBase::GetLabelText
//
// Radio group stuff
@@ -363,7 +363,7 @@ void wxMenuItem::Check(
wxMenuItemBase::Check(bCheck);
} // end of wxMenuItem::Check
void wxMenuItem::SetText( const wxString& rText )
void wxMenuItem::SetItemLabel( const wxString& rText )
{
//
// Don't do anything if label didn't change
@@ -374,7 +374,7 @@ void wxMenuItem::SetText( const wxString& rText )
return;
// wxMenuItemBase will do stock ID checks
wxMenuItemBase::SetText(sText);
wxMenuItemBase::SetItemLabel(sText);
// m_text could now be different from 'text' if we are a stock menu item,
// so use only m_text below