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

6
src/msw/menuitem.cpp
View File

@@ -207,7 +207,7 @@ bool wxMenuItem::IsChecked() const
}
/* static */
wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
wxString wxMenuItemBase::GetLabelText(const wxString& text)
{
return wxStripMenuCodes(text);
}
@@ -337,7 +337,7 @@ void wxMenuItem::Check(bool check)
wxMenuItemBase::Check(check);
}
void wxMenuItem::SetText(const wxString& txt)
void wxMenuItem::SetItemLabel(const wxString& txt)
{
wxString text = txt;
@@ -346,7 +346,7 @@ void wxMenuItem::SetText(const wxString& txt)
return;
// wxMenuItemBase will do stock ID checks
wxMenuItemBase::SetText(text);
wxMenuItemBase::SetItemLabel(text);
// m_text could now be different from 'text' if we are a stock menu item,
// so use only m_text below