Make sizing logic clearer, at the expense of a few duplicated lines.

[wxWidgets.git] / src / gtk / textentry.cpp

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index c5a2fe89f5b25c4916fbfa13b2f63a6b740a0c7f..f96aa09b508e7138784bf92b28e9e749e7c853c6 100644 (file)
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -221,10 +221,10 @@ void wxTextEntry::GetSelection(long *from, long *to) const
 // auto completion
 // ----------------------------------------------------------------------------
 
-void wxTextEntry::AutoComplete(const wxArrayString& choices)
+bool wxTextEntry::AutoComplete(const wxArrayString& choices)
 {
     GtkEntry * const entry = GTK_ENTRY(GetEditable());
-    wxCHECK_RET( entry, "auto completion doesn't work with this control" );
+    wxCHECK_MSG(entry, false, "auto completion doesn't work with this control");
 
     GtkListStore * const store = gtk_list_store_new(1, G_TYPE_STRING);
     GtkTreeIter iter;
@@ -244,6 +244,7 @@ void wxTextEntry::AutoComplete(const wxArrayString& choices)
     gtk_entry_completion_set_text_column(completion, 0);
     gtk_entry_set_completion(entry, completion);
     g_object_unref(completion);
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -312,7 +313,7 @@ void wxTextEntry::SendMaxLenEvent()
     wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId());
     event.SetEventObject(win);
     event.SetString(GetValue());
-    win->GetEventHandler()->ProcessEvent(event);
+    win->HandleWindowEvent(event);
 }
 
 #endif // wxUSE_TEXTCTRL || wxUSE_COMBOBOX