From 7ebaf77cdcbcadb4706c87f1662730a4687caf20 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Sun, 5 Aug 2001 23:58:54 +0000
Subject: 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
---
 CHANGES                |   7 +-
 FL/Enumerations.H      |  50 ++++++-----
 FL/Fl_Bitmap.H         |  29 ++++---
 FL/Fl_Image.H          |  43 +++++++---
 FL/Fl_Pixmap.H         |  36 ++++----
 FL/Fl_Widget.H         |  13 ++-
 FL/fl_draw.H           |  15 +++-
 fluid/Fluid_Image.cxx  |   8 +-
 fluid/makedepend       |   2 +-
 src/Fl_Bitmap.cxx      |  55 ++++--------
 src/Fl_HelpView.cxx    |   8 +-
 src/Fl_Image.cxx       |  62 ++++++--------
 src/Fl_Pixmap.cxx      |  74 +++++++---------
 src/fl_draw.cxx        |  57 ++++++++-----
 src/fl_labeltype.cxx   |  29 +++++--
 src/makedepend         |  88 +++++++++++--------
 test/bitmap.cxx        |  26 +++---
 test/color_chooser.cxx |   6 +-
 test/image.cxx         |  39 +++++----
 test/makedepend        | 223 +++++++++++++++++++++++++------------------------
 test/pixmap.cxx        |  26 +++---
 21 files changed, 470 insertions(+), 426 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1c782d9a0..3d92df1b1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,9 @@
 CHANGES IN FLTK 1.1.0
 
-TODO	- Added new image(), active_image(), and
-	  inactive_image() methods to support image + text
-	  labels more easily.
+	- Added new image() and deimage() methods to support
+	  image + text labels more easily.
 
-TODO	- Added new alignment bit FL_ALIGN_TEXT_OVER_IMAGE.
+	- Added new alignment bit FL_ALIGN_TEXT_OVER_IMAGE.
 
 	- Added tooltip support using Jacques Tremblay's tooltip
 	  patch.
diff --git a/FL/Enumerations.H b/FL/Enumerations.H
index ae39d371e..05ce6caf8 100644
--- a/FL/Enumerations.H
+++ b/FL/Enumerations.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Enumerations.H,v 1.18.2.14.2.3 2001/08/04 12:21:33 easysw Exp $"
+// "$Id: Enumerations.H,v 1.18.2.14.2.4 2001/08/05 23:58:54 easysw Exp $"
 //
 // Enumerations for the Fast Light Tool Kit (FLTK).
 //
@@ -62,10 +62,11 @@ enum Fl_Event {	// events
   FL_DRAG		= 5,
   FL_FOCUS		= 6,
   FL_UNFOCUS		= 7,
-  FL_KEYBOARD		= 8,
-  FL_CLOSE		= 9,
-  FL_MOVE		= 10,
-  FL_SHORTCUT		= 11,
+  FL_KEYDOWN		= 8,
+  FL_KEYUP		= 9,
+  FL_CLOSE		= 10,
+  FL_MOVE		= 11,
+  FL_SHORTCUT		= 12,
   FL_DEACTIVATE		= 13,
   FL_ACTIVATE		= 14,
   FL_HIDE		= 15,
@@ -74,6 +75,7 @@ enum Fl_Event {	// events
   FL_SELECTIONCLEAR	= 18,
   FL_MOUSEWHEEL		= 19
 };
+#define FL_KEYBOARD FL_KEYDOWN
 
 enum Fl_When { // Fl_Widget::when():
   FL_WHEN_NEVER		= 0,
@@ -215,23 +217,25 @@ extern Fl_Labeltype FL_EXPORT define_FL_EMBOSSED_LABEL();
 #define FL_EMBOSSED_LABEL define_FL_EMBOSSED_LABEL()
 
 enum Fl_Align {	// align() values
-  FL_ALIGN_CENTER	= 0,
-  FL_ALIGN_TOP		= 1,
-  FL_ALIGN_BOTTOM	= 2,
-  FL_ALIGN_LEFT		= 4,
-  FL_ALIGN_RIGHT	= 8,
-  FL_ALIGN_INSIDE	= 16,
-  FL_ALIGN_CLIP		= 64,
-  FL_ALIGN_WRAP		= 128,
-  FL_ALIGN_TOP_LEFT	= FL_ALIGN_TOP | FL_ALIGN_LEFT,
-  FL_ALIGN_TOP_RIGHT	= FL_ALIGN_TOP | FL_ALIGN_RIGHT,
-  FL_ALIGN_BOTTOM_LEFT	= FL_ALIGN_BOTTOM | FL_ALIGN_LEFT,
-  FL_ALIGN_BOTTOM_RIGHT	= FL_ALIGN_BOTTOM | FL_ALIGN_RIGHT,
-  FL_ALIGN_LEFT_TOP	= FL_ALIGN_TOP_LEFT,
-  FL_ALIGN_RIGHT_TOP	= FL_ALIGN_TOP_RIGHT,
-  FL_ALIGN_LEFT_BOTTOM	= FL_ALIGN_BOTTOM_LEFT,
-  FL_ALIGN_RIGHT_BOTTOM	= FL_ALIGN_BOTTOM_RIGHT,
-  FL_ALIGN_NOWRAP	= 0 // for back compatability
+  FL_ALIGN_CENTER		= 0,
+  FL_ALIGN_TOP			= 1,
+  FL_ALIGN_BOTTOM		= 2,
+  FL_ALIGN_LEFT			= 4,
+  FL_ALIGN_RIGHT		= 8,
+  FL_ALIGN_INSIDE		= 16,
+  FL_ALIGN_TEXT_OVER_IMAGE	= 32,
+  FL_ALIGN_IMAGE_OVER_TEXT	= 0,
+  FL_ALIGN_CLIP			= 64,
+  FL_ALIGN_WRAP			= 128,
+  FL_ALIGN_TOP_LEFT		= FL_ALIGN_TOP | FL_ALIGN_LEFT,
+  FL_ALIGN_TOP_RIGHT		= FL_ALIGN_TOP | FL_ALIGN_RIGHT,
+  FL_ALIGN_BOTTOM_LEFT		= FL_ALIGN_BOTTOM | FL_ALIGN_LEFT,
+  FL_ALIGN_BOTTOM_RIGHT		= FL_ALIGN_BOTTOM | FL_ALIGN_RIGHT,
+  FL_ALIGN_LEFT_TOP		= FL_ALIGN_TOP_LEFT,
+  FL_ALIGN_RIGHT_TOP		= FL_ALIGN_TOP_RIGHT,
+  FL_ALIGN_LEFT_BOTTOM		= FL_ALIGN_BOTTOM_LEFT,
+  FL_ALIGN_RIGHT_BOTTOM		= FL_ALIGN_BOTTOM_RIGHT,
+  FL_ALIGN_NOWRAP		= 0 // for back compatability
 };
 
 enum Fl_Font {	// standard fonts
@@ -365,5 +369,5 @@ enum Fl_Damage {
 #endif
 
 //
-// End of "$Id: Enumerations.H,v 1.18.2.14.2.3 2001/08/04 12:21:33 easysw Exp $".
+// End of "$Id: Enumerations.H,v 1.18.2.14.2.4 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H
index 994b31d2f..03256caa7 100644
--- a/FL/Fl_Bitmap.H
+++ b/FL/Fl_Bitmap.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Bitmap.H,v 1.5.2.3 2001/01/22 15:13:37 easysw Exp $"
+// "$Id: Fl_Bitmap.H,v 1.5.2.3.2.1 2001/08/05 23:58:54 easysw Exp $"
 //
 // Bitmap header file for the Fast Light Tool Kit (FLTK).
 //
@@ -25,27 +25,30 @@
 
 #ifndef Fl_Bitmap_H
 #define Fl_Bitmap_H
+#  include "Fl_Image.H"
 
 class Fl_Widget;
 struct Fl_Menu_Item;
 
-struct Fl_Bitmap {
+class FL_EXPORT Fl_Bitmap : public Fl_Image {
+  public:
+
   const uchar *array;
-  int w, h;
   ulong id; // for internal use
-  FL_EXPORT Fl_Bitmap(const uchar *bits, int W, int H) :
-    array(bits), w(W), h(H), id(0) {}
-  FL_EXPORT Fl_Bitmap(const char *bits, int W, int H) :
-    array((const uchar *)bits), w(W), h(H), id(0) {}
-  FL_EXPORT ~Fl_Bitmap();
-  FL_EXPORT void label(Fl_Widget*);
-  FL_EXPORT void label(Fl_Menu_Item*);
-  FL_EXPORT void draw(int X, int Y, int W, int H, int cx=0, int cy=0);
-  FL_EXPORT void draw(int X, int Y) {draw(X, Y, w, h, 0, 0);}
+
+  Fl_Bitmap(const uchar *bits, int W, int H) :
+    Fl_Image(W,H), array(bits), id(0) {}
+  Fl_Bitmap(const char *bits, int W, int H) :
+    Fl_Image(W,H), array((const uchar *)bits), id(0) {}
+  virtual ~Fl_Bitmap();
+  virtual void draw(int X, int Y, int W, int H, int cx=0, int cy=0);
+  void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);}
+  virtual void label(Fl_Widget*w);
+  virtual void label(Fl_Menu_Item*m);
 };
 
 #endif
 
 //
-// End of "$Id: Fl_Bitmap.H,v 1.5.2.3 2001/01/22 15:13:37 easysw Exp $".
+// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.1 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H
index 8e7bb219c..e0a9f29f8 100644
--- a/FL/Fl_Image.H
+++ b/FL/Fl_Image.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Image.H,v 1.5.2.3 2001/01/22 15:13:37 easysw Exp $"
+// "$Id: Fl_Image.H,v 1.5.2.3.2.1 2001/08/05 23:58:54 easysw Exp $"
 //
 // Image header file for the Fast Light Tool Kit (FLTK).
 //
@@ -29,21 +29,42 @@
 class Fl_Widget;
 struct Fl_Menu_Item;
 
-struct Fl_Image {
+class FL_EXPORT Fl_Image {
+  int w_, h_;
+
+  public:
+
+  int w() const {return w_;}
+  void w(int W) {w_ = W;}
+  int h() const {return h_;}
+  void h(int H) {h_ = H;}
+
+  Fl_Image(int W, int H) {w_ = W; h_ = H;}
+  virtual ~Fl_Image();
+  virtual void label(Fl_Widget*w);
+  virtual void label(Fl_Menu_Item*m);
+  virtual void draw(int X, int Y, int W, int H, int cx=0, int cy=0);
+  void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);}
+};
+
+class FL_EXPORT Fl_RGB_Image : public Fl_Image {
+  public:
+
   const uchar *array;
-  int w, h, d, ld;
+  int d, ld;
   ulong id; // for internal use
-  FL_EXPORT Fl_Image(const uchar *bits, int W, int H, int D=3, int LD=0) :
-    array(bits), w(W), h(H), d(D), ld(LD), id(0) {}
-  FL_EXPORT ~Fl_Image();
-  FL_EXPORT void label(Fl_Widget*);
-  FL_EXPORT void label(Fl_Menu_Item*);
-  FL_EXPORT void draw(int X, int Y, int W, int H, int cx=0, int cy=0);
-  FL_EXPORT void draw(int X, int Y) {draw(X, Y, w, h, 0, 0);}
+
+  Fl_RGB_Image(const uchar *bits, int W, int H, int D=3, int LD=0) :
+    Fl_Image(W,H), array(bits), d(D), ld(LD), id(0) {}
+  virtual ~Fl_RGB_Image();
+  virtual void draw(int X, int Y, int W, int H, int cx=0, int cy=0);
+  void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);}
+  virtual void label(Fl_Widget*w);
+  virtual void label(Fl_Menu_Item*m);
 };
 
 #endif
 
 //
-// End of "$Id: Fl_Image.H,v 1.5.2.3 2001/01/22 15:13:37 easysw Exp $".
+// End of "$Id: Fl_Image.H,v 1.5.2.3.2.1 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H
index b663f755b..31d99c673 100644
--- a/FL/Fl_Pixmap.H
+++ b/FL/Fl_Pixmap.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Pixmap.H,v 1.6.2.8 2001/06/07 13:16:08 easysw Exp $"
+// "$Id: Fl_Pixmap.H,v 1.6.2.8.2.1 2001/08/05 23:58:54 easysw Exp $"
 //
 // Pixmap header file for the Fast Light Tool Kit (FLTK).
 //
@@ -25,33 +25,33 @@
 
 #ifndef Fl_Pixmap_H
 #define Fl_Pixmap_H
+#  include "Fl_Image.H"
 
 class Fl_Widget;
 struct Fl_Menu_Item;
 
-// Older C++ compilers don't support the explicit keyword... :(
-#if defined(__sgi) && !defined(_COMPILER_VERSION)
-#define explicit
-#endif // __sgi && !_COMPILER_VERSION
+class FL_EXPORT Fl_Pixmap : public Fl_Image {
+  void measure();
+
+  public:
 
-struct Fl_Pixmap {
   const char * const * data;
-  int w, h; // set by first draw...
-  ulong id; // for internal use (the pixmap)
+  ulong id; // for internal use
   ulong mask; // for internal use (mask bitmap)
-  explicit Fl_Pixmap(char * const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {}
-  explicit Fl_Pixmap(uchar* const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {}
-  explicit Fl_Pixmap(const char * const * d) : data(d), w(-1), h(0), id(0),mask(0) {}
-  explicit Fl_Pixmap(const uchar* const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {}
-  FL_EXPORT ~Fl_Pixmap();
-  FL_EXPORT void label(Fl_Widget*);
-  FL_EXPORT void label(Fl_Menu_Item*);
-  FL_EXPORT void draw(int X, int Y, int W, int H, int cx=0, int cy=0);
-  void draw(int X, int Y) {draw(X, Y, w, h, 0, 0);}
+
+  explicit Fl_Pixmap(char * const * d) : Fl_Image(-1,0), data((const char*const*)d), id(0),mask(0) {measure();}
+  explicit Fl_Pixmap(uchar* const * d) : Fl_Image(-1,0), data((const char*const*)d), id(0),mask(0) {measure();}
+  explicit Fl_Pixmap(const char * const * d) : Fl_Image(-1,0), data(d), id(0),mask(0) {measure();}
+  explicit Fl_Pixmap(const uchar* const * d) : Fl_Image(-1,0), data((const char*const*)d), id(0),mask(0) {measure();}
+  virtual ~Fl_Pixmap();
+  virtual void draw(int X, int Y, int W, int H, int cx=0, int cy=0);
+  void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);}
+  virtual void label(Fl_Widget*w);
+  virtual void label(Fl_Menu_Item*m);
 };
 
 #endif
 
 //
-// End of "$Id: Fl_Pixmap.H,v 1.6.2.8 2001/06/07 13:16:08 easysw Exp $".
+// End of "$Id: Fl_Pixmap.H,v 1.6.2.8.2.1 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H
index 37530cbb3..3f5804188 100644
--- a/FL/Fl_Widget.H
+++ b/FL/Fl_Widget.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Widget.H,v 1.6.2.4.2.4 2001/08/04 20:17:10 easysw Exp $"
+// "$Id: Fl_Widget.H,v 1.6.2.4.2.5 2001/08/05 23:58:54 easysw Exp $"
 //
 // Widget header file for the Fast Light Tool Kit (FLTK).
 //
@@ -30,6 +30,7 @@
 
 class Fl_Widget;
 class Fl_Window;
+class Fl_Image;
 
 typedef void (Fl_Callback )(Fl_Widget*, void*);
 typedef Fl_Callback* Fl_Callback_p; // needed for BORLAND
@@ -38,6 +39,8 @@ typedef void (Fl_Callback1)(Fl_Widget*, long);
 
 struct Fl_Label {
   const char* value;
+  Fl_Image* image;
+  Fl_Image* deimage;
   uchar type;
   uchar font;
   uchar size;
@@ -132,6 +135,12 @@ public:
   void labelfont(uchar a) {label_.font=a;}
   uchar labelsize() const {return label_.size;}
   void labelsize(uchar a) {label_.size=a;}
+  Fl_Image* image() {return label_.image;}
+  void image(Fl_Image* a) {label_.image=a;}
+  void image(Fl_Image& a) {label_.image=&a;}
+  Fl_Image* deimage() {return label_.deimage;}
+  void deimage(Fl_Image* a) {label_.deimage=a;}
+  void deimage(Fl_Image& a) {label_.deimage=&a;}
   const char *tooltip() const {return tooltip_;}
   void tooltip(const char *t);
   Fl_Callback_p callback() const {return callback_;}
@@ -197,5 +206,5 @@ public:
 #endif
 
 //
-// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.4 2001/08/04 20:17:10 easysw Exp $".
+// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.5 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/FL/fl_draw.H b/FL/fl_draw.H
index 50ab7a1f9..e33ed8a39 100644
--- a/FL/fl_draw.H
+++ b/FL/fl_draw.H
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_draw.H,v 1.9.2.6.2.1 2001/08/04 12:21:33 easysw Exp $"
+// "$Id: fl_draw.H,v 1.9.2.6.2.2 2001/08/05 23:58:54 easysw Exp $"
 //
 // Portable drawing function header file for the Fast Light Tool Kit (FLTK).
 //
@@ -28,6 +28,12 @@
 
 #include "Enumerations.H"  // for the color names
 
+// Image class...
+class Fl_Image;
+
+// Label flags...
+FL_EXPORT extern char fl_draw_shortcut;
+
 // Colors:
 FL_EXPORT void	fl_color(Fl_Color); // select indexed color
 inline void fl_color(int c) {fl_color((Fl_Color)c);} // for back compatability
@@ -146,9 +152,10 @@ FL_EXPORT double fl_width(uchar);
 FL_EXPORT void fl_draw(const char*, int x, int y);
 FL_EXPORT void fl_draw(const char*, int n, int x, int y);
 FL_EXPORT void fl_measure(const char*, int& x, int& y);
-FL_EXPORT void fl_draw(const char*, int,int,int,int, Fl_Align);
+FL_EXPORT void fl_draw(const char*, int,int,int,int, Fl_Align, Fl_Image* img=0);
 FL_EXPORT void fl_draw(const char*, int,int,int,int, Fl_Align,
-	               void (*callthis)(const char *, int n, int x, int y));
+	               void (*callthis)(const char *, int n, int x, int y),
+		       Fl_Image* img=0);
 
 // boxtypes:
 FL_EXPORT void fl_frame(const char* s, int x, int y, int w, int h);
@@ -184,5 +191,5 @@ FL_EXPORT int fl_add_symbol(const char* name, void (*drawit)(Fl_Color), int scal
 #endif
 
 //
-// End of "$Id: fl_draw.H,v 1.9.2.6.2.1 2001/08/04 12:21:33 easysw Exp $".
+// End of "$Id: fl_draw.H,v 1.9.2.6.2.2 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/fluid/Fluid_Image.cxx b/fluid/Fluid_Image.cxx
index 72cb8c493..d10c2b9df 100644
--- a/fluid/Fluid_Image.cxx
+++ b/fluid/Fluid_Image.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fluid_Image.cxx,v 1.7.2.9 2001/04/13 19:34:03 easysw Exp $"
+// "$Id: Fluid_Image.cxx,v 1.7.2.9.2.1 2001/08/05 23:58:54 easysw Exp $"
 //
 // Pixmap label support for the Fast Light Tool Kit (FLTK).
 //
@@ -274,14 +274,14 @@ void bitmap_image::write_static() {
 #else // this seems to produce slightly shorter c++ files
   write_c("static unsigned char %s[] =\n",
 	  unique_id(this, "bits", filename_name(name()), 0));
-  int n = ((p->w+7)/8)*p->h;
+  int n = ((p->w()+7)/8)*p->h();
   write_cstring((const char*)(p->array), n);
   write_c(";\n");
 #endif
   write_c("static Fl_Bitmap %s(%s, %d, %d);\n",
 	  unique_id(this, "bitmap", filename_name(name()), 0),
 	  unique_id(this, "bits", filename_name(name()), 0),
-	  p->w, p->h);
+	  p->w(), p->h());
 }
 
 void bitmap_image::write_code() {
@@ -436,5 +436,5 @@ Fluid_Image *ui_find_image(const char *oldname) {
 }
 
 //
-// End of "$Id: Fluid_Image.cxx,v 1.7.2.9 2001/04/13 19:34:03 easysw Exp $".
+// End of "$Id: Fluid_Image.cxx,v 1.7.2.9.2.1 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/fluid/makedepend b/fluid/makedepend
index 1b6da71f9..aa314c0ce 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -69,7 +69,7 @@ Fluid_Image.o: ../FL/Fl_Menu_Item.H Fluid_Image.h ../FL/Fl_Tabs.H
 Fluid_Image.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H
 Fluid_Image.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
 Fluid_Image.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H ../FL/filename.H
-Fluid_Image.o: ../FL/Fl_Pixmap.H
+Fluid_Image.o: ../FL/Fl_Pixmap.H ../FL/Fl_Image.H
 code.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Type.h
 code.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h
 code.o: ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H
diff --git a/src/Fl_Bitmap.cxx b/src/Fl_Bitmap.cxx
index 91c9fd4d3..49d450479 100644
--- a/src/Fl_Bitmap.cxx
+++ b/src/Fl_Bitmap.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Bitmap.cxx,v 1.5.2.4 2001/01/22 15:13:39 easysw Exp $"
+// "$Id: Fl_Bitmap.cxx,v 1.5.2.4.2.1 2001/08/05 23:58:54 easysw Exp $"
 //
 // Bitmap drawing routines for the Fast Light Tool Kit (FLTK).
 //
@@ -36,30 +36,30 @@ void Fl_Bitmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
   cx += X-XP; cy += Y-YP;
   // clip the box down to the size of image, quit if empty:
   if (cx < 0) {W += cx; X -= cx; cx = 0;}
-  if ((cx+W) > w) W = w-cx;
+  if ((cx+W) > w()) W = w()-cx;
   if (W <= 0) return;
   if (cy < 0) {H += cy; Y -= cy; cy = 0;}
-  if ((cy+H) > h) H = h-cy;
+  if ((cy+H) > h()) H = h()-cy;
   if (H <= 0) return;
 #ifdef WIN32
   if (!id) {
     // we need to pad the lines out to words & swap the bits
     // in each byte.
-    int w1 = (w+7)/8;
-    int w2 = ((w+15)/16)*2;
-    uchar* newarray = new uchar[w2*h];
+    int w1 = (w()+7)/8;
+    int w2 = ((w()+15)/16)*2;
+    uchar* newarray = new uchar[w2*h()];
     const uchar* src = array;
     uchar* dest = newarray;
     static uchar reverse[16] =	/* Bit reversal lookup table */
   		{ 0x00, 0x88, 0x44, 0xcc, 0x22, 0xaa, 0x66, 0xee,
 		  0x11, 0x99, 0x55, 0xdd, 0x33, 0xbb, 0x77, 0xff };
-    for (int y=0; y < h; y++) {
+    for (int y=0; y < h(); y++) {
       for (int n = 0; n < w1; n++, src++)
 	*dest++ = (reverse[*src & 0x0f] & 0xf0) |
 	          (reverse[(*src >> 4) & 0x0f] & 0x0f);
       dest += w2-w1;
     }
-    id = (ulong)CreateBitmap(w, h, 1, 1, newarray);
+    id = (ulong)CreateBitmap(w(), h(), 1, 1, newarray);
     array = newarray; // keep the pointer so I can free it later
   }
   HDC tempdc = CreateCompatibleDC(fl_gc);
@@ -70,10 +70,10 @@ void Fl_Bitmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
   DeleteDC(tempdc);
 #else
   if (!id) id = XCreateBitmapFromData(fl_display, fl_window,
-				      (const char*)array, (w+7)&-8, h);
+				      (const char*)array, (w()+7)&-8, h());
   XSetStipple(fl_display, fl_gc, id);
-  int ox = X-cx; if (ox < 0) ox += w;
-  int oy = Y-cy; if (oy < 0) oy += h;
+  int ox = X-cx; if (ox < 0) ox += w();
+  int oy = Y-cy; if (oy < 0) oy += h();
   XSetTSOrigin(fl_display, fl_gc, ox, oy);
   XSetFillStyle(fl_display, fl_gc, FillStippled);
   XFillRectangle(fl_display, fl_window, fl_gc, X, Y, W, H);
@@ -92,38 +92,13 @@ Fl_Bitmap::~Fl_Bitmap() {
 #endif
 }
 
-static void bitmap_labeltype(
-    const Fl_Label* o, int x, int y, int w, int h, Fl_Align a)
-{
-  Fl_Bitmap* b = (Fl_Bitmap*)(o->value);
-  int cx;
-  if (a & FL_ALIGN_LEFT) cx = 0;
-  else if (a & FL_ALIGN_RIGHT) cx = b->w-w;
-  else cx = (b->w-w)/2;
-  int cy;
-  if (a & FL_ALIGN_TOP) cy = 0;
-  else if (a & FL_ALIGN_BOTTOM) cy = b->h-h;
-  else cy = (b->h-h)/2;
-  fl_color((Fl_Color)o->color);
-  b->draw(x,y,w,h,cx,cy);
+void Fl_Bitmap::label(Fl_Widget* w) {
+  w->image(this);
 }
 
-static void bitmap_measure(const Fl_Label* o, int& w, int& h) {
-  Fl_Bitmap* b = (Fl_Bitmap*)(o->value);
-  w = b->w;
-  h = b->h;
-}
-
-void Fl_Bitmap::label(Fl_Widget* o) {
-  Fl::set_labeltype(_FL_BITMAP_LABEL, bitmap_labeltype, bitmap_measure);
-  o->label(_FL_BITMAP_LABEL, (const char*)this);
-}
-
-void Fl_Bitmap::label(Fl_Menu_Item* o) {
-  Fl::set_labeltype(_FL_BITMAP_LABEL, bitmap_labeltype, bitmap_measure);
-  o->label(_FL_BITMAP_LABEL, (const char*)this);
+void Fl_Bitmap::label(Fl_Menu_Item* m) {
 }
 
 //
-// End of "$Id: Fl_Bitmap.cxx,v 1.5.2.4 2001/01/22 15:13:39 easysw Exp $".
+// End of "$Id: Fl_Bitmap.cxx,v 1.5.2.4.2.1 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/src/Fl_HelpView.cxx b/src/Fl_HelpView.cxx
index 15579c41b..d658ec96e 100644
--- a/src/Fl_HelpView.cxx
+++ b/src/Fl_HelpView.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_HelpView.cxx,v 1.1.2.3 2001/08/02 21:11:43 easysw Exp $"
+// "$Id: Fl_HelpView.cxx,v 1.1.2.4 2001/08/05 23:58:54 easysw Exp $"
 //
 // Fl_HelpView widget routines.
 //
@@ -499,7 +499,7 @@ Fl_HelpView::add_image(const char *name,	// I - Path of image
   {
     // Make the image if needed...
     if (!img->image)
-      img->image = new Fl_Image(img->data, img->w, img->h, img->d);
+      img->image = new Fl_RGB_Image(img->data, img->w, img->h, img->d);
 
     return (img);
   }
@@ -723,7 +723,7 @@ Fl_HelpView::add_image(const char *name,	// I - Path of image
   img->hattr[sizeof(img->hattr) - 1] = '\0';
 
   if (make)
-    img->image = new Fl_Image(img->data, img->w, img->h, img->d);
+    img->image = new Fl_RGB_Image(img->data, img->w, img->h, img->d);
   else
     img->image = (Fl_Image *)0;
 
@@ -3132,5 +3132,5 @@ scrollbar_callback(Fl_Widget *s, void *)
 
 
 //
-// End of "$Id: Fl_HelpView.cxx,v 1.1.2.3 2001/08/02 21:11:43 easysw Exp $".
+// End of "$Id: Fl_HelpView.cxx,v 1.1.2.4 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx
index 843a88963..1c62e2fea 100644
--- a/src/Fl_Image.cxx
+++ b/src/Fl_Image.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Image.cxx,v 1.5.2.3 2001/01/22 15:13:39 easysw Exp $"
+// "$Id: Fl_Image.cxx,v 1.5.2.3.2.1 2001/08/05 23:58:54 easysw Exp $"
 //
 // Image drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -30,61 +30,51 @@
 #include <FL/Fl_Menu_Item.H>
 #include <FL/Fl_Image.H>
 
+Fl_Image::~Fl_Image() {
+}
+
 void Fl_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
+}
+
+void Fl_Image::label(Fl_Widget* w) {
+  w->image(this);
+}
+
+void Fl_Image::label(Fl_Menu_Item* m) {
+}
+
+Fl_RGB_Image::~Fl_RGB_Image() {
+  if (id) fl_delete_offscreen((Fl_Offscreen)id);
+}
+
+void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
   // account for current clip region (faster on Irix):
   int X,Y,W,H; fl_clip_box(XP,YP,WP,HP,X,Y,W,H);
   cx += X-XP; cy += Y-YP;
   // clip the box down to the size of image, quit if empty:
   if (cx < 0) {W += cx; X -= cx; cx = 0;}
-  if (cx+W > w) W = w-cx;
+  if (cx+W > w()) W = w()-cx;
   if (W <= 0) return;
   if (cy < 0) {H += cy; Y -= cy; cy = 0;}
-  if (cy+H > h) H = h-cy;
+  if (cy+H > h()) H = h()-cy;
   if (H <= 0) return;
   if (!id) {
-    id = (ulong)fl_create_offscreen(w, h);
+    id = (ulong)fl_create_offscreen(w(), h());
     fl_begin_offscreen((Fl_Offscreen)id);
-    fl_draw_image(array, 0, 0, w, h, d, ld);
+    fl_draw_image(array, 0, 0, w(), h(), d, ld);
     fl_end_offscreen();
   }
   fl_copy_offscreen(X, Y, W, H, (Fl_Offscreen)id, cx, cy);
 }
 
-Fl_Image::~Fl_Image() {
-  if (id) fl_delete_offscreen((Fl_Offscreen)id);
+void Fl_RGB_Image::label(Fl_Widget* w) {
+  w->image(this);
 }
 
-static void image_labeltype(
-    const Fl_Label* o, int x, int y, int w, int h, Fl_Align a)
-{
-  Fl_Image* b = (Fl_Image*)(o->value);
-  int cx;
-  if (a & FL_ALIGN_LEFT) cx = 0;
-  else if (a & FL_ALIGN_RIGHT) cx = b->w-w;
-  else cx = (b->w-w)/2;
-  int cy;
-  if (a & FL_ALIGN_TOP) cy = 0;
-  else if (a & FL_ALIGN_BOTTOM) cy = b->h-h;
-  else cy = (b->h-h)/2;
-  b->draw(x,y,w,h,cx,cy);
+void Fl_RGB_Image::label(Fl_Menu_Item* m) {
 }
 
-static void image_measure(const Fl_Label* o, int& w, int& h) {
-  Fl_Image* b = (Fl_Image*)(o->value);
-  w = b->w;
-  h = b->h;
-}
-
-void Fl_Image::label(Fl_Widget* o) {
-  Fl::set_labeltype(_FL_IMAGE_LABEL, image_labeltype, image_measure);
-  o->label(_FL_IMAGE_LABEL, (const char*)this);
-}
-
-void Fl_Image::label(Fl_Menu_Item* o) {
-  Fl::set_labeltype(_FL_IMAGE_LABEL, image_labeltype, image_measure);
-  o->label(_FL_IMAGE_LABEL, (const char*)this);
-}
 
 //
-// End of "$Id: Fl_Image.cxx,v 1.5.2.3 2001/01/22 15:13:39 easysw Exp $".
+// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.1 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx
index 846383b55..df0e029a6 100644
--- a/src/Fl_Pixmap.cxx
+++ b/src/Fl_Pixmap.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Pixmap.cxx,v 1.9.2.4 2001/01/22 15:13:40 easysw Exp $"
+// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.1 2001/08/05 23:58:54 easysw Exp $"
 //
 // Pixmap drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -42,25 +42,35 @@
 extern uchar **fl_mask_bitmap; // used by fl_draw_pixmap.C to store mask
 void fl_restore_clip(); // in fl_rect.C
 
+void Fl_Pixmap::measure() {
+  int W, H;
+
+  // ignore empty or bad pixmap data:
+  if (w()<0) {
+    fl_measure_pixmap(data, W, H);
+    w(W); h(H);
+  }
+}
+
 void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
   // ignore empty or bad pixmap data:
-  if (w<0) {
-    fl_measure_pixmap(data, w, h);
-    if (WP==-1) { WP = w; HP = h; }
+  if (w()<0) {
+    measure();
+    if (WP==-1) { WP = w(); HP = h(); }
   }
-  if (!w) return;
+  if (!w()) return;
   // account for current clip region (faster on Irix):
   int X,Y,W,H; fl_clip_box(XP,YP,WP,HP,X,Y,W,H);
   cx += X-XP; cy += Y-YP;
   // clip the box down to the size of image, quit if empty:
   if (cx < 0) {W += cx; X -= cx; cx = 0;}
-  if (cx+W > w) W = w-cx;
+  if (cx+W > w()) W = w()-cx;
   if (W <= 0) return;
   if (cy < 0) {H += cy; Y -= cy; cy = 0;}
-  if (cy+H > h) H = h-cy;
+  if (cy+H > h()) H = h()-cy;
   if (H <= 0) return;
   if (!id) {
-    id = (ulong)fl_create_offscreen(w, h);
+    id = (ulong)fl_create_offscreen(w(), h());
     fl_begin_offscreen((Fl_Offscreen)id);
     uchar *bitmap = 0;
     fl_mask_bitmap = &bitmap;
@@ -78,11 +88,11 @@ void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
 	0x01, 0x09, 0x05, 0x0d, 0x03, 0x0b, 0x07, 0x0f };
       int np  = GetDeviceCaps(fl_gc, PLANES);	//: was always one on sample machines
       int bpp = GetDeviceCaps(fl_gc, BITSPIXEL);//: 1,4,8,16,24,32 and more odd stuff?
-      int Bpr = (bpp*w+7)/8;			//: bytes per row
-      int pad = Bpr&1, w1 = (w+7)/8, shr = ((w-1)&7)+1;
+      int Bpr = (bpp*w()+7)/8;			//: bytes per row
+      int pad = Bpr&1, w1 = (w()+7)/8, shr = ((w()-1)&7)+1;
       if (bpp==4) shr = (shr+1)/2;
       uchar *newarray = new uchar[(Bpr+pad)*h], *dst = newarray, *src = bitmap;
-      for (int i=0; i<h; i++) {
+      for (int i=0; i<h(); i++) {
 	//: this is slooow, but we do it only once per pixmap
 	for (int j=w1; j>0; j--) {
 	  uchar b = *src++;
@@ -112,11 +122,11 @@ void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
 	}
 	dst += pad;
       }
-      mask = (ulong)CreateBitmap(w, h, np, bpp, newarray);
+      mask = (ulong)CreateBitmap(w(), h(), np, bpp, newarray);
       delete[] newarray;
 #else
       mask = XCreateBitmapFromData(fl_display, fl_window,
-				(const char*)bitmap, (w+7)&-8, h);
+				   (const char*)bitmap, (w()+7)&-8, h());
 #endif
       delete[] bitmap;
     }
@@ -142,8 +152,8 @@ void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
     cy += ny-Y; Y = ny;
     // make X use the bitmap as a mask:
     XSetClipMask(fl_display, fl_gc, mask);
-    int ox = X-cx; if (ox < 0) ox += w;
-    int oy = Y-cy; if (oy < 0) oy += h;
+    int ox = X-cx; if (ox < 0) ox += w();
+    int oy = Y-cy; if (oy < 0) oy += h();
     XSetClipOrigin(fl_display, fl_gc, X-cx, Y-cy);
   }
   fl_copy_offscreen(X, Y, W, H, (Fl_Offscreen)id, cx, cy);
@@ -160,39 +170,13 @@ Fl_Pixmap::~Fl_Pixmap() {
   if (mask) fl_delete_offscreen((Fl_Offscreen)mask);
 }
 
-static void pixmap_labeltype(
-														 const Fl_Label* o, int x, int y, int w, int h, Fl_Align a)
-{
-  Fl_Pixmap* b = (Fl_Pixmap*)(o->value);
-  if (b->w<0) fl_measure_pixmap(b->data, b->w, b->h);
-  int cx;
-  if (a & FL_ALIGN_LEFT) cx = 0;
-  else if (a & FL_ALIGN_RIGHT) cx = b->w-w;
-  else cx = (b->w-w)/2;
-  int cy;
-  if (a & FL_ALIGN_TOP) cy = 0;
-  else if (a & FL_ALIGN_BOTTOM) cy = b->h-h;
-  else cy = (b->h-h)/2;
-  b->draw(x,y,w,h,cx,cy);
-}
-
-static void pixmap_measure(const Fl_Label* o, int& w, int& h) {
-  Fl_Pixmap* b = (Fl_Pixmap*)(o->value);
-  if (b->w<0) fl_measure_pixmap(b->data, b->w, b->h);
-  w = b->w;
-  h = b->h;
-}
-
-void Fl_Pixmap::label(Fl_Widget* o) {
-  Fl::set_labeltype(_FL_PIXMAP_LABEL, pixmap_labeltype, pixmap_measure);
-  o->label(_FL_PIXMAP_LABEL, (const char*)this);
+void Fl_Pixmap::label(Fl_Widget* w) {
+  w->image(this);
 }
 
-void Fl_Pixmap::label(Fl_Menu_Item* o) {
-  Fl::set_labeltype(_FL_PIXMAP_LABEL, pixmap_labeltype, pixmap_measure);
-  o->label(_FL_PIXMAP_LABEL, (const char*)this);
+void Fl_Pixmap::label(Fl_Menu_Item* m) {
 }
 
 //
-// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4 2001/01/22 15:13:40 easysw Exp $".
+// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.1 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx
index 97857d6c1..10d5a24e9 100644
--- a/src/fl_draw.cxx
+++ b/src/fl_draw.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_draw.cxx,v 1.6.2.4 2001/01/22 15:13:40 easysw Exp $"
+// "$Id: fl_draw.cxx,v 1.6.2.4.2.1 2001/08/05 23:58:54 easysw Exp $"
 //
 // Label drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -31,11 +31,14 @@
 // Aligns them against the inside of the box.
 
 #include <FL/fl_draw.H>
+#include <FL/Fl_Image.H>
+
 #include <string.h>
 
 #define MAXBUF 1024
 
-char fl_draw_shortcut;	// set by fl_labeltypes.C
+char fl_draw_shortcut;	// set by fl_labeltypes.cxx
+
 static char* underline_at;
 
 // Copy p to buf, replacing unprintable characters with ^X and \nnn
@@ -90,19 +93,6 @@ expand(const char* from, char* buf, double maxw, int& n, double &width, int wrap
       *o++ = '^';
       *o++ = c ^ 0x40;
 
-   /*
-    * mike@fltk.org - The following escaping code causes problems when
-    * using the PostScript ISOLatin1 and WinANSI encodings, because these
-    * map to I18N characters...
-    */
-#if 0
-    } else if (c >= 128 && c < 0xA0) { // \nnn
-      *o++ = '\\';
-      *o++ = (c>>6)+'0';
-      *o++ = ((c>>3)&7)+'0';
-      *o++ = (c&7)+'0';
-#endif /* 0 */
-
     } else if (c == 0xA0) { // non-breaking space
       *o++ = ' ';
 
@@ -122,8 +112,8 @@ void fl_draw(
     const char* str,	// the (multi-line) string
     int x, int y, int w, int h,	// bounding box
     Fl_Align align,
-    void (*callthis)(const char*,int,int,int)
-) {
+    void (*callthis)(const char*,int,int,int),
+    Fl_Image* img) {
   const char* p;
   const char* e;
   char buf[MAXBUF];
@@ -140,18 +130,30 @@ void fl_draw(
   }
 
   // figure out vertical position of the first line:
+  int xpos;
   int ypos;
   int height = fl_height();
-  if (align & FL_ALIGN_BOTTOM) ypos = y+h-(lines-1)*height;
+  int imgh = img ? img->h() : 0;
+
+  if (align & FL_ALIGN_BOTTOM) ypos = y+h-(lines-1)*height-imgh;
   else if (align & FL_ALIGN_TOP) ypos = y+height;
-  else ypos = y+(h-lines*height)/2+height;
+  else ypos = y+(h-lines*height-imgh)/2+height;
+
+  // draw the image unless the "text over image" alignment flag is set...
+  if (img && !(align & FL_ALIGN_TEXT_OVER_IMAGE)) {
+    if (align & FL_ALIGN_LEFT) xpos = x;
+    else if (align & FL_ALIGN_RIGHT) xpos = x+w-img->w();
+    else xpos = x+(w-img->w())/2;
+
+    img->draw(xpos, ypos - height);
+    ypos += img->h();
+  }
 
   // now draw all the lines:
   int desc = fl_descent();
   for (p=str; ; ypos += height) {
     if (lines>1) e = expand(p, buf, w, buflen, width, align&FL_ALIGN_WRAP);
 
-    int xpos;
     if (align & FL_ALIGN_LEFT) xpos = x;
     else if (align & FL_ALIGN_RIGHT) xpos = x+w-int(width+.5);
     else xpos = x+int((w-width)/2);
@@ -165,16 +167,25 @@ void fl_draw(
     p = e;
   }
 
+  // draw the image if the "text over image" alignment flag is set...
+  if (img && (align & FL_ALIGN_TEXT_OVER_IMAGE)) {
+    if (align & FL_ALIGN_LEFT) xpos = x;
+    else if (align & FL_ALIGN_RIGHT) xpos = x+w-img->w();
+    else xpos = x+(w-img->w())/2;
+
+    img->draw(xpos, ypos);
+  }
 }
 
 void fl_draw(
   const char* str,	// the (multi-line) string
   int x, int y, int w, int h,	// bounding box
-  Fl_Align align) {
+  Fl_Align align,
+  Fl_Image* img) {
   if (!str || !*str) return;
   if (w && h && !fl_not_clipped(x, y, w, h)) return;
   if (align & FL_ALIGN_CLIP) fl_clip(x, y, w, h);
-  fl_draw(str, x, y, w, h, align, fl_draw);
+  fl_draw(str, x, y, w, h, align, fl_draw, img);
   if (align & FL_ALIGN_CLIP) fl_pop_clip();
 }
 
@@ -200,5 +211,5 @@ void fl_measure(const char* str, int& w, int& h) {
 }
 
 //
-// End of "$Id: fl_draw.cxx,v 1.6.2.4 2001/01/22 15:13:40 easysw Exp $".
+// End of "$Id: fl_draw.cxx,v 1.6.2.4.2.1 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/src/fl_labeltype.cxx b/src/fl_labeltype.cxx
index b669b7e6e..32cc94775 100644
--- a/src/fl_labeltype.cxx
+++ b/src/fl_labeltype.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_labeltype.cxx,v 1.6.2.3 2001/01/22 15:13:41 easysw Exp $"
+// "$Id: fl_labeltype.cxx,v 1.6.2.3.2.1 2001/08/05 23:58:54 easysw Exp $"
 //
 // Label drawing routines for the Fast Light Tool Kit (FLTK).
 //
@@ -40,7 +40,16 @@ fl_normal_label(const Fl_Label* o, int X, int Y, int W, int H, Fl_Align align)
 {
   fl_font(o->font, o->size);
   fl_color((Fl_Color)o->color);
-  fl_draw(o->value, X, Y, W, H, align);
+  if (o->image) {
+    if (align & FL_ALIGN_TEXT_OVER_IMAGE) {
+      fl_draw(o->value, X, Y, W, H, align, o->image);
+    } else {
+      fl_draw(o->value, X, Y, W, H, align, o->image);
+    }
+  }
+  else {
+    fl_draw(o->value, X, Y, W, H, align, o->image);
+  }
 }
 
 void
@@ -77,12 +86,16 @@ void Fl::set_labeltype(Fl_Labeltype t,Fl_Label_Draw_F* f,Fl_Label_Measure_F*m)
 
 // draw label with arbitrary alignment in arbitrary box:
 void Fl_Label::draw(int X, int Y, int W, int H, Fl_Align align) const {
-  if (!value) return;
+  if (!value && !image) return;
   table[type](this, X, Y, W, H, align);
 }
 
 void Fl_Label::measure(int& W, int& H) const {
-  if (!value) return;
+  if (!value && !image) {
+    W = H = 0;
+    return;
+  }
+
   Fl_Label_Measure_F* f = ::measure[type]; if (!f) f = fl_normal_measure;
   f(this, W, H);
 }
@@ -103,11 +116,13 @@ void Fl_Widget::draw_label(int X, int Y, int W, int H) const {
 }
 
 // Anybody can call this to force the label to draw anywhere:
-extern char fl_draw_shortcut;
 void Fl_Widget::draw_label(int X, int Y, int W, int H, Fl_Align a) const {
   if (flags()&SHORTCUT_LABEL) fl_draw_shortcut = 1;
   Fl_Label l1 = label_;
-  if (!active_r()) l1.color = inactive((Fl_Color)l1.color);
+  if (!active_r()) {
+    l1.color = inactive((Fl_Color)l1.color);
+    if (l1.deimage) l1.image = l1.deimage;
+  }
   l1.draw(X,Y,W,H,a);
   fl_draw_shortcut = 0;
 }
@@ -117,5 +132,5 @@ void Fl_Widget::draw_label(int X, int Y, int W, int H, Fl_Align a) const {
 #include <FL/Fl_Input_.H>
 
 //
-// End of "$Id: fl_labeltype.cxx,v 1.6.2.3 2001/01/22 15:13:41 easysw Exp $".
+// End of "$Id: fl_labeltype.cxx,v 1.6.2.3.2.1 2001/08/05 23:58:54 easysw Exp $".
 //
diff --git a/src/makedepend b/src/makedepend
index f09496585..7a7b88bec 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -5,11 +5,12 @@ Fl.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/x.H ../FL/Fl_Window.H
 Fl.o: ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H ../FL/fl_draw.H
 Fl_Adjuster.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Adjuster.o: ../FL/Fl_Adjuster.H ../FL/Fl_Valuator.H ../FL/Fl_Widget.H
-Fl_Adjuster.o: ../FL/Fl_Bitmap.H ../FL/fl_draw.H fastarrow.h mediumarrow.h
-Fl_Adjuster.o: slowarrow.h
+Fl_Adjuster.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/fl_draw.H fastarrow.h
+Fl_Adjuster.o: mediumarrow.h slowarrow.h
 Fl_Bitmap.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H
 Fl_Bitmap.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/Fl_Widget.H
 Fl_Bitmap.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H
+Fl_Bitmap.o: ../FL/Fl_Image.H
 Fl_Browser.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Browser.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Group.H
 Fl_Browser.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
@@ -26,7 +27,6 @@ Fl_Box.o: ../FL/Fl_Widget.H ../FL/Fl_Box.H ../FL/Fl_Widget.H
 Fl_Box.o: ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Button.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Button.o: ../FL/Fl_Button.H ../FL/Fl_Widget.H ../FL/Fl_Group.H
-Fl_Button.o: ../FL/fl_draw.H
 Fl_Chart.o: ../FL/math.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Chart.o: ../FL/Fl_Chart.H ../FL/Fl_Widget.H ../FL/fl_draw.H
 Fl_Check_Button.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
@@ -66,7 +66,7 @@ Fl_FileChooser.o: ../FL/Fl_Valuator.H ../FL/Fl_FileIcon.H ../FL/Fl.H
 Fl_FileChooser.o: ../FL/Fl_Button.H ../FL/Fl_Return_Button.H
 Fl_FileChooser.o: ../FL/Fl_Button.H ../FL/fl_ask.H ../FL/Fl_Input.H
 Fl_FileChooser.o: ../FL/Fl_Input_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
-Fl_FileChooser.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Bitmap.H
+Fl_FileChooser.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
 Fl_FileChooser2.o: ../FL/Fl_FileChooser.H ../FL/Fl.H ../FL/Enumerations.H
 Fl_FileChooser2.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 Fl_FileChooser2.o: ../FL/Fl_Widget.H ../FL/Fl_FileBrowser.H
@@ -93,6 +93,7 @@ Fl_HelpView.o: ../FL/Fl_HelpView.H ../FL/Fl.H ../FL/Enumerations.H
 Fl_HelpView.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H
 Fl_HelpView.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Widget.H
 Fl_HelpView.o: ../FL/fl_draw.H ../config.h ../FL/Fl_Image.H ../FL/Fl_Pixmap.H
+Fl_HelpView.o: ../FL/Fl_Image.H
 Fl_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H
 Fl_Image.o: ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_Widget.H
 Fl_Image.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H
@@ -137,6 +138,7 @@ Fl_Pack.o: ../FL/Fl_Group.H ../FL/fl_draw.H
 Fl_Pixmap.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Pixmap.o: ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_Widget.H
 Fl_Pixmap.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Pixmap.H
+Fl_Pixmap.o: ../FL/Fl_Image.H
 Fl_Positioner.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Positioner.o: ../FL/Fl_Positioner.H ../FL/Fl_Widget.H ../FL/fl_draw.H
 Fl_Repeat_Button.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
@@ -195,6 +197,7 @@ Fl_Value_Slider.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H
 Fl_Value_Slider.o: ../FL/Fl_Valuator.H ../FL/Fl_Widget.H ../FL/fl_draw.H
 Fl_Widget.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Widget.o: ../FL/Fl_Widget.H ../FL/Fl_Group.H ../FL/Fl_Tooltip.H
+Fl_Widget.o: ../FL/fl_draw.H
 Fl_Window.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Window.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 Fl_Window_fullscreen.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
@@ -256,6 +259,7 @@ fl_curve.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_diamond_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_diamond_box.o: ../FL/fl_draw.H
 fl_draw.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H
+fl_draw.o: ../FL/Fl_Image.H
 fl_draw_image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_draw_image.o: ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H Fl_XColor.H
 fl_draw_image.o: ../config.h ../FL/Enumerations.H
@@ -314,13 +318,13 @@ forms_compatability.o: ../FL/forms.H ../FL/Fl.H ../FL/Enumerations.H
 forms_compatability.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 forms_compatability.o: ../FL/Fl_Window.H ../FL/fl_draw.H
 forms_compatability.o: ../FL/Fl_FormsBitmap.H ../FL/Fl_Bitmap.H
-forms_compatability.o: ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H
-forms_compatability.o: ../FL/Fl_Box.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
-forms_compatability.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
-forms_compatability.o: ../FL/Fl_Valuator.H ../FL/Fl_Button.H
-forms_compatability.o: ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H
-forms_compatability.o: ../FL/Fl_Check_Button.H ../FL/Fl_Chart.H
-forms_compatability.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
+forms_compatability.o: ../FL/Fl_Image.H ../FL/Fl_FormsPixmap.H
+forms_compatability.o: ../FL/Fl_Pixmap.H ../FL/Fl_Box.H ../FL/Fl_Browser.H
+forms_compatability.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
+forms_compatability.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
+forms_compatability.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H
+forms_compatability.o: ../FL/Fl_Round_Button.H ../FL/Fl_Check_Button.H
+forms_compatability.o: ../FL/Fl_Chart.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
 forms_compatability.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H
 forms_compatability.o: ../FL/Fl_Counter.H ../FL/Fl_Dial.H ../FL/Fl_Free.H
 forms_compatability.o: ../FL/fl_ask.H ../FL/fl_show_colormap.H
@@ -332,10 +336,10 @@ forms_compatability.o: ../FL/Fl_Return_Button.H ../FL/Fl_Repeat_Button.H
 forms_bitmap.o: ../FL/forms.H ../FL/Fl.H ../FL/Enumerations.H
 forms_bitmap.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 forms_bitmap.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H
-forms_bitmap.o: ../FL/Fl_Bitmap.H ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H
-forms_bitmap.o: ../FL/Fl_Box.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
-forms_bitmap.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-forms_bitmap.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H
+forms_bitmap.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_FormsPixmap.H
+forms_bitmap.o: ../FL/Fl_Pixmap.H ../FL/Fl_Box.H ../FL/Fl_Browser.H
+forms_bitmap.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
+forms_bitmap.o: ../FL/Fl_Valuator.H ../FL/Fl_Button.H ../FL/Fl_Light_Button.H
 forms_bitmap.o: ../FL/Fl_Round_Button.H ../FL/Fl_Check_Button.H
 forms_bitmap.o: ../FL/Fl_Chart.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
 forms_bitmap.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H ../FL/Fl_Counter.H
@@ -349,25 +353,25 @@ forms_free.o: ../FL/Fl_Free.H ../FL/Fl_Widget.H
 forms_fselect.o: ../FL/forms.H ../FL/Fl.H ../FL/Enumerations.H
 forms_fselect.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 forms_fselect.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H
-forms_fselect.o: ../FL/Fl_Bitmap.H ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H
-forms_fselect.o: ../FL/Fl_Box.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
-forms_fselect.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-forms_fselect.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H
-forms_fselect.o: ../FL/Fl_Round_Button.H ../FL/Fl_Check_Button.H
-forms_fselect.o: ../FL/Fl_Chart.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
-forms_fselect.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H ../FL/Fl_Counter.H
-forms_fselect.o: ../FL/Fl_Dial.H ../FL/Fl_Free.H ../FL/fl_ask.H
-forms_fselect.o: ../FL/fl_show_colormap.H ../FL/filename.H
+forms_fselect.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_FormsPixmap.H
+forms_fselect.o: ../FL/Fl_Pixmap.H ../FL/Fl_Box.H ../FL/Fl_Browser.H
+forms_fselect.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
+forms_fselect.o: ../FL/Fl_Valuator.H ../FL/Fl_Button.H
+forms_fselect.o: ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H
+forms_fselect.o: ../FL/Fl_Check_Button.H ../FL/Fl_Chart.H ../FL/Fl_Choice.H
+forms_fselect.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H
+forms_fselect.o: ../FL/Fl_Counter.H ../FL/Fl_Dial.H ../FL/Fl_Free.H
+forms_fselect.o: ../FL/fl_ask.H ../FL/fl_show_colormap.H ../FL/filename.H
 forms_fselect.o: ../FL/fl_file_chooser.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
 forms_fselect.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Positioner.H
 forms_fselect.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Timer.H
 forms_pixmap.o: ../FL/forms.H ../FL/Fl.H ../FL/Enumerations.H
 forms_pixmap.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 forms_pixmap.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H
-forms_pixmap.o: ../FL/Fl_Bitmap.H ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H
-forms_pixmap.o: ../FL/Fl_Box.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
-forms_pixmap.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-forms_pixmap.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H
+forms_pixmap.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_FormsPixmap.H
+forms_pixmap.o: ../FL/Fl_Pixmap.H ../FL/Fl_Box.H ../FL/Fl_Browser.H
+forms_pixmap.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
+forms_pixmap.o: ../FL/Fl_Valuator.H ../FL/Fl_Button.H ../FL/Fl_Light_Button.H
 forms_pixmap.o: ../FL/Fl_Round_Button.H ../FL/Fl_Check_Button.H
 forms_pixmap.o: ../FL/Fl_Chart.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
 forms_pixmap.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H ../FL/Fl_Counter.H
@@ -378,13 +382,27 @@ forms_pixmap.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Positioner.H
 forms_pixmap.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Timer.H
 forms_timer.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 forms_timer.o: ../FL/Fl_Timer.H ../FL/Fl_Widget.H ../FL/fl_draw.H
-Fl_Gl_Choice.o: ../config.h
-Fl_Gl_Overlay.o: ../config.h
-Fl_Gl_Window.o: ../config.h
-gl_draw.o: ../config.h
-gl_start.o: ../config.h
-glut_compatability.o: ../config.h
-glut_font.o: ../config.h
+Fl_Gl_Choice.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
+Fl_Gl_Choice.o: ../FL/x.H ../FL/Fl_Window.H Fl_Gl_Choice.H
+Fl_Gl_Overlay.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H
+Fl_Gl_Overlay.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H Fl_Gl_Choice.H
+Fl_Gl_Overlay.o: ../FL/Fl_Gl_Window.H
+Fl_Gl_Window.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
+Fl_Gl_Window.o: ../FL/x.H ../FL/Fl_Window.H Fl_Gl_Choice.H
+Fl_Gl_Window.o: ../FL/Fl_Gl_Window.H
+gl_draw.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
+gl_draw.o: ../FL/gl.h ../FL/x.H ../FL/Fl_Window.H ../FL/fl_draw.H
+gl_draw.o: Fl_Gl_Choice.H Fl_Font.H
+gl_start.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
+gl_start.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/x.H
+gl_start.o: ../FL/Fl_Window.H ../FL/fl_draw.H Fl_Gl_Choice.H
+glut_compatability.o: ../config.h ../FL/glut.H ../FL/gl.h
+glut_compatability.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl.H
+glut_compatability.o: ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H
+glut_compatability.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H
+glut_font.o: ../config.h ../FL/glut.H ../FL/gl.h ../FL/Enumerations.H
+glut_font.o: ../FL/Fl_Export.H ../FL/Fl.H ../FL/Fl_Gl_Window.H
+glut_font.o: ../FL/Fl_Window.H
 scandir.o: ../config.h
 numericsort.o: ../config.h
 vsnprintf.o: ../config.h
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 $".
 //
-- 
cgit v1.2.3