32-bit color (RGB0 or 000I), a la FLTK 2.0, including fl_rgb_color()

function to generate an RGB Fl_Color value.

Sort button names in FLUID.

Fix focus and scroll problems in Fl_Text_Display/Editor.

Fix radio/button demo.

Removed D2 menubar.H header...


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

3 files changed, 12 insertions, 12 deletions

diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx
index d7f400ed5..1afc5782d 100644
--- a/fluid/Fl_Type.cxx
+++ b/fluid/Fl_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Type.cxx,v 1.6.2.6 2001/01/22 15:13:38 easysw Exp $"
+// "$Id: Fl_Type.cxx,v 1.6.2.6.2.1 2001/10/29 03:44:32 easysw Exp $"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -130,7 +130,7 @@ extern const char* subclassname(Fl_Type*);
 void Widget_Browser::item_draw(void *v, int x, int y, int, int) const {
   Fl_Type *l = (Fl_Type *)v;
   x += 3 + l->level * 10;
-  if (l->new_selected) fl_color(contrast(FL_BLACK,FL_SELECTION_COLOR));
+  if (l->new_selected) fl_color(fl_contrast(FL_BLACK,FL_SELECTION_COLOR));
   else fl_color(FL_BLACK);
   if (l->is_parent()) {
     if (!l->next || l->next->level <= l->level) {
@@ -667,5 +667,5 @@ void Fl_Type::read_property(const char *c) {
 int Fl_Type::read_fdesign(const char*, const char*) {return 0;}
 
 //
-// End of "$Id: Fl_Type.cxx,v 1.6.2.6 2001/01/22 15:13:38 easysw Exp $".
+// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.1 2001/10/29 03:44:32 easysw Exp $".
 //
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index aff78506e..5e9caa775 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.5 2001/10/01 19:38:28 easysw Exp $"
+// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.6 2001/10/29 03:44:32 easysw Exp $"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -846,7 +846,7 @@ void color_cb(Fl_Button* i, void *v) {
 	q->o->color(c); q->o->redraw();
     }
   }
-  i->color(c); i->labelcolor(contrast(FL_BLACK,c)); i->redraw();
+  i->color(c); i->labelcolor(fl_contrast(FL_BLACK,c)); i->redraw();
 }
 
 void color2_cb(Fl_Button* i, void *v) {
@@ -863,7 +863,7 @@ void color2_cb(Fl_Button* i, void *v) {
 	q->o->selection_color(c); q->o->redraw();
     }
   }
-  i->color(c); i->labelcolor(contrast(FL_BLACK,c)); i->redraw();
+  i->color(c); i->labelcolor(fl_contrast(FL_BLACK,c)); i->redraw();
 }
 
 void labelcolor_cb(Fl_Button* i, void *v) {
@@ -878,7 +878,7 @@ void labelcolor_cb(Fl_Button* i, void *v) {
 	q->o->labelcolor(c); q->redraw();
     }
   }
-  i->color(c); i->labelcolor(contrast(FL_BLACK,c)); i->redraw();
+  i->color(c); i->labelcolor(fl_contrast(FL_BLACK,c)); i->redraw();
 }
 
 static Fl_Button* relative(Fl_Widget* o, int i) {
@@ -1078,7 +1078,7 @@ void textcolor_cb(Fl_Button* i, void* v) {
 	q->textstuff(3,n,s,c); q->o->redraw();
       }
   }
-  i->color(c); i->labelcolor(contrast(FL_BLACK,c)); i->redraw();
+  i->color(c); i->labelcolor(fl_contrast(FL_BLACK,c)); i->redraw();
 }
 
 ////////////////////////////////////////////////////////////////
@@ -1957,5 +1957,5 @@ int Fl_Widget_Type::read_fdesign(const char* name, const char* value) {
 }
 
 //
-// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.5 2001/10/01 19:38:28 easysw Exp $".
+// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.6 2001/10/29 03:44:32 easysw Exp $".
 //
diff --git a/fluid/factory.cxx b/fluid/factory.cxx
index 181a626d4..0e8269c72 100644
--- a/fluid/factory.cxx
+++ b/fluid/factory.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: factory.cxx,v 1.4.2.11.2.2 2001/09/29 14:38:59 easysw Exp $"
+// "$Id: factory.cxx,v 1.4.2.11.2.3 2001/10/29 03:44:32 easysw Exp $"
 //
 // Widget factory code for the Fast Light Tool Kit (FLTK).
 //
@@ -681,8 +681,8 @@ Fl_Menu_Item New_Menu[] = {
   {0,0,cb,(void*)&Fl_Return_Button_type},
   {0,0,cb,(void*)&Fl_Light_Button_type},
   {0,0,cb,(void*)&Fl_Check_Button_type},
-  {0,0,cb,(void*)&Fl_Round_Button_type},
   {0,0,cb,(void*)&Fl_Repeat_Button_type},
+  {0,0,cb,(void*)&Fl_Round_Button_type},
 {0},
 {"valuators",0,0,0,FL_SUBMENU},
   {0,0,cb,(void*)&Fl_Slider_type},
@@ -887,5 +887,5 @@ int lookup_symbol(const char *name, int &v, int numberok) {
 }
 
 //
-// End of "$Id: factory.cxx,v 1.4.2.11.2.2 2001/09/29 14:38:59 easysw Exp $".
+// End of "$Id: factory.cxx,v 1.4.2.11.2.3 2001/10/29 03:44:32 easysw Exp $".
 //