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.

diff --git a/ChangeLog b/ChangeLog
index f372760d62731fd6f731f4f8edc9e930edfb2da5..18c3e6bbf44f4864d4aacbb609a66b123f22904c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f372760d62731fd6f731f4f8edc9e930edfb2da5..18c3e6bbf44f4864d4aacbb609a66b123f22904c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f372760d62731fd6f731f4f8edc9e930edfb2da5..18c3e6bbf44f4864d4aacbb609a66b123f22904c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f372760d62731fd6f731f4f8edc9e930edfb2da5..18c3e6bbf44f4864d4aacbb609a66b123f22904c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f372760d62731fd6f731f4f8edc9e930edfb2da5..18c3e6bbf44f4864d4aacbb609a66b123f22904c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f372760d62731fd6f731f4f8edc9e930edfb2da5..18c3e6bbf44f4864d4aacbb609a66b123f22904c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f372760d62731fd6f731f4f8edc9e930edfb2da5..18c3e6bbf44f4864d4aacbb609a66b123f22904c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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.

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 6aaa50a85dd9bda15e97bfe7a7693719b7e27ad9..3dc13cc8125c217efcf8b16c38119e852b597bb3 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -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);