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

fixes to menu stock items support (patch 1547639)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-05 21:00:55 +00:00
parent d3c7fc996a
commit 345319d60c
10 changed files with 147 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/os2/menuitem.cpp
View File

@@ -373,17 +373,16 @@ void wxMenuItem::SetText( const wxString& rText )
if (m_text == sText)
return;
if (sText.IsEmpty())
{
wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
sText = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
}
// wxMenuItemBase will do stock ID checks
wxMenuItemBase::SetText(sText);
OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(sText));
// m_text could now be different from 'text' if we are a stock menu item,
// so use only m_text below
OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(m_text));
#if wxUSE_OWNER_DRAWN
if (rText.IsEmpty())
SetAccelString(sText.AfterFirst(_T('\t')));
SetAccelString(m_text.AfterFirst(_T('\t')));
else
SetAccelString(rText.AfterFirst(_T('\t')));
#endif // wxUSE_OWNER_DRAWN
@@ -428,7 +427,7 @@ void wxMenuItem::SetText( const wxString& rText )
#endif //owner drawn
{
uFlagsOld |= MIS_TEXT;
pData = (BYTE*)sText.c_str();
pData = (BYTE*)m_text.c_str();
}
//