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

gtk/gtkstyle.c: use accessor functions to access GtkWidget

Browse Source
This commit is contained in:
Javier Jardón
2010-08-11 22:54:01 +02:00
parent c9dd25bd11
commit bf1f03ad5d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkstyle.c
View File

@ -5698,13 +5698,16 @@ get_insertion_cursor_color (GtkWidget *widget,
gboolean is_primary) gboolean is_primary)
{ {
CursorInfo *cursor_info; CursorInfo *cursor_info;
GtkStyle *style;
GdkColor *cursor_color; GdkColor *cursor_color;
cursor_info = g_object_get_data (G_OBJECT (widget->style), "gtk-style-cursor-info"); style = gtk_widget_get_style (widget);
cursor_info = g_object_get_data (G_OBJECT (style), "gtk-style-cursor-info");
if (!cursor_info) if (!cursor_info)
{ {
cursor_info = g_new0 (CursorInfo, 1); cursor_info = g_new0 (CursorInfo, 1);
g_object_set_data (G_OBJECT (widget->style), I_("gtk-style-cursor-info"), cursor_info); g_object_set_data (G_OBJECT (style), I_("gtk-style-cursor-info"), cursor_info);
cursor_info->for_type = G_TYPE_INVALID; cursor_info->for_type = G_TYPE_INVALID;
} }
@ -5728,7 +5731,7 @@ get_insertion_cursor_color (GtkWidget *widget,
} }
else else
{ {
cursor_info->primary = widget->style->text[GTK_STATE_NORMAL]; cursor_info->primary = style->text[GTK_STATE_NORMAL];
} }
gtk_widget_style_get (widget, "secondary-cursor-color", &cursor_color, NULL); gtk_widget_style_get (widget, "secondary-cursor-color", &cursor_color, NULL);
@ -5741,7 +5744,7 @@ get_insertion_cursor_color (GtkWidget *widget,
{ {
/* text_aa is the average of text and base colors, /* text_aa is the average of text and base colors,
* in usual black-on-white case it's grey. */ * in usual black-on-white case it's grey. */
cursor_info->secondary = widget->style->text_aa[GTK_STATE_NORMAL]; cursor_info->secondary = style->text_aa[GTK_STATE_NORMAL];
} }
} }
@ -5768,7 +5771,7 @@ _gtk_widget_get_cursor_color (GtkWidget *widget,
gdk_color_free (style_color); gdk_color_free (style_color);
} }
else else
*color = widget->style->text[GTK_STATE_NORMAL]; *color = gtk_widget_get_style (widget)->text[GTK_STATE_NORMAL];
} }
static void static void