X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ecaed0bcdaddf522bda6a73dd655ee473f35c03a..ff58644a54af11b74b8e9b33a00de8496c531566:/src/gtk/textentry.cpp diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp index c5a2fe89f5..a84c0e691e 100644 --- a/src/gtk/textentry.cpp +++ b/src/gtk/textentry.cpp @@ -187,6 +187,12 @@ long wxTextEntry::GetLastPosition() const 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); } @@ -221,10 +227,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 +250,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; } // ---------------------------------------------------------------------------- @@ -312,7 +319,7 @@ void wxTextEntry::SendMaxLenEvent() 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