Menu label consistency changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -847,7 +847,7 @@ void wxMenuBar::EnableTop(
|
||||
Refresh();
|
||||
} // end of wxMenuBar::EnableTop
|
||||
|
||||
void wxMenuBar::SetLabelTop(
|
||||
void wxMenuBar::SetMenuLabel(
|
||||
size_t nPos
|
||||
, const wxString& rLabel
|
||||
)
|
||||
@@ -884,16 +884,16 @@ void wxMenuBar::SetLabelTop(
|
||||
wxLogLastError(wxT("ModifyMenu"));
|
||||
}
|
||||
Refresh();
|
||||
} // end of wxMenuBar::SetLabelTop
|
||||
} // end of wxMenuBar::SetMenuLabel
|
||||
|
||||
wxString wxMenuBar::GetLabelTop(
|
||||
wxString wxMenuBar::GetMenuLabel(
|
||||
size_t nPos
|
||||
) const
|
||||
{
|
||||
wxCHECK_MSG( nPos < GetMenuCount(), wxEmptyString,
|
||||
wxT("invalid menu index in wxMenuBar::GetLabelTop") );
|
||||
wxT("invalid menu index in wxMenuBar::GetMenuLabel") );
|
||||
return m_titles[nPos];
|
||||
} // end of wxMenuBar::GetLabelTop
|
||||
} // end of wxMenuBar::GetMenuLabel
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// wxMenuBar construction
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user