don't use wxVector<wxDataFormat> from wx/clipbrd.h as wxDataFormat definition is...

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

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index c5a2fe89f5b25c4916fbfa13b2f63a6b740a0c7f..99d0f129435aaf986dec8f978960c85a1d72207d 100644 (file)
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -187,7 +187,16 @@ long wxTextEntry::GetLastPosition() const
 
 void wxTextEntry::SetSelection(long from, long to)
 {
 
 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
 }
 
 void wxTextEntry::GetSelection(long *from, long *to) const


@@ -221,10 +230,10 @@ void wxTextEntry::GetSelection(long *from, long *to) const
 // auto completion
 // ----------------------------------------------------------------------------
 
 // auto completion
 // ----------------------------------------------------------------------------
 

-void wxTextEntry::AutoComplete(const wxArrayString& choices)
+bool wxTextEntry::AutoComplete(const wxArrayString& choices)

 {
     GtkEntry * const entry = GTK_ENTRY(GetEditable());
 {
     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;
 
     GtkListStore * const store = gtk_list_store_new(1, G_TYPE_STRING);
     GtkTreeIter iter;


@@ -244,6 +253,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);
     gtk_entry_completion_set_text_column(completion, 0);
     gtk_entry_set_completion(entry, completion);
     g_object_unref(completion);

+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -312,7 +322,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
 }
 
 #endif // wxUSE_TEXTCTRL || wxUSE_COMBOBOX