Enable graphics context by default

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

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 040dc0ef8d53c7f4f4ad8774bc7620599eadffc9..a84c0e691ef83f0a79c3387009a321aca03774e9 100644 (file)
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -23,7 +23,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_TEXTCTRL || wxUSE_COMBOBOX
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/window.h"
+    #include "wx/textctrl.h"

 #endif //WX_PRECOMP
 
 #include "wx/textentry.h"
 #endif //WX_PRECOMP
 
 #include "wx/textentry.h"


@@ -40,9 +44,9 @@ extern "C"
 // "insert_text" handler for GtkEntry
 static void
 wx_gtk_insert_text_callback(GtkEditable *editable,
 // "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
                             wxTextEntry *text)
 {
     // we should only be called if we have a max len limit at all


@@ -183,6 +187,12 @@ long wxTextEntry::GetLastPosition() const
 
 void wxTextEntry::SetSelection(long from, long to)
 {
 
 void wxTextEntry::SetSelection(long from, long 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;
+

     gtk_editable_select_region(GetEditable(), from, to);
 }
 
     gtk_editable_select_region(GetEditable(), from, to);
 }
 


@@ -213,6 +223,36 @@ void wxTextEntry::GetSelection(long *from, long *to) const
         *to = end;
 }
 
         *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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // editable status
 // ----------------------------------------------------------------------------


@@ -279,6 +319,7 @@ void wxTextEntry::SendMaxLenEvent()
     wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId());
     event.SetEventObject(win);
     event.SetString(GetValue());
     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