Use new function GetItemLabel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1309,7 +1309,7 @@ wxBorder wxWindowMSW::GetDefaultBorderForControl() const
|
|||||||
|
|
||||||
wxBorder wxWindowMSW::GetDefaultBorder() const
|
wxBorder wxWindowMSW::GetDefaultBorder() const
|
||||||
{
|
{
|
||||||
return GetDefaultBorderForControl();
|
return GetDefaultBorderForControl();
|
||||||
}
|
}
|
||||||
|
|
||||||
WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
|
WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
|
||||||
@@ -5417,7 +5417,7 @@ int wxWindowMSW::HandleMenuChar(int WXUNUSED_IN_WINCE(chAccel),
|
|||||||
// menu creation code
|
// menu creation code
|
||||||
wxMenuItem *item = (wxMenuItem*)mii.dwItemData;
|
wxMenuItem *item = (wxMenuItem*)mii.dwItemData;
|
||||||
|
|
||||||
const wxChar *p = wxStrchr(item->GetText().wx_str(), _T('&'));
|
const wxChar *p = wxStrchr(item->GetItemLabel().wx_str(), _T('&'));
|
||||||
while ( p++ )
|
while ( p++ )
|
||||||
{
|
{
|
||||||
if ( *p == _T('&') )
|
if ( *p == _T('&') )
|
||||||
|
Reference in New Issue
Block a user