keyboard navigation in dialogs works (again)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -105,7 +105,6 @@ public:
|
||||
void OnSysColourChanged(wxSysColourChangedEvent& event);
|
||||
|
||||
// IMPLEMENTATION
|
||||
virtual bool MSWProcessMessage(WXMSG* pMsg);
|
||||
virtual bool MSWOnClose();
|
||||
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
|
||||
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
|
||||
|
@@ -58,11 +58,6 @@ extern wxList WXDLLEXPORT wxPendingDelete;
|
||||
END_EVENT_TABLE()
|
||||
#endif
|
||||
|
||||
bool wxDialog::MSWProcessMessage(WXMSG* pMsg)
|
||||
{
|
||||
return (::IsDialogMessage((HWND) GetHWND(), (MSG*)pMsg) != 0);
|
||||
}
|
||||
|
||||
bool wxDialog::MSWOnClose(void)
|
||||
{
|
||||
return Close();
|
||||
@@ -362,11 +357,13 @@ bool wxDialog::Show(bool show)
|
||||
while (wxModalDialogs.Member(this) && m_modalShowing && GetMessage(&msg, NULL, 0, 0))
|
||||
{
|
||||
if ( m_acceleratorTable.Ok() &&
|
||||
::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), &msg))
|
||||
::TranslateAccelerator((HWND)GetHWND(),
|
||||
(HACCEL)m_acceleratorTable.GetHACCEL(),
|
||||
&msg) )
|
||||
{
|
||||
// Have processed the message
|
||||
}
|
||||
else if (!IsDialogMessage((HWND) GetHWND(), &msg))
|
||||
else if ( !wxTheApp->ProcessMessage((WXMSG *)&msg) )
|
||||
{
|
||||
TranslateMessage(&msg);
|
||||
DispatchMessage(&msg);
|
||||
|
Reference in New Issue
Block a user