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

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

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index f25d8f80fa5d1f2c67af70d3ea7f388fb60c523c..2d1f8686665620a113104c8498d43b08103a040d 100644 (file)
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -23,6 +23,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_TEXTCTRL || wxUSE_COMBOBOX
+
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/textctrl.h"
@@ -42,9 +44,9 @@ extern "C"
 // "insert_text" handler for GtkEntry
 static void
 wx_gtk_insert_text_callback(GtkEditable *editable,
-                            const gchar *new_text,
-                            gint new_text_length,
-                            gint *position,
+                            const gchar * WXUNUSED(new_text),
+                            gint WXUNUSED(new_text_length),
+                            gint * WXUNUSED(position),
                             wxTextEntry *text)
 {
     // we should only be called if we have a max len limit at all
@@ -215,6 +217,36 @@ void wxTextEntry::GetSelection(long *from, long *to) const
         *to = end;
 }
 
+// ----------------------------------------------------------------------------
+// auto completion
+// ----------------------------------------------------------------------------
+
+bool wxTextEntry::AutoComplete(const wxArrayString& choices)
+{
+    GtkEntry * const entry = GTK_ENTRY(GetEditable());
+    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;
+
+    for ( wxArrayString::const_iterator i = choices.begin();
+          i != choices.end();
+          ++i )
+    {
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter,
+                           0, (const gchar *)i->utf8_str(),
+                           -1);
+    }
+
+    GtkEntryCompletion * const completion = gtk_entry_completion_new();
+    gtk_entry_completion_set_model(completion, GTK_TREE_MODEL(store));
+    gtk_entry_completion_set_text_column(completion, 0);
+    gtk_entry_set_completion(entry, completion);
+    g_object_unref(completion);
+    return true;
+}
+
 // ----------------------------------------------------------------------------
 // editable status
 // ----------------------------------------------------------------------------
@@ -284,3 +316,4 @@ void wxTextEntry::SendMaxLenEvent()
     win->GetEventHandler()->ProcessEvent(event);
 }
 
+#endif // wxUSE_TEXTCTRL || wxUSE_COMBOBOX