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

Prevent pasting too much text into limited length wxTextCtrl in wxGTK.

Browse Source 
Improve insert-text signal handler to block pasting text into the control,
which may overflow the specified max length in one action, and not only
entering individual characters.

See #3158.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-10-25 23:26:32 +00:00
parent 58263bb4c3
commit 656b9f4467
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gtk/textentry.cpp
View File

@@ -43,31 +43,38 @@
extern "C" extern "C"
void void
wx_gtk_insert_text_callback(GtkEditable *editable, wx_gtk_insert_text_callback(GtkEditable *editable,
const gchar * WXUNUSED(new_text), const gchar * new_text,
gint WXUNUSED(new_text_length), gint WXUNUSED(new_text_length),
gint * WXUNUSED(position), gint * WXUNUSED(position),
wxTextEntry *text) wxTextEntry *text)
{ {
// we should only be called if we have a max len limit at all
GtkEntry *entry = GTK_ENTRY (editable); GtkEntry *entry = GTK_ENTRY (editable);
const int text_length = gtk_entry_get_text_length(entry);
#if GTK_CHECK_VERSION(3,0,0) || defined(GSEAL_ENABLE) #if GTK_CHECK_VERSION(3,0,0) || defined(GSEAL_ENABLE)
const int text_max_length = gtk_entry_buffer_get_max_length(gtk_entry_get_buffer(entry)); const int text_max_length = gtk_entry_buffer_get_max_length(gtk_entry_get_buffer(entry));
#else #else
const int text_max_length = entry->text_max_length; const int text_max_length = entry->text_max_length;
#endif #endif
// we should only be called if we have a max len limit at all
wxCHECK_RET(text_max_length, "shouldn't be called"); wxCHECK_RET(text_max_length, "shouldn't be called");
// check that we don't overflow the max length limit // check that we don't overflow the max length limit
//
// FIXME: this doesn't work when we paste a string which is going to be const int text_length = gtk_entry_get_text_length(entry);
// truncated
if (text_length == text_max_length) // We can't use new_text_length as it is in bytes while we want to count
// characters (in first approximation, anyhow...).
if ( text_length + g_utf8_strlen(new_text, -1) > text_max_length )
{ {
// we don't need to run the base class version at all // Prevent the new text from being inserted.
g_signal_stop_emission_by_name (editable, "insert_text"); g_signal_stop_emission_by_name (editable, "insert_text");
// Currently we don't insert anything at all, but it would be better to
// insert as many characters as would fit into the text control and
// only discard the rest.
// Notify the user code about overflow.
text->SendMaxLenEvent(); text->SendMaxLenEvent();
} }
} }