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

Fix behaviour of wxTextCtrl without wxTE_PROCESS_TAB in wxGTK

Browse Source 
TAB should be used for navigation by default and only should be inserted
into the control as a literal character if wxTE_PROCESS_TAB is specified
for consistency with wxMSW and because this behaviour is much more
useful by default.

Fix this by calling gtk_text_view_set_accepts_tab() as appropriate for
multiline text controls. For single line ones, the behaviour is
unchanged but it's more reasonable as TAB is always handled as if
wxTE_PROCESS_TAB were not specified and it doesn't seem really useful to
try to support wxTE_PROCESS_TAB for them anyhow, so just document this
limitation.

Also remove the outdated/misleading documentation of this style, notably
don't say that it is required to get char events for TAB presses as
these events are generated both with and without this style in both
wxGTK and wxMSW.

Closes https://github.com/wxWidgets/wxWidgets/pull/704
This commit is contained in:
Vadim Zeitlin
2018-01-30 22:12:22 +01:00
parent 193939453e
commit ad71bbb9ad
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk/textctrl.cpp
View File

@@ -323,6 +323,14 @@ au_apply_tag_callback(GtkTextBuffer *buffer,
}
}
// Check if the style contains wxTE_PROCESS_TAB and update the given
// GtkTextView accordingly.
static void wxGtkSetAcceptsTab(GtkWidget* text, long style)
{
gtk_text_view_set_accepts_tab(GTK_TEXT_VIEW(text),
(style & wxTE_PROCESS_TAB) != 0);
}
//-----------------------------------------------------------------------------
// GtkTextCharPredicates for gtk_text_iter_*_find_char
//-----------------------------------------------------------------------------
@@ -800,6 +808,8 @@ bool wxTextCtrl::Create( wxWindow *parent,
if (multi_line)
{
wxGtkSetAcceptsTab(m_text, style);
// Handle URLs on multi-line controls with wxTE_AUTO_URL style
if (style & wxTE_AUTO_URL)
{
@@ -984,6 +994,15 @@ void wxTextCtrl::SetWindowStyleFlag(long style)
if ( (style & wxTE_PROCESS_ENTER) != (styleOld & wxTE_PROCESS_ENTER) )
GTKSetActivatesDefault();
if ( IsMultiLine() )
{
wxGtkSetAcceptsTab(m_text, style);
}
//else: there doesn't seem to be any way to do it for entries and while we
// could emulate wxTE_PROCESS_TAB for them by handling Tab key events
// explicitly, it doesn't seem to be worth doing it, this style is
// pretty useless with single-line controls.
static const long flagsWrap = wxTE_WORDWRAP | wxTE_CHARWRAP | wxTE_DONTWRAP;
if ( (style & flagsWrap) != (styleOld & flagsWrap) )
GTKSetWrapMode();