From 7d25dedafd3827340d4e8c54dfc8c3c7848be72d Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 25 Jun 2016 21:17:54 -0400 Subject: [PATCH] Apply recent navigation fixes only where needed on Mac... ... Windows didn't need them, Preferences already navigated correctly between the panes, but the new changes caused navigation to get trapped in radio button groups. --- src/widgets/wxPanelWrapper.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/widgets/wxPanelWrapper.cpp b/src/widgets/wxPanelWrapper.cpp index 51621d718..db8474b0c 100644 --- a/src/widgets/wxPanelWrapper.cpp +++ b/src/widgets/wxPanelWrapper.cpp @@ -20,6 +20,9 @@ wxPanelWrapper::wxPanelWrapper(wxWindow * parent, wxWindowID id, void wxPanelWrapper::DoCharHook(wxKeyEvent &event) { +#ifdef __WXMAC + // Compensate for the regressions in TAB key navigation + // due to the switch to wxWidgets 3.0.2 if (event.GetKeyCode() == WXK_TAB) { wxWindow::FindFocus()->Navigate( event.ShiftDown() @@ -28,6 +31,7 @@ void wxPanelWrapper::DoCharHook(wxKeyEvent &event) ); return; } +#endif event.Skip(); }