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

Don't assert if Ctrl+Tab is pressed inside a wxGTK window

Browse Source 
Ignore the WinChange flag in DoNavigateIn() to fix an assertion that happened
when pressing Ctrl+Tab with the generic wxListCtrl having focus.

This seems to be consistent with pressing Ctrl+Tab elsewhere, e.g. when
cycling between buttons in a dialog.

(this is a backport of f3cd79984f2936a4148964af8c23cd42aab6a871 from master)
This commit is contained in:
Tim Kosse
2016-01-14 15:26:49 +01:00
committed by Vadim Zeitlin
parent 4e5e788bae
commit 6f5b629f2f
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gtk/window.cpp
View File

@@ -3713,26 +3713,17 @@ void wxWindowGTK::DoMoveInTabOrder(wxWindow *win, WindowOrder move)
bool wxWindowGTK::DoNavigateIn(int flags)
{
if ( flags & wxNavigationKeyEvent::WinChange )
{
wxFAIL_MSG( wxT("not implemented") );
wxWindow *parent = wxGetTopLevelParent((wxWindow *)this);
wxCHECK_MSG( parent, false, wxT("every window must have a TLW parent") );
return false;
}
else // navigate inside the container
{
wxWindow *parent = wxGetTopLevelParent((wxWindow *)this);
wxCHECK_MSG( parent, false, wxT("every window must have a TLW parent") );
GtkDirectionType dir;
dir = flags & wxNavigationKeyEvent::IsForward ? GTK_DIR_TAB_FORWARD
: GTK_DIR_TAB_BACKWARD;
GtkDirectionType dir;
dir = flags & wxNavigationKeyEvent::IsForward ? GTK_DIR_TAB_FORWARD
: GTK_DIR_TAB_BACKWARD;
gboolean rc;
g_signal_emit_by_name(parent->m_widget, "focus", dir, &rc);
gboolean rc;
g_signal_emit_by_name(parent->m_widget, "focus", dir, &rc);
return rc != 0;
}
return rc != 0;
}
bool wxWindowGTK::GTKWidgetNeedsMnemonic() const