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

2 files changed, 40 insertions, 38 deletions

diff --git a/test/input.cxx b/test/input.cxx
index db65bfba5..2a1e5255c 100644
--- a/test/input.cxx
+++ b/test/input.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: input.cxx,v 1.5.2.4 2001/05/05 23:39:01 spitzak Exp $"
+// "$Id: input.cxx,v 1.5.2.4.2.1 2001/10/29 03:44:33 easysw Exp $"
 //
 // Input field test program for the Fast Light Tool Kit (FLTK).
 //
@@ -67,7 +67,7 @@ void color_cb(Fl_Widget* button, void* v) {
   uchar r,g,b; Fl::get_color(c, r,g,b);
   if (fl_color_chooser(0,r,g,b)) {
     Fl::set_color(c,r,g,b); Fl::redraw();
-    button->labelcolor(contrast(FL_BLACK,c));
+    button->labelcolor(fl_contrast(FL_BLACK,c));
     button->redraw();
   }
 }
@@ -107,10 +107,10 @@ int main(int argc, char **argv) {
   b->color(input[0]->color()); b->callback(color_cb, (void*)0);
   b = new Fl_Button(220,y1,100,25,"selection_color"); y1 += 25;
   b->color(input[0]->selection_color()); b->callback(color_cb, (void*)1);
-  b->labelcolor(contrast(FL_BLACK,b->color()));
+  b->labelcolor(fl_contrast(FL_BLACK,b->color()));
   b = new Fl_Button(220,y1,100,25,"textcolor"); y1 += 25;
   b->color(input[0]->textcolor()); b->callback(color_cb, (void*)2);
-  b->labelcolor(contrast(FL_BLACK,b->color()));
+  b->labelcolor(fl_contrast(FL_BLACK,b->color()));
 
   window->end();
   window->show(argc,argv);
@@ -118,5 +118,5 @@ int main(int argc, char **argv) {
 }
 
 //
-// End of "$Id: input.cxx,v 1.5.2.4 2001/05/05 23:39:01 spitzak Exp $".
+// End of "$Id: input.cxx,v 1.5.2.4.2.1 2001/10/29 03:44:33 easysw Exp $".
 //
diff --git a/test/radio.fl b/test/radio.fl
index 360ed58fc..680636857 100644
--- a/test/radio.fl
+++ b/test/radio.fl
@@ -1,71 +1,73 @@
-# data file for FL User Interface Designer (fluid)
-version 0.99 
+# data file for the Fltk User Interface Designer (fluid)
+version 1.0100 
+header_name {.h} 
+code_name {.cxx} 
 gridx 10 
 gridy 5 
 snap 3
 Function {} {open
 } {
-  Fl_Window {} {open selected
-    xywh {447 255 462 453}
+  Fl_Window {} {open
+    xywh {447 255 369 214} visible
   } {
     Fl_Button {} {
-      label Fl_Button open
+      label Fl_Button
       xywh {20 10 160 30}
     }
     Fl_Return_Button {} {
-      label Fl_Return_Button open
+      label Fl_Return_Button
       xywh {20 50 160 30}
     }
     Fl_Light_Button {} {
-      label Fl_Light_Button open
+      label Fl_Light_Button
       xywh {20 90 160 30}
     }
     Fl_Check_Button {} {
-      label Fl_Check_Button open
-      xywh {20 130 160 30} box 2
+      label Fl_Check_Button
+      xywh {20 130 160 30} down_box DOWN_BOX
     }
     Fl_Round_Button {} {
-      label Fl_Round_Button open
-      xywh {20 170 160 30} box 2
+      label Fl_Round_Button selected
+      xywh {20 170 160 30} down_box ROUND_DOWN_BOX
     }
     Fl_Group {} {
-      xywh {190 10 70 120} box 8
+      xywh {190 10 70 120} box THIN_UP_FRAME
     } {
-      Fl_Check_Button {} {
-        label radio open
-        xywh {190 10 70 30} type 102
+      Fl_Round_Button {} {
+        label radio
+        xywh {190 10 70 30} type Radio down_box ROUND_DOWN_BOX
       }
-      Fl_Check_Button {} {
-        label radio open
-        xywh {190 40 70 30} type 102
+      Fl_Round_Button {} {
+        label radio
+        xywh {190 40 70 30} type Radio down_box ROUND_DOWN_BOX
       }
-      Fl_Check_Button {} {
-        label radio open
-        xywh {190 70 70 30} type 102
+      Fl_Round_Button {} {
+        label radio
+        xywh {190 70 70 30} type Radio down_box ROUND_DOWN_BOX
       }
-      Fl_Check_Button {} {
-        label radio open
-        xywh {190 100 70 30} type 102
+      Fl_Round_Button {} {
+        label radio
+        xywh {190 100 70 30} type Radio down_box ROUND_DOWN_BOX
       }
     }
     Fl_Group {} {open
-      xywh {270 10 90 115} box 6
+      xywh {270 10 90 115} box THIN_UP_BOX
     } {
       Fl_Button {} {
-        label radio open
-        xywh {280 20 20 20} type 102 color {47 1} align 8
+        label radio
+        xywh {280 20 20 20} type Radio selection_color 1 align 8
       }
       Fl_Button {} {
-        label radio open
-        xywh {280 45 20 20} type 102 color {47 1} align 8
+        label radio
+        xywh {280 45 20 20} type Radio selection_color 1 align 8
       }
       Fl_Button {} {
-        label radio open
-        xywh {280 70 20 20} type 102 color {47 1} align 8
+        label radio
+        xywh {280 70 20 20} type Radio selection_color 1 align 8
       }
       Fl_Button {} {
-        label radio open
-        xywh {280 95 20 20} type 102 color {47 1} align 8
+        label radio
+        xywh {280 95 20 20} type Radio selection_color 1 align 8
       }
     }
   }