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

always call GTKSetActivatesDefault(), not only if wxTE_PROCESS_ENTER style was given (patch 1835260)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-28 02:10:32 +00:00
parent ce4f741ca0
commit 3cfe87da6e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/textctrl.cpp
View File

@@ -737,9 +737,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
if (style & wxTE_READONLY) if (style & wxTE_READONLY)
GTKSetEditable(); GTKSetEditable();
if (style & wxTE_PROCESS_ENTER)
GTKSetActivatesDefault();
// left justification (alignment) is the default anyhow // left justification (alignment) is the default anyhow
if ( style & (wxTE_RIGHT | wxTE_CENTRE) ) if ( style & (wxTE_RIGHT | wxTE_CENTRE) )
GTKSetJustification(); GTKSetJustification();
@@ -782,6 +779,13 @@ bool wxTextCtrl::Create( wxWindow *parent,
au_check_range(&start, &end); au_check_range(&start, &end);
} }
} }
else // single line
{
// do the right thing with Enter presses depending on whether we have
// wxTE_PROCESS_ENTER or not
GTKSetActivatesDefault();
}
g_signal_connect (m_text, "copy-clipboard", g_signal_connect (m_text, "copy-clipboard",
G_CALLBACK (gtk_copy_clipboard_callback), this); G_CALLBACK (gtk_copy_clipboard_callback), this);