Fixes for accelerators
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:
@@ -89,8 +89,8 @@ wxAcceleratorTable::wxAcceleratorTable(
|
||||
wxFrame* pFrame = (wxFrame*)wxTheApp->GetTopWindow();
|
||||
|
||||
::WinSetAccelTable( vHabmain
|
||||
,(HWND)pFrame->GetFrame()
|
||||
,hAccel
|
||||
,(HWND)pFrame->GetFrame()
|
||||
);
|
||||
}
|
||||
M_ACCELDATA->m_hAccel = hAccel;
|
||||
@@ -152,8 +152,8 @@ wxAcceleratorTable::wxAcceleratorTable(
|
||||
wxFrame* pFrame = (wxFrame*)wxTheApp->GetTopWindow();
|
||||
|
||||
::WinSetAccelTable( vHabmain
|
||||
,(HWND)pFrame->GetFrame()
|
||||
,M_ACCELDATA->m_hAccel
|
||||
,(HWND)pFrame->GetFrame()
|
||||
);
|
||||
}
|
||||
|
||||
|
@@ -733,14 +733,15 @@ bool wxApp::ProcessMessage(
|
||||
// Try translations first; find the youngest window with
|
||||
// a translation table.
|
||||
//
|
||||
#if 0
|
||||
for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
|
||||
if(pMsg->msg == WM_CHAR)
|
||||
{
|
||||
if (pMsg->msg == WM_CHAR)
|
||||
if (pWnd->OS2TranslateMessage(pWxmsg))
|
||||
return TRUE;
|
||||
for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
|
||||
{
|
||||
if(pWnd->OS2TranslateMessage(pWxmsg))
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
//
|
||||
// Anyone for a non-translation message? Try youngest descendants first.
|
||||
//
|
||||
|
Reference in New Issue
Block a user