mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-14 04:31:09 +00:00
a11y text test: Use a GtkText instead
This commit is contained in:
parent
3422edff6c
commit
ac445229d0
@ -27,8 +27,8 @@ set_text (GtkWidget *widget,
|
|||||||
{
|
{
|
||||||
if (GTK_IS_LABEL (widget))
|
if (GTK_IS_LABEL (widget))
|
||||||
gtk_label_set_text (GTK_LABEL (widget), text);
|
gtk_label_set_text (GTK_LABEL (widget), text);
|
||||||
else if (GTK_IS_ENTRY (widget))
|
else if (GTK_IS_EDITABLE (widget))
|
||||||
gtk_entry_set_text (GTK_ENTRY (widget), text);
|
gtk_editable_set_text (GTK_EDITABLE (widget), text);
|
||||||
else if (GTK_IS_TEXT_VIEW (widget))
|
else if (GTK_IS_TEXT_VIEW (widget))
|
||||||
gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)), text, -1);
|
gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)), text, -1);
|
||||||
else
|
else
|
||||||
@ -47,12 +47,12 @@ append_text (GtkWidget *widget,
|
|||||||
gtk_label_set_text (GTK_LABEL (widget), tmp);
|
gtk_label_set_text (GTK_LABEL (widget), tmp);
|
||||||
g_free (tmp);
|
g_free (tmp);
|
||||||
}
|
}
|
||||||
else if (GTK_IS_ENTRY (widget))
|
else if (GTK_IS_EDITABLE (widget))
|
||||||
{
|
{
|
||||||
gchar *tmp;
|
gchar *tmp;
|
||||||
|
|
||||||
tmp = g_strconcat (gtk_entry_get_text (GTK_ENTRY (widget)), text, NULL);
|
tmp = g_strconcat (gtk_editable_get_text (GTK_EDITABLE (widget)), text, NULL);
|
||||||
gtk_entry_set_text (GTK_ENTRY (widget), tmp);
|
gtk_editable_set_text (GTK_EDITABLE (widget), tmp);
|
||||||
g_free (tmp);
|
g_free (tmp);
|
||||||
}
|
}
|
||||||
else if (GTK_IS_TEXT_VIEW (widget))
|
else if (GTK_IS_TEXT_VIEW (widget))
|
||||||
@ -134,7 +134,7 @@ test_text_changed (GtkWidget *widget)
|
|||||||
SignalData insert_data;
|
SignalData insert_data;
|
||||||
gboolean cant_append = FALSE;
|
gboolean cant_append = FALSE;
|
||||||
|
|
||||||
if (GTK_IS_LABEL (widget) || GTK_IS_ENTRY (widget))
|
if (GTK_IS_LABEL (widget) || GTK_IS_TEXT (widget))
|
||||||
cant_append = TRUE;
|
cant_append = TRUE;
|
||||||
|
|
||||||
atk_text = ATK_TEXT (gtk_widget_get_accessible (widget));
|
atk_text = ATK_TEXT (gtk_widget_get_accessible (widget));
|
||||||
@ -874,9 +874,9 @@ test_words (GtkWidget *widget)
|
|||||||
|
|
||||||
for (i = 0; expected[i].offset != -1; i++)
|
for (i = 0; expected[i].offset != -1; i++)
|
||||||
{
|
{
|
||||||
if (GTK_IS_ENTRY (widget))
|
if (GTK_IS_TEXT (widget))
|
||||||
{
|
{
|
||||||
/* GtkEntry sets single-paragraph mode on its pango layout */
|
/* GtkText sets single-paragraph mode on its pango layout */
|
||||||
if (expected[i].boundary == ATK_TEXT_BOUNDARY_LINE_START ||
|
if (expected[i].boundary == ATK_TEXT_BOUNDARY_LINE_START ||
|
||||||
expected[i].boundary == ATK_TEXT_BOUNDARY_LINE_END)
|
expected[i].boundary == ATK_TEXT_BOUNDARY_LINE_END)
|
||||||
continue;
|
continue;
|
||||||
@ -1094,7 +1094,7 @@ main (int argc, char *argv[])
|
|||||||
g_test_add_func ("/text/bold/GtkLabel", test_bold_label);
|
g_test_add_func ("/text/bold/GtkLabel", test_bold_label);
|
||||||
|
|
||||||
add_text_tests (gtk_label_new (""));
|
add_text_tests (gtk_label_new (""));
|
||||||
add_text_tests (gtk_entry_new ());
|
add_text_tests (gtk_text_new ());
|
||||||
add_text_tests (gtk_text_view_new ());
|
add_text_tests (gtk_text_view_new ());
|
||||||
|
|
||||||
return g_test_run ();
|
return g_test_run ();
|
||||||
|
Loading…
Reference in New Issue
Block a user