We now accept the color parameter to be NULL. If it is NULL, it will mark

1998-03-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* gtk/gtkclist.c (gtk_clist_set_foreground): We now accept the
	color parameter to be NULL.  If it is NULL, it will mark the row
	with "color not set", so it will be repainted with the default color.
	(gtk_clist_set_background): Likewise.

8 files changed, 69 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 8492031044..21d28413d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1998-03-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gtk/gtkclist.c (gtk_clist_set_foreground): We now accept the
+	color parameter to be NULL.  If it is NULL, it will mark the row
+	with "color not set", so it will be repainted with the default color.
+	(gtk_clist_set_background): Likewise.
+
 Mon Mar  9 15:48:10 1998  Tim Janik  <timj@gimp.org>
 
 	* Signal signedness and naming corrections, plus GtkType fixes:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8492031044..21d28413d2 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+1998-03-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gtk/gtkclist.c (gtk_clist_set_foreground): We now accept the
+	color parameter to be NULL.  If it is NULL, it will mark the row
+	with "color not set", so it will be repainted with the default color.
+	(gtk_clist_set_background): Likewise.
+
 Mon Mar  9 15:48:10 1998  Tim Janik  <timj@gimp.org>
 
 	* Signal signedness and naming corrections, plus GtkType fixes:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8492031044..21d28413d2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+1998-03-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gtk/gtkclist.c (gtk_clist_set_foreground): We now accept the
+	color parameter to be NULL.  If it is NULL, it will mark the row
+	with "color not set", so it will be repainted with the default color.
+	(gtk_clist_set_background): Likewise.
+
 Mon Mar  9 15:48:10 1998  Tim Janik  <timj@gimp.org>
 
 	* Signal signedness and naming corrections, plus GtkType fixes:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8492031044..21d28413d2 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+1998-03-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gtk/gtkclist.c (gtk_clist_set_foreground): We now accept the
+	color parameter to be NULL.  If it is NULL, it will mark the row
+	with "color not set", so it will be repainted with the default color.
+	(gtk_clist_set_background): Likewise.
+
 Mon Mar  9 15:48:10 1998  Tim Janik  <timj@gimp.org>
 
 	* Signal signedness and naming corrections, plus GtkType fixes:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8492031044..21d28413d2 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+1998-03-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gtk/gtkclist.c (gtk_clist_set_foreground): We now accept the
+	color parameter to be NULL.  If it is NULL, it will mark the row
+	with "color not set", so it will be repainted with the default color.
+	(gtk_clist_set_background): Likewise.
+
 Mon Mar  9 15:48:10 1998  Tim Janik  <timj@gimp.org>
 
 	* Signal signedness and naming corrections, plus GtkType fixes:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8492031044..21d28413d2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+1998-03-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gtk/gtkclist.c (gtk_clist_set_foreground): We now accept the
+	color parameter to be NULL.  If it is NULL, it will mark the row
+	with "color not set", so it will be repainted with the default color.
+	(gtk_clist_set_background): Likewise.
+
 Mon Mar  9 15:48:10 1998  Tim Janik  <timj@gimp.org>
 
 	* Signal signedness and naming corrections, plus GtkType fixes:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8492031044..21d28413d2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+1998-03-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gtk/gtkclist.c (gtk_clist_set_foreground): We now accept the
+	color parameter to be NULL.  If it is NULL, it will mark the row
+	with "color not set", so it will be repainted with the default color.
+	(gtk_clist_set_background): Likewise.
+
 Mon Mar  9 15:48:10 1998  Tim Janik  <timj@gimp.org>
 
 	* Signal signedness and naming corrections, plus GtkType fixes:
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 3cb3860e77..00e40d9a9d 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -1131,34 +1131,45 @@ gtk_clist_set_foreground (GtkCList * clist,
   GtkCListRow *clist_row;
 
   g_return_if_fail (clist != NULL);
-  g_return_if_fail (color != NULL);
 
   if (row < 0 || row >= clist->rows)
     return;
 
   clist_row = (g_list_nth (clist->row_list, row))->data;
-  clist_row->foreground = *color;
-  clist_row->fg_set = TRUE;
+
+  if (color)
+    {
+      clist_row->foreground = *color;
+      clist_row->fg_set = TRUE;
+    }
+  else
+    clist_row->fg_set = FALSE;
 
   if (!GTK_CLIST_FROZEN (clist) && gtk_clist_row_is_visible (clist, row))
     draw_row (clist, NULL, row, clist_row);
 }
 
-void gtk_clist_set_background (GtkCList * clist,
-			       gint row,
-			       GdkColor * color)
+void
+gtk_clist_set_background (GtkCList * clist,
+			  gint row,
+			  GdkColor * color)
 {
   GtkCListRow *clist_row;
 
   g_return_if_fail (clist != NULL);
-  g_return_if_fail (color != NULL);
 
   if (row < 0 || row >= clist->rows)
     return;
 
   clist_row = (g_list_nth (clist->row_list, row))->data;
-  clist_row->background = *color;
-  clist_row->bg_set = TRUE;
+
+  if (color)
+    {
+      clist_row->background = *color;
+      clist_row->bg_set = TRUE;
+    }
+  else
+    clist_row->bg_set = FALSE;
 
   if (!GTK_CLIST_FROZEN (clist) && gtk_clist_row_is_visible (clist, row))
     draw_row (clist, NULL, row, clist_row);