Added icons to Fluid's menu and object list.

Previous version is tagged in cvs with
'pre_fluid_icon_changes'.


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

51 files changed, 1508 insertions, 63 deletions

diff --git a/documentation/common.html b/documentation/common.html
index ca7b4c4fc..85d091138 100644
--- a/documentation/common.html
+++ b/documentation/common.html
@@ -451,7 +451,7 @@ structure containing the label information, the bounding box for
 the label, and the label alignment:</P>
 
 <UL><PRE>
-void xyz_draw(Fl_Label *label, int x, int y, int w, int h, Fl_Align align) {
+void xyz_draw(const Fl_Label *label, int x, int y, int w, int h, Fl_Align align) {
 ...
 }
 </PRE></UL>
@@ -465,7 +465,7 @@ is not called if the label value is <TT>NULL</TT>.</P>
 height:</P>
 
 <UL><PRE>
-void xyz_measure(Fl_Label *label, int &amp;w, int &amp;h) {
+void xyz_measure(const Fl_Label *label, int &amp;w, int &amp;h) {
 ...
 }
 </PRE></UL>
diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx
index 5e777b76a..91e5b9bcc 100644
--- a/fluid/Fl_Type.cxx
+++ b/fluid/Fl_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Type.cxx,v 1.6.2.6.2.9 2002/08/09 22:57:00 easysw Exp $"
+// "$Id: Fl_Type.cxx,v 1.6.2.6.2.10 2002/10/30 21:06:11 matthiaswm Exp $"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -46,10 +46,112 @@
 
 #include <FL/Fl_Pixmap.H>
 #include "lock.xpm"
-#include "unlock.xpm"
+//#include "unlock.xpm"
 
 static Fl_Pixmap	lock_pixmap(lock_xpm);
-static Fl_Pixmap	unlock_pixmap(unlock_xpm);
+//static Fl_Pixmap	unlock_pixmap(unlock_xpm);
+
+#include "flWindow.xpm"
+#include "flButton.xpm"
+#include "flCheckButton.xpm"
+#include "flRoundButton.xpm"
+#include "flBox.xpm"
+#include "flGroup.xpm"
+#include "flFunction.xpm"
+#include "flCode.xpm"
+#include "flCodeBlock.xpm"
+#include "flDeclaration.xpm"
+#include "flDeclarationBlock.xpm"
+#include "flClass.xpm"
+#include "flTabs.xpm"
+#include "flInput.xpm"
+#include "flChoice.xpm"
+#include "flMenuitem.xpm"
+#include "flMenubar.xpm"
+#include "flSubmenu.xpm"
+#include "flScroll.xpm"
+#include "flTile.xpm"
+#include "flWizard.xpm"
+#include "flPack.xpm"
+#include "flReturnButton.xpm"
+#include "flLightButton.xpm"
+#include "flRepeatButton.xpm"
+#include "flMenuButton.xpm"
+#include "flOutput.xpm"
+#include "flTextDisplay.xpm"
+#include "flTextEdit.xpm"
+#include "flFileInput.xpm"
+#include "flBrowser.xpm"
+#include "flCheckBrowser.xpm"
+#include "flFileBrowser.xpm"
+#include "flClock.xpm"
+#include "flHelp.xpm"
+#include "flProgress.xpm"
+#include "flSlider.xpm"
+#include "flScrollBar.xpm"
+#include "flValueSlider.xpm"
+#include "flAdjuster.xpm"
+#include "flCounter.xpm"
+#include "flDial.xpm"
+#include "flRoller.xpm"
+#include "flValueInput.xpm"
+#include "flValueOutput.xpm"
+
+static Fl_Pixmap	window_pixmap(flWindow_xpm);
+static Fl_Pixmap	button_pixmap(flButton_xpm);
+static Fl_Pixmap	checkbutton_pixmap(flCheckButton_xpm);
+static Fl_Pixmap	roundbutton_pixmap(flRoundButton_xpm);
+static Fl_Pixmap	box_pixmap(flBox_xpm);
+static Fl_Pixmap	group_pixmap(flGroup_xpm);
+static Fl_Pixmap	function_pixmap(flFunction_xpm);
+static Fl_Pixmap	code_pixmap(flCode_xpm);
+static Fl_Pixmap	codeblock_pixmap(flCodeBlock_xpm);
+static Fl_Pixmap	declaration_pixmap(flDeclaration_xpm);
+static Fl_Pixmap	declarationblock_pixmap(flDeclarationBlock_xpm);
+static Fl_Pixmap	class_pixmap(flClass_xpm);
+static Fl_Pixmap	tabs_pixmap(flTabs_xpm);
+static Fl_Pixmap	input_pixmap(flInput_xpm);
+static Fl_Pixmap	choice_pixmap(flChoice_xpm);
+static Fl_Pixmap	menuitem_pixmap(flMenuitem_xpm);
+static Fl_Pixmap	menubar_pixmap(flMenubar_xpm);
+static Fl_Pixmap	submenu_pixmap(flSubmenu_xpm);
+static Fl_Pixmap	scroll_pixmap(flScroll_xpm);
+static Fl_Pixmap	tile_pixmap(flTile_xpm);
+static Fl_Pixmap	wizard_pixmap(flWizard_xpm);
+static Fl_Pixmap	pack_pixmap(flPack_xpm);
+static Fl_Pixmap	returnbutton_pixmap(flReturnButton_xpm);
+static Fl_Pixmap	lightbutton_pixmap(flLightButton_xpm);
+static Fl_Pixmap	repeatbutton_pixmap(flRepeatButton_xpm);
+static Fl_Pixmap	menubutton_pixmap(flMenuButton_xpm);
+static Fl_Pixmap	output_pixmap(flOutput_xpm);
+static Fl_Pixmap	textdisplay_pixmap(flTextDisplay_xpm);
+static Fl_Pixmap	textedit_pixmap(flTextEdit_xpm);
+static Fl_Pixmap	fileinput_pixmap(flFileInput_xpm);
+static Fl_Pixmap	browser_pixmap(flBrowser_xpm);
+static Fl_Pixmap	checkbrowser_pixmap(flCheckBrowser_xpm);
+static Fl_Pixmap	filebrowser_pixmap(flFileBrowser_xpm);
+static Fl_Pixmap	clock_pixmap(flClock_xpm);
+static Fl_Pixmap	help_pixmap(flHelp_xpm);
+static Fl_Pixmap	progress_pixmap(flProgress_xpm);
+static Fl_Pixmap	slider_pixmap(flSlider_xpm);
+static Fl_Pixmap	scrollbar_pixmap(flScrollBar_xpm);
+static Fl_Pixmap	valueslider_pixmap(flValueSlider_xpm);
+static Fl_Pixmap	adjuster_pixmap(flAdjuster_xpm);
+static Fl_Pixmap	counter_pixmap(flCounter_xpm);
+static Fl_Pixmap	dial_pixmap(flDial_xpm);
+static Fl_Pixmap	roller_pixmap(flRoller_xpm);
+static Fl_Pixmap	valueinput_pixmap(flValueInput_xpm);
+static Fl_Pixmap	valueoutput_pixmap(flValueOutput_xpm);
+
+Fl_Pixmap *pixmap[] = { 0, &window_pixmap, &button_pixmap, &checkbutton_pixmap, &roundbutton_pixmap, /* 0..4 */
+ &box_pixmap, &group_pixmap, &function_pixmap, &code_pixmap, &codeblock_pixmap, &declaration_pixmap, /* 5..10 */ 
+ &declarationblock_pixmap, &class_pixmap, &tabs_pixmap, &input_pixmap, &choice_pixmap,               /* 11..15 */
+ &menuitem_pixmap, &menubar_pixmap, &submenu_pixmap, &scroll_pixmap, &tile_pixmap, &wizard_pixmap,   /* 16..21 */
+ &pack_pixmap, &returnbutton_pixmap, &lightbutton_pixmap, &repeatbutton_pixmap, &menubutton_pixmap,  /* 22..26 */
+ &output_pixmap, &textdisplay_pixmap, &textedit_pixmap, &fileinput_pixmap, &browser_pixmap,          /* 27..32 */
+ &checkbrowser_pixmap, &filebrowser_pixmap, &clock_pixmap, &help_pixmap, &progress_pixmap,	     /* 33..36 */
+ &slider_pixmap, &scrollbar_pixmap, &valueslider_pixmap, &adjuster_pixmap, &counter_pixmap,          /* 37..41 */
+ &dial_pixmap, &roller_pixmap, &valueinput_pixmap, &valueoutput_pixmap, /* 42..45*/ };
 
 ////////////////////////////////////////////////////////////////
 
@@ -135,11 +237,13 @@ extern const char* subclassname(Fl_Type*);
 
 void Widget_Browser::item_draw(void *v, int X, int Y, int, int) const {
   Fl_Type *l = (Fl_Type *)v;
-  X += 3 + 16 + l->level * 10;
+  X += 3 + 18 + l->level * 12;
   if (l->new_selected) fl_color(fl_contrast(FL_BLACK,FL_SELECTION_COLOR));
   else fl_color(FL_BLACK);
-  if (l->is_public() == 0) lock_pixmap.draw(X - 16, Y);
-  else if (l->is_public() > 0) unlock_pixmap.draw(X - 16, Y);
+  Fl_Pixmap *pm = pixmap[l->pixmapID()];
+  if (pm) pm->draw(X-18, Y);
+  if (l->is_public() == 0) lock_pixmap.draw(X - 17, Y);
+  else if (l->is_public() > 0) ; //unlock_pixmap.draw(X - 17, Y);
   if (l->is_parent()) {
     if (!l->next || l->next->level <= l->level) {
       if (l->open_!=(l==pushedtitle)) {
@@ -680,5 +784,5 @@ void Fl_Type::read_property(const char *c) {
 int Fl_Type::read_fdesign(const char*, const char*) {return 0;}
 
 //
-// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.9 2002/08/09 22:57:00 easysw Exp $".
+// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.10 2002/10/30 21:06:11 matthiaswm Exp $".
 //
diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h
index d1fed8451..2c4fa0540 100644
--- a/fluid/Fl_Type.h
+++ b/fluid/Fl_Type.h
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Type.h,v 1.5.2.11.2.6 2002/08/09 22:57:00 easysw Exp $"
+// "$Id: Fl_Type.h,v 1.5.2.11.2.7 2002/10/30 21:06:14 matthiaswm Exp $"
 //
 // Widget type header file for the Fast Light Tool Kit (FLTK).
 //
@@ -127,6 +127,8 @@ public:
   virtual int is_class() const;
   virtual int is_public() const;
 
+  virtual int pixmapID() { return 0; }
+
   const char* class_name(const int need_nest) const;
 };
 
@@ -146,6 +148,7 @@ public:
   int is_parent() const {return 1;}
   int is_code_block() const {return 1;}
   virtual int is_public() const;
+  int pixmapID() { return 7; }
   void write_properties();
   void read_property(const char *);
 };
@@ -158,6 +161,7 @@ public:
   void open();
   virtual const char *type_name() {return "code";}
   int is_code_block() const {return 0;}
+  int pixmapID() { return 8; }
   virtual int is_public() const;
 };
 
@@ -172,6 +176,7 @@ public:
   int is_code_block() const {return 1;}
   int is_parent() const {return 1;}
   virtual int is_public() const;
+  int pixmapID() { return 9; }
   void write_properties();
   void read_property(const char *);
 };
@@ -187,6 +192,7 @@ public:
   void write_properties();
   void read_property(const char *);
   virtual int is_public() const;
+  int pixmapID() { return 10; }
 };
 
 class Fl_DeclBlock_Type : public Fl_Type {
@@ -201,6 +207,7 @@ public:
   void read_property(const char *);
   int is_parent() const {return 1;}
   int is_decl_block() const {return 1;}
+  int pixmapID() { return 11; }
 };
 
 class Fl_Class_Type : public Fl_Type {
@@ -220,6 +227,7 @@ public:
   int is_decl_block() const {return 1;}
   int is_class() const {return 1;}
   virtual int is_public() const;
+  int pixmapID() { return 12; }
   void write_properties();
   void read_property(const char *);
 };
@@ -327,6 +335,7 @@ public:
   void remove_child(Fl_Type*);
   int is_parent() const {return 1;}
   int is_group() const {return 1;}
+  int pixmapID() { return 6; }
 };
 
 extern const char pack_type_name[];
@@ -337,6 +346,7 @@ class Fl_Pack_Type : public Fl_Group_Type {
 public:
   virtual const char *type_name() {return pack_type_name;}
   Fl_Widget_Type *_make() {return new Fl_Pack_Type();}
+  int pixmapID() { return 22; }
 };
 
 extern const char tabs_type_name[];
@@ -350,6 +360,7 @@ public:
   Fl_Type* click_test(int,int);
   void add_child(Fl_Type*, Fl_Type*);
   void remove_child(Fl_Type*);
+  int pixmapID() { return 13; }
 };
 
 extern const char scroll_type_name[];
@@ -360,6 +371,7 @@ class Fl_Scroll_Type : public Fl_Group_Type {
 public:
   virtual const char *type_name() {return scroll_type_name;}
   Fl_Widget_Type *_make() {return new Fl_Scroll_Type();}
+  int pixmapID() { return 19; }
 };
 
 extern const char tile_type_name[];
@@ -368,6 +380,7 @@ class Fl_Tile_Type : public Fl_Group_Type {
 public:
   virtual const char *type_name() {return tile_type_name;}
   Fl_Widget_Type *_make() {return new Fl_Tile_Type();}
+  int pixmapID() { return 20; }
 };
 
 extern const char wizard_type_name[];
@@ -378,6 +391,7 @@ public:
   Fl_Widget *widget(int X,int Y,int W,int H) {
     iwizard *g = new iwizard(X,Y,W,H); Fl_Group::current(0); return g;}
   Fl_Widget_Type *_make() {return new Fl_Wizard_Type();}
+  int pixmapID() { return 21; }
 };
 
 extern Fl_Menu_Item window_type_menu[];
@@ -404,6 +418,7 @@ class Fl_Window_Type : public Fl_Widget_Type {
   Fl_Widget *widget(int,int,int,int) {return 0;}
   int recalc;		// set by fix_overlay()
   void moveallchildren();
+  int pixmapID() { return 1; }
 
 public:
 
@@ -446,6 +461,7 @@ public:
   void write_item();
   void write_code1();
   void write_code2();
+  int pixmapID() { return 16; }
 };
 
 class Fl_Submenu_Type : public Fl_Menu_Item_Type {
@@ -460,6 +476,7 @@ public:
   void add_child(Fl_Type*a, Fl_Type*b) {parent->add_child(a,b);}
   void move_child(Fl_Type*a, Fl_Type*b) {parent->move_child(a,b);}
   void remove_child(Fl_Type*a) {parent->remove_child(a);}
+  int pixmapID() { return 18; }
 };
 
 
@@ -502,6 +519,7 @@ public:
   Fl_Widget *widget(int X,int Y,int W,int H) {
     return new Fl_Menu_Button(X,Y,W,H,"menu");}
   Fl_Widget_Type *_make() {return new Fl_Menu_Button_Type();}
+  int pixmapID() { return 26; }
 };
 
 extern Fl_Menu_Item dummymenu[];
@@ -516,6 +534,7 @@ public:
     return myo;
   }
   Fl_Widget_Type *_make() {return new Fl_Choice_Type();}
+  int pixmapID() { return 15; }
 };
 
 #include <FL/Fl_Menu_Bar.H>
@@ -525,6 +544,7 @@ public:
   Fl_Widget *widget(int X,int Y,int W,int H) {
     return new Fl_Menu_Bar(X,Y,W,H);}
   Fl_Widget_Type *_make() {return new Fl_Menu_Bar_Type();}
+  int pixmapID() { return 17; }
 };
 // object list operations:
 Fl_Widget *make_widget_browser(int X,int Y,int W,int H);
@@ -567,5 +587,5 @@ int storestring(const char *n, const char * & p, int nostrip=0);
 extern int include_H_from_C;
 
 //
-// End of "$Id: Fl_Type.h,v 1.5.2.11.2.6 2002/08/09 22:57:00 easysw Exp $".
+// End of "$Id: Fl_Type.h,v 1.5.2.11.2.7 2002/10/30 21:06:14 matthiaswm Exp $".
 //
diff --git a/fluid/factory.cxx b/fluid/factory.cxx
index e47718349..cf7f653d4 100644
--- a/fluid/factory.cxx
+++ b/fluid/factory.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: factory.cxx,v 1.4.2.11.2.8 2002/05/16 12:47:43 easysw Exp $"
+// "$Id: factory.cxx,v 1.4.2.11.2.9 2002/10/30 21:06:18 matthiaswm Exp $"
 //
 // Widget factory code for the Fast Light Tool Kit (FLTK).
 //
@@ -34,11 +34,14 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Group.H>
 #include <FL/Fl_Menu_Item.H>
+#include <FL/Fl_Pixmap.H>
 #include <stdio.h>
 #include "../src/flstring.h"
 
 #include "Fl_Widget_Type.h"
 
+extern Fl_Pixmap *pixmap[];
+
 #if !HAVE_STRCASECMP
 //
 // 'strcasecmp()' - Do a case-insensitive compare...
@@ -74,6 +77,7 @@ public:
   Fl_Widget *widget(int x,int y,int w, int h) {
     return new Fl_Box(x,y,w,h,"label");}
   Fl_Widget_Type *_make() {return new Fl_Box_Type();}
+  int pixmapID() { return 5; }
 };
 static Fl_Box_Type Fl_Box_type;
 
@@ -93,6 +97,7 @@ public:
     return new Fl_Button(x,y,w,h,"button");}
   Fl_Widget_Type *_make() {return new Fl_Button_Type();}
   int is_button() const {return 1;}
+  int pixmapID() { return 2; }
 };
 static Fl_Button_Type Fl_Button_type;
 
@@ -105,6 +110,7 @@ public:
   Fl_Widget *widget(int x,int y,int w,int h) {
     return new Fl_Return_Button(x,y,w,h,0);}
   Fl_Widget_Type *_make() {return new Fl_Return_Button_Type();}
+  int pixmapID() { return 23; }
 };
 static Fl_Return_Button_Type Fl_Return_Button_type;
 
@@ -117,6 +123,7 @@ public:
   Fl_Widget *widget(int x,int y,int w,int h) {
     return new Fl_Repeat_Button(x,y,w,h,0);}
   Fl_Widget_Type *_make() {return new Fl_Repeat_Button_Type();}
+  int pixmapID() { return 25; }
 };
 static Fl_Repeat_Button_Type Fl_Repeat_Button_type;
 
@@ -129,6 +136,7 @@ public:
   Fl_Widget *widget(int x,int y,int w,int h) {
     return new Fl_Light_Button(x,y,w,h,"button");}
   Fl_Widget_Type *_make() {return new Fl_Light_Button_Type();}
+  int pixmapID() { return 24; }
 };
 static Fl_Light_Button_Type Fl_Light_Button_type;
 
@@ -141,6 +149,7 @@ public:
   Fl_Widget *widget(int x,int y,int w,int h) {
     return new Fl_Check_Button(x,y,w,h,"button");}
   Fl_Widget_Type *_make() {return new Fl_Check_Button_Type();}
+  int pixmapID() { return 3; }
 };
 static Fl_Check_Button_Type Fl_Check_Button_type;
 
@@ -153,6 +162,7 @@ public:
   Fl_Widget *widget(int x,int y,int w,int h) {
     return new Fl_Round_Button(x,y,w,h,"button");}
   Fl_Widget_Type *_make() {return new Fl_Round_Button_Type();}
+  int pixmapID() { return 4; }
 };
 static Fl_Round_Button_Type Fl_Round_Button_type;
 
@@ -189,6 +199,7 @@ public:
     return b;
   }
   Fl_Widget_Type *_make() {return new Fl_Browser_Type();}
+  int pixmapID() { return 31; }
 };
 static Fl_Browser_Type Fl_Browser_type;
 
@@ -223,6 +234,7 @@ public:
     return b;
   }
   Fl_Widget_Type *_make() {return new Fl_Check_Browser_Type();}
+  int pixmapID() { return 32; }
 };
 static Fl_Check_Browser_Type Fl_Check_Browser_type;
 
@@ -253,6 +265,7 @@ public:
     return b;
   }
   Fl_Widget_Type *_make() {return new Fl_File_Browser_Type();}
+  int pixmapID() { return 33; }
 };
 static Fl_File_Browser_Type Fl_File_Browser_type;
 
@@ -279,6 +292,7 @@ class Fl_Counter_Type : public Fl_Widget_Type {
   Fl_Menu_Item *subtypes() {return counter_type_menu;}
   int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c);
   int is_valuator() const {return 1;}
+  int pixmapID() { return 41; }
 public:
   virtual const char *type_name() {return "Fl_Counter";}
   Fl_Widget *widget(int x,int y,int w,int h) {
@@ -320,6 +334,7 @@ public:
     return myo;
   }
   Fl_Widget_Type *_make() {return new Fl_Input_Type();}
+  int pixmapID() { return 14; }
 };
 static Fl_Input_Type Fl_Input_type;
 
@@ -349,6 +364,7 @@ public:
     return myo;
   }
   Fl_Widget_Type *_make() {return new Fl_File_Input_Type();}
+  int pixmapID() { return 30; }
 };
 static Fl_File_Input_Type Fl_File_Input_type;
 
@@ -376,6 +392,7 @@ public:
     return myo;
   }
   Fl_Widget_Type *_make() {return new Fl_Text_Display_Type();}
+  int pixmapID() { return 28; }
 };
 static Fl_Text_Display_Type Fl_Text_Display_type;
 
@@ -403,6 +420,7 @@ public:
     return myo;
   }
   Fl_Widget_Type *_make() {return new Fl_Text_Editor_Type();}
+  int pixmapID() { return 29; }
 };
 static Fl_Text_Editor_Type Fl_Text_Editor_type;
 
@@ -427,6 +445,7 @@ public:
   Fl_Widget *widget(int x,int y,int w,int h) {
     return new Fl_Clock(x,y,w,h);}
   Fl_Widget_Type *_make() {return new Fl_Clock_Type();}
+  int pixmapID() { return 34; }
 };
 static Fl_Clock_Type Fl_Clock_type;
 
@@ -442,6 +461,7 @@ public:
                "<P>This is a Fl_Help_View widget.</P></BODY></HTML>");
     return myo;}
   Fl_Widget_Type *_make() {return new Fl_Help_View_Type();}
+  int pixmapID() { return 35; }
 };
 static Fl_Help_View_Type Fl_Help_View_type;
 
@@ -456,6 +476,7 @@ public:
     myo->value(50);
     return myo;}
   Fl_Widget_Type *_make() {return new Fl_Progress_Type();}
+  int pixmapID() { return 36; }
 };
 static Fl_Progress_Type Fl_Progress_type;
 
@@ -469,6 +490,7 @@ public:
   Fl_Widget *widget(int x,int y,int w,int h) {
     return new Fl_Adjuster(x,y,w,h);}
   Fl_Widget_Type *_make() {return new Fl_Adjuster_Type();}
+  int pixmapID() { return 40; }
 };
 static Fl_Adjuster_Type Fl_Adjuster_type;
 
@@ -488,6 +510,7 @@ public:
   Fl_Widget *widget(int x,int y,int w,int h) {
     return new Fl_Dial(x,y,w,h);}
   Fl_Widget_Type *_make() {return new Fl_Dial_Type();}
+  int pixmapID() { return 42; }
 };
 static Fl_Dial_Type Fl_Dial_type;
 
@@ -506,6 +529,7 @@ public:
   Fl_Widget *widget(int x,int y,int w,int h) {
     return new Fl_Roller(x,y,w,h);}
   Fl_Widget_Type *_make() {return new Fl_Roller_Type();}
+  int pixmapID() { return 43; }
 };
 static Fl_Roller_Type Fl_Roller_type;
 
@@ -528,6 +552,7 @@ public:
   Fl_Widget *widget(int x,int y,int w,int h) {
     return new Fl_Slider(x,y,w,h);}
   Fl_Widget_Type *_make() {return new Fl_Slider_Type();}
+  int pixmapID() { return 37; }
 };
 static Fl_Slider_Type Fl_Slider_type;
 
@@ -542,6 +567,7 @@ public:
   Fl_Widget *widget(int x,int y,int w,int h) {
     return new Fl_Scrollbar(x,y,w,h);}
   Fl_Widget_Type *_make() {return new Fl_Scrollbar_Type();}
+  int pixmapID() { return 38; }
 };
 static Fl_Scrollbar_Type Fl_Scrollbar_type;
 
@@ -562,6 +588,7 @@ public:
     return myo;
   }
   Fl_Widget_Type *_make() {return new Fl_Output_Type();}
+  int pixmapID() { return 27; }
 };
 static Fl_Output_Type Fl_Output_type;
 
@@ -578,6 +605,7 @@ public:
     return myo;
   }
   Fl_Widget_Type *_make() {return new Fl_Value_Input_Type();}
+  int pixmapID() { return 44; }
 };
 static Fl_Value_Input_Type Fl_Value_Input_type;
 
@@ -606,6 +634,7 @@ public:
     return myo;
   }
   Fl_Widget_Type *_make() {return new Fl_Value_Output_Type();}
+  int pixmapID() { return 45; }
 };
 static Fl_Value_Output_Type Fl_Value_Output_type;
 
@@ -631,6 +660,7 @@ public:
   Fl_Widget *widget(int x,int y,int w,int h) {
     return new Fl_Value_Slider(x,y,w,h);}
   Fl_Widget_Type *_make() {return new Fl_Value_Slider_Type();}
+  int pixmapID() { return 39; }
 };
 static Fl_Value_Slider_Type Fl_Value_Slider_type;
 
@@ -739,13 +769,40 @@ Fl_Menu_Item New_Menu[] = {
 {0},
 {0}};
 
+#include <FL/Fl_Multi_Label.H>
+
+// modify a menuitem to display an icon in front of the label
+static void make_iconlabel( Fl_Menu_Item *mi, Fl_Image *ic, const char *txt )
+{
+  if (ic) {
+    char *t1 = new char (strlen(txt)+2);
+    strcpy( t1, " " );
+    strcat( t1, txt );
+    mi->image( ic );
+    Fl_Multi_Label *ml = new Fl_Multi_Label;
+    ml->labela = (char*)ic;
+    ml->labelb = t1;
+    ml->typea = _FL_IMAGE_LABEL;
+    ml->typeb = FL_NORMAL_LABEL;
+    ml->label( mi );
+  }
+  else
+    mi->label(txt);
+}
+
 void fill_in_New_Menu() {
   for (unsigned i = 0; i < sizeof(New_Menu)/sizeof(*New_Menu); i++) {
     Fl_Menu_Item *m = New_Menu+i;
-    if (m->user_data() && !m->text) {
-      const char *n = ((Fl_Type*)(m->user_data()))->type_name();
-      if (!strncmp(n,"Fl_",3)) n += 3;
-      m->text = n;
+    if (m->user_data()) {
+      if (m->text) {
+	make_iconlabel( New_Menu+i, pixmap[ ((Fl_Type*)(New_Menu[i].user_data_))->pixmapID() ], New_Menu[i].label() );
+      }
+      else {
+	Fl_Type *t = (Fl_Type*)m->user_data();
+	const char *n = t->type_name();
+	if (!strncmp(n,"Fl_",3)) n += 3;
+	make_iconlabel( m, pixmap[t->pixmapID()], n );
+      }
     }
   }
 }
@@ -905,5 +962,5 @@ int lookup_symbol(const char *name, int &v, int numberok) {
 }
 
 //
-// End of "$Id: factory.cxx,v 1.4.2.11.2.8 2002/05/16 12:47:43 easysw Exp $".
+// End of "$Id: factory.cxx,v 1.4.2.11.2.9 2002/10/30 21:06:18 matthiaswm Exp $".
 //
diff --git a/fluid/flAdjuster.xpm b/fluid/flAdjuster.xpm
new file mode 100644
index 000000000..1524904f0
--- /dev/null
+++ b/fluid/flAdjuster.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flAdjuster_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #2020ff",
+"c c none",
+"d c #c0c0c0",
+"e c #8080ff",

+"f c #e0e0e0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"fffffffffffffffc",

+"fdddafdddafdddac",

+"fdddafdddafdddac",

+"fdddafdddafdddac",
+"fdddafdddafdddac",
+"fdddafdddafdddac",
+"fdddafdddafdddac",
+"aaaaaaaaaaaaaaac",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flBox.xpm b/fluid/flBox.xpm
new file mode 100644
index 000000000..08ae8eb2b
--- /dev/null
+++ b/fluid/flBox.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flBox_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #2020ff",
+"c c none",
+"d c #c0c0c0",
+"e c #909090",

+"f c #000000",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"dddddddddddddddc",
+"dddddddddddddddc",
+"deeeeeeeeeeeeedc",

+"deeeeeeeeeeeeedc",

+"deeeeeeeeeeeeedc",

+"deeeeeeeeeeeeedc",

+"deeeeeeeeeeeeedc",

+"deeeeeeeeeeeeedc",

+"deeeeeeeeeeeeedc",

+"deeeeeeeeeeeeedc",

+"dddddddddddddddc",

+"dddddddddddddddc",

+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flBrowser.xpm b/fluid/flBrowser.xpm
new file mode 100644
index 000000000..503067888
--- /dev/null
+++ b/fluid/flBrowser.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flBrowser_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #808080",
+"c c none",
+"d c #c0c0c0",
+"e c #ffffff",

+"f c #000000",

+/* pixels */
+"cccccccccccccccc",
+"dddddddddddddddc",
+"dfffffffffffffdc",
+"dfeeeeeeeeebbfdc",

+"dfeeeeeeeeebdfdc",

+"dfeeeeeeeeebdfdc",

+"dfeeeeeeeeebffdc",
+"dfeeeeeeeeebdfdc",

+"dfeeeeeeeeebdfdc",

+"dfeeeeeeeeebdfdc",

+"dfeeeeeeeeebdfdc",

+"dfbbbbbbbbbbbfdc",
+"dfbdddfddddbdfdc",
+"dfffffffffffffdc",
+"dddddddddddddddc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flButton.xpm b/fluid/flButton.xpm
new file mode 100644
index 000000000..312677489
--- /dev/null
+++ b/fluid/flButton.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flButton_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #2020ff",
+"c c none",
+"d c #a0a0a0",
+"e c #8080ff",

+"f c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"ffffffffffffffac",

+"fdddddddddddddac",

+"fdddddddddddddac",

+"fdddddddddddddac",
+"fdddddddddddddac",
+"fdddddddddddddac",
+"fdddddddddddddac",
+"aaaaaaaaaaaaaaac",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flCheckBrowser.xpm b/fluid/flCheckBrowser.xpm
new file mode 100644
index 000000000..a32555d3c
--- /dev/null
+++ b/fluid/flCheckBrowser.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flCheckBrowser_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #808080",
+"c c none",
+"d c #c0c0c0",
+"e c #ffffff",

+"f c #000000",

+/* pixels */
+"cccccccccccccccc",
+"dddddddddddddddc",
+"dfffffffffffffdc",
+"dfeeeeeeeeebbfdc",

+"dfefffeeeeebdfdc",

+"dfefefeeeeebdfdc",

+"dfefffeeeeebffdc",
+"dfeeeeeeeeebdfdc",

+"dfefffeeeeebdfdc",

+"dfefefeeeeebdfdc",

+"dfefffeeeeebdfdc",

+"dfbbbbbbbbbbbfdc",
+"dfbdddfddddbdfdc",
+"dfffffffffffffdc",
+"dddddddddddddddc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flCheckButton.xpm b/fluid/flCheckButton.xpm
new file mode 100644
index 000000000..5ea5c4b7c
--- /dev/null
+++ b/fluid/flCheckButton.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static const char *flCheckButton_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 7 1",
+/* colors */
+"a c #606060",
+"b c #2020ff",
+"c c none",
+"d c #ffffff",
+"e c #8080ff",

+"f c #d0d0d0",

+"' c #000000",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccaaaaaaaaaaccc",
+"cccaddddddddfccc",
+"cccadddddd''fccc",

+"cccaddddd''dfccc",

+"cccaddddd''dfccc",

+"ccca''dd''ddfccc",

+"cccad''''dddfccc",

+"cccadd''ddddfccc",

+"cccaddddddddfccc",

+"cccaaaaaaaaaaccc",
+"cccccccccccccccc",
+"cccccccccccccccc",

+"cccccccccccccccc"
+};
diff --git a/fluid/flChoice.xpm b/fluid/flChoice.xpm
new file mode 100644
index 000000000..58fca84d0
--- /dev/null
+++ b/fluid/flChoice.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flChoice_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+". c #000000",
+"c c none",
+"d c #b0b0b0",
+"e c #ffffff",

+"f c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"ffffffffffffffff",
+"feeeeeafddddddda",

+"feeeeeafddddddda",

+"feeeeeaf.......a",

+"feeeeeafd.....da",
+"feeeeeafdd...dda",
+"feeeeeafddd.ddda",
+"feeeeeafddddddda",
+"feeeeeafddddddda",
+"aaaaaaaaaaaaaaaa",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flClass.xpm b/fluid/flClass.xpm
new file mode 100644
index 000000000..9a744838d
--- /dev/null
+++ b/fluid/flClass.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static const char *flClass_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+". c none",

+"a c #000000",

+"b c #c0e0c0",
+"c c #000000",

+/* pixels */
+"................",

+"................",

+"...aaaaaaaaaaaaa",

+"..abbbbbbbbbbbc.",

+".abbbbbbbbbbbc..",

+".abbbbbbbbbbbc..",

+"abbbbbbbbbbbc...",

+"abbbbbbbbbbbc...",

+"abbbbbbbbbbbc...",

+"abbbbbbbbbbbc...",

+".abbbbbbbbbbbc..",

+".abbbbbbbbbbbc..",

+"..cbbbbbbbbbbbc.",

+"...ccccccccccccc",

+"................",

+"................",

+};
diff --git a/fluid/flClock.xpm b/fluid/flClock.xpm
new file mode 100644
index 000000000..113c2feb9
--- /dev/null
+++ b/fluid/flClock.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static const char *flClock_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 5 1",
+/* colors */
+". c none",

+"a c #000000",

+"b c #c0c0c0",
+"c c #000000",

+"' c #202080",

+/* pixels */
+"................",

+"................",

+"....aaaaaaa.....",

+"..aabbbbbbbcc...",

+".abbbbbbbbb'bc..",

+".abb'bbbbb'bbc..",

+"abbbb'bbb'bbbbc.",

+"abbbbb'b'bbbbbc.",

+"abbbbbb'bbbbbbc.",

+"abbbbbbbbbbbbbc.",

+"abbbbbbbbbbbbbc.",

+".abbbbbbbbbbbc..",

+".abbbbbbbbbbbc..",

+"..ccbbbbbbbcc...",

+"....ccccccc.....",

+"................",

+};
diff --git a/fluid/flCode.xpm b/fluid/flCode.xpm
new file mode 100644
index 000000000..954f46d81
--- /dev/null
+++ b/fluid/flCode.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static const char *flCode_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+". c none",

+"a c #000000",

+"b c #c0e0c0",
+"c c #000000",

+/* pixels */
+"................",

+"................",

+"aaaaaaaaaaaaaaaa",

+"abbbbbbbbbbbbbbc",

+"abbbbbbbbbbbbbbc",

+"abbbbbbbbbbbbbbc",

+"abbbbbbbbbbbbbbc",

+"abbbbbbbbbbbbbbc",

+"abbbbbbbbbbbbbbc",

+"abbbbbbbbbbbbbbc",

+"abbbbbbbbbbbbbbc",

+"abbbbbbbbbbbbbbc",

+"abbbbbbbbbbbbbbc",

+"accccccccccccccc",

+"................",

+"................",

+};
diff --git a/fluid/flCodeBlock.xpm b/fluid/flCodeBlock.xpm
new file mode 100644
index 000000000..d595f5397
--- /dev/null
+++ b/fluid/flCodeBlock.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static const char *flCodeBlock_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+". c none",

+"a c #000000",

+"b c #c0e0c0",
+"c c #000000",

+/* pixels */
+".......aa.......",

+"......abbc......",

+".....abbbbc.....",

+"....abbbbbbc....",

+"...abbbbbbbbc...",

+"..abbbbbbbbbbc..",

+".abbbbbbbbbbbbc.",

+"abbbbbbbbbbbbbbc",

+"abbbbbbbbbbbbbbc",

+".abbbbbbbbbbbbc.",

+"..abbbbbbbbbbc..",

+"...abbbbbbbbc...",

+"....abbbbbbc....",

+".....abbbbc.....",

+"......abbc......",

+".......ac.......",

+};
diff --git a/fluid/flCounter.xpm b/fluid/flCounter.xpm
new file mode 100644
index 000000000..5c241f9eb
--- /dev/null
+++ b/fluid/flCounter.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flCounter_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"' c #000000",
+"c c none",
+"d c #c0c0c0",
+"e c #ffffff",

+"f c #e0e0e0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"fffffffffffffffc",

+"fdddaeeeeefdddac",

+"fd'daee'eefd'dac",

+"f''dae''eefd''ac",
+"f''daee'eefd''ac",
+"fd'dae'''efd'dac",
+"fdddaeeeeefdddac",
+"aaaaaaaaaaaaaaac",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flDeclaration.xpm b/fluid/flDeclaration.xpm
new file mode 100644
index 000000000..23e92ca2e
--- /dev/null
+++ b/fluid/flDeclaration.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static const char *flDeclaration_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+". c none",

+"a c #000000",

+"b c #c0e0c0",
+"c c #000000",

+/* pixels */
+"................",

+"................",

+"...aaaaaaaaaaaaa",

+"...abbbbbbbbbbbc",

+"...abbbbbbbbbbbc",

+"..abbbbbbbbbbbc.",

+"..abbbbbbbbbbbc.",

+"..abbbbbbbbbbbc.",

+".abbbbbbbbbbbc..",

+".abbbbbbbbbbbc..",

+".abbbbbbbbbbbc..",

+"abbbbbbbbbbbc...",

+"abbbbbbbbbbbc...",

+"acccccccccccc...",

+"................",

+"................",

+};
diff --git a/fluid/flDeclarationBlock.xpm b/fluid/flDeclarationBlock.xpm
new file mode 100644
index 000000000..a9a6e0e85
--- /dev/null
+++ b/fluid/flDeclarationBlock.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static const char *flDeclarationBlock_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+". c none",

+"a c #000000",

+"b c #c0e0c0",
+"c c #000000",

+/* pixels */
+".......aa.......",

+"......abbc......",

+".....abbbbc.....",

+"....abbbbbbc....",

+"...abbbbbbbbc...",

+"..abbbcbbcbbbc..",

+".abbbccccccbbbc.",

+"abbbbbcbbcbbbbbc",

+"abbbbbcbbcbbbbbc",

+".abbbccccccbbbc.",

+"..abbbcbbcbbbc..",

+"...abbbbbbbbc...",

+"....abbbbbbc....",

+".....abbbbc.....",

+"......abbc......",

+".......ac.......",

+};
diff --git a/fluid/flDial.xpm b/fluid/flDial.xpm
new file mode 100644
index 000000000..3e8fd4eff
--- /dev/null
+++ b/fluid/flDial.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static const char *flDial_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 5 1",
+/* colors */
+". c none",

+"a c #000000",

+"b c #c0c0c0",
+"c c #000000",

+"' c #202080",

+/* pixels */
+"................",

+"................",

+"....aaaaaaa.....",

+"..aabbbbbbbcc...",

+".abbbbbbbbbbbc..",

+".ab''bbbbbbbbc..",

+"ab'bb'bbbbbbbbc.",

+"ab'bb'bbbbbbbbc.",

+"abb''bbbbbbbbbc.",

+"abbbbbbbbbbbbbc.",

+"abbbbbbbbbbbbbc.",

+".abbbbbbbbbbbc..",

+".abbbbbbbbbbbc..",

+"..ccbbbbbbbcc...",

+"....ccccccc.....",

+"................",

+};
diff --git a/fluid/flFIleInput.xpm b/fluid/flFIleInput.xpm
new file mode 100644
index 000000000..c4f72a869
--- /dev/null
+++ b/fluid/flFIleInput.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flFileInput_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"f c #606060",
+". c #000000",
+"c c none",
+"d c #ffffff",
+"e c #8080ff",

+"a c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"ffffffffffffffff",

+"faaaaaaaafaaaaaa",

+"ffffffffffffffff",
+"fdddddddddddddda",

+"fdd...dd..ddddda",

+"fd.ddd.d..ddddda",

+"fd.ddd.d..ddddda",
+"fd.....d..ddddda",
+"fd.ddd.d..ddddda",
+"fd.ddd.d..ddddda",
+"fdddddddddddddda",
+"aaaaaaaaaaaaaaaa",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flFileBrowser.xpm b/fluid/flFileBrowser.xpm
new file mode 100644
index 000000000..10e20e70c
--- /dev/null
+++ b/fluid/flFileBrowser.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flFileBrowser_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #ffff00",
+"b c #808080",
+"c c none",
+"d c #c0c0c0",
+"e c #ffffff",

+"f c #000000",

+/* pixels */
+"cccccccccccccccc",
+"dddddddddddddddc",
+"dfffffffffffffdc",
+"dfeeeeeeeeebbfdc",

+"dfeefffeeeebdfdc",

+"dfefaaafffebdfdc",

+"dfefaaaaafebffdc",
+"dfefaaaaafebdfdc",

+"dfefaaaaafebdfdc",

+"dfefffffffebdfdc",

+"dfeeeeeeeeebdfdc",

+"dfbbbbbbbbbbbfdc",
+"dfbdddfddddbdfdc",
+"dfffffffffffffdc",
+"dddddddddddddddc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flFunction.xpm b/fluid/flFunction.xpm
new file mode 100644
index 000000000..9b3e27d59
--- /dev/null
+++ b/fluid/flFunction.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static const char *flFunction_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+". c none",

+"a c #000000",

+"b c #c0e0c0",
+"c c #000000",

+/* pixels */
+"................",

+"................",

+"....aaaaaaaa....",

+"..aabbbbbbbbcc..",

+".abbbbbbbbbbbbc.",

+".abbbbbbbbbbbbc.",

+"abbbbbbbbbbbbbbc",

+"abbbbbbbbbbbbbbc",

+"abbbbbbbbbbbbbbc",

+"abbbbbbbbbbbbbbc",

+".abbbbbbbbbbbbc.",

+".abbbbbbbbbbbbc.",

+"..ccbbbbbbbbcc..",

+"....cccccccc....",

+"................",

+"................",

+};
diff --git a/fluid/flGroup.xpm b/fluid/flGroup.xpm
new file mode 100644
index 000000000..da2b165ff
--- /dev/null
+++ b/fluid/flGroup.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flGroup_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #2020ff",
+"c c none",
+"d c #c0c0c0",
+"e c #8080ff",

+"f c #000000",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"dddddddddddddddc",
+"dfffffffffffffdc",
+"dfdddddddddddfdc",

+"dfdddddddddddfdc",

+"dfdddddddddddfdc",

+"dfdddddddddddfdc",
+"dfdddddddddddfdc",
+"dfdddddddddddfdc",
+"dfdddddddddddfdc",
+"dfdddddddddddfdc",
+"dfffffffffffffdc",
+"dddddddddddddddc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flHelp.xpm b/fluid/flHelp.xpm
new file mode 100644
index 000000000..b85230548
--- /dev/null
+++ b/fluid/flHelp.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flHelp_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #808080",
+"c c none",
+"d c #c0c0c0",
+"e c #ffffff",

+"f c #000000",

+/* pixels */
+"cccccccccccccccc",
+"dddddddddddddddc",
+"dfffffffffffffdc",
+"dfeeeeeeeeebbfdc",

+"dfeeeffeeeebdfdc",

+"dfeeffeeeeebdfdc",

+"dfeffeeeeeebffdc",
+"dfeeffeeeeebdfdc",

+"dfeeeffeeeebdfdc",

+"dfeeeeeeeeebdfdc",

+"dfeeeeeeeeebdfdc",

+"dfbbbbbbbbbbbfdc",
+"dfbdddfddddbdfdc",
+"dfffffffffffffdc",
+"dddddddddddddddc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flInput.xpm b/fluid/flInput.xpm
new file mode 100644
index 000000000..b37961cd4
--- /dev/null
+++ b/fluid/flInput.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flInput_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"f c #606060",
+". c #000000",
+"c c none",
+"d c #ffffff",
+"e c #8080ff",

+"a c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"ffffffffffffffff",
+"fdddddddddddddda",

+"fdd...dd..ddddda",

+"fd.ddd.d..ddddda",

+"fd.ddd.d..ddddda",
+"fd.....d..ddddda",
+"fd.ddd.d..ddddda",
+"fd.ddd.d..ddddda",
+"fdddddddddddddda",
+"aaaaaaaaaaaaaaaa",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flLightButton.xpm b/fluid/flLightButton.xpm
new file mode 100644
index 000000000..c350d7007
--- /dev/null
+++ b/fluid/flLightButton.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flLightButton_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #ffff00",
+"c c none",
+"d c #a0a0a0",
+"e c #8080ff",

+"f c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"ffffffffffffffac",

+"fdddddddddddddac",

+"fdaaaaddddddddac",

+"fdabbfddddddddac",
+"fdabbfddddddddac",
+"fdafffddddddddac",
+"fdddddddddddddac",
+"aaaaaaaaaaaaaaac",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flMenubar.xpm b/fluid/flMenubar.xpm
new file mode 100644
index 000000000..2d782ea0e
--- /dev/null
+++ b/fluid/flMenubar.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flMenubar_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+". c #2020cf",
+"c c none",
+"d c #b0b0b0",
+"e c #ffffff",

+"f c #e0e0e0",

+/* pixels */
+"cccccccccccccccc",
+"ffffffffffffffff",
+"dddddddddddddddd",

+"dddddddddddddddd",

+"dddddddddddddddd",
+"dddffffffffffffd",

+"aaafddddddddddaa",

+"cccfddddddddddac",

+"cccfddddddddddac",

+"cccfddddddddddac",

+"cccfddddddddddac",

+"cccfddddddddddac",

+"cccfddddddddddac",

+"cccfddddddddddac",
+"cccfaaaaaaaaaaac",
+"cccccccccccccccc"
+};
diff --git a/fluid/flMenubutton.xpm b/fluid/flMenubutton.xpm
new file mode 100644
index 000000000..f0ab6cdc1
--- /dev/null
+++ b/fluid/flMenubutton.xpm
@@ -0,0 +1,29 @@
+/* XPM */

+static const char *flMenuButton_xpm[] = {

+/* width height ncolors chars_per_pixel */

+"16 16 6 1",

+/* colors */

+"a c #606060",

+". c #000000",

+"c c none",

+"d c #b0b0b0",

+"e c #ffffff",

+"f c #d0d0d0",

+/* pixels */

+"cccccccccccccccc",

+"cccccccccccccccc",

+"cccccccccccccccc",

+"ffffffffffffffff",

+"fdddddddddddddda",

+"fdddddddddddddda",

+"fddddddd.......a",

+"fdddddddd.ddd.da",

+"fddddddddd.d.dda",

+"fdddddddddd.ddda",

+"fdddddddddddddda",

+"fdddddddddddddda",

+"aaaaaaaaaaaaaaaa",

+"cccccccccccccccc",

+"cccccccccccccccc",

+"cccccccccccccccc"

+};

diff --git a/fluid/flMenuitem.xpm b/fluid/flMenuitem.xpm
new file mode 100644
index 000000000..a55201efd
--- /dev/null
+++ b/fluid/flMenuitem.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flMenuitem_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+". c #000000",
+"c c none",
+"d c #b0b0b0",
+"e c #d0d0d0",

+"f c #c0c0c0",

+/* pixels */
+"cccccccccccccccc",

+"cccccccccccccccc",

+"cccffffccccccccc",

+"c.fffffffccccf.c",

+"c.ffffffffffff.c",

+"c.eeeeeeeeeeee.c",

+"c.ee.ee.eeeeee.c",

+"c.e.e.e.eee..e.c",

+"c.e...e..e.eee.c",

+"c.e.e.e..e.eee.c",

+"c.e.e.e..ee..e.c",

+"c.eeeeeeeeeeee.c",

+"c.ffffffffffff.c",

+"c.fccccfffffff.c",

+"cccccccccffffccc",

+"cccccccccccccccc"

+};
diff --git a/fluid/flOutput.xpm b/fluid/flOutput.xpm
new file mode 100644
index 000000000..149ffd849
--- /dev/null
+++ b/fluid/flOutput.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flOutput_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"f c #606060",
+". c #000000",
+"c c none",
+"d c #d0d0d0",
+"e c #8080ff",

+"a c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"ffffffffffffffff",
+"fdddddddddddddda",

+"fdd...ddddddddda",

+"fd.ddd.dddddddda",

+"fd.ddd.dddddddda",
+"fd.....dddddddda",
+"fd.ddd.dddddddda",
+"fd.ddd.dddddddda",
+"fdddddddddddddda",
+"aaaaaaaaaaaaaaaa",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flPack.xpm b/fluid/flPack.xpm
new file mode 100644
index 000000000..8ee60edeb
--- /dev/null
+++ b/fluid/flPack.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flPack_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #f0f0f0",
+"c c none",
+"d c #c0c0c0",
+"e c #8080ff",

+"f c #000000",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"dddddddddddddddc",
+"dfffffffffffffdc",
+"dfddfddfddfddfdc",

+"dfddfddfddfddfdc",

+"dfddfddfddfddfdc",

+"dfddfddfddfddfdc",
+"dfddfddfddfddfdc",
+"dfddfddfddfddfdc",
+"dfddfddfddfddfdc",
+"dfddfddfddfddfdc",
+"dfffffffffffffdc",
+"dddddddddddddddc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flProgress.xpm b/fluid/flProgress.xpm
new file mode 100644
index 000000000..6d7274b5a
--- /dev/null
+++ b/fluid/flProgress.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flProgress_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"f c #606060",
+". c #f0f000",
+"c c none",
+"d c #ffffff",
+"e c #8080ff",

+"a c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",

+"cccccccccccccccc",

+"ffffffffffffffff",
+"f.........ddddda",

+"f.........ddddda",

+"f.........ddddda",

+"f.........ddddda",

+"f.........ddddda",

+"f.........ddddda",

+"aaaaaaaaaaaaaaaa",
+"cccccccccccccccc",

+"cccccccccccccccc",

+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flRepeatButton.xpm b/fluid/flRepeatButton.xpm
new file mode 100644
index 000000000..13f85d861
--- /dev/null
+++ b/fluid/flRepeatButton.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flRepeatButton_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"' c #000000",
+"c c none",
+"d c #a0a0a0",
+"e c #8080ff",

+"f c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"ffffffffffffffac",

+"fdddddddddddddac",

+"fdddddddddddddac",

+"fdddddddddddddac",
+"fdddd''d''d''dac",
+"fdddd''d''d''dac",
+"fdddddddddddddac",
+"aaaaaaaaaaaaaaac",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flReturnButton.xpm b/fluid/flReturnButton.xpm
new file mode 100644
index 000000000..7e9ab281d
--- /dev/null
+++ b/fluid/flReturnButton.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flReturnButton_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"' c #000000",
+"c c none",
+"d c #a0a0a0",
+"e c #8080ff",

+"f c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"ffffffffffffffac",

+"fdddddddddddddac",

+"fddddddd'dd''dac",

+"fdddddd''dd''dac",
+"fddddd'''''''dac",
+"fdddddd''dddddac",
+"fddddddd'dddddac",
+"aaaaaaaaaaaaaaac",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flRoller.xpm b/fluid/flRoller.xpm
new file mode 100644
index 000000000..e9c78b240
--- /dev/null
+++ b/fluid/flRoller.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flRoller_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #e0e0e0",
+"' c #000000",
+"c c none",
+"d c #c0c0c0",
+"e c #ffffff",

+"f c #606060",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"aaaaaaaaaaaaaaac",

+"a'f'ee'ddd'dd'f'",

+"a'f'ee'ddd'dd'f'",

+"a'f'ee'ddd'dd'f'",

+"a'f'ee'ddd'dd'f'",

+"a'f'ee'ddd'dd'f'",

+"a'f'ee'ddd'dd'f'",

+"''''''''''''''''",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flRoundButton.xpm b/fluid/flRoundButton.xpm
new file mode 100644
index 000000000..98fc4fe03
--- /dev/null
+++ b/fluid/flRoundButton.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static const char *flRoundButton_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 7 1",
+/* colors */
+"a c #606060",
+"b c #2020ff",
+". c none",
+"d c #ffffff",
+"e c #8080ff",

+"f c #d0d0d0",

+"# c #000000",

+/* pixels */
+"................",
+"................",
+"......aaa.......",
+"....aadddaa.....",
+"...adddddddf....",
+"...add###ddf....",

+"..add#####ddf...",

+"..add#####ddf...",

+"..add#####ddf...",

+"...add###ddf....",

+"...adddddddf....",

+"....ffdddff.....",

+"......fff.......",
+"................",
+"................",

+"................"
+};
diff --git a/fluid/flScroll.xpm b/fluid/flScroll.xpm
new file mode 100644
index 000000000..bdc78692c
--- /dev/null
+++ b/fluid/flScroll.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flScroll_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #f0f0f0",
+"c c none",
+"d c #c0c0c0",
+"e c #8080ff",

+"f c #000000",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"dddddddddddddddc",
+"dfffffffffffffdc",
+"dfddddddddbbbfdc",

+"dfddddddddbddfdc",

+"dfddddddddbddfdc",

+"dfddddddddbfffdc",
+"dfddddddddbddfdc",
+"dfbbbbbbbbbbbfdc",
+"dfbdddfdddbddfdc",
+"dfbdddfdddbddfdc",
+"dfffffffffffffdc",
+"dddddddddddddddc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flScrollBar.xpm b/fluid/flScrollBar.xpm
new file mode 100644
index 000000000..3e2a54ff2
--- /dev/null
+++ b/fluid/flScrollBar.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flScrollBar_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #2020ff",
+"c c none",
+"d c #c0c0c0",
+"e c #8080ff",

+"f c #e0e0e0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"aaaaaaaaaaaaaaaa",

+"adddfffffddddddf",

+"ad'dfdddadddd'df",

+"a''dfdddadddd''f",
+"a''dfdddadddd''f",
+"ad'dfdddadddd'df",
+"adddfaaaaddddddf",
+"afffffffffffffff",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flSlider.xpm b/fluid/flSlider.xpm
new file mode 100644
index 000000000..d56e88e47
--- /dev/null
+++ b/fluid/flSlider.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flSlider_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #2020ff",
+"c c none",
+"d c #c0c0c0",
+"e c #8080ff",

+"f c #e0e0e0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"aaaaaaaaaaaaaaaa",

+"afffffdddddddddf",

+"afdddadddddddddf",

+"afdddadddddddddf",
+"afdddadddddddddf",
+"afdddadddddddddf",
+"afaaaadddddddddf",
+"afffffffffffffff",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flSubmenu.xpm b/fluid/flSubmenu.xpm
new file mode 100644
index 000000000..3f7830aca
--- /dev/null
+++ b/fluid/flSubmenu.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flSubmenu_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+". c #000000",
+"c c none",
+"d c #b0b0b0",
+"e c #d0d0d0",

+"f c #c0c0c0",

+/* pixels */
+"cccccccccccccccc",

+"cccccccccccccccc",

+"cccffffccccccccc",

+"c.fffffffccccf.c",

+"c.ffffffffffff.c",

+"c.eeeeeeeeeeee.c",

+"c.ee.eeeee.eee.c",

+"c.e.e.eeee..ee.c",

+"c.e...eeee...e.c",

+"c.e.e.eeee..ee.c",

+"c.e.e.eeee.eee.c",

+"c.eeeeeeeee.....",

+"c.fffffffff.ffff",

+"c.fccccffff.ffff",

+"cccccccccff.ffff",

+"ccccccccccc.ffff"

+};
diff --git a/fluid/flTabs.xpm b/fluid/flTabs.xpm
new file mode 100644
index 000000000..4e9b0709d
--- /dev/null
+++ b/fluid/flTabs.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flTabs_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #a0a0a0",
+"b c #2020ff",
+"c c none",
+"d c #c0c0c0",
+"e c #8080ff",

+"f c #000000",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"dddddddddddddddc",
+"ddffffdffffddddc",
+"dfddddfaaaafdddc",

+"dfddddfaaaafdddc",

+"dfddddffffffffdc",

+"dfdddddddddddfdc",
+"dfdddddddddddfdc",
+"dfdddddddddddfdc",
+"dfdddddddddddfdc",
+"dfdddddddddddfdc",
+"dfffffffffffffdc",
+"dddddddddddddddc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flTextDisplay.xpm b/fluid/flTextDisplay.xpm
new file mode 100644
index 000000000..50324f00b
--- /dev/null
+++ b/fluid/flTextDisplay.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flTextDisplay_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"f c #606060",
+". c #000000",
+"c c none",
+"d c #d0d0d0",
+"e c #8080ff",

+"a c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"ffffffffffffffff",
+"fdddddddddddddda",

+"fdd...ddddddddda",

+"fd.ddd.dddddddda",

+"fd.ddd.dddddddda",
+"fd.....dddddddda",
+"fd.ddd.dddddddda",
+"fd.ddd.dddddddda",
+"fdddddddddddddda",

+"fdddddddddddddda",

+"fdddddddddddddda",

+"fdddddddddddddda",

+"fdddddddddddddda",

+"aaaaaaaaaaaaaaaa",
+"cccccccccccccccc"
+};
diff --git a/fluid/flTextEdit.xpm b/fluid/flTextEdit.xpm
new file mode 100644
index 000000000..b2fb76819
--- /dev/null
+++ b/fluid/flTextEdit.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flTextEdit_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"f c #606060",
+". c #000000",
+"c c none",
+"d c #ffffff",
+"e c #8080ff",

+"a c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"ffffffffffffffff",
+"fdddddddddddddda",

+"fdd...dd..ddddda",

+"fd.ddd.d..ddddda",

+"fd.ddd.d..ddddda",
+"fd.....d..ddddda",
+"fd.ddd.d..ddddda",
+"fd.ddd.d..ddddda",
+"fdddddddddddddda",

+"fdddddddddddddda",

+"fdddddddddddddda",

+"fdddddddddddddda",

+"fdddddddddddddda",

+"aaaaaaaaaaaaaaaa",
+"cccccccccccccccc"
+};
diff --git a/fluid/flTile.xpm b/fluid/flTile.xpm
new file mode 100644
index 000000000..2f5683855
--- /dev/null
+++ b/fluid/flTile.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flTile_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #f0f0f0",
+"c c none",
+"d c #c0c0c0",
+"e c #8080ff",

+"f c #000000",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"dddddddddddddddd",
+"dfffffffffffffbd",
+"dfdddddbfdddddbd",

+"dfdddddbfdddddbd",

+"dfdddddbfdddddbdc",

+"dfbbbbbbfbbbbbbd",

+"dfffffffffffffbd",

+"dfdddddbfdddddbd",

+"dfdddddbfdddddbd",

+"dfdddddbfdddddbd",

+"dfbbbbbbfbbbbbbd",
+"dddddddddddddddd",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flValueInput.xpm b/fluid/flValueInput.xpm
new file mode 100644
index 000000000..00ac98eea
--- /dev/null
+++ b/fluid/flValueInput.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flValueInput_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"f c #606060",
+". c #000000",
+"c c none",
+"d c #ffffff",
+"e c #8080ff",

+"a c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"ffffffffffffffff",
+"fdddddddddddddda",

+"fdd...dd..ddddda",

+"fd.dd..d..ddddda",

+"fd.d.d.d..ddddda",
+"fd..dd.d..ddddda",
+"fd.ddd.d..ddddda",
+"fdd...dd..ddddda",
+"fdddddddddddddda",
+"aaaaaaaaaaaaaaaa",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flValueOutput.xpm b/fluid/flValueOutput.xpm
new file mode 100644
index 000000000..f3fb0e0af
--- /dev/null
+++ b/fluid/flValueOutput.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flValueOutput_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"f c #606060",
+". c #000000",
+"c c none",
+"d c #d0d0d0",
+"e c #8080ff",

+"a c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"ffffffffffffffff",
+"fdddddddddddddda",

+"fdd...ddddddddda",

+"fd.dd..dddddddda",

+"fd.d.d.dddddddda",
+"fd..dd.dddddddda",
+"fd.ddd.dddddddda",
+"fdd...ddddddddda",
+"fdddddddddddddda",
+"aaaaaaaaaaaaaaaa",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flValueSlider.xpm b/fluid/flValueSlider.xpm
new file mode 100644
index 000000000..d8afbc00e
--- /dev/null
+++ b/fluid/flValueSlider.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flValueSlider_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #2020ff",
+"c c none",
+"d c #c0c0c0",
+"' c #000000",

+"f c #e0e0e0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"aaaaaaaaaaaaaaaa",

+"adddddfffffddddf",

+"add'ddfdddaddddf",

+"ad''ddfdddaddddf",

+"add'ddfdddaddddf",

+"ad'''dfdddaddddf",

+"adddddfaaaaddddf",

+"afffffffffffffff",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/flWindow.xpm b/fluid/flWindow.xpm
new file mode 100644
index 000000000..15a36b111
--- /dev/null
+++ b/fluid/flWindow.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flWindow_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #2020ff",
+"c c none",
+"d c #a0a0a0",
+"e c #8080ff",

+"f c #d0d0d0",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"ffffffffffffffff",
+"feebbbbbbbeebeea",
+"feebbbbbbbeebeea",
+"fdddddddddddddda",
+"fdddddddddddddda",
+"fdddddddddddddda",
+"fdddddddddddddda",
+"fdddddddddddddda",
+"fdddddddddddddda",
+"fdddddddddddddda",
+"fdddddddddddddda",
+"faaaaaaaaaaaaaaa",
+"cccccccccccccccc",

+"cccccccccccccccc"
+};
diff --git a/fluid/flWizard.xpm b/fluid/flWizard.xpm
new file mode 100644
index 000000000..c64d804a4
--- /dev/null
+++ b/fluid/flWizard.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flWizard_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #f0f0f0",
+"c c none",
+"d c #c0c0c0",
+"e c #8080ff",

+"f c #000000",

+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"dddddddddddddddc",
+"dfffffffffffffdc",
+"dfdddddddddddfdc",

+"dfdddddddddddfdc",

+"dfdddddddddddfdc",

+"dfdddddddddddfdc",
+"dfdddddddddddfdc",
+"dfbbbbbbbbbbbfdc",
+"dfbddddfbdbddfdc",
+"dfbddddfbdbddfdc",
+"dfffffffffffffdc",
+"dddddddddddddddc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/fluid/lock.xpm b/fluid/lock.xpm
index 73c5aa347..f12e227d7 100644
--- a/fluid/lock.xpm
+++ b/fluid/lock.xpm
@@ -4,26 +4,26 @@ static const char *lock_xpm[] = {
 "16 16 6 1",
 /* colors */
 "` c #000000",
-"a c #FF0000",
-"b c #FF4040",
+"a c #c08080",
+"b c #FFc0c0",
 "c c none",
-"d c #FF8080",
-"e c #800000",
+"d c #FFc0c0",
+"e c #804040",
 /* pixels */
 "cccccccccccccccc",
 "cccccccccccccccc",
-"cccccccccccccccc",
-"cccc````cccccccc",
-"ccc`daaa`ccccccc",
-"cc`da``bd`cccccc",
-"cc`a`cc`d`cccccc",
-"cc`a`cc`d`cccccc",
-"c``````````ccccc",
-"c`dddaaaae`ccccc",
-"c`daa`aaae`ccccc",
-"c`da`edaae`ccccc",
-"c`da`edaae`ccccc",
-"c`da`ddaee`ccccc",
-"c``````````ccccc",
+"cccccccccccccccc",

+"cccccccccccccccc",

+"cccccccccccccccc",

+"cccccccccc```ccc",
+"ccccccccc`daa`cc",
+"cccccccc`da`bd`c",
+"cccccccc`a`c`d`c",
+"ccccccc`````````",
+"ccccccc`dddaaae`",
+"ccccccc`daa`aae`",
+"ccccccc`da`eaae`",
+"ccccccc`da`daee`",
+"ccccccc`````````",
 "cccccccccccccccc"
 };
diff --git a/fluid/unlock.xpm b/fluid/unlock.xpm
deleted file mode 100644
index c5d45e72f..000000000
--- a/fluid/unlock.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static const char *unlock_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
-/* colors */
-"` c #000000",
-"a c #00FF00",
-"b c #40FF40",
-"c c none",
-"d c #80FF80",
-"e c #008000",
-/* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ccccccccc````ccc",
-"cccccccc`daaa`cc",
-"ccccccc`da``bd`c",
-"ccccccc`a`cc`d`c",
-"ccccccc`a`cc`d`c",
-"c``````````c```c",
-"c`dddaaaae`ccccc",
-"c`daa`aaae`ccccc",
-"c`da`edaae`ccccc",
-"c`da`edaae`ccccc",
-"c`da`ddaee`ccccc",
-"c``````````ccccc",
-"cccccccccccccccc"
-};