Commit 2aca4b0a authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Allow a bg_pixmap of "<none>", as there was no way to set the background

Sun Jan 17 12:01:57 1999  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkrc.c (gtk_rc_style_init): Allow a bg_pixmap
	of "<none>", as there was no way to set the background
	on all widget but some widgets. This is important
	because Text widgets with background images are
	slow and possibly ugly.
parent 5af447fa
Sun Jan 17 12:01:57 1999 Owen Taylor <otaylor@gtk.org>
* gtk/gtkrc.c (gtk_rc_style_init): Allow a bg_pixmap
of "<none>", as there was no way to set the background
on all widget but some widgets. This is important
because Text widgets with background images are
slow and possibly ugly.
1999-01-17 Nat Friedman <nat@nat.org>
* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
......
Sun Jan 17 12:01:57 1999 Owen Taylor <otaylor@gtk.org>
* gtk/gtkrc.c (gtk_rc_style_init): Allow a bg_pixmap
of "<none>", as there was no way to set the background
on all widget but some widgets. This is important
because Text widgets with background images are
slow and possibly ugly.
1999-01-17 Nat Friedman <nat@nat.org>
* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
......
Sun Jan 17 12:01:57 1999 Owen Taylor <otaylor@gtk.org>
* gtk/gtkrc.c (gtk_rc_style_init): Allow a bg_pixmap
of "<none>", as there was no way to set the background
on all widget but some widgets. This is important
because Text widgets with background images are
slow and possibly ugly.
1999-01-17 Nat Friedman <nat@nat.org>
* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
......
Sun Jan 17 12:01:57 1999 Owen Taylor <otaylor@gtk.org>
* gtk/gtkrc.c (gtk_rc_style_init): Allow a bg_pixmap
of "<none>", as there was no way to set the background
on all widget but some widgets. This is important
because Text widgets with background images are
slow and possibly ugly.
1999-01-17 Nat Friedman <nat@nat.org>
* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
......
Sun Jan 17 12:01:57 1999 Owen Taylor <otaylor@gtk.org>
* gtk/gtkrc.c (gtk_rc_style_init): Allow a bg_pixmap
of "<none>", as there was no way to set the background
on all widget but some widgets. This is important
because Text widgets with background images are
slow and possibly ugly.
1999-01-17 Nat Friedman <nat@nat.org>
* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
......
Sun Jan 17 12:01:57 1999 Owen Taylor <otaylor@gtk.org>
* gtk/gtkrc.c (gtk_rc_style_init): Allow a bg_pixmap
of "<none>", as there was no way to set the background
on all widget but some widgets. This is important
because Text widgets with background images are
slow and possibly ugly.
1999-01-17 Nat Friedman <nat@nat.org>
* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
......
Sun Jan 17 12:01:57 1999 Owen Taylor <otaylor@gtk.org>
* gtk/gtkrc.c (gtk_rc_style_init): Allow a bg_pixmap
of "<none>", as there was no way to set the background
on all widget but some widgets. This is important
because Text widgets with background images are
slow and possibly ugly.
1999-01-17 Nat Friedman <nat@nat.org>
* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
......
......@@ -1120,6 +1120,14 @@ gtk_rc_style_init (GSList *rc_styles)
tmp_styles = tmp_styles->next;
}
for (i=0; i<5; i++)
if (proto_style->bg_pixmap_name[i] &&
(strcmp (proto_style->bg_pixmap_name[i], "<none>") == 0))
{
g_free (proto_style->bg_pixmap_name[i]);
proto_style->bg_pixmap_name[i] = NULL;
}
style = gtk_rc_style_to_style (proto_style);
g_hash_table_insert (realized_style_ht, rc_styles, style);
......@@ -1467,7 +1475,8 @@ gtk_rc_parse_bg_pixmap (GScanner *scanner,
if (token != G_TOKEN_STRING)
return G_TOKEN_STRING;
if (strcmp (scanner->value.v_string, "<parent>") == 0)
if ((strcmp (scanner->value.v_string, "<parent>") == 0) ||
(strcmp (scanner->value.v_string, "<none>") == 0))
pixmap_file = g_strdup (scanner->value.v_string);
else
pixmap_file = gtk_rc_find_pixmap_in_path (scanner, scanner->value.v_string);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment