Updated the default label and text colors of all widgets to use

FL_FOREGROUND_COLOR instead of FL_BLACK (STR #1052)



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

8 files changed, 9 insertions, 9 deletions

diff --git a/src/Fl_Adjuster.cxx b/src/Fl_Adjuster.cxx
index 18b0dcdc5..5c5e46f3a 100644
--- a/src/Fl_Adjuster.cxx
+++ b/src/Fl_Adjuster.cxx
@@ -161,7 +161,7 @@ Fl_Adjuster::Fl_Adjuster(int X, int Y, int W, int H, const char* l)
   : Fl_Valuator(X, Y, W, H, l) {
   box(FL_UP_BOX);
   step(1, 10000);
-  selection_color(FL_BLACK);
+  selection_color(FL_SELECTION_COLOR);
   drag = 0;
   soft_ = 1;
 }
diff --git a/src/Fl_Chart.cxx b/src/Fl_Chart.cxx
index a7bab2076..fce4bf045 100644
--- a/src/Fl_Chart.cxx
+++ b/src/Fl_Chart.cxx
@@ -296,7 +296,7 @@ Fl_Widget(X,Y,W,H,l) {
   min = max  = 0;
   textfont_  = FL_HELVETICA;
   textsize_  = 10;
-  textcolor_ = FL_BLACK;
+  textcolor_ = FL_FOREGROUND_COLOR;
   entries    = (FL_CHART_ENTRY *)calloc(sizeof(FL_CHART_ENTRY), FL_CHART_MAX + 1);
 }
 
diff --git a/src/Fl_Check_Button.cxx b/src/Fl_Check_Button.cxx
index 2fa990445..ba8f22fcb 100644
--- a/src/Fl_Check_Button.cxx
+++ b/src/Fl_Check_Button.cxx
@@ -36,5 +36,5 @@ Fl_Check_Button::Fl_Check_Button(int X, int Y, int W, int H, const char *l)
 : Fl_Light_Button(X, Y, W, H, l) {
   box(FL_NO_BOX);
   down_box(FL_DOWN_BOX);
-  selection_color(FL_BLACK);
+  selection_color(FL_SELECTION_COLOR);
 }
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index 533811c72..aa532e672 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -122,7 +122,7 @@ int Fl_Menu_Item::measure(int* hp, const Fl_Menu_* m) const {
   l.type    = labeltype_;
   l.font    = labelsize_ || labelfont_ ? labelfont_ : uchar(m ? m->textfont() : FL_HELVETICA);
   l.size    = labelsize_ ? labelsize_ : m ? m->textsize() : (uchar)FL_NORMAL_SIZE;
-  l.color   = FL_BLACK; // this makes no difference?
+  l.color   = FL_FOREGROUND_COLOR; // this makes no difference?
   fl_draw_shortcut = 1;
   int w = 0; int h = 0;
   l.measure(w, hp ? *hp : h);
@@ -140,7 +140,7 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m,
   l.type    = labeltype_;
   l.font    = labelsize_ || labelfont_ ? labelfont_ : uchar(m ? m->textfont() : FL_HELVETICA);
   l.size    = labelsize_ ? labelsize_ : m ? m->textsize() : (uchar)FL_NORMAL_SIZE;
-  l.color   = labelcolor_ ? labelcolor_ : m ? m->textcolor() : int(FL_BLACK);
+  l.color   = labelcolor_ ? labelcolor_ : m ? m->textcolor() : int(FL_FOREGROUND_COLOR);
   if (!active()) l.color = fl_inactive((Fl_Color)l.color);
   Fl_Color color = m ? m->color() : FL_GRAY;
   if (selected) {
diff --git a/src/Fl_Menu_.cxx b/src/Fl_Menu_.cxx
index 4b1edb4e1..f5b3c61a2 100644
--- a/src/Fl_Menu_.cxx
+++ b/src/Fl_Menu_.cxx
@@ -176,7 +176,7 @@ Fl_Menu_::Fl_Menu_(int X,int Y,int W,int H,const char* l)
   selection_color(FL_SELECTION_COLOR);
   textfont(FL_HELVETICA);
   textsize((uchar)FL_NORMAL_SIZE);
-  textcolor(FL_BLACK);
+  textcolor(FL_FOREGROUND_COLOR);
   down_box(FL_NO_BOX);
 }
 
diff --git a/src/Fl_Value_Output.cxx b/src/Fl_Value_Output.cxx
index 0594e3d10..6574bf106 100644
--- a/src/Fl_Value_Output.cxx
+++ b/src/Fl_Value_Output.cxx
@@ -94,7 +94,7 @@ Fl_Value_Output::Fl_Value_Output(int X, int Y, int W, int H,const char *l)
   align(FL_ALIGN_LEFT);
   textfont_ = FL_HELVETICA;
   textsize_ = (uchar)FL_NORMAL_SIZE;
-  textcolor_ = FL_BLACK;
+  textcolor_ = FL_FOREGROUND_COLOR;
   soft_ = 0;
 }
 
diff --git a/src/Fl_Value_Slider.cxx b/src/Fl_Value_Slider.cxx
index 834eba74c..ac7ca2efb 100644
--- a/src/Fl_Value_Slider.cxx
+++ b/src/Fl_Value_Slider.cxx
@@ -35,7 +35,7 @@ Fl_Value_Slider::Fl_Value_Slider(int X, int Y, int W, int H, const char*l)
   step(1,100);
   textfont_ = FL_HELVETICA;
   textsize_ = 10;
-  textcolor_ = FL_BLACK;
+  textcolor_ = FL_FOREGROUND_COLOR;
 }
 
 void Fl_Value_Slider::draw() {
diff --git a/src/Fl_Widget.cxx b/src/Fl_Widget.cxx
index a94764346..3c637767b 100644
--- a/src/Fl_Widget.cxx
+++ b/src/Fl_Widget.cxx
@@ -88,7 +88,7 @@ Fl_Widget::Fl_Widget(int X, int Y, int W, int H, const char* L) {
   label_.type	 = FL_NORMAL_LABEL;
   label_.font	 = FL_HELVETICA;
   label_.size	 = (uchar)FL_NORMAL_SIZE;
-  label_.color	 = FL_BLACK;
+  label_.color	 = FL_FOREGROUND_COLOR;
   tooltip_       = 0;
   callback_	 = default_callback;
   user_data_ 	 = 0;