diff --git a/ChangeLog b/ChangeLog
index 24bed158a..211a4bd0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-09  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSLayoutManager.m (-drawGlyphsForGlyphRange:atPoint:)
+	Replaced explicit colour setting.
+	* Source/NSTabView.m: (-drawRect:) Use color constant instead of
+	number in DPSsetgray().	
+
 2004-02-08  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/Additions/GNUstepGUI/GSDrawFunctions.h: Add two more methods.
diff --git a/Source/NSLayoutManager.m b/Source/NSLayoutManager.m
index 5f339c985..9f21605e8 100644
--- a/Source/NSLayoutManager.m
+++ b/Source/NSLayoutManager.m
@@ -1450,13 +1450,11 @@ container
 		    characterIndex: char_index
 		    layoutManager: self];
 		  [f set];
-		  if (color)
-		    [color set];
-		  else
+		  if (color == nil)
 		    {
-		      DPSsetgray(ctxt, 0.0);
-		      DPSsetalpha(ctxt, 1.0);
+		      color = defaultTextColor;
 		    }
+		  [color set];
 		}
 	      continue;
 	    }
diff --git a/Source/NSTabView.m b/Source/NSTabView.m
index 23d48d5da..fbae9657d 100644
--- a/Source/NSTabView.m
+++ b/Source/NSTabView.m
@@ -442,7 +442,7 @@
 	      r.size.height = 15 + iFlex;
 
 	      DPSsetlinewidth(ctxt,1);
-	      DPSsetgray(ctxt,1);
+	      DPSsetgray(ctxt, NSWhite);
 	      DPSmoveto(ctxt, r.origin.x, r.origin.y-1);
 	      DPSrlineto(ctxt, r.size.width, 0);
 	      DPSstroke(ctxt);      
@@ -500,7 +500,7 @@
 	      iFlex = 0;
 
 	      DPSsetlinewidth(ctxt,1);
-	      DPSsetgray(ctxt,1);
+	      DPSsetgray(ctxt, NSWhite);
 	      DPSmoveto(ctxt, r.origin.x, r.origin.y - 1);
 	      DPSrlineto(ctxt, r.size.width, 0);
 	      DPSstroke(ctxt);      
@@ -568,7 +568,7 @@
 	      r.size.height = 15;
 	      
 	      DPSsetlinewidth(ctxt,1);
-	      DPSsetgray(ctxt,1);
+	      DPSsetgray(ctxt, NSWhite);
 	      DPSmoveto(ctxt, r.origin.x, r.origin.y+16);
 	      DPSrlineto(ctxt, r.size.width, 0);
 	      DPSstroke(ctxt);      
@@ -616,7 +616,7 @@
 	      r.size.height = 15;
 
 	      DPSsetlinewidth(ctxt,1);
-	      DPSsetgray(ctxt,1);
+	      DPSsetgray(ctxt, NSWhite);
 	      DPSmoveto(ctxt, r.origin.x, r.origin.y+16);
 	      DPSrlineto(ctxt, r.size.width, 0);
 	      DPSstroke(ctxt);