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

Merge branch 'gtk-mnemonics'

Browse Source 
Fixes for association of controls with their mnemonics in wxGTK.

See https://github.com/wxWidgets/wxWidgets/pull/1278

Closes #15776.
This commit is contained in:
Vadim Zeitlin
2019-03-29 19:22:05 +01:00
parent e81c738694 b0133392b7
commit 7f39e4ab88
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gtk/window.cpp
View File

@@ -4768,25 +4768,25 @@ void wxWindowGTK::RealizeTabOrder()
{
if ( focusableFromKeyboard )
{
// wxComboBox et al. needs to focus on on a different
// widget than m_widget, so if the main widget isn't
// focusable try the connect widget
// We may need to focus on the connect widget if the
// main one isn't focusable, but note that we still use
// the main widget if neither it nor connect widget is
// focusable, without this using a wxStaticText before
// wxChoice wouldn't work at all, for example.
GtkWidget* w = win->m_widget;
if ( !gtk_widget_get_can_focus(w) )
{
w = win->GetConnectWidget();
if ( !gtk_widget_get_can_focus(w) )
w = NULL;
GtkWidget* const cw = win->GetConnectWidget();
if ( cw != w && gtk_widget_get_can_focus(cw) )
w = cw;
}
if ( w )
{
mnemonicWindow->GTKWidgetDoSetMnemonic(w);
mnemonicWindow = NULL;
}
mnemonicWindow->GTKWidgetDoSetMnemonic(w);
mnemonicWindow = NULL;
}
}
else if ( win->GTKWidgetNeedsMnemonic() )
if ( win->GTKWidgetNeedsMnemonic() )
{
mnemonicWindow = win;
}