X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d290d2fe93267f5d48f1ff32a520b3c3b2b2c7fa..b85b06e13d22e7fc1604ec1a49caa1227a1b3d36:/src/gtk/textentry.cpp

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index f25d8f80fa..20abc5559b 100644
--- 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
@@ -101,11 +103,12 @@ void wxTextEntry::WriteText(const wxString& value)
     gtk_editable_set_position(edit, len);
 }
 
-wxString wxTextEntry::GetValue() const
+wxString wxTextEntry::DoGetValue() const
 {
     const wxGtkString value(gtk_editable_get_chars(GetEditable(), 0, -1));
 
-    return wxGTK_CONV_BACK_FONT(value, GetEditableWindow()->GetFont());
+    return wxGTK_CONV_BACK_FONT(value,
+            const_cast<wxTextEntry *>(this)->GetEditableWindow()->GetFont());
 }
 
 void wxTextEntry::Remove(long from, long to)
@@ -185,7 +188,16 @@ long wxTextEntry::GetLastPosition() const
 
 void wxTextEntry::SetSelection(long from, long to)
 {
-    gtk_editable_select_region(GetEditable(), from, to);
+    // in wx convention, (-1, -1) means the entire range but GTK+ translates -1
+    // (or any negative number for that matter) into last position so we need
+    // to translate manually
+    if ( from == -1 && to == -1 )
+        from = 0;
+
+    // for compatibility with MSW, exchange from and to parameters so that the
+    // insertion point is set to the start of the selection and not its end as
+    // GTK+ does by default
+    gtk_editable_select_region(GetEditable(), to, from);
 }
 
 void wxTextEntry::GetSelection(long *from, long *to) const
@@ -215,6 +227,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
 // ----------------------------------------------------------------------------
@@ -277,10 +319,11 @@ void wxTextEntry::SendMaxLenEvent()
     // generating a dummy wxEVT_COMMAND_TEXT_UPDATED event
     //IgnoreNextTextUpdate();
 
-    wxWindow * const win = const_cast<wxWindow *>(GetEditableWindow());
+    wxWindow * const win = GetEditableWindow();
     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