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

Fixes for accelerators

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-08-18 00:02:41 +00:00
parent 39dd8deaa6
commit 3ed3532bd7
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/os2/accel.cpp
View File

@@ -89,8 +89,8 @@ wxAcceleratorTable::wxAcceleratorTable(
wxFrame* pFrame = (wxFrame*)wxTheApp->GetTopWindow(); wxFrame* pFrame = (wxFrame*)wxTheApp->GetTopWindow();
::WinSetAccelTable( vHabmain ::WinSetAccelTable( vHabmain
,(HWND)pFrame->GetFrame()
,hAccel ,hAccel
,(HWND)pFrame->GetFrame()
); );
} }
M_ACCELDATA->m_hAccel = hAccel; M_ACCELDATA->m_hAccel = hAccel;
@@ -152,8 +152,8 @@ wxAcceleratorTable::wxAcceleratorTable(
wxFrame* pFrame = (wxFrame*)wxTheApp->GetTopWindow(); wxFrame* pFrame = (wxFrame*)wxTheApp->GetTopWindow();
::WinSetAccelTable( vHabmain ::WinSetAccelTable( vHabmain
,(HWND)pFrame->GetFrame()
,M_ACCELDATA->m_hAccel ,M_ACCELDATA->m_hAccel
,(HWND)pFrame->GetFrame()
); );
} }

13
src/os2/app.cpp
View File

@@ -733,14 +733,15 @@ bool wxApp::ProcessMessage(
// Try translations first; find the youngest window with // Try translations first; find the youngest window with
// a translation table. // a translation table.
// //
#if 0 if(pMsg->msg == WM_CHAR)
for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
{ {
if (pMsg->msg == WM_CHAR) for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
if (pWnd->OS2TranslateMessage(pWxmsg)) {
return TRUE; if(pWnd->OS2TranslateMessage(pWxmsg))
break;
}
} }
#endif
// //
// Anyone for a non-translation message? Try youngest descendants first. // Anyone for a non-translation message? Try youngest descendants first.
// //