Fixed compile bug in dropsrc.cpp (constr. arg); GnuWin32 fix in registry.cpp;

combobox event fix; moved SetAcceleratorTable down to window.h/cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-08-13 10:16:03 +00:00
parent 5e0394ae9b
commit 088a95f5ff
6 changed files with 27 additions and 9 deletions

View File

@@ -504,6 +504,12 @@ void wxWindow::ReleaseMouse(void)
}
}
void wxWindow::SetAcceleratorTable(const wxAcceleratorTable& accel)
{
m_acceleratorTable = accel;
}
// Push/pop event handler (i.e. allow a chain of event handlers
// be searched)
void wxWindow::PushEventHandler(wxEvtHandler *handler)
@@ -1961,9 +1967,13 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg)
return FALSE;
}
bool wxWindow::MSWTranslateMessage(WXMSG* WXUNUSED(pMsg))
bool wxWindow::MSWTranslateMessage(WXMSG* pMsg)
{
return FALSE;
if (m_acceleratorTable.Ok() &&
::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), (MSG *)pMsg))
return TRUE;
else
return FALSE;
}
long wxWindow::MSWOnMDIActivate(long WXUNUSED(flag), WXHWND WXUNUSED(activate), WXHWND WXUNUSED(deactivate))