diff options
Diffstat (limited to 'gtk/gtktextdisplay.c')
| -rw-r--r-- | gtk/gtktextdisplay.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c index a5a6cd8c5c..1b9a7f2ebc 100644 --- a/gtk/gtktextdisplay.c +++ b/gtk/gtktextdisplay.c @@ -202,12 +202,12 @@ gtk_text_renderer_prepare_run (PangoRenderer *renderer, if (text_renderer->state == SELECTED) { - if (GTK_WIDGET_HAS_FOCUS (text_renderer->widget)) + if (gtk_widget_has_focus (text_renderer->widget)) fg_color = &text_renderer->widget->style->text[GTK_STATE_SELECTED]; else fg_color = &text_renderer->widget->style->text[GTK_STATE_ACTIVE]; } - else if (text_renderer->state == CURSOR && GTK_WIDGET_HAS_FOCUS (text_renderer->widget)) + else if (text_renderer->state == CURSOR && gtk_widget_has_focus (text_renderer->widget)) fg_color = &text_renderer->widget->style->base[GTK_STATE_NORMAL]; else fg_color = &appearance->fg_color; @@ -259,12 +259,12 @@ gtk_text_renderer_draw_shape (PangoRenderer *renderer, if (text_renderer->state == SELECTED) { - if (GTK_WIDGET_HAS_FOCUS (text_renderer->widget)) + if (gtk_widget_has_focus (text_renderer->widget)) fg_gc = text_renderer->widget->style->text_gc[GTK_STATE_SELECTED]; else fg_gc = text_renderer->widget->style->text_gc[GTK_STATE_SELECTED]; } - else if (text_renderer->state == CURSOR && GTK_WIDGET_HAS_FOCUS (text_renderer->widget)) + else if (text_renderer->state == CURSOR && gtk_widget_has_focus (text_renderer->widget)) fg_gc = text_renderer->widget->style->base_gc[GTK_STATE_NORMAL]; else fg_gc = text_renderer->widget->style->text_gc[GTK_STATE_NORMAL]; @@ -481,7 +481,7 @@ render_para (GtkTextRenderer *text_renderer, screen_width = line_display->total_width; - if (GTK_WIDGET_HAS_FOCUS (text_renderer->widget)) + if (gtk_widget_has_focus (text_renderer->widget)) state = GTK_STATE_SELECTED; else state = GTK_STATE_ACTIVE; @@ -649,7 +649,7 @@ render_para (GtkTextRenderer *text_renderer, } } else if (line_display->has_block_cursor && - GTK_WIDGET_HAS_FOCUS (text_renderer->widget) && + gtk_widget_has_focus (text_renderer->widget) && byte_offset <= line_display->insert_index && (line_display->insert_index < byte_offset + line->length || (at_last_line && line_display->insert_index == byte_offset + line->length))) |