diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-04-18 20:16:38 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-04-18 20:16:38 +0000 |
| commit | f8ceea8b354a75bd811341d1b8c73b55b464074a (patch) | |
| tree | 6c392dd65c7ccb67d15fc2211f054049021fcbe0 /gtk/gtkentry.c | |
| parent | c01a1c7363ec11353f3b87d5a9fdec96b5b15a30 (diff) | |
| download | gtk+-f8ceea8b354a75bd811341d1b8c73b55b464074a.tar.gz | |
Close bug #50615:
2001-04-18 Havoc Pennington <hp@redhat.com>
Close bug #50615:
* gtk/gtkstyle.c (gtk_default_draw_layout): Use text_gc to draw
the layout
* gtk/gtktext.c: Use base/text instead of bg/fg throughout
* gtk/gtkentry.c: Use base/text instead of bg/fg throughout
* gtk/gtktextdisplay.c: Use base/text instead of bg/fg throughout
* gtk/gtkstyle.c (gtk_style_init): make GTK_STATE_SELECTED default
to blue for base, in addition to bg
Diffstat (limited to 'gtk/gtkentry.c')
| -rw-r--r-- | gtk/gtkentry.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index e338bbf45d..84af9d3c7f 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -846,7 +846,7 @@ gtk_entry_realize_cursor_gc (GtkEntry *entry) gdk_gc_set_rgb_fg_color (entry->cursor_gc, cursor_color); } else - entry->cursor_gc = gdk_gc_ref (GTK_WIDGET (entry)->style->bg_gc[GTK_STATE_SELECTED]); + entry->cursor_gc = gdk_gc_ref (GTK_WIDGET (entry)->style->base_gc[GTK_STATE_SELECTED]); } static void @@ -2372,17 +2372,17 @@ gtk_entry_draw_text (GtkEntry *entry) rect.width = (ranges[2*i + 1] - ranges[2*i]) / PANGO_SCALE; rect.height = logical_rect.height / PANGO_SCALE; - gdk_draw_rectangle (entry->text_area, widget->style->bg_gc [GTK_STATE_SELECTED], TRUE, + gdk_draw_rectangle (entry->text_area, widget->style->base_gc [GTK_STATE_SELECTED], TRUE, rect.x, rect.y, rect.width, rect.height); gdk_region_union_with_rect (clip_region, &rect); } - gdk_gc_set_clip_region (widget->style->fg_gc [GTK_STATE_SELECTED], clip_region); - gdk_draw_layout (entry->text_area, widget->style->fg_gc [GTK_STATE_SELECTED], + gdk_gc_set_clip_region (widget->style->text_gc [GTK_STATE_SELECTED], clip_region); + gdk_draw_layout (entry->text_area, widget->style->text_gc [GTK_STATE_SELECTED], x, y, layout); - gdk_gc_set_clip_region (widget->style->fg_gc [GTK_STATE_SELECTED], NULL); + gdk_gc_set_clip_region (widget->style->text_gc [GTK_STATE_SELECTED], NULL); gdk_region_destroy (clip_region); g_free (ranges); @@ -2416,7 +2416,7 @@ gtk_entry_draw_cursor (GtkEntry *entry, xoffset + strong_x, text_area_height - INNER_BORDER); if (weak_x != strong_x) - gdk_draw_line (entry->text_area, widget->style->fg_gc[GTK_STATE_NORMAL], + gdk_draw_line (entry->text_area, widget->style->text_gc[GTK_STATE_NORMAL], xoffset + weak_x, INNER_BORDER, xoffset + weak_x, text_area_height - INNER_BORDER); } |