AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Owen Taylor 1999-01-17 22:38:05 +00:00 committed by Owen Taylor
parent 5af447fa07
commit 2aca4b0a80
8 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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.

8
ChangeLog.pre-2-0
View File

@ -1,3 +1,11 @@
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.

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
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.

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
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.

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
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.

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
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.

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
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.

11
gtk/gtkrc.c
View File

@ -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);