callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export gtk_entry_get_display_text() as a private function through

Browse Source 
gtkentryprivate.h, so we can use it from gtkentryaccessible.c

https://bugzilla.gnome.org/show_bug.cgi?id=681591
This commit is contained in:
Mario Sanchez Prada
2012-08-10 18:03:17 +02:00
parent 66810c1e7f
commit 58a9244518
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkentry.c
View File

@ -2750,8 +2750,8 @@ gtk_entry_get_display_mode (GtkEntry *entry)
return DISPLAY_INVISIBLE;
}
static gchar*
gtk_entry_get_display_text (GtkEntry *entry,
gchar*
_gtk_entry_get_display_text (GtkEntry *entry,
gint start_pos,
gint end_pos)
{
@ -5170,7 +5170,7 @@ gtk_entry_backspace (GtkEntry *entry)
gchar *normalized_text;
glong len;
cluster_text = gtk_entry_get_display_text (entry, prev_pos,
cluster_text = _gtk_entry_get_display_text (entry, prev_pos,
priv->current_pos);
normalized_text = g_utf8_normalize (cluster_text,
strlen (cluster_text),
@ -5222,7 +5222,7 @@ gtk_entry_copy_clipboard (GtkEntry *entry)
return;
}
str = gtk_entry_get_display_text (entry, start, end);
str = _gtk_entry_get_display_text (entry, start, end);
gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (entry),
GDK_SELECTION_CLIPBOARD),
str, -1);
@ -5380,7 +5380,7 @@ gtk_entry_retrieve_surrounding_cb (GtkIMContext *context,
gchar *text;
/* XXXX ??? does this even make sense when text is not visible? Should we return FALSE? */
text = gtk_entry_get_display_text (entry, 0, -1);
text = _gtk_entry_get_display_text (entry, 0, -1);
gtk_im_context_set_surrounding (context, text, strlen (text), /* Length in bytes */
g_utf8_offset_to_pointer (text, priv->current_pos) - text);
g_free (text);
@ -5598,7 +5598,7 @@ gtk_entry_create_layout (GtkEntry *entry,
pango_layout_set_single_paragraph_mode (layout, TRUE);
display = placeholder_layout ? g_strdup (priv->placeholder_text) : gtk_entry_get_display_text (entry, 0, -1);
display = placeholder_layout ? g_strdup (priv->placeholder_text) : _gtk_entry_get_display_text (entry, 0, -1);
n_bytes = strlen (display);
if (!placeholder_layout && include_preedit)
@ -6563,7 +6563,7 @@ primary_get_cb (GtkClipboard *clipboard,
if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start, &end))
{
gchar *str = gtk_entry_get_display_text (entry, start, end);
gchar *str = _gtk_entry_get_display_text (entry, start, end);
gtk_selection_data_set_text (selection_data, str, -1);
g_free (str);
}
@ -9102,7 +9102,7 @@ gtk_entry_drag_data_get (GtkWidget *widget,
if (gtk_editable_get_selection_bounds (editable, &sel_start, &sel_end))
{
gchar *str = gtk_entry_get_display_text (GTK_ENTRY (widget), sel_start, sel_end);
gchar *str = _gtk_entry_get_display_text (GTK_ENTRY (widget), sel_start, sel_end);
gtk_selection_data_set_text (selection_data, str, -1);

5
gtk/gtkentryprivate.h
View File

@ -77,7 +77,10 @@ void _gtk_entry_completion_popup (GtkEntryCompletion *completion,
GdkDevice *device);
void _gtk_entry_completion_popdown (GtkEntryCompletion *completion);
void _gtk_entry_get_borders (GtkEntry *entry,
gchar* _gtk_entry_get_display_text (GtkEntry *entry,
gint start_pos,
gint end_pos);
void _gtk_entry_get_border (GtkEntry *entry,
GtkBorder *borders);
void _gtk_entry_reset_im_context (GtkEntry *entry);
GtkIMContext* _gtk_entry_get_im_context (GtkEntry *entry);