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

Menu corruption fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-07-03 21:44:40 +00:00
parent 482ee3976f
commit 8635b0dbb3
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/os2/accel.cpp
View File

@@ -148,7 +148,7 @@ wxAcceleratorTable::wxAcceleratorTable(
pArr->aaccel[i].key = uKey; pArr->aaccel[i].key = uKey;
pArr->aaccel[i].cmd = uCmd; pArr->aaccel[i].cmd = uCmd;
} }
pArr->codepage = 437; // default to english Fix??? pArr->codepage = 437;
pArr->cAccel = (USHORT)n; pArr->cAccel = (USHORT)n;
M_ACCELDATA->m_hAccel = ::WinCreateAccelTable( vHabmain M_ACCELDATA->m_hAccel = ::WinCreateAccelTable( vHabmain
,pArr ,pArr

5
src/os2/menu.cpp
View File

@@ -73,9 +73,11 @@ static wxString TextToLabel(
const wxString& rsTitle const wxString& rsTitle
) )
{ {
wxString sTitle; wxString sTitle = "";
const wxChar* zPc; const wxChar* zPc;
if (rsTitle.IsEmpty())
return sTitle;
for (zPc = rsTitle.c_str(); *zPc != wxT('\0'); zPc++ ) for (zPc = rsTitle.c_str(); *zPc != wxT('\0'); zPc++ )
{ {
if (*zPc == wxT('&') ) if (*zPc == wxT('&') )
@@ -291,6 +293,7 @@ bool wxMenu::DoInsertOrAppend(
ERRORID vError; ERRORID vError;
wxString sError; wxString sError;
char zMsg[128]; char zMsg[128];
#if wxUSE_ACCEL #if wxUSE_ACCEL
UpdateAccel(pItem); UpdateAccel(pItem);
#endif // wxUSE_ACCEL #endif // wxUSE_ACCEL

2
src/os2/menuitem.cpp
View File

@@ -135,6 +135,8 @@ wxMenuItem::wxMenuItem(
#endif // owner drawn #endif // owner drawn
{ {
wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent")); wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent"));
memset(&m_vMenuData, '\0', sizeof(m_vMenuData));
m_vMenuData.id = (USHORT)nId;
Init(); Init();
} // end of wxMenuItem::wxMenuItem } // end of wxMenuItem::wxMenuItem