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

keyboard navigation in dialogs works (again)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-27 14:37:31 +00:00
parent 296ec7d3ac
commit 0a54c4a8cd
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/msw/dialog.h
View File

@@ -105,7 +105,6 @@ public:
void OnSysColourChanged(wxSysColourChangedEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event);
// IMPLEMENTATION // IMPLEMENTATION
virtual bool MSWProcessMessage(WXMSG* pMsg);
virtual bool MSWOnClose(); virtual bool MSWOnClose();
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam); WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

13
src/msw/dialog.cpp
View File

@@ -58,11 +58,6 @@ extern wxList WXDLLEXPORT wxPendingDelete;
END_EVENT_TABLE() END_EVENT_TABLE()
#endif #endif
bool wxDialog::MSWProcessMessage(WXMSG* pMsg)
{
return (::IsDialogMessage((HWND) GetHWND(), (MSG*)pMsg) != 0);
}
bool wxDialog::MSWOnClose(void) bool wxDialog::MSWOnClose(void)
{ {
return Close(); return Close();
@@ -361,12 +356,14 @@ bool wxDialog::Show(bool show)
// a message before the deletion. // a message before the deletion.
while (wxModalDialogs.Member(this) && m_modalShowing && GetMessage(&msg, NULL, 0, 0)) while (wxModalDialogs.Member(this) && m_modalShowing && GetMessage(&msg, NULL, 0, 0))
{ {
if (m_acceleratorTable.Ok() && if ( m_acceleratorTable.Ok() &&
::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), &msg)) ::TranslateAccelerator((HWND)GetHWND(),
(HACCEL)m_acceleratorTable.GetHACCEL(),
&msg) )
{ {
// Have processed the message // Have processed the message
} }
else if (!IsDialogMessage((HWND) GetHWND(), &msg)) else if ( !wxTheApp->ProcessMessage((WXMSG *)&msg) )
{ {
TranslateMessage(&msg); TranslateMessage(&msg);
DispatchMessage(&msg); DispatchMessage(&msg);