Use new function GetItemLabel

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 2632c1f73040c188ce7e3b8ce1d262884e38534d..8bc6143cf3ee31c0eff8b0e1a6d341de317a6763 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1309,7 +1309,7 @@ wxBorder wxWindowMSW::GetDefaultBorderForControl() const
 
 wxBorder wxWindowMSW::GetDefaultBorder() const
 {
-       return GetDefaultBorderForControl();
+    return GetDefaultBorderForControl();
 }
 
 WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
@@ -5417,7 +5417,7 @@ int wxWindowMSW::HandleMenuChar(int WXUNUSED_IN_WINCE(chAccel),
                 //  menu creation code
                 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++ )
                 {
                     if ( *p == _T('&') )