// we should only be called if we have a max len limit at all
GtkEntry *entry = GTK_ENTRY (editable);
- wxCHECK_RET( entry->text_max_length, _T("shouldn't be called") );
+ const int text_length = gtk_entry_get_text_length(entry);
+#if GTK_CHECK_VERSION(3,0,0) || defined(GSEAL_ENABLE)
+ const int text_max_length = gtk_entry_buffer_get_max_length(gtk_entry_get_buffer(entry));
+#else
+ const int text_max_length = entry->text_max_length;
+#endif
+ wxCHECK_RET(text_max_length, "shouldn't be called");
// check that we don't overflow the max length limit
//
// FIXME: this doesn't work when we paste a string which is going to be
// truncated
- if ( entry->text_length == entry->text_max_length )
+ if (text_length == text_max_length)
{
// we don't need to run the base class version at all
g_signal_stop_emission_by_name (editable, "insert_text");
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)
// GtkEntries
GtkEntry * const entry = GTK_ENTRY(GetEditable());
- return entry ? entry->text_length : - 1;
+ return entry ? gtk_entry_get_text_length(entry) : -1;
}
// ----------------------------------------------------------------------------
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
*to = end;
}
+// ----------------------------------------------------------------------------
+// auto completion
+// ----------------------------------------------------------------------------
+
+bool wxTextEntry::DoAutoCompleteStrings(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
// ----------------------------------------------------------------------------
// 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);
+}
+
+// ----------------------------------------------------------------------------
+// margins support
+// ----------------------------------------------------------------------------
+
+bool wxTextEntry::DoSetMargins(const wxPoint& margins)
+{
+#if GTK_CHECK_VERSION(2,10,0)
+ GtkEntry* entry = GetEntry();
+
+ if ( !entry )
+ return false;
+
+ const GtkBorder* oldBorder = gtk_entry_get_inner_border(entry);
+ GtkBorder* newBorder;
+
+ if ( oldBorder )
+ {
+ newBorder = gtk_border_copy(oldBorder);
+ }
+ else
+ {
+ #if GTK_CHECK_VERSION(2,14,0)
+ newBorder = gtk_border_new();
+ #else
+ newBorder = g_slice_new0(GtkBorder);
+ #endif
+ // Use some reasonable defaults for initial margins
+ newBorder->left = 2;
+ newBorder->right = 2;
+
+ // These numbers seem to let the text remain vertically centered
+ // in common use scenarios when margins.y == -1.
+ newBorder->top = 3;
+ newBorder->bottom = 3;
+ }
+
+ if ( margins.x != -1 )
+ newBorder->left = (gint) margins.x;
+
+ if ( margins.y != -1 )
+ newBorder->top = (gint) margins.y;
+
+ gtk_entry_set_inner_border(entry, newBorder);
+
+#if GTK_CHECK_VERSION(2,14,0)
+ gtk_border_free(newBorder);
+#else
+ g_slice_free(GtkBorder, newBorder);
+#endif
+
+ return true;
+#else
+ wxUnusedVar(margins);
+ return false;
+#endif
+}
+
+wxPoint wxTextEntry::DoGetMargins() const
+{
+#if GTK_CHECK_VERSION(2,10,0)
+ GtkEntry* entry = GetEntry();
+
+ if ( !entry )
+ return wxPoint(-1, -1);
+
+ const GtkBorder* border = gtk_entry_get_inner_border(entry);
+
+ if ( !border )
+ return wxPoint(-1, -1);
+
+ return wxPoint((wxCoord) border->left, (wxCoord) border->top);
+#else
+ return wxPoint(-1, -1);
+#endif
}
#endif // wxUSE_TEXTCTRL || wxUSE_COMBOBOX
projects / wxWidgets.git / blobdiff