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

fix for MSWDetachWindowMenu when "&Window" string is translated

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-12-13 16:18:26 +00:00
parent 6d14cac77d
commit aa44b26115
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/window.cpp
View File

@@ -2304,15 +2304,13 @@ void wxWindow::MSWDetachWindowMenu()
{ {
if ( m_hMenu ) if ( m_hMenu )
{ {
wxChar buf[1024];
HMENU hMenu = (HMENU)m_hMenu; HMENU hMenu = (HMENU)m_hMenu;
int N = ::GetMenuItemCount(hMenu); int N = ::GetMenuItemCount(hMenu);
int i; for ( int i = 0; i < N; i++ )
for (i = 0; i < N; i++)
{ {
wxChar buf[100]; if ( !::GetMenuString(hMenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION) )
int chars = GetMenuString(hMenu, i, buf, 100, MF_BYPOSITION);
if ( !chars )
{ {
wxLogLastError(wxT("GetMenuString")); wxLogLastError(wxT("GetMenuString"));
@@ -2321,7 +2319,10 @@ void wxWindow::MSWDetachWindowMenu()
if ( wxStrcmp(buf, wxT("&Window")) == 0 ) if ( wxStrcmp(buf, wxT("&Window")) == 0 )
{ {
RemoveMenu(hMenu, i, MF_BYPOSITION); if ( !::RemoveMenu(hMenu, i, MF_BYPOSITION) )
{
wxLogLastError(wxT("RemoveMenu"));
}
break; break;
} }