Redefine FL_ color values to use the color cube.

Add FL_BACKGROUND_COLOR, FL_BACKGROUND2_COLOR, and FL_FOREGROUND_COLOR,
and use them instead of FL_GRAY, FL_WHITE, and FL_BLACK, respectively.
(FL_GRAY defined to FL_BACKGROUND_COLOR for back-compatibility)

Add fl_rgb_color(uchar g) inline method to map 8-bit grayscale to
24-bit RGB color.

Doco updates for all of this...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2072 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

15 files changed, 63 insertions, 64 deletions

diff --git a/src/Fl_Browser_.cxx b/src/Fl_Browser_.cxx
index 19a6afde4..0741ea11e 100644
--- a/src/Fl_Browser_.cxx
+++ b/src/Fl_Browser_.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.10 2002/01/01 15:11:30 easysw Exp $"
+// "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.11 2002/04/11 10:46:19 easysw Exp $"
 //
 // Base Browser widget class for the Fast Light Tool Kit (FLTK).
 //
@@ -671,15 +671,14 @@ Fl_Browser_::Fl_Browser_(int x, int y, int w, int h, const char* l)
   top_ = 0;
   when(FL_WHEN_RELEASE_ALWAYS);
   selection_ = 0;
-  color(FL_WHITE);
-  selection_color(FL_SELECTION_COLOR);
+  color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR);
   scrollbar.callback(scrollbar_callback);
 //scrollbar.align(FL_ALIGN_LEFT|FL_ALIGN_BOTTOM); // back compatability?
   hscrollbar.callback(hscrollbar_callback);
   hscrollbar.type(FL_HORIZONTAL);
   textfont_ = FL_HELVETICA;
   textsize_ = FL_NORMAL_SIZE;
-  textcolor_ = FL_BLACK;
+  textcolor_ = FL_FOREGROUND_COLOR;
   has_scrollbar_ = BOTH;
   max_width = 0;
   max_width_item = 0;
@@ -713,5 +712,5 @@ void Fl_Browser_::item_select(void*, int) {}
 int Fl_Browser_::item_selected(void* l) const {return l==selection_;}
 
 //
-// End of "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.10 2002/01/01 15:11:30 easysw Exp $".
+// End of "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.11 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx
index e593e9adc..3ed71d97c 100644
--- a/src/Fl_Choice.cxx
+++ b/src/Fl_Choice.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.8 2002/03/26 00:50:16 easysw Exp $"
+// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.9 2002/04/11 10:46:19 easysw Exp $"
 //
 // Choice widget for the Fast Light Tool Kit (FLTK).
 //
@@ -81,7 +81,7 @@ Fl_Choice::Fl_Choice(int x,int y,int w,int h, const char *l)
   textfont(FL_HELVETICA);
   box(FL_FLAT_BOX);
   down_box(FL_BORDER_BOX);
-  color(FL_WHITE);
+  color(FL_BACKGROUND2_COLOR);
 }
 
 int Fl_Choice::value(int v) {
@@ -128,5 +128,5 @@ int Fl_Choice::handle(int e) {
 }
 
 //
-// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.8 2002/03/26 00:50:16 easysw Exp $".
+// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.9 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/Fl_Color_Chooser.cxx b/src/Fl_Color_Chooser.cxx
index bee62ef66..f2b6777f0 100644
--- a/src/Fl_Color_Chooser.cxx
+++ b/src/Fl_Color_Chooser.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Color_Chooser.cxx,v 1.7.2.4.2.3 2002/01/01 15:11:30 easysw Exp $"
+// "$Id: Fl_Color_Chooser.cxx,v 1.7.2.4.2.4 2002/04/11 10:46:19 easysw Exp $"
 //
 // Color chooser for the Fast Light Tool Kit (FLTK).
 //
@@ -289,7 +289,7 @@ void Flcc_HueBox::draw() {
   if (X < 0) X = 0; else if (X > w1-6) X = w1-6;
   if (Y < 0) Y = 0; else if (Y > h1-6) Y = h1-6;
   //  fl_color(c->value()>.75 ? FL_BLACK : FL_WHITE);
-  draw_box(FL_UP_BOX,x1+X,y1+Y,6,6,Fl::focus() == this ? FL_BLACK : FL_GRAY);
+  draw_box(FL_UP_BOX,x1+X,y1+Y,6,6,Fl::focus() == this ? FL_FOREGROUND_COLOR : FL_GRAY);
   px = X; py = Y;
 }
 
@@ -350,7 +350,7 @@ void Flcc_ValueBox::draw() {
   if (damage() == FL_DAMAGE_EXPOSE) fl_pop_clip();
   int Y = int((1-c->value()) * (h1-6));
   if (Y < 0) Y = 0; else if (Y > h1-6) Y = h1-6;
-  draw_box(FL_UP_BOX,x1,y1+Y,w1,6,Fl::focus() == this ? FL_BLACK : FL_GRAY);
+  draw_box(FL_UP_BOX,x1,y1+Y,w1,6,Fl::focus() == this ? FL_FOREGROUND_COLOR : FL_GRAY);
   py = Y;
 }
 
@@ -521,5 +521,5 @@ int fl_color_chooser(const char* name, uchar& r, uchar& g, uchar& b) {
 }
 
 //
-// End of "$Id: Fl_Color_Chooser.cxx,v 1.7.2.4.2.3 2002/01/01 15:11:30 easysw Exp $".
+// End of "$Id: Fl_Color_Chooser.cxx,v 1.7.2.4.2.4 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/Fl_Counter.cxx b/src/Fl_Counter.cxx
index 1872fb34a..a531cec50 100644
--- a/src/Fl_Counter.cxx
+++ b/src/Fl_Counter.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Counter.cxx,v 1.8.2.3.2.7 2002/03/25 21:08:41 easysw Exp $"
+// "$Id: Fl_Counter.cxx,v 1.8.2.3.2.8 2002/04/11 10:46:19 easysw Exp $"
 //
 // Counter widget for the Fast Light Tool Kit (FLTK).
 //
@@ -54,7 +54,7 @@ void Fl_Counter::draw() {
     xx[3] = x()+w()-1*W; ww[3] = W;
   }
 
-  draw_box(boxtype[0], xx[0], y(), ww[0], h(), FL_WHITE);
+  draw_box(boxtype[0], xx[0], y(), ww[0], h(), FL_BACKGROUND2_COLOR);
   fl_font(textfont(), textsize());
   fl_color(active_r() ? textcolor() : fl_inactive(textcolor()));
   char str[128]; format(str);
@@ -184,9 +184,9 @@ Fl_Counter::Fl_Counter(int x, int y, int w, int h, const char* l)
   mouseobj = 0;
   textfont_ = FL_HELVETICA;
   textsize_ = FL_NORMAL_SIZE;
-  textcolor_ = FL_BLACK;
+  textcolor_ = FL_FOREGROUND_COLOR;
 }
 
 //
-// End of "$Id: Fl_Counter.cxx,v 1.8.2.3.2.7 2002/03/25 21:08:41 easysw Exp $".
+// End of "$Id: Fl_Counter.cxx,v 1.8.2.3.2.8 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/Fl_Dial.cxx b/src/Fl_Dial.cxx
index fcc26fd0b..3a09af7a6 100644
--- a/src/Fl_Dial.cxx
+++ b/src/Fl_Dial.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Dial.cxx,v 1.12.2.3.2.1 2002/01/01 15:11:30 easysw Exp $"
+// "$Id: Fl_Dial.cxx,v 1.12.2.3.2.2 2002/04/11 10:46:19 easysw Exp $"
 //
 // Circular dial widget for the Fast Light Tool Kit (FLTK).
 //
@@ -47,7 +47,7 @@ void Fl_Dial::draw(int x, int y, int w, int h) {
     fl_color(selection_color());
     fl_pie(x, y, w-1, h-1, 270-angle, 270-a1);
     if (foo) {
-      fl_color(FL_BLACK);
+      fl_color(FL_FOREGROUND_COLOR);
       fl_arc(x, y, w, h, 0, 360);
     }
     return;
@@ -68,7 +68,7 @@ void Fl_Dial::draw(int x, int y, int w, int h) {
     fl_vertex(-0.25, 0.25);
     fl_vertex(0.0,   0.04);
     fl_end_polygon();
-    fl_color(FL_BLACK);
+    fl_color(FL_FOREGROUND_COLOR);
     fl_begin_loop();
     fl_vertex(0.0,   0.0);
     fl_vertex(-0.04, 0.0);
@@ -77,7 +77,7 @@ void Fl_Dial::draw(int x, int y, int w, int h) {
     fl_end_loop();
   } else {
     fl_begin_polygon(); fl_circle(-0.20, 0.20, 0.07); fl_end_polygon();
-    fl_color(FL_BLACK);
+    fl_color(FL_FOREGROUND_COLOR);
     fl_begin_loop(); fl_circle(-0.20, 0.20, 0.07); fl_end_loop();
   }
   fl_pop_matrix();
@@ -131,5 +131,5 @@ Fl_Dial::Fl_Dial(int x, int y, int w, int h, const char* l)
 }
 
 //
-// End of "$Id: Fl_Dial.cxx,v 1.12.2.3.2.1 2002/01/01 15:11:30 easysw Exp $".
+// End of "$Id: Fl_Dial.cxx,v 1.12.2.3.2.2 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx
index 900187262..be6696017 100644
--- a/src/Fl_Help_View.cxx
+++ b/src/Fl_Help_View.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Help_View.cxx,v 1.1.2.29 2002/03/05 11:26:41 easysw Exp $"
+// "$Id: Fl_Help_View.cxx,v 1.1.2.30 2002/04/11 10:46:19 easysw Exp $"
 //
 // Fl_Help_View widget routines.
 //
@@ -2230,9 +2230,8 @@ Fl_Help_View::Fl_Help_View(int        xx,	// I - Left position
   leftline_    = 0;
   size_        = 0;
 
-  color(FL_WHITE);
-  textcolor(FL_BLACK);
-  selection_color(FL_BLUE);
+  color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR);
+  textcolor(FL_FOREGROUND_COLOR);
 
   scrollbar_.value(0, hh, 0, 1);
   scrollbar_.step(8.0);
@@ -2624,5 +2623,5 @@ hscrollbar_callback(Fl_Widget *s, void *)
 
 
 //
-// End of "$Id: Fl_Help_View.cxx,v 1.1.2.29 2002/03/05 11:26:41 easysw Exp $".
+// End of "$Id: Fl_Help_View.cxx,v 1.1.2.30 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/Fl_Input_.cxx b/src/Fl_Input_.cxx
index ed40d1d48..b60fce213 100644
--- a/src/Fl_Input_.cxx
+++ b/src/Fl_Input_.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Input_.cxx,v 1.21.2.11.2.8 2002/04/08 18:32:16 easysw Exp $"
+// "$Id: Fl_Input_.cxx,v 1.21.2.11.2.9 2002/04/11 10:46:19 easysw Exp $"
 //
 // Common input widget routines for the Fast Light Tool Kit (FLTK).
 //
@@ -768,12 +768,12 @@ int Fl_Input_::handletext(int event, int X, int Y, int W, int H) {
 Fl_Input_::Fl_Input_(int x, int y, int w, int h, const char* l)
 : Fl_Widget(x, y, w, h, l) {
   box(FL_DOWN_BOX);
-  color(FL_WHITE, FL_SELECTION_COLOR);
+  color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR);
   align(FL_ALIGN_LEFT);
   textsize_ = FL_NORMAL_SIZE;
   textfont_ = FL_HELVETICA;
-  textcolor_ = FL_BLACK;
-  cursor_color_ = FL_BLACK; // was FL_BLUE
+  textcolor_ = FL_FOREGROUND_COLOR;
+  cursor_color_ = FL_FOREGROUND_COLOR; // was FL_BLUE
   mark_ = position_ = size_ = 0;
   bufsize = 0;
   buffer  = 0;
@@ -864,5 +864,5 @@ Fl_Input_::~Fl_Input_() {
 }
 
 //
-// End of "$Id: Fl_Input_.cxx,v 1.21.2.11.2.8 2002/04/08 18:32:16 easysw Exp $".
+// End of "$Id: Fl_Input_.cxx,v 1.21.2.11.2.9 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/Fl_Light_Button.cxx b/src/Fl_Light_Button.cxx
index 499dd470d..8a9ad003f 100644
--- a/src/Fl_Light_Button.cxx
+++ b/src/Fl_Light_Button.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.12 2002/03/25 21:08:41 easysw Exp $"
+// "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.13 2002/04/11 10:46:19 easysw Exp $"
 //
 // Lighted button widget for the Fast Light Tool Kit (FLTK).
 //
@@ -53,7 +53,7 @@ void Fl_Light_Button::draw() {
       case _FL_PLASTIC_DOWN_BOX :
       case _FL_PLASTIC_UP_BOX :
         // Check box...
-        draw_box(down_box(), x()+dx, y()+dy, W, W, FL_WHITE);
+        draw_box(down_box(), x()+dx, y()+dy, W, W, FL_BACKGROUND2_COLOR);
 	if (value()) {
 	  fl_color(col);
           fl_line_style(FL_SOLID, 2);
@@ -66,7 +66,7 @@ void Fl_Light_Button::draw() {
       case _FL_ROUND_DOWN_BOX :
       case _FL_ROUND_UP_BOX :
         // Radio button...
-        draw_box(down_box(), x()+dx, y()+dy+1, W, W, FL_WHITE);
+        draw_box(down_box(), x()+dx, y()+dy+1, W, W, FL_BACKGROUND2_COLOR);
 	if (value()) {
 	  fl_color(col);
 	  int tW = W - Fl::box_dw(down_box()) - 3;
@@ -116,5 +116,5 @@ Fl_Light_Button::Fl_Light_Button(int x, int y, int w, int h, const char* l)
 }
 
 //
-// End of "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.12 2002/03/25 21:08:41 easysw Exp $".
+// End of "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.13 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index b6d33ed24..465d01dff 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.8 2002/03/25 22:11:52 easysw Exp $"
+// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.9 2002/04/11 10:46:19 easysw Exp $"
 //
 // Menu code for the Fast Light Tool Kit (FLTK).
 //
@@ -163,7 +163,7 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m,
     int W = h - 2 * d;
 
     if (flags & FL_MENU_RADIO) {
-      fl_draw_box(FL_ROUND_DOWN_BOX, x+2, y+d+1, W, W, FL_WHITE);
+      fl_draw_box(FL_ROUND_DOWN_BOX, x+2, y+d+1, W, W, FL_BACKGROUND2_COLOR);
       if (value()) {
 	fl_color(labelcolor_);
 	int tW = W - Fl::box_dw(FL_ROUND_DOWN_BOX) - 3;
@@ -177,7 +177,7 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m,
 	}
       }
     } else {
-      fl_draw_box(FL_DOWN_BOX, x+2, y+d, W, W, FL_WHITE);
+      fl_draw_box(FL_DOWN_BOX, x+2, y+d, W, W, FL_BACKGROUND2_COLOR);
       if (value()) {
 	fl_color(labelcolor_);
         fl_line_style(FL_SOLID, 2);
@@ -756,5 +756,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const {
 }
 
 //
-// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.8 2002/03/25 22:11:52 easysw Exp $".
+// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.9 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/Fl_Progress.cxx b/src/Fl_Progress.cxx
index a3d58567f..0bd79f6ef 100644
--- a/src/Fl_Progress.cxx
+++ b/src/Fl_Progress.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Progress.cxx,v 1.1.2.4 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_Progress.cxx,v 1.1.2.5 2002/04/11 10:46:19 easysw Exp $"
 //
 // Progress bar widget routines.
 //
@@ -97,7 +97,7 @@ Fl_Progress::Fl_Progress(int x, int y, int w, int h, const char* l)
 {
   align(FL_ALIGN_INSIDE);
   box(FL_DOWN_BOX);
-  color(FL_WHITE, FL_YELLOW);
+  color(FL_BACKGROUND2_COLOR, FL_YELLOW);
   minimum(0.0f);
   maximum(100.0f);
   value(0.0f);
@@ -105,5 +105,5 @@ Fl_Progress::Fl_Progress(int x, int y, int w, int h, const char* l)
 
 
 //
-// End of "$Id: Fl_Progress.cxx,v 1.1.2.4 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_Progress.cxx,v 1.1.2.5 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/Fl_Slider.cxx b/src/Fl_Slider.cxx
index b0c66b86e..4330f6d9f 100644
--- a/src/Fl_Slider.cxx
+++ b/src/Fl_Slider.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Slider.cxx,v 1.8.2.10.2.5 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_Slider.cxx,v 1.8.2.10.2.6 2002/04/11 10:46:19 easysw Exp $"
 //
 // Slider widget for the Fast Light Tool Kit (FLTK).
 //
@@ -86,7 +86,7 @@ void Fl_Slider::draw_bg(int x, int y, int w, int h) {
   if (!(damage()&FL_DAMAGE_ALL)) { // not a complete redraw
     draw_box();
   }
-  Fl_Color black = active_r() ? FL_BLACK : FL_INACTIVE_COLOR;
+  Fl_Color black = active_r() ? FL_FOREGROUND_COLOR : FL_INACTIVE_COLOR;
   if (type() == FL_VERT_NICE_SLIDER) {
     draw_box(FL_THIN_DOWN_BOX, x+w/2-2, y, 4, h, black);
   } else if (type() == FL_HOR_NICE_SLIDER) {
@@ -291,5 +291,5 @@ int Fl_Slider::handle(int event) {
 }
 
 //
-// End of "$Id: Fl_Slider.cxx,v 1.8.2.10.2.5 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_Slider.cxx,v 1.8.2.10.2.6 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx
index c1299f970..1b34a27b6 100644
--- a/src/Fl_Text_Display.cxx
+++ b/src/Fl_Text_Display.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Text_Display.cxx,v 1.12.2.11 2002/03/07 19:22:56 spitzak Exp $"
+// "$Id: Fl_Text_Display.cxx,v 1.12.2.12 2002/04/11 10:46:19 easysw Exp $"
 //
 // Copyright 2001-2002 by Bill Spitzak and others.
 // Original code Copyright Mark Edel.  Permission to distribute under
@@ -72,10 +72,10 @@ Fl_Text_Display::Fl_Text_Display(int X, int Y, int W, int H,  const char* l)
   dragPos = dragType = dragging = 0;
   display_insert_position_hint = 0;
 
-  color(FL_WHITE, FL_SELECTION_COLOR);
+  color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR);
   box(FL_DOWN_FRAME);
   textsize(FL_NORMAL_SIZE);
-  textcolor(FL_BLACK);
+  textcolor(FL_FOREGROUND_COLOR);
   textfont(FL_HELVETICA);
 
   text_area.x = 0;
@@ -1958,5 +1958,5 @@ int Fl_Text_Display::handle(int event) {
 
 
 //
-// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.11 2002/03/07 19:22:56 spitzak Exp $".
+// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.12 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx
index 5c0ce8329..8f216af88 100644
--- a/src/Fl_get_system_colors.cxx
+++ b/src/Fl_get_system_colors.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.6 2002/01/07 18:47:27 easysw Exp $"
+// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.7 2002/04/11 10:46:19 easysw Exp $"
 //
 // System color support for the Fast Light Tool Kit (FLTK).
 //
@@ -53,12 +53,13 @@ void Fl::background(uchar r, uchar g, uchar b) {
 }
 
 void Fl::foreground(uchar r, uchar g, uchar b) {
-  Fl::set_color(FL_BLACK,r,g,b);
+  Fl::set_color(FL_FOREGROUND_COLOR,r,g,b);
 }
 
 void Fl::background2(uchar r, uchar g, uchar b) {
-  Fl::set_color(FL_WHITE,r,g,b);
-  Fl::set_color(FL_BLACK,get_color(fl_contrast(FL_BLACK,FL_WHITE)));
+  Fl::set_color(FL_BACKGROUND2_COLOR,r,g,b);
+  Fl::set_color(FL_FOREGROUND_COLOR,
+                get_color(fl_contrast(FL_FOREGROUND_COLOR,FL_BACKGROUND2_COLOR)));
 }
 
 // these are set by Fl::args() and override any system colors:
@@ -304,5 +305,5 @@ int Fl::reload_scheme() {
 
 
 //
-// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.6 2002/01/07 18:47:27 easysw Exp $".
+// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.7 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/fl_color.cxx b/src/fl_color.cxx
index cb4101239..0d2fbc683 100644
--- a/src/fl_color.cxx
+++ b/src/fl_color.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_color.cxx,v 1.12.2.5.2.5 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_color.cxx,v 1.12.2.5.2.6 2002/04/11 10:46:19 easysw Exp $"
 //
 // Color functions for the Fast Light Tool Kit (FLTK).
 //
@@ -366,11 +366,11 @@ Fl_Color fl_contrast(Fl_Color fg, Fl_Color bg) {
   if ((c1^c2)&0x80800000)
     return fg;
   else if (c2&0x80800000)
-    return FL_GRAY_RAMP; // black from gray ramp
+    return FL_BLACK;
   else
-    return (Fl_Color)(FL_COLOR_CUBE-1); // white from gray ramp
+    return FL_WHITE;
 }
 
 //
-// End of "$Id: fl_color.cxx,v 1.12.2.5.2.5 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_color.cxx,v 1.12.2.5.2.6 2002/04/11 10:46:19 easysw Exp $".
 //
diff --git a/src/fl_set_gray.cxx b/src/fl_set_gray.cxx
index a41671d80..f68cb8cab 100644
--- a/src/fl_set_gray.cxx
+++ b/src/fl_set_gray.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_set_gray.cxx,v 1.5.2.3.2.1 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_set_gray.cxx,v 1.5.2.3.2.2 2002/04/11 10:46:19 easysw Exp $"
 //
 // Background (gray) color routines for the Fast Light Tool Kit (FLTK).
 //
@@ -41,22 +41,22 @@ void Fl::background(uchar r, uchar g, uchar b) {
 }
 
 static void set_others() {
-  uchar r,g,b; Fl::get_color(FL_BLACK,r,g,b);
-  uchar r1,g1,b1; Fl::get_color(FL_WHITE,r1,g1,b1);
+  uchar r,g,b; Fl::get_color(FL_FOREGROUND_COLOR,r,g,b);
+  uchar r1,g1,b1; Fl::get_color(FL_BACKGROUND2_COLOR,r1,g1,b1);
   Fl::set_color(FL_INACTIVE_COLOR,(2*r+r1)/3, (2*g+g1)/3, (2*b+b1)/3);
   Fl::set_color(FL_SELECTION_COLOR,(2*r1+r)/3, (2*g1+g)/3, (2*b1+b)/3);
 }
 
 void Fl::foreground(uchar r, uchar g, uchar b) {
-  Fl::set_color(FL_BLACK,r,g,b);
+  Fl::set_color(FL_FOREGROUND_COLOR,r,g,b);
   set_others();
 }
 
 void Fl::background2(uchar r, uchar g, uchar b) {
-  Fl::set_color(FL_WHITE,r,g,b);
+  Fl::set_color(FL_BACKGROUND2_COLOR,r,g,b);
   set_others();
 }
 
 //
-// End of "$Id: fl_set_gray.cxx,v 1.5.2.3.2.1 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_set_gray.cxx,v 1.5.2.3.2.2 2002/04/11 10:46:19 easysw Exp $".
 //