nyje/medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream changes

Browse Source
This commit is contained in:
Yevgen Muntyan 2007-04-17 12:49:39 -05:00
parent c0a52d0709
commit fd560c2582
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
moo/mooedit/gtksourceview/upstream/gtksourcestylescheme.c
View File

@ -339,14 +339,14 @@ set_text_style (GtkWidget *widget,
{
GdkColor *color;
if (STYLE_HAS_BACKGROUND (style))
if (style != NULL && STYLE_HAS_BACKGROUND (style))
color = &style->background;
else
color = NULL;
gtk_widget_modify_base (widget, state, color);
if (STYLE_HAS_FOREGROUND (style))
if (style != NULL && STYLE_HAS_FOREGROUND (style))
color = &style->foreground;
else
color = NULL;
@ -360,7 +360,7 @@ set_cursor_color (GtkWidget *widget,
{
GdkColor *color;
if (STYLE_HAS_FOREGROUND (style))
if (style != NULL && STYLE_HAS_FOREGROUND (style))
color = &style->foreground;
else
color = &widget->style->text[GTK_STATE_NORMAL];
@ -370,7 +370,7 @@ set_cursor_color (GtkWidget *widget,
/**
* _gtk_source_style_scheme_apply:
* @scheme: a #GtkSourceStyleScheme.
* @scheme: a #GtkSourceStyleScheme or NULL.
* @widget: a #GtkWidget to apply styles to.
*
* Sets text colors from @scheme in the @widget.
@ -381,11 +381,13 @@ void
_gtk_source_style_scheme_apply (GtkSourceStyleScheme *scheme,
GtkWidget *widget)
{
GtkSourceStyle *style;
g_return_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme));
g_return_if_fail (!scheme || GTK_IS_SOURCE_STYLE_SCHEME (scheme));
g_return_if_fail (GTK_IS_WIDGET (widget));
if (scheme != NULL)
{
GtkSourceStyle *style;
gtk_widget_ensure_style (widget);
style = gtk_source_style_scheme_get_style (scheme, STYLE_TEXT);
@ -402,6 +404,16 @@ _gtk_source_style_scheme_apply (GtkSourceStyleScheme *scheme,
style = gtk_source_style_scheme_get_style (scheme, STYLE_CURSOR);
set_cursor_color (widget, style);
gtk_source_style_free (style);
}
else
{
set_text_style (widget, NULL, GTK_STATE_NORMAL);
set_text_style (widget, NULL, GTK_STATE_ACTIVE);
set_text_style (widget, NULL, GTK_STATE_PRELIGHT);
set_text_style (widget, NULL, GTK_STATE_INSENSITIVE);
set_text_style (widget, NULL, GTK_STATE_SELECTED);
set_cursor_color (widget, NULL);
}
}
/* --- PARSER ---------------------------------------------------------------- */