From 84c88a17c019692f40a7c506b8a2d29bbd080f1d Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 21 Jan 2002 19:03:23 +0000 Subject: [PATCH] added TAB handling git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mgl/window.cpp | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp index 64bef3e090..86b882527f 100644 --- a/src/mgl/window.cpp +++ b/src/mgl/window.cpp @@ -248,7 +248,20 @@ static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e) static long wxScanToKeyCode(event_t *event) { - #define KEY(mgl,wx) case mgl: key = wx; break; + // VS: make it __WXDEBUG__-only, since we have lots of wxLogTrace calls + // here and the arguments would be stored in non-debug executable even + // though wxLogTrace would be no-op... + #ifdef __WXDEBUG__ + #define KEY(mgl_key,wx_key) \ + case mgl_key: \ + wxLogTrace(_T("keyevents"), \ + _T("key " #mgl_key ", mapped to " #wx_key)); \ + key = wx_key; \ + break; + #else + #define KEY(mgl_key,wx_key) \ + case mgl_key: key = wx_key; break; + #endif long key = 0; switch ( EVT_scanCode(event->message) ) @@ -437,9 +450,9 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) } #endif // wxUSE_ACCEL - /* wxMSW doesn't send char events with Alt pressed */ - /* Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x - will only be sent if it is not in an accelerator table. */ + // wxMSW doesn't send char events with Alt pressed + // Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x + // will only be sent if it is not in an accelerator table. event2.m_keyCode = wxAsciiToKeyCode(e); if ( !ret && event2.m_keyCode != 0 ) { @@ -447,6 +460,22 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) ret = win->GetEventHandler()->ProcessEvent(event2); } + // Synthetize navigation key event, but do it only if the TAB key + // wasn't handled yet. + // FIXME_MGL - isn't this wxUniv's business? + if ( !ret && event.m_keyCode == WXK_TAB && + win->GetParent() && win->GetParent()->HasFlag(wxTAB_TRAVERSAL) ) + { + wxNavigationKeyEvent navEvent; + navEvent.SetEventObject(win->GetParent()); + // Shift-TAB goes in reverse direction: + navEvent.SetDirection(!event.m_shiftDown); + // Ctrl-TAB changes the (parent) window, i.e. switch notebook page: + navEvent.SetWindowChange(event.m_controlDown); + navEvent.SetCurrentFocus(wxStaticCast(win, wxWindow)); + ret = win->GetParent()->GetEventHandler()->ProcessEvent(navEvent); + } + return ret; } } -- 2.45.2