Image labels!

image() method to set active image, deimage() method to set inactive image.


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

5 files changed, 164 insertions, 156 deletions

diff --git a/test/bitmap.cxx b/test/bitmap.cxx
index f351cf790..a033a84c6 100644
--- a/test/bitmap.cxx
+++ b/test/bitmap.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: bitmap.cxx,v 1.4.2.3 2001/01/22 15:13:41 easysw Exp $"
+// "$Id: bitmap.cxx,v 1.4.2.3.2.1 2001/08/05 23:58:54 easysw Exp $"
 //
 // Bitmap label test program for the Fast Light Tool Kit (FLTK).
 //
@@ -96,11 +96,9 @@ static uchar sorceress_bits[] = {
    0xff, 0xff, 0x40, 0xf0, 0xff, 0xff, 0xff, 0x07, 0xff, 0xff, 0xff, 0xff,
    0x41, 0xf0, 0xff, 0xff, 0xff, 0x07};
 
-Fl_Bitmap fl_bitmap(sorceress_bits, sorceress_width, sorceress_height);
-
 #include <FL/Fl_Toggle_Button.H>
 
-Fl_Toggle_Button *leftb,*rightb,*topb,*bottomb,*insideb;
+Fl_Toggle_Button *leftb,*rightb,*topb,*bottomb,*insideb,*overb;
 Fl_Button *b;
 Fl_Window *w;
 
@@ -111,25 +109,27 @@ void button_cb(Fl_Widget *,void *) {
   if (topb->value()) i |= FL_ALIGN_TOP;
   if (bottomb->value()) i |= FL_ALIGN_BOTTOM;
   if (insideb->value()) i |= FL_ALIGN_INSIDE;
+  if (overb->value()) i |= FL_ALIGN_TEXT_OVER_IMAGE;
   b->align(i);
   w->redraw();
 }
 
 int main(int argc, char **argv) {
   Fl_Window window(400,400); ::w = &window;
-  Fl_Button b(140,160,120,120,0); ::b = &b;
-  //(new Fl_Bitmap(sorceress_bits,sorceress_width,sorceress_height))->label(&b);
-  fl_bitmap.label(&b);
-  leftb = new Fl_Toggle_Button(50,75,50,25,"left");
+  Fl_Button b(140,160,120,120,"Bitmap"); ::b = &b;
+  (new Fl_Bitmap(sorceress_bits,sorceress_width,sorceress_height))->label(&b);
+  leftb = new Fl_Toggle_Button(25,75,50,25,"left");
   leftb->callback(button_cb);
-  rightb = new Fl_Toggle_Button(100,75,50,25,"right");
+  rightb = new Fl_Toggle_Button(75,75,50,25,"right");
   rightb->callback(button_cb);
-  topb = new Fl_Toggle_Button(150,75,50,25,"top");
+  topb = new Fl_Toggle_Button(125,75,50,25,"top");
   topb->callback(button_cb);
-  bottomb = new Fl_Toggle_Button(200,75,50,25,"bottom");
+  bottomb = new Fl_Toggle_Button(175,75,50,25,"bottom");
   bottomb->callback(button_cb);
-  insideb = new Fl_Toggle_Button(250,75,50,25,"inside");
+  insideb = new Fl_Toggle_Button(225,75,50,25,"inside");
   insideb->callback(button_cb);
+  overb = new Fl_Toggle_Button(275,75,100,25,"text over");
+  overb->callback(button_cb);
   window.resizable(window);
   window.end();
   window.show(argc, argv);
@@ -137,5 +137,5 @@ int main(int argc, char **argv) {
 }
 
 //
-// End of "$Id: bitmap.cxx,v 1.4.2.3 2001/01/22 15:13:41 easysw Exp $".
+// End of "$Id: bitmap.cxx,v 1.4.2.3.2.1 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/test/color_chooser.cxx b/test/color_chooser.cxx
index c96130ced..6178ec745 100644
--- a/test/color_chooser.cxx
+++ b/test/color_chooser.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: color_chooser.cxx,v 1.6.2.3 2001/01/22 15:13:41 easysw Exp $"
+// "$Id: color_chooser.cxx,v 1.6.2.3.2.1 2001/08/05 23:58:54 easysw Exp $"
 //
 // Color chooser test program for the Fast Light Tool Kit (FLTK).
 //
@@ -105,7 +105,7 @@ int main(int argc, char ** argv) {
   b2.callback(cb2,&box);
   Fl_Box image_box(140,200,120,120,0);
   make_image();
-  (new Fl_Image(image, width, height))->label(&image_box);
+  (new Fl_RGB_Image(image, width, height))->label(&image_box);
   Fl_Box b(140,320,120,0,"Example of fl_draw_image()");
   Pens p(80,200,3*8,120,"lines");
   p.align(FL_ALIGN_TOP);
@@ -146,5 +146,5 @@ int main(int argc, char ** argv) {
 }
 
 //
-// End of "$Id: color_chooser.cxx,v 1.6.2.3 2001/01/22 15:13:41 easysw Exp $".
+// End of "$Id: color_chooser.cxx,v 1.6.2.3.2.1 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/test/image.cxx b/test/image.cxx
index d0158067a..43840c0c4 100644
--- a/test/image.cxx
+++ b/test/image.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: image.cxx,v 1.6.2.3 2001/01/22 15:13:41 easysw Exp $"
+// "$Id: image.cxx,v 1.6.2.3.2.1 2001/08/05 23:58:54 easysw Exp $"
 //
 // Fl_Image test program for the Fast Light Tool Kit (FLTK).
 //
@@ -54,19 +54,20 @@ void make_image() {
 
 #include <FL/Fl_Toggle_Button.H>
 
-Fl_Toggle_Button *leftb,*rightb,*topb,*bottomb,*insideb;
+Fl_Toggle_Button *leftb,*rightb,*topb,*bottomb,*insideb,*overb;
 Fl_Button *b;
 Fl_Window *w;
 
 void button_cb(Fl_Widget *,void *) {
-    int i = 0;
-    if (leftb->value()) i |= FL_ALIGN_LEFT;
-    if (rightb->value()) i |= FL_ALIGN_RIGHT;
-    if (topb->value()) i |= FL_ALIGN_TOP;
-    if (bottomb->value()) i |= FL_ALIGN_BOTTOM;
-    if (insideb->value()) i |= FL_ALIGN_INSIDE;
-    b->align(i);
-    w->redraw();
+  int i = 0;
+  if (leftb->value()) i |= FL_ALIGN_LEFT;
+  if (rightb->value()) i |= FL_ALIGN_RIGHT;
+  if (topb->value()) i |= FL_ALIGN_TOP;
+  if (bottomb->value()) i |= FL_ALIGN_BOTTOM;
+  if (insideb->value()) i |= FL_ALIGN_INSIDE;
+  if (overb->value()) i |= FL_ALIGN_TEXT_OVER_IMAGE;
+  b->align(i);
+  w->redraw();
 }
 
 #include <FL/x.H>
@@ -113,19 +114,21 @@ int main(int argc, char **argv) {
 #endif
 
   Fl_Window window(400,400); ::w = &window;
-  Fl_Button b(140,160,120,120,0); ::b = &b;
+  Fl_Button b(140,160,120,120,"Image"); ::b = &b;
   make_image();
-  (new Fl_Image(image, width, height))->label(&b);
-  leftb = new Fl_Toggle_Button(50,75,50,25,"left");
+  (new Fl_RGB_Image(image, width, height))->label(&b);
+  leftb = new Fl_Toggle_Button(25,75,50,25,"left");
   leftb->callback(button_cb);
-  rightb = new Fl_Toggle_Button(100,75,50,25,"right");
+  rightb = new Fl_Toggle_Button(75,75,50,25,"right");
   rightb->callback(button_cb);
-  topb = new Fl_Toggle_Button(150,75,50,25,"top");
+  topb = new Fl_Toggle_Button(125,75,50,25,"top");
   topb->callback(button_cb);
-  bottomb = new Fl_Toggle_Button(200,75,50,25,"bottom");
+  bottomb = new Fl_Toggle_Button(175,75,50,25,"bottom");
   bottomb->callback(button_cb);
-  insideb = new Fl_Toggle_Button(250,75,50,25,"inside");
+  insideb = new Fl_Toggle_Button(225,75,50,25,"inside");
   insideb->callback(button_cb);
+  overb = new Fl_Toggle_Button(275,75,100,25,"text over");
+  overb->callback(button_cb);
   window.resizable(window);
   window.end();
   window.show(argc, argv);
@@ -133,5 +136,5 @@ int main(int argc, char **argv) {
 }
 
 //
-// End of "$Id: image.cxx,v 1.6.2.3 2001/01/22 15:13:41 easysw Exp $".
+// End of "$Id: image.cxx,v 1.6.2.3.2.1 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/test/makedepend b/test/makedepend
index e6888c8bd..d179c90e4 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -1,31 +1,35 @@
 # DO NOT DELETE
 
 CubeMain.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
+CubeMain.o: CubeViewUI.h ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
+CubeMain.o: ../FL/Fl_Group.H ../FL/Fl_Roller.H ../FL/Fl_Valuator.H
+CubeMain.o: ../FL/Fl_Slider.H ../FL/Fl_Box.H CubeView.h ../FL/Fl_Gl_Window.H
+CubeMain.o: ../FL/Fl_Window.H ../FL/gl.h ../FL/Fl_Value_Slider.H
+CubeMain.o: ../FL/Fl_Slider.H
 CubeView.o: CubeView.h ../config.h ../FL/Fl.H ../FL/Enumerations.H
-CubeView.o: ../FL/Fl_Export.H ../FL/Fl_Box.H ../FL/Fl_Widget.H
+CubeView.o: ../FL/Fl_Export.H ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H
+CubeView.o: ../FL/gl.h
 adjuster.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 adjuster.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 adjuster.o: ../FL/Fl_Adjuster.H ../FL/Fl_Valuator.H ../FL/Fl_Box.H
 arc.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-arc.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-arc.o: ../FL/Fl_Widget.H ../FL/Fl_Hor_Value_Slider.H ../FL/Fl_Value_Slider.H
-arc.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H
+arc.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Hor_Value_Slider.H
+arc.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H ../FL/fl_draw.H
 ask.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 ask.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
 ask.o: ../FL/Fl_Button.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
 ask.o: ../FL/fl_ask.H
 bitmap.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 bitmap.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Button.H
-bitmap.o: ../FL/Fl_Bitmap.H ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H
+bitmap.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Toggle_Button.H
+bitmap.o: ../FL/Fl_Button.H
 boxtype.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-boxtype.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-boxtype.o: ../FL/Fl_Widget.H ../FL/Fl_Box.H
+boxtype.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H ../FL/Fl_Box.H
 browser.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 browser.o: ../FL/Fl_Select_Browser.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
 browser.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H
-browser.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Double_Window.H
-browser.o: ../FL/Fl_Window.H ../FL/Fl_Button.H ../FL/Fl_Input.H
-browser.o: ../FL/Fl_Input_.H
+browser.o: ../FL/Fl_Slider.H ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
+browser.o: ../FL/Fl_Button.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
 button.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 button.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Button.H
 buttons.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
@@ -35,30 +39,30 @@ buttons.o: ../FL/Fl_Repeat_Button.H ../FL/Fl.H ../FL/Fl_Check_Button.H
 buttons.o: ../FL/Fl_Light_Button.H ../FL/Fl_Light_Button.H
 buttons.o: ../FL/Fl_Round_Button.H ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H
 checkers.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-checkers.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-checkers.o: ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H ../FL/fl_draw.H
-checkers.o: ../FL/Fl_Menu_Item.H ../FL/fl_ask.H black_1.xbm black_2.xbm
+checkers.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Bitmap.H
+checkers.o: ../FL/Fl_Image.H ../FL/fl_draw.H ../FL/Fl_Menu_Item.H
+checkers.o: ../FL/Fl_Widget.H ../FL/fl_ask.H black_1.xbm black_2.xbm
 checkers.o: black_3.xbm black_4.xbm white_1.xbm white_2.xbm white_3.xbm
 checkers.o: white_4.xbm blackking_1.xbm blackking_2.xbm blackking_3.xbm
 checkers.o: blackking_4.xbm whiteking_1.xbm whiteking_2.xbm whiteking_3.xbm
 checkers.o: whiteking_4.xbm ../FL/Fl_Box.H ../FL/Fl_Slider.H
-checkers.o: ../FL/Fl_Valuator.H ../FL/Fl_Value_Output.H
+checkers.o: ../FL/Fl_Value_Output.H ../FL/Fl_Valuator.H
 clock.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 clock.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Clock.H
 clock.o: ../FL/Fl_Round_Clock.H ../FL/Fl_Clock.H
 colbrowser.o: ../FL/forms.H ../FL/Fl.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 colbrowser.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 colbrowser.o: ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H ../FL/Fl_Bitmap.H
-colbrowser.o: ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H ../FL/Fl_Box.H
-colbrowser.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
-colbrowser.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Button.H
+colbrowser.o: ../FL/Fl_Image.H ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H
+colbrowser.o: ../FL/Fl_Box.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
+colbrowser.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Button.H
 colbrowser.o: ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H
 colbrowser.o: ../FL/Fl_Check_Button.H ../FL/Fl_Chart.H ../FL/Fl_Choice.H
 colbrowser.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H
-colbrowser.o: ../FL/Fl_Counter.H ../FL/Fl_Dial.H ../FL/Fl_Free.H
-colbrowser.o: ../FL/fl_ask.H ../FL/fl_show_colormap.H ../FL/filename.H
-colbrowser.o: ../FL/fl_file_chooser.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
-colbrowser.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Positioner.H
+colbrowser.o: ../FL/Fl_Counter.H ../FL/Fl_Valuator.H ../FL/Fl_Dial.H
+colbrowser.o: ../FL/Fl_Free.H ../FL/fl_ask.H ../FL/fl_show_colormap.H
+colbrowser.o: ../FL/filename.H ../FL/fl_file_chooser.H ../FL/Fl_Input.H
+colbrowser.o: ../FL/Fl_Input_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Positioner.H
 colbrowser.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Timer.H
 color_chooser.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 color_chooser.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
@@ -73,33 +77,32 @@ cube.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 cube.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Box.H
 cube.o: ../FL/Fl_Button.H ../FL/Fl_Radio_Light_Button.H
 cube.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_Slider.H
-cube.o: ../FL/Fl_Valuator.H
+cube.o: ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H ../FL/gl.h
 cursor.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 cursor.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Hor_Value_Slider.H
-cursor.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-cursor.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
-cursor.o: ../FL/fl_draw.H ../FL/Fl_Box.H
+cursor.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H ../FL/Fl_Choice.H
+cursor.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/fl_draw.H
+cursor.o: ../FL/Fl_Box.H
 curve.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-curve.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-curve.o: ../FL/Fl_Widget.H ../FL/Fl_Hor_Value_Slider.H
-curve.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-curve.o: ../FL/fl_draw.H ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H
+curve.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
+curve.o: ../FL/Fl_Hor_Value_Slider.H ../FL/Fl_Value_Slider.H
+curve.o: ../FL/Fl_Slider.H ../FL/fl_draw.H ../FL/Fl_Toggle_Button.H
+curve.o: ../FL/Fl_Button.H
 demo.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 demo.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Box.H ../FL/Fl_Button.H
 demo.o: ../FL/filename.H ../FL/x.H ../FL/Fl_Window.H
 doublebuffer.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-doublebuffer.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-doublebuffer.o: ../FL/Fl_Widget.H ../FL/Fl_Double_Window.H ../FL/Fl_Box.H
-doublebuffer.o: ../FL/fl_draw.H ../FL/Fl_Hor_Slider.H ../FL/Fl_Slider.H
-doublebuffer.o: ../FL/Fl_Valuator.H ../FL/math.h
+doublebuffer.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H
+doublebuffer.o: ../FL/Fl_Double_Window.H ../FL/Fl_Box.H ../FL/fl_draw.H
+doublebuffer.o: ../FL/Fl_Hor_Slider.H ../FL/Fl_Slider.H ../FL/math.h
 editor.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Group.H
-editor.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-editor.o: ../FL/Fl_Widget.H ../FL/fl_ask.H ../FL/fl_file_chooser.H
-editor.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
-editor.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Button.H
-editor.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H ../FL/Fl_Text_Buffer.H
-editor.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H
-editor.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
+editor.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/fl_ask.H
+editor.o: ../FL/fl_file_chooser.H ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H
+editor.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
+editor.o: ../FL/Fl_Button.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
+editor.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H
+editor.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Group.H
+editor.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
 editor.o: ../FL/Fl_Text_Buffer.H
 file_chooser.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 file_chooser.o: ../FL/Fl_Button.H ../FL/Fl_Window.H ../FL/Fl_Group.H
@@ -108,44 +111,46 @@ file_chooser.o: ../FL/fl_file_chooser.H ../FL/Fl_FileIcon.H ../FL/Fl.H
 fonts.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 fonts.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Hold_Browser.H
 fonts.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
-fonts.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H ../FL/Fl_Box.H
-fonts.o: ../FL/fl_ask.H
+fonts.o: ../FL/Fl_Slider.H ../FL/fl_draw.H ../FL/Fl_Box.H ../FL/fl_ask.H
 forms.o: ../FL/forms.H ../FL/Fl.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 forms.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 forms.o: ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H ../FL/Fl_Bitmap.H
-forms.o: ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H ../FL/Fl_Box.H
-forms.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
-forms.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Button.H
+forms.o: ../FL/Fl_Image.H ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H
+forms.o: ../FL/Fl_Box.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
+forms.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Button.H
 forms.o: ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H
 forms.o: ../FL/Fl_Check_Button.H ../FL/Fl_Chart.H ../FL/Fl_Choice.H
 forms.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H
-forms.o: ../FL/Fl_Counter.H ../FL/Fl_Dial.H ../FL/Fl_Free.H ../FL/fl_ask.H
-forms.o: ../FL/fl_show_colormap.H ../FL/filename.H ../FL/fl_file_chooser.H
-forms.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Menu_Button.H
-forms.o: ../FL/Fl_Positioner.H ../FL/Fl_Value_Slider.H ../FL/Fl_Timer.H
-forms.o: srs.xbm
-fractals.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-fractals.o: ../FL/fl_message.H ../FL/fl_ask.H
+forms.o: ../FL/Fl_Counter.H ../FL/Fl_Valuator.H ../FL/Fl_Dial.H
+forms.o: ../FL/Fl_Free.H ../FL/fl_ask.H ../FL/fl_show_colormap.H
+forms.o: ../FL/filename.H ../FL/fl_file_chooser.H ../FL/Fl_Input.H
+forms.o: ../FL/Fl_Input_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Positioner.H
+forms.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Timer.H srs.xbm
+fractals.o: ../config.h ../FL/glut.H ../FL/gl.h ../FL/Enumerations.H
+fractals.o: ../FL/Fl_Export.H ../FL/Fl.H ../FL/Fl_Gl_Window.H
+fractals.o: ../FL/Fl_Window.H fracviewer.c ../GL/glut.h fracviewer.h
+fractals.o: ../FL/Fl_Button.H ../FL/Fl_Group.H ../FL/Fl_Window.H
+fractals.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H
 fullscreen.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-fullscreen.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-fullscreen.o: ../FL/Fl_Widget.H ../FL/Fl_Hor_Slider.H ../FL/Fl_Slider.H
-fullscreen.o: ../FL/Fl_Valuator.H ../FL/Fl_Toggle_Light_Button.H
-fullscreen.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/math.h
-fullscreen.o: ../FL/fl_draw.H
+fullscreen.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H
+fullscreen.o: ../FL/Fl_Hor_Slider.H ../FL/Fl_Slider.H
+fullscreen.o: ../FL/Fl_Toggle_Light_Button.H ../FL/Fl_Light_Button.H
+fullscreen.o: ../FL/Fl_Button.H ../FL/math.h ../FL/gl.h ../FL/Fl_Gl_Window.H
 gl_overlay.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 gl_overlay.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
-gl_overlay.o: ../FL/Fl_Hor_Slider.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
+gl_overlay.o: ../FL/Fl_Hor_Slider.H ../FL/Fl_Slider.H
 gl_overlay.o: ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H ../FL/math.h
-gl_overlay.o: ../FL/Fl_Box.H
-glpuzzle.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-glpuzzle.o: ../FL/fl_message.H ../FL/fl_ask.H
+gl_overlay.o: ../FL/gl.h ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H
+glpuzzle.o: ../config.h ../FL/glut.H ../FL/gl.h ../FL/Enumerations.H
+glpuzzle.o: ../FL/Fl_Export.H ../FL/Fl.H ../FL/Fl_Gl_Window.H
+glpuzzle.o: ../FL/Fl_Window.H trackball.c trackball.h
 hello.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 hello.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Box.H
 help.o: ../FL/Fl_HelpDialog.H ../FL/Fl.H ../FL/Enumerations.H
 help.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 help.o: ../FL/Fl_Widget.H ../FL/Fl_HelpView.H ../FL/Fl_Group.H
-help.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-help.o: ../FL/fl_draw.H ../FL/Fl_Button.H
+help.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/fl_draw.H
+help.o: ../FL/Fl_Button.H
 iconize.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 iconize.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 iconize.o: ../FL/Fl_Button.H ../FL/Fl_Box.H
@@ -167,20 +172,19 @@ keyboard.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 keyboard.o: ../FL/Fl_Widget.H ../FL/Fl_Button.H ../FL/Fl_Output.H
 keyboard.o: ../FL/Fl_Input_.H ../FL/Fl_Box.H
 label.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-label.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-label.o: ../FL/Fl_Widget.H ../FL/Fl_Box.H ../FL/Fl_Hor_Value_Slider.H
-label.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-label.o: ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H ../FL/Fl_Input.H
-label.o: ../FL/Fl_Input_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
-label.o: ../FL/Fl_Menu_Item.H ../FL/fl_draw.H
+label.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Box.H
+label.o: ../FL/Fl_Hor_Value_Slider.H ../FL/Fl_Value_Slider.H
+label.o: ../FL/Fl_Slider.H ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H
+label.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Choice.H
+label.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/fl_draw.H
 list_visuals.o: ../config.h
 mandelbrot.o: mandelbrot_ui.cxx mandelbrot_ui.h ../FL/Fl.H
 mandelbrot.o: ../FL/Enumerations.H ../FL/Fl_Export.H mandelbrot.h
-mandelbrot.o: ../FL/Fl_Box.H ../FL/Fl_Widget.H ../FL/Fl_Slider.H
-mandelbrot.o: ../FL/Fl_Valuator.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-mandelbrot.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/fl_draw.H
+mandelbrot.o: ../FL/Fl_Box.H ../FL/Fl_Slider.H ../FL/Fl_Window.H
+mandelbrot.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Input.H
+mandelbrot.o: ../FL/Fl_Input_.H ../FL/fl_draw.H
 menubar.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Box.H
-menubar.o: ../FL/Fl_Widget.H ../FL/Fl_Window.H ../FL/Fl_Group.H
+menubar.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 menubar.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
 menubar.o: ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H ../FL/Fl_Menu_Button.H
 menubar.o: ../FL/Fl_Choice.H ../FL/fl_draw.H
@@ -189,8 +193,8 @@ message.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 message.o: ../FL/fl_ask.H
 minimum.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 minimum.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
-minimum.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Box.H
-minimum.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
+minimum.o: ../FL/Fl_Slider.H ../FL/Fl_Box.H ../FL/Fl_Return_Button.H
+minimum.o: ../FL/Fl_Button.H
 navigation.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 navigation.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 navigation.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H
@@ -207,34 +211,38 @@ overlay.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H
 overlay.o: ../FL/Fl_Window.H ../FL/Fl_Button.H ../FL/fl_draw.H
 pixmap.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 pixmap.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Button.H
-pixmap.o: ../FL/Fl_Pixmap.H porsche.xpm ../FL/Fl_Toggle_Button.H
-pixmap.o: ../FL/Fl_Button.H ../FL/Fl_Multi_Label.H
+pixmap.o: ../FL/Fl_Pixmap.H ../FL/Fl_Image.H porsche.xpm
+pixmap.o: ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H ../FL/Fl_Multi_Label.H
 pixmap_browser.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-pixmap_browser.o: ../FL/Fl_Box.H ../FL/Fl_Widget.H ../FL/Fl_Window.H
-pixmap_browser.o: ../FL/Fl_Group.H ../FL/Fl_Button.H ../FL/Fl_Pixmap.H
-pixmap_browser.o: ../FL/fl_file_chooser.H ../FL/fl_message.H ../FL/fl_ask.H
+pixmap_browser.o: ../FL/Fl_Box.H ../FL/Fl_Window.H ../FL/Fl_Group.H
+pixmap_browser.o: ../FL/Fl_Widget.H ../FL/Fl_Button.H ../FL/Fl_Pixmap.H
+pixmap_browser.o: ../FL/Fl_Image.H ../FL/fl_file_chooser.H ../FL/fl_message.H
+pixmap_browser.o: ../FL/fl_ask.H
 radio.o: radio.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 radio.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 radio.o: ../FL/Fl_Button.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
 radio.o: ../FL/Fl_Light_Button.H ../FL/Fl_Check_Button.H
 radio.o: ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H ../FL/Fl_Group.H
 resizebox.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-resizebox.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-resizebox.o: ../FL/Fl_Widget.H ../FL/Fl_Box.H ../FL/Fl_Radio_Button.H
-resizebox.o: ../FL/Fl_Button.H ../FL/fl_draw.H ../FL/fl_message.H
-resizebox.o: ../FL/fl_ask.H
+resizebox.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H ../FL/Fl_Box.H
+resizebox.o: ../FL/Fl_Radio_Button.H ../FL/Fl_Button.H ../FL/fl_draw.H
+resizebox.o: ../FL/fl_message.H ../FL/fl_ask.H
 scroll.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-scroll.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-scroll.o: ../FL/Fl_Widget.H ../FL/Fl_Scroll.H ../FL/Fl_Scrollbar.H
-scroll.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Toggle_Button.H
-scroll.o: ../FL/Fl_Button.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
-scroll.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Box.H ../FL/fl_draw.H ../FL/math.h
+scroll.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Scroll.H
+scroll.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H
+scroll.o: ../FL/Fl_Slider.H ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H
+scroll.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
+scroll.o: ../FL/Fl_Box.H ../FL/fl_draw.H ../FL/math.h
 shape.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 shape.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
-shape.o: ../FL/Fl_Hor_Slider.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-shape.o: ../FL/math.h ../FL/Fl_Box.H
-shiny.o: ../config.h ../FL/fl_message.H ../FL/fl_ask.H ../FL/Enumerations.H
-shiny.o: ../FL/Fl_Export.H ../FL/fl_draw.H
+shape.o: ../FL/Fl_Hor_Slider.H ../FL/Fl_Slider.H ../FL/math.h ../FL/gl.h
+shape.o: ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H
+shiny.o: ../config.h shiny_panel.cxx shiny_panel.h ../FL/Fl.H
+shiny.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
+shiny.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Box.H ../FL/Fl_Group.H
+shiny.o: ../FL/Fl_Button.H ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H
+shiny.o: ../FL/Fl_Slider.H ../FL/fl_message.H ../FL/fl_ask.H ../FL/fl_draw.H
+shiny.o: ../FL/gl.h
 subwindow.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 subwindow.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 subwindow.o: ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H
@@ -242,43 +250,42 @@ subwindow.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
 subwindow.o: ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
 subwindow.o: ../FL/fl_draw.H
 symbols.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-symbols.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-symbols.o: ../FL/Fl_Widget.H ../FL/Fl_Box.H ../FL/fl_draw.H
+symbols.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H ../FL/Fl_Box.H
+symbols.o: ../FL/fl_draw.H
 tabs.o: tabs.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 tabs.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Tabs.H
 tabs.o: ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Button.H
 tabs.o: ../FL/Fl_Clock.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
 tile.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-tile.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-tile.o: ../FL/Fl_Widget.H ../FL/Fl_Tile.H ../FL/Fl_Box.H
+tile.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Tile.H
+tile.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Box.H
 valuators.o: valuators.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 valuators.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
-valuators.o: ../FL/Fl_Box.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-valuators.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H ../FL/Fl_Adjuster.H
+valuators.o: ../FL/Fl_Box.H ../FL/Fl_Slider.H ../FL/Fl_Value_Slider.H
+valuators.o: ../FL/Fl_Slider.H ../FL/Fl_Adjuster.H ../FL/Fl_Valuator.H
 valuators.o: ../FL/Fl_Counter.H ../FL/Fl_Dial.H ../FL/Fl_Roller.H
 valuators.o: ../FL/Fl_Value_Input.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
 valuators.o: ../FL/Fl_Value_Output.H ../FL/Fl_Scrollbar.H
 fast_slow.o: fast_slow.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fast_slow.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
-fast_slow.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Box.H
+fast_slow.o: ../FL/Fl_Slider.H ../FL/Fl_Box.H
 resize.o: resize.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 resize.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 resize.o: ../FL/Fl_Button.H ../FL/Fl_Box.H
 pack.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Button.H
 pack.o: ../FL/Fl_Light_Button.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 pack.o: ../FL/Fl_Widget.H ../FL/Fl_Scroll.H ../FL/Fl_Scrollbar.H
-pack.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Value_Slider.H
-pack.o: ../FL/Fl_Pack.H ../FL/Fl_Group.H
+pack.o: ../FL/Fl_Slider.H ../FL/Fl_Value_Slider.H ../FL/Fl_Pack.H
+pack.o: ../FL/Fl_Group.H
 inactive.o: inactive.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 inactive.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 inactive.o: ../FL/Fl_Group.H ../FL/Fl_Button.H ../FL/Fl_Check_Button.H
 inactive.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_Slider.H
-inactive.o: ../FL/Fl_Valuator.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
-inactive.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
-inactive.o: ../FL/Fl_Box.H ../FL/Fl_Value_Output.H ../FL/Fl_Scrollbar.H
+inactive.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Menu_Button.H
+inactive.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Box.H
+inactive.o: ../FL/Fl_Value_Output.H ../FL/Fl_Valuator.H ../FL/Fl_Scrollbar.H
 inactive.o: ../FL/Fl_Slider.H
 line_style.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 line_style.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
-line_style.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-line_style.o: ../FL/fl_draw.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
-line_style.o: ../FL/Fl_Menu_Item.H
+line_style.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H ../FL/fl_draw.H
+line_style.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
diff --git a/test/pixmap.cxx b/test/pixmap.cxx
index 38054b073..a6143cc73 100644
--- a/test/pixmap.cxx
+++ b/test/pixmap.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: pixmap.cxx,v 1.4.2.3 2001/01/22 15:13:41 easysw Exp $"
+// "$Id: pixmap.cxx,v 1.4.2.3.2.1 2001/08/05 23:58:54 easysw Exp $"
 //
 // Pixmap label test program for the Fast Light Tool Kit (FLTK).
 //
@@ -33,7 +33,7 @@
 
 #include <FL/Fl_Toggle_Button.H>
 
-Fl_Toggle_Button *leftb,*rightb,*topb,*bottomb,*insideb;
+Fl_Toggle_Button *leftb,*rightb,*topb,*bottomb,*insideb,*overb;
 Fl_Button *b;
 Fl_Window *w;
 
@@ -44,6 +44,7 @@ void button_cb(Fl_Widget *,void *) {
   if (topb->value()) i |= FL_ALIGN_TOP;
   if (bottomb->value()) i |= FL_ALIGN_BOTTOM;
   if (insideb->value()) i |= FL_ALIGN_INSIDE;
+  if (overb->value()) i |= FL_ALIGN_TEXT_OVER_IMAGE;
   b->align(i);
   w->redraw();
 }
@@ -56,29 +57,26 @@ int arg(int, char **argv, int &i) {
 
 #include <FL/Fl_Multi_Label.H>
 
-Fl_Multi_Label multi = {
-  0, "This is the text", 0, FL_NORMAL_LABEL
-};
-
 int main(int argc, char **argv) {
   int i = 1;
   if (Fl::args(argc,argv,i,arg) < argc)
     Fl::fatal(" -8 # : use default visual\n%s\n",Fl::help);
 
   Fl_Window window(400,400); ::w = &window;
-  Fl_Button b(140,160,120,120,0); ::b = &b;
+  Fl_Button b(140,160,120,120,"Pixmap"); ::b = &b;
   (new Fl_Pixmap(porsche_xpm))->label(&b);
-  multi.labela = b.label(); multi.typea = b.labeltype(); multi.label(&b);
-  leftb = new Fl_Toggle_Button(50,75,50,25,"left");
+  leftb = new Fl_Toggle_Button(25,75,50,25,"left");
   leftb->callback(button_cb);
-  rightb = new Fl_Toggle_Button(100,75,50,25,"right");
+  rightb = new Fl_Toggle_Button(75,75,50,25,"right");
   rightb->callback(button_cb);
-  topb = new Fl_Toggle_Button(150,75,50,25,"top");
+  topb = new Fl_Toggle_Button(125,75,50,25,"top");
   topb->callback(button_cb);
-  bottomb = new Fl_Toggle_Button(200,75,50,25,"bottom");
+  bottomb = new Fl_Toggle_Button(175,75,50,25,"bottom");
   bottomb->callback(button_cb);
-  insideb = new Fl_Toggle_Button(250,75,50,25,"inside");
+  insideb = new Fl_Toggle_Button(225,75,50,25,"inside");
   insideb->callback(button_cb);
+  overb = new Fl_Toggle_Button(275,75,100,25,"text over");
+  overb->callback(button_cb);
   if (!dvisual) Fl::visual(FL_RGB);
   window.resizable(window);
   window.end();
@@ -87,5 +85,5 @@ int main(int argc, char **argv) {
 }
 
 //
-// End of "$Id: pixmap.cxx,v 1.4.2.3 2001/01/22 15:13:41 easysw Exp $".
+// End of "$Id: pixmap.cxx,v 1.4.2.3.2.1 2001/08/05 23:58:54 easysw Exp $".
 //