diff --git a/include/wx/gtk/textentry.h b/include/wx/gtk/textentry.h
index ec565facee..eb329722cd 100644
--- a/include/wx/gtk/textentry.h
+++ b/include/wx/gtk/textentry.h
@@ -43,7 +43,7 @@ public:
     virtual void SetSelection(long from, long to);
     virtual void GetSelection(long *from, long *to) const;
 
-    virtual void AutoComplete(const wxArrayString& choices);
+    virtual bool AutoComplete(const wxArrayString& choices);
 
     virtual bool IsEditable() const;
     virtual void SetEditable(bool editable);
diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index c5a2fe89f5..2d1f868666 100644
--- 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;
 }
 
 // ----------------------------------------------------------------------------