keyboard navigation in dialogs works (again)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index c156d77e1c21e458bb551b141dd932422f8e2092..b92ca7c1036024584491d2f106d59984ea216565 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -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);

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 49c48a65d2a766ce74dba27326e94013e48a085f..14f2cfb07db800874b56cde5d4a215266dc9fb49 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -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();
@@ -361,12 +356,14 @@ bool wxDialog::Show(bool show)
       // a message before the deletion.
       while (wxModalDialogs.Member(this) && m_modalShowing && GetMessage(&msg, NULL, 0, 0))
       {
-        if (m_acceleratorTable.Ok() &&
-          ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), &msg))
+        if ( m_acceleratorTable.Ok() &&
+             ::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);