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

Preserve style changes in wxGTK wxTextEntry auto-complete code

Browse Source 
Don't overwrite the current window style with the style that it had when
AutoComplete() was called in wxGTK code, just turn wxTE_PROCESS_ENTER
off or on, without touching the other bits.

This still can result in setting wxTE_PROCESS_ENTER bit itself
unexpectedly if it somehow is changed while the completion popup is
shown, but this shouldn't happen often (if ever) in practice and, at
least, the other bits are preserved no matter what.

See https://github.com/wxWidgets/wxWidgets/pull/729
This commit is contained in:
Vadim Zeitlin
2018-02-17 17:13:34 +01:00
parent 8278f7b618
commit a4487c056b
1 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gtk/textentry.cpp
View File

@@ -228,11 +228,33 @@ public:
// see wxTextCtrl::OnChar()
void ToggleProcessEnterFlag(bool toggleOff)
{
long flags = m_origWinFlags;
if ( toggleOff )
flags &= ~wxTE_PROCESS_ENTER;
wxWindow* const win = GetEditableWindow(m_entry);
GetEditableWindow(m_entry)->SetWindowStyleFlag(flags);
long flags = win->GetWindowStyleFlag();
if ( toggleOff )
{
// Store the original window flags before we change them.
m_hadProcessEnterFlag = (flags & wxTE_PROCESS_ENTER) != 0;
if ( !m_hadProcessEnterFlag )
{
// No need to do anything, it was already off.
return;
}
flags &= ~wxTE_PROCESS_ENTER;
}
else // Restore the original flags.
{
if ( !m_hadProcessEnterFlag )
{
// We hadn't turned it off, no need to turn it back on.
return;
}
flags |= wxTE_PROCESS_ENTER;
}
win->SetWindowStyleFlag(flags);
}
virtual ~wxTextAutoCompleteData()
@@ -261,9 +283,11 @@ protected:
explicit wxTextAutoCompleteData(wxTextEntry* entry)
: m_entry(entry),
m_widgetEntry(entry->GetEntry()),
m_origWinFlags(GetEditableWindow(m_entry)->GetWindowStyleFlag())
m_widgetEntry(entry->GetEntry())
{
// This will be really set in ToggleProcessEnterFlag().
m_hadProcessEnterFlag = false;
GtkEntryCompletion* const completion = gtk_entry_completion_new();
gtk_entry_completion_set_text_column (completion, 0);
@@ -305,8 +329,9 @@ protected:
// And its GTK widget.
GtkEntry* const m_widgetEntry;
// The original flags of the associated wxTextEntry.
const long m_origWinFlags;
// True if the window had wxTE_PROCESS_ENTER flag before we turned it off
// in ToggleProcessEnterFlag().
bool m_hadProcessEnterFlag;
wxDECLARE_NO_COPY_CLASS(wxTextAutoCompleteData);
};