diff -Nru ./FL/Fl_Boxtype.H ../fltk-2-cvs/FL/Fl_Boxtype.H
--- ./FL/Fl_Boxtype.H	Fri Aug 11 05:14:54 2000
+++ ../fltk-2-cvs/FL/Fl_Boxtype.H	Tue Jul 10 20:00:12 2001
@@ -65,14 +65,29 @@
   const Fl_Frame_Box* down;
 public:
   const char* data() const {return data_;}
-  void draw(int,int,int,int, Fl_Color, Fl_Flags=0) const;
-  void draw(const Fl_Widget*, int,int,int,int, Fl_Flags=0) const;
+  virtual void draw(int,int,int,int, Fl_Color, Fl_Flags=0) const;
+  virtual void draw(const Fl_Widget*, int,int,int,int, Fl_Flags=0) const;
   Fl_Frame_Box(const char* n, const char* c, const Fl_Frame_Box* d=0);
 };
-extern FL_API const Fl_Frame_Box fl_up_box;
+
+class FL_API Fl_Mappy_Box : public Fl_Frame_Box {
+protected:
+  const char* data2_;
+  int data_sz_x,data_sz_y;
+  int data_sl_x,data_sl_y;
+  char at(int x,int y) const;
+public:
+  const char* data() const {return data_;}
+  virtual void draw(int,int,int,int, Fl_Color, Fl_Flags=0) const;
+  virtual void draw(const Fl_Widget*, int,int,int,int, Fl_Flags=0) const;
+  Fl_Mappy_Box(const char* n, const char* c, const Fl_Frame_Box* d=0);
+};
+
+
+extern FL_API const Fl_Mappy_Box fl_up_box;
 #define FL_UP_BOX (&fl_up_box)
 #define FL_NORMAL_BOX (&fl_up_box)
-extern FL_API const Fl_Frame_Box fl_down_box;
+extern FL_API const Fl_Mappy_Box fl_down_box;
 #define FL_DOWN_BOX (&fl_down_box)
 extern FL_API const Fl_Frame_Box fl_thin_up_box;
 #define FL_THIN_UP_BOX (&fl_thin_up_box)
diff -Nru ./fluid/about_panel.cxx ../fltk-2-cvs/fluid/about_panel.cxx
--- ./fluid/about_panel.cxx	Tue Jul 10 11:14:38 2001
+++ ../fltk-2-cvs/fluid/about_panel.cxx	Tue Jul 10 20:02:50 2001
@@ -8,30 +8,32 @@
 
 static void cb_1998(Fl_Button*, void*) {
   display_group->hide();
-copyright_box->show();
+  copyright_box->show();
+
 }
 
 Fl_Box *copyright_box=(Fl_Box *)0;
 
 static void cb_OK(Fl_Return_Button* o, void*) {
   ((Fl_Window*)(o->parent()))->hide();
+
 }
 
 Fl_Window* make_about_panel(const char *copyright) {
   Fl_Window* w;
-  { Fl_Window* o = about_panel = new Fl_Window(303, 258, "about fluid");
+   {  Fl_Window* o = about_panel = new Fl_Window(303, 258, "about fluid");
     w = o;
     o->color((Fl_Color)97);
     o->selection_color((Fl_Color)47);
     ((Fl_Window*)(o))->hotspot(o);
-    { Fl_Group* o = display_group = new Fl_Group(5, 5, 295, 245);
+     {    Fl_Group* o = display_group = new Fl_Group(5, 5, 295, 245);
       o->box(FL_NO_BOX);
-      { Fl_Group* o = new Fl_Group(55, 25, 60, 150);
+       {      Fl_Group* o = new Fl_Group(55, 25, 60, 150);
         o->box(FL_UP_BOX);
         o->color((Fl_Color)14);
         o->label_color((Fl_Color)6);
         o->selection_color((Fl_Color)47);
-        { Fl_Box* o = new Fl_Box(30, 90, 15, 15, "` ");
+         {        Fl_Box* o = new Fl_Box(30, 90, 15, 15, "` ");
           o->box(FL_OVAL_BOX);
           o->color((Fl_Color)6);
           o->label_color((Fl_Color)7);
@@ -42,24 +44,24 @@
         o->resizable(o);
         o->end();
       }
-      { Fl_Box* o = new Fl_Box(40, 0, 90, 40);
+       {      Fl_Box* o = new Fl_Box(40, 0, 90, 40);
         o->box(FL_FLAT_BOX);
         o->color((Fl_Color)97);
         o->selection_color((Fl_Color)47);
       }
-      { Fl_Box* o = new Fl_Box(60, 45, 50, 65);
+       {      Fl_Box* o = new Fl_Box(60, 45, 50, 65);
         o->box(FL_DOWN_BOX);
         o->color((Fl_Color)6);
         o->selection_color((Fl_Color)47);
       }
-      { Fl_Box* o = new Fl_Box(45, 25, 80, 25);
+       {      Fl_Box* o = new Fl_Box(45, 25, 80, 25);
         o->box(FL_ROUND_UP_BOX);
         o->color((Fl_Color)6);
         o->label_color((Fl_Color)6);
         o->selection_color((Fl_Color)47);
         o->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
       }
-      { Fl_Group* o = new Fl_Group(10, 130, 150, 105, "fluid");
+       {      Fl_Group* o = new Fl_Group(10, 130, 150, 105, "fluid");
         o->box(FL_ROUND_UP_BOX);
         o->label_font(fl_fonts()+1);
         o->label_type(FL_SHADOW_LABEL);
@@ -68,7 +70,7 @@
         o->selection_color((Fl_Color)47);
         o->label_size(40);
         o->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
-        { Fl_Box* o = new Fl_Box(69, 20, 15, 15, "` ");
+         {        Fl_Box* o = new Fl_Box(69, 20, 15, 15, "` ");
           o->box(FL_OVAL_BOX);
           o->color((Fl_Color)6);
           o->label_color((Fl_Color)7);
@@ -76,7 +78,7 @@
           o->label_size(20);
           o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE);
         }
-        { Fl_Box* o = new Fl_Box(60, 5, 15, 15, "` ");
+         {        Fl_Box* o = new Fl_Box(60, 5, 15, 15, "` ");
           o->box(FL_OVAL_BOX);
           o->color((Fl_Color)6);
           o->label_color((Fl_Color)7);
@@ -87,19 +89,19 @@
         o->resizable(o);
         o->end();
       }
-      { Fl_Box* o = new Fl_Box(57, 130, 56, 2);
+       {      Fl_Box* o = new Fl_Box(57, 130, 56, 2);
         o->box(FL_FLAT_BOX);
         o->color((Fl_Color)14);
         o->selection_color((Fl_Color)47);
       }
-      { Fl_Group* o = new Fl_Group(145, 18, 149, 122);
+       {      Fl_Group* o = new Fl_Group(145, 18, 149, 122);
         o->box(FL_OFLAT_BOX);
         o->label_font(fl_fonts()+1);
         o->color((Fl_Color)14);
         o->label_color((Fl_Color)7);
         o->selection_color((Fl_Color)47);
         o->label_size(18);
-        { Fl_Box* o = new Fl_Box(5, 4, 140, 113, "FLTK User\nInterface\nDesigner\nVersion 2.0");
+         {        Fl_Box* o = new Fl_Box(5, 4, 140, 113, "FLTK User\nInterface\nDesigner\nVersion 2.0");
           o->box(FL_OVAL_BOX);
           o->label_font(fl_fonts()+1);
           o->label_type(FL_SHADOW_LABEL);
@@ -111,7 +113,7 @@
         o->resizable(o);
         o->end();
       }
-      { Fl_Button* o = new Fl_Button(175, 159, 95, 41, "\251""1998-2001\nClick here for more information");
+       {      Fl_Button* o = new Fl_Button(175, 159, 95, 41, "\251""1998-2001\nClick here for more information");
         o->box(FL_BORDER_BOX);
         o->color((Fl_Color)136);
         o->label_color((Fl_Color)6);
@@ -122,7 +124,7 @@
       o->resizable(o);
       o->end();
     }
-    { Fl_Box* o = copyright_box = new Fl_Box(3, 5, 297, 250);
+     {    Fl_Box* o = copyright_box = new Fl_Box(3, 5, 297, 250);
       o->label_color((Fl_Color)6);
       o->label_size(10);
       o->align(132|FL_ALIGN_INSIDE);
@@ -130,7 +132,7 @@
       Fl_Group::current()->resizable(o);
       o->label(copyright);
     }
-    { Fl_Return_Button* o = new Fl_Return_Button(240, 223, 55, 22, "OK");
+     {    Fl_Return_Button* o = new Fl_Return_Button(240, 223, 55, 22, "OK");
       o->label_size(10);
       o->shortcut(0xff0d);
       o->callback((Fl_Callback*)cb_OK);
diff -Nru ./fluid/alignment_panel.cxx ../fltk-2-cvs/fluid/alignment_panel.cxx
--- ./fluid/alignment_panel.cxx	Tue Jan 23 20:47:54 2001
+++ ../fltk-2-cvs/fluid/alignment_panel.cxx	Tue Jul 10 20:02:55 2001
@@ -18,51 +18,52 @@
 
 static void cb_Close(Fl_Button*, void*) {
   alignment_window->hide();
+
 }
 
 Fl_Window* make_alignment_window() {
   Fl_Window* w;
-  { Fl_Window* o = alignment_window = new Fl_Window(210, 310, "fluid Preferences");
+   {  Fl_Window* o = alignment_window = new Fl_Window(210, 310, "fluid Preferences");
     w = o;
-    { Fl_Group* o = new Fl_Group(10, 20, 190, 100, "Alignment:");
+     {    Fl_Group* o = new Fl_Group(10, 20, 190, 100, "Alignment:");
       o->box(FL_ENGRAVED_BOX);
       o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
-      { Fl_Input* o = horizontal_input = new Fl_Input(80, 10, 100, 20, "Horizontal:");
+       {      Fl_Input* o = horizontal_input = new Fl_Input(80, 10, 100, 20, "Horizontal:");
         o->callback((Fl_Callback*)alignment_cb, (void*)(1));
         o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
       }
-      { Fl_Input* o = vertical_input = new Fl_Input(80, 40, 100, 20, "Vertical:");
+       {      Fl_Input* o = vertical_input = new Fl_Input(80, 40, 100, 20, "Vertical:");
         o->callback((Fl_Callback*)alignment_cb, (void*)(2));
         o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
       }
-      { Fl_Input* o = snap_input = new Fl_Input(80, 70, 100, 20, "Snap:");
+       {      Fl_Input* o = snap_input = new Fl_Input(80, 70, 100, 20, "Snap:");
         o->callback((Fl_Callback*)alignment_cb, (void*)(3));
         o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
       }
       o->end();
     }
-    { Fl_Group* o = new Fl_Group(10, 140, 190, 130, "Output File Names:");
+     {    Fl_Group* o = new Fl_Group(10, 140, 190, 130, "Output File Names:");
       o->box(FL_ENGRAVED_BOX);
       o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
-      { Fl_Box* o = new Fl_Box(10, 10, 170, 30, "Use \"name.ext\" to set name or just \".ext\" to set only extension.");
+       {      Fl_Box* o = new Fl_Box(10, 10, 170, 30, "Use \"name.ext\" to set name or just \".ext\" to set only extension.");
         o->label_size(10);
         o->align(132|FL_ALIGN_INSIDE);
       }
-      { Fl_Input* o = header_file_input = new Fl_Input(90, 40, 90, 20, "Header File:");
+       {      Fl_Input* o = header_file_input = new Fl_Input(90, 40, 90, 20, "Header File:");
         o->callback((Fl_Callback*)header_input_cb, (void*)(1));
         o->when(FL_WHEN_CHANGED);
       }
-      { Fl_Input* o = code_file_input = new Fl_Input(90, 70, 90, 20, "Code File:");
+       {      Fl_Input* o = code_file_input = new Fl_Input(90, 70, 90, 20, "Code File:");
         o->callback((Fl_Callback*)code_input_cb, (void*)(1));
         o->when(FL_WHEN_CHANGED);
       }
-      { Fl_Light_Button* o = include_H_from_C_button = new Fl_Light_Button(10, 100, 170, 20, "Include Header from Code");
+       {      Fl_Light_Button* o = include_H_from_C_button = new Fl_Light_Button(10, 100, 170, 20, "Include Header from Code");
         o->value(1);
         o->callback((Fl_Callback*)include_H_from_C_button_cb);
       }
       o->end();
     }
-    { Fl_Button* o = new Fl_Button(140, 280, 60, 20, "Close");
+     {    Fl_Button* o = new Fl_Button(140, 280, 60, 20, "Close");
       o->callback((Fl_Callback*)cb_Close);
     }
     o->set_modal();
diff -Nru ./fluid/coding_style.cxx ../fltk-2-cvs/fluid/coding_style.cxx
--- ./fluid/coding_style.cxx	Thu Mar  8 09:39:05 2001
+++ ../fltk-2-cvs/fluid/coding_style.cxx	Tue Jul 10 20:02:59 2001
@@ -11,188 +11,200 @@
 
 static void use_coding_style() {
   gbrace_style = brace_style;
-gno_space_parens = no_space_parens;
-gbrace_functions = brace_functions;
-gindent_tabs = indent_tabs;
-gtab_size = tab_size;
-galways_return_parens = always_return_parens;
+  gno_space_parens = no_space_parens;
+  gbrace_functions = brace_functions;
+  gindent_tabs = indent_tabs;
+  gtab_size = tab_size;
+  galways_return_parens = always_return_parens;
 }
 
 static Fl_Round_Button *pStyle1=(Fl_Round_Button *)0;
 
 static void cb_pStyle1(Fl_Round_Button* o, void*) {
   if(o->value())
-   brace_style = 1;
+     brace_style = 1;
+
 }
 
 static Fl_Round_Button *pStyle2=(Fl_Round_Button *)0;
 
 static void cb_pStyle2(Fl_Round_Button* o, void*) {
   if(o->value())
-   brace_style = 2;
+     brace_style = 2;
+
 }
 
 static Fl_Round_Button *pStyle3=(Fl_Round_Button *)0;
 
 static void cb_pStyle3(Fl_Round_Button* o, void*) {
   if(o->value())
-   brace_style = 3;
+     brace_style = 3;
+
 }
 
 static Fl_Check_Button *pNoSpaceParens=(Fl_Check_Button *)0;
 
 static void cb_pNoSpaceParens(Fl_Check_Button* o, void*) {
   no_space_parens = o->value();;
+
 }
 
 static Fl_Check_Button *pBraceFuncs=(Fl_Check_Button *)0;
 
 static void cb_pBraceFuncs(Fl_Check_Button* o, void*) {
   brace_functions = o->value();
+
 }
 
 static Fl_Value_Input *pTabSize=(Fl_Value_Input *)0;
 
 static void cb_pTabSize(Fl_Value_Input* o, void*) {
   tab_size = (int)o->value();
+
 }
 
 static Fl_Check_Button *pIndentTabs=(Fl_Check_Button *)0;
 
 static void cb_pIndentTabs(Fl_Check_Button* o, void*) {
   indent_tabs = o->value();
-if(o->value())
-    pTabSize->hide();
-else
-   pTabSize->show();
+  if(o->value())
+      pTabSize->hide();
+  else
+     pTabSize->show();
+
 }
 
 static Fl_Check_Button *pIndentCode=(Fl_Check_Button *)0;
 
 static void cb_pIndentCode(Fl_Check_Button* o, void*) {
   indent_code = o->value();
+
 }
 
 static Fl_Check_Button *pReturnParens=(Fl_Check_Button *)0;
 
 static void cb_pReturnParens(Fl_Check_Button* o, void*) {
   always_return_parens = o->value();
+
 }
 
 static void cb_Cancel(Fl_Button* o, void*) {
   o->window()->hide();
+
 }
 
 static void cb_Save(Fl_Button* o, void*) {
   use_coding_style();
-save_coding_style();
-o->window()->hide();
+  save_coding_style();
+  o->window()->hide();
+
 }
 
 static void cb_Use(Fl_Button* o, void*) {
   use_coding_style();
-o->window()->hide();
+  o->window()->hide();
+
 }
 
 Fl_Window* make_codingstyle_window() {
   Fl_Window* w;
-  { Fl_Window* o = new Fl_Window(7, 78, 310, 255);
+   {  Fl_Window* o = new Fl_Window(310, 255);
     w = o;
-    { Fl_Tabs* o = new Fl_Tabs(0, 0, 303, 218);
+     {    Fl_Tabs* o = new Fl_Tabs(0, 0, 303, 218);
       o->box(FL_EMBOSSED_BOX);
-      { Fl_Group* o = new Fl_Group(0, 25, 303, 193, "Brace Style");
-        { Fl_Group* o = new Fl_Group(14, 22, 282, 122, "Brace Style");
+       {      Fl_Group* o = new Fl_Group(0, 25, 303, 193, "Brace Style");
+         {        Fl_Group* o = new Fl_Group(14, 22, 282, 122, "Brace Style");
           o->box(FL_ENGRAVED_BOX);
           o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
-          { Fl_Box* o = new Fl_Box(20, 6, 47, 20, "if ( x ) {");
+           {          Fl_Box* o = new Fl_Box(20, 6, 47, 20, "if ( x ) {");
             o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
           }
-          { Fl_Box* o = new Fl_Box(20, 25, 45, 20, "++y;");
+           {          Fl_Box* o = new Fl_Box(20, 25, 45, 20, "++y;");
             o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
           }
-          { Fl_Box* o = new Fl_Box(20, 41, 36, 20, "}");
+           {          Fl_Box* o = new Fl_Box(20, 41, 36, 20, "}");
             o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
           }
-          { Fl_Box* o = new Fl_Box(114, 6, 47, 20, "if ( x )");
+           {          Fl_Box* o = new Fl_Box(114, 6, 47, 20, "if ( x )");
             o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
           }
-          { Fl_Box* o = new Fl_Box(114, 25, 36, 20, "{");
+           {          Fl_Box* o = new Fl_Box(114, 25, 36, 20, "{");
             o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
           }
-          { Fl_Box* o = new Fl_Box(115, 42, 46, 20, "++y;");
+           {          Fl_Box* o = new Fl_Box(115, 42, 46, 20, "++y;");
             o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
           }
-          { Fl_Box* o = new Fl_Box(114, 59, 36, 20, "}");
+           {          Fl_Box* o = new Fl_Box(114, 59, 36, 20, "}");
             o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
           }
-          { Fl_Round_Button* o = pStyle1 = new Fl_Round_Button(16, 84, 66, 25, "Style 1");
+           {          Fl_Round_Button* o = pStyle1 = new Fl_Round_Button(16, 84, 66, 25, "Style 1");
             o->type(102);
             o->value(1);
             o->callback((Fl_Callback*)cb_pStyle1);
           }
-          { Fl_Box* o = new Fl_Box(201, 6, 47, 20, "if ( x )");
+           {          Fl_Box* o = new Fl_Box(201, 6, 47, 20, "if ( x )");
             o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
           }
-          { Fl_Box* o = new Fl_Box(201, 25, 36, 20, "{");
+           {          Fl_Box* o = new Fl_Box(201, 25, 36, 20, "{");
             o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
           }
-          { Fl_Box* o = new Fl_Box(227, 42, 34, 22, "++y;");
+           {          Fl_Box* o = new Fl_Box(227, 42, 34, 22, "++y;");
             o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
           }
-          { Fl_Box* o = new Fl_Box(201, 59, 36, 20, "}");
+           {          Fl_Box* o = new Fl_Box(201, 59, 36, 20, "}");
             o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
           }
-          { Fl_Round_Button* o = pStyle2 = new Fl_Round_Button(109, 84, 66, 25, "Style 2");
+           {          Fl_Round_Button* o = pStyle2 = new Fl_Round_Button(109, 84, 66, 25, "Style 2");
             o->type(102);
             o->callback((Fl_Callback*)cb_pStyle2);
           }
-          { Fl_Round_Button* o = pStyle3 = new Fl_Round_Button(200, 84, 66, 25, "Style 3");
+           {          Fl_Round_Button* o = pStyle3 = new Fl_Round_Button(200, 84, 66, 25, "Style 3");
             o->type(102);
             o->callback((Fl_Callback*)cb_pStyle3);
           }
           o->end();
         }
-        { Fl_Check_Button* o = pNoSpaceParens = new Fl_Check_Button(14, 147, 193, 25, "No space before parentheses");
+         {        Fl_Check_Button* o = pNoSpaceParens = new Fl_Check_Button(14, 147, 193, 25, "No space before parentheses");
           o->callback((Fl_Callback*)cb_pNoSpaceParens);
         }
-        { Fl_Check_Button* o = pBraceFuncs = new Fl_Check_Button(14, 168, 175, 25, "Apply to function braces");
+         {        Fl_Check_Button* o = pBraceFuncs = new Fl_Check_Button(14, 168, 175, 25, "Apply to function braces");
           o->value(1);
           o->callback((Fl_Callback*)cb_pBraceFuncs);
         }
         o->end();
       }
-      { Fl_Group* o = new Fl_Group(0, 25, 303, 183, "Other");
+       {      Fl_Group* o = new Fl_Group(0, 25, 303, 183, "Other");
         o->hide();
-        { Fl_Group* o = new Fl_Group(11, 22, 218, 90, "Indentation");
+         {        Fl_Group* o = new Fl_Group(11, 22, 218, 90, "Indentation");
           o->box(FL_ENGRAVED_BOX);
           o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
-          { Fl_Value_Input* o = pTabSize = new Fl_Value_Input(129, 33, 31, 25, "Tab size for indents");
+           {          Fl_Value_Input* o = pTabSize = new Fl_Value_Input(129, 33, 31, 25, "Tab size for indents");
             o->maximum(12);
             o->value(2);
             o->callback((Fl_Callback*)cb_pTabSize);
           }
-          { Fl_Check_Button* o = pIndentTabs = new Fl_Check_Button(13, 7, 114, 25, "Indent with tabs");
+           {          Fl_Check_Button* o = pIndentTabs = new Fl_Check_Button(13, 7, 114, 25, "Indent with tabs");
             o->callback((Fl_Callback*)cb_pIndentTabs);
           }
-          { Fl_Check_Button* o = pIndentCode = new Fl_Check_Button(14, 58, 151, 25, "Indent code blocks");
+           {          Fl_Check_Button* o = pIndentCode = new Fl_Check_Button(14, 58, 151, 25, "Indent code blocks");
             o->callback((Fl_Callback*)cb_pIndentCode);
           }
           o->end();
         }
-        { Fl_Check_Button* o = pReturnParens = new Fl_Check_Button(9, 120, 221, 25, "Always use parentheses on return");
+         {        Fl_Check_Button* o = pReturnParens = new Fl_Check_Button(9, 120, 221, 25, "Always use parentheses on return");
           o->callback((Fl_Callback*)cb_pReturnParens);
         }
         o->end();
       }
       o->end();
     }
-    { Fl_Button* o = new Fl_Button(106, 223, 59, 25, "Cancel");
+     {    Fl_Button* o = new Fl_Button(106, 223, 59, 25, "Cancel");
       o->callback((Fl_Callback*)cb_Cancel);
     }
-    { Fl_Button* o = new Fl_Button(171, 223, 59, 25, "Save");
+     {    Fl_Button* o = new Fl_Button(171, 223, 59, 25, "Save");
       o->callback((Fl_Callback*)cb_Save);
     }
-    { Fl_Button* o = new Fl_Button(236, 223, 59, 25, "Use");
+     {    Fl_Button* o = new Fl_Button(236, 223, 59, 25, "Use");
       o->callback((Fl_Callback*)cb_Use);
     }
     o->end();
@@ -202,23 +214,23 @@
 
 void load_codingstyle_window() {
   brace_style = gbrace_style;
-no_space_parens = gno_space_parens;
-brace_functions = gbrace_functions;  
-indent_tabs = gindent_tabs;
-tab_size = gtab_size;
-always_return_parens = galways_return_parens;
-indent_code = gindent_code;
-pStyle1->value(gbrace_style == 1);
-pStyle2->value(gbrace_style == 2);
-pStyle3->value(gbrace_style == 3);
-pNoSpaceParens->value(gno_space_parens);
-pBraceFuncs->value(gbrace_functions);
-pIndentTabs->value(gindent_tabs);
-pTabSize->value(gtab_size);
-pReturnParens->value(galways_return_parens);
-if(gindent_tabs)
-   pTabSize->hide();
-else
-   pTabSize->show();
-pIndentCode->value(gindent_code);
+  no_space_parens = gno_space_parens;
+  brace_functions = gbrace_functions;  
+  indent_tabs = gindent_tabs;
+  tab_size = gtab_size;
+  always_return_parens = galways_return_parens;
+  indent_code = gindent_code;
+  pStyle1->value(gbrace_style == 1);
+  pStyle2->value(gbrace_style == 2);
+  pStyle3->value(gbrace_style == 3);
+  pNoSpaceParens->value(gno_space_parens);
+  pBraceFuncs->value(gbrace_functions);
+  pIndentTabs->value(gindent_tabs);
+  pTabSize->value(gtab_size);
+  pReturnParens->value(galways_return_parens);
+  if(gindent_tabs)
+     pTabSize->hide();
+  else
+     pTabSize->show();
+  pIndentCode->value(gindent_code);
 }
diff -Nru ./fluid/function_panel.cxx ../fltk-2-cvs/fluid/function_panel.cxx
--- ./fluid/function_panel.cxx	Tue Jan 23 20:47:54 2001
+++ ../fltk-2-cvs/fluid/function_panel.cxx	Tue Jul 10 20:03:06 2001
@@ -20,33 +20,36 @@
 
 Fl_Window* make_function_panel() {
   Fl_Window* w;
-  { Fl_Window* o = function_panel = new Fl_Window(287, 218, "function/method");
+   {  Fl_Window* o = function_panel = new Fl_Window(280, 215, "function/method");
     w = o;
-    { Fl_Light_Button* o = f_public_button = new Fl_Light_Button(10, 15, 65, 25, "public");
+     {    Fl_Light_Button* o = f_public_button = new Fl_Light_Button(10, 15, 64, 25, "public");
       o->label_size(10);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Light_Button* o = f_c_button = new Fl_Light_Button(90, 15, 90, 25, "C declaration");
+     {    Fl_Light_Button* o = f_c_button = new Fl_Light_Button(88, 15, 88, 25, "C declaration");
       o->label_size(10);
     }
-    { Fl_Input* o = f_name_input = new Fl_Input(10, 60, 270, 25, "Name(args): (blank for main())");
+     {    Fl_Input* o = f_name_input = new Fl_Input(10, 60, 263, 22, "Name(args): (blank for main())");
+      o->text_font(fl_fonts()+4);
       o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
       o->when(FL_WHEN_NEVER);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Input* o = f_attributes_input = new Fl_Input(10, 105, 270, 25, "Attributes (virtual, static, __declspec, ...)");
+     {    Fl_Input* o = f_attributes_input = new Fl_Input(10, 102, 263, 25, "Attributes (virtual, static, __declspec, ...)");
+      o->text_font(fl_fonts()+4);
       o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Input* o = f_return_type_input = new Fl_Input(10, 150, 270, 25, "Return Type: (blank to return outermost widget)");
+     {    Fl_Input* o = f_return_type_input = new Fl_Input(10, 147, 263, 25, "Return Type: (blank to return outermost widget)");
+      o->text_font(fl_fonts()+4);
       o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Return_Button* o = f_panel_ok = new Fl_Return_Button(110, 185, 80, 25, "OK");
+     {    Fl_Return_Button* o = f_panel_ok = new Fl_Return_Button(108, 182, 78, 25, "OK");
       o->shortcut(0xff0d);
       ((Fl_Window*)(o->parent()))->hotspot(o);
     }
-    { Fl_Button* o = f_panel_cancel = new Fl_Button(200, 185, 80, 25, "Cancel");
+     {    Fl_Button* o = f_panel_cancel = new Fl_Button(196, 182, 77, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
@@ -65,19 +68,20 @@
 
 Fl_Window* make_code_panel() {
   Fl_Window* w;
-  { Fl_Window* o = code_panel = new Fl_Window(291, 178, "code");
+   {  Fl_Window* o = code_panel = new Fl_Window(640, 390, "code");
     w = o;
-    { Fl_Input* o = code_input = new Fl_Input(6, 5, 280, 135);
+     {    Fl_Input* o = code_input = new Fl_Input(6, 5, 629, 347);
       o->type(4);
+      o->text_font(fl_fonts()+4);
       o->align(FL_ALIGN_CENTER);
       o->when(FL_WHEN_NEVER);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Return_Button* o = code_panel_ok = new Fl_Return_Button(115, 145, 80, 25, "OK");
+     {    Fl_Return_Button* o = code_panel_ok = new Fl_Return_Button(250, 357, 180, 25, "OK");
       o->shortcut(0xff0d);
       ((Fl_Window*)(o->parent()))->hotspot(o);
     }
-    { Fl_Button* o = code_panel_cancel = new Fl_Button(205, 145, 80, 25, "Cancel");
+     {    Fl_Button* o = code_panel_cancel = new Fl_Button(453, 357, 179, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
@@ -98,25 +102,27 @@
 
 Fl_Window* make_codeblock_panel() {
   Fl_Window* w;
-  { Fl_Window* o = codeblock_panel = new Fl_Window(293, 134, "codeblock");
+   {  Fl_Window* o = codeblock_panel = new Fl_Window(290, 130, "codeblock");
     w = o;
-    { Fl_Input* o = code_before_input = new Fl_Input(10, 5, 275, 25);
+     {    Fl_Input* o = code_before_input = new Fl_Input(10, 5, 272, 21);
+      o->text_font(fl_fonts()+4);
       o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
       o->when(FL_WHEN_NEVER);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Box* o = new Fl_Box(10, 35, 270, 25, "\"{...child code...}\" is inserted here");
+     {    Fl_Box* o = new Fl_Box(10, 31, 268, 25, "\"{...child code...}\" is inserted here");
       o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
     }
-    { Fl_Input* o = code_after_input = new Fl_Input(10, 65, 275, 25);
+     {    Fl_Input* o = code_after_input = new Fl_Input(10, 61, 272, 25);
+      o->text_font(fl_fonts()+4);
       o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Return_Button* o = codeblock_panel_ok = new Fl_Return_Button(115, 100, 80, 25, "OK");
+     {    Fl_Return_Button* o = codeblock_panel_ok = new Fl_Return_Button(114, 96, 79, 25, "OK");
       o->shortcut(0xff0d);
       ((Fl_Window*)(o->parent()))->hotspot(o);
     }
-    { Fl_Button* o = codeblock_panel_cancel = new Fl_Button(205, 100, 80, 25, "Cancel");
+     {    Fl_Button* o = codeblock_panel_cancel = new Fl_Button(203, 96, 79, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
@@ -137,25 +143,27 @@
 
 Fl_Window* make_declblock_panel() {
   Fl_Window* w;
-  { Fl_Window* o = declblock_panel = new Fl_Window(293, 134, "declaration block");
+   {  Fl_Window* o = declblock_panel = new Fl_Window(290, 130, "declaration block");
     w = o;
-    { Fl_Input* o = decl_before_input = new Fl_Input(15, 10, 275, 25);
+     {    Fl_Input* o = decl_before_input = new Fl_Input(15, 10, 272, 21);
+      o->text_font(fl_fonts()+4);
       o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
       o->when(FL_WHEN_NEVER);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Box* o = new Fl_Box(15, 40, 270, 25, "\"\\n...child code...\\n\" is inserted here");
+     {    Fl_Box* o = new Fl_Box(15, 36, 268, 25, "\"\\n...child code...\\n\" is inserted here");
       o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
     }
-    { Fl_Input* o = decl_after_input = new Fl_Input(15, 70, 275, 25);
+     {    Fl_Input* o = decl_after_input = new Fl_Input(15, 66, 272, 25);
+      o->text_font(fl_fonts()+4);
       o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Return_Button* o = declblock_panel_ok = new Fl_Return_Button(120, 105, 80, 25, "OK");
+     {    Fl_Return_Button* o = declblock_panel_ok = new Fl_Return_Button(119, 101, 79, 25, "OK");
       o->shortcut(0xff0d);
       ((Fl_Window*)(o->parent()))->hotspot(o);
     }
-    { Fl_Button* o = declblock_panel_cancel = new Fl_Button(210, 105, 80, 25, "Cancel");
+     {    Fl_Button* o = declblock_panel_cancel = new Fl_Button(208, 101, 79, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
@@ -176,24 +184,25 @@
 
 Fl_Window* make_decl_panel() {
   Fl_Window* w;
-  { Fl_Window* o = decl_panel = new Fl_Window(290, 176, "declaration");
+   {  Fl_Window* o = decl_panel = new Fl_Window(290, 175, "declaration");
     w = o;
-    { Fl_Light_Button* o = decl_public_button = new Fl_Light_Button(10, 15, 65, 25, "public");
+     {    Fl_Light_Button* o = decl_public_button = new Fl_Light_Button(10, 15, 65, 25, "public");
       o->label_size(10);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Input* o = decl_input = new Fl_Input(10, 50, 270, 25, "can be any declartion, like \"int x;\",\nan external symbol like \"extern int\
+     {    Fl_Input* o = decl_input = new Fl_Input(10, 50, 270, 24, "can be any declartion, like \"int x;\",\nan external symbol like \"extern int\
  foo();\",\na #directive like \"#include <foo.h>\",\nor a comment like \"//foo\
 \" or \"/*foo*/\"");
+      o->text_font(fl_fonts()+4);
       o->align(FL_ALIGN_BOTTOM | FL_ALIGN_LEFT);
       o->when(FL_WHEN_NEVER);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Return_Button* o = decl_panel_ok = new Fl_Return_Button(115, 145, 80, 25, "OK");
+     {    Fl_Return_Button* o = decl_panel_ok = new Fl_Return_Button(115, 144, 80, 25, "OK");
       o->shortcut(0xff0d);
       ((Fl_Window*)(o->parent()))->hotspot(o);
     }
-    { Fl_Button* o = decl_panel_cancel = new Fl_Button(205, 145, 80, 25, "Cancel");
+     {    Fl_Button* o = decl_panel_cancel = new Fl_Button(205, 144, 80, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->end();
@@ -215,26 +224,28 @@
 
 Fl_Window* make_class_panel() {
   Fl_Window* w;
-  { Fl_Window* o = class_panel = new Fl_Window(287, 173, "class");
+   {  Fl_Window* o = class_panel = new Fl_Window(280, 170, "class");
     w = o;
-    { Fl_Light_Button* o = c_public_button = new Fl_Light_Button(10, 10, 65, 25, "public");
+     {    Fl_Light_Button* o = c_public_button = new Fl_Light_Button(10, 10, 64, 25, "public");
       o->label_size(10);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Input* o = c_name_input = new Fl_Input(10, 55, 270, 25, "name:");
+     {    Fl_Input* o = c_name_input = new Fl_Input(10, 55, 263, 22, "name:");
+      o->text_font(fl_fonts()+4);
       o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
       o->when(FL_WHEN_NEVER);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Input* o = c_subclass_input = new Fl_Input(10, 100, 270, 25, "subclass of (text between : and {)");
+     {    Fl_Input* o = c_subclass_input = new Fl_Input(10, 97, 263, 25, "subclass of (text between : and {)");
+      o->text_font(fl_fonts()+4);
       o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Return_Button* o = c_panel_ok = new Fl_Return_Button(110, 135, 80, 25, "OK");
+     {    Fl_Return_Button* o = c_panel_ok = new Fl_Return_Button(108, 132, 78, 25, "OK");
       o->shortcut(0xff0d);
       ((Fl_Window*)(o->parent()))->hotspot(o);
     }
-    { Fl_Button* o = c_panel_cancel = new Fl_Button(200, 135, 80, 25, "Cancel");
+     {    Fl_Button* o = c_panel_cancel = new Fl_Button(196, 132, 77, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
diff -Nru ./fluid/function_panel.fl ../fltk-2-cvs/fluid/function_panel.fl
--- ./fluid/function_panel.fl	Mon Jan 10 08:31:10 2000
+++ ../fltk-2-cvs/fluid/function_panel.fl	Tue Jul 10 20:00:12 2001
@@ -1,5 +1,5 @@
 # data file for the FLTK User Interface Designer (FLUID)
-version 2.0000 
+version 2.0001 
 images_dir ./ 
 header_name {.h} 
 code_name {.cxx} 
@@ -10,35 +10,35 @@
 } {
   Fl_Window function_panel {
     label {function/method}
-    xywh {165 408 287 218} resizable modal visible
+    xywh {116 405 280 215} resizable modal visible
   } {
     Fl_Light_Button f_public_button {
       label public
-      xywh {10 15 65 25} when 0 labelsize 10
+      xywh {10 15 64 25} when 0 labelsize 10
     }
     Fl_Light_Button f_c_button {
       label {C declaration}
-      xywh {90 15 90 25} labelsize 10
+      xywh {88 15 88 25} labelsize 10
     }
     Fl_Input f_name_input {
       label {Name(args): (blank for main())}
-      xywh {10 60 270 25} align 5 when 0 resizable
+      xywh {10 60 263 22} align 5 when 0 resizable textfont 4
     }
     Fl_Input f_attributes_input {
       label {Attributes (virtual, static, __declspec, ...)}
-      xywh {10 105 270 25} align 5 when 0
+      xywh {10 102 263 25} align 5 when 0 textfont 4
     }
     Fl_Input f_return_type_input {
-      label {Return Type: (blank to return outermost widget)}
-      xywh {10 150 270 25} align 5 when 0
+      label {Return Type: (blank to return outermost widget)} selected
+      xywh {10 147 263 25} align 5 when 0 textfont 4
     }
     Fl_Return_Button f_panel_ok {
       label OK
-      xywh {110 185 80 25} hotspot
+      xywh {108 182 78 25} hotspot shortcut 0xff0d
     }
     Fl_Button f_panel_cancel {
       label Cancel
-      xywh {200 185 80 25} shortcut 0xff1b
+      xywh {196 182 77 25} shortcut 0xff1b
     }
   }
 } 
@@ -47,18 +47,18 @@
 } {
   Fl_Window code_panel {
     label code
-    xywh {171 177 291 178} resizable modal visible
+    xywh {66 62 640 390} resizable modal visible
   } {
     Fl_Input code_input {
-      xywh {6 5 280 135} type Multiline align 0 when 0 resizable
+      xywh {6 5 629 347} type Multiline align 0 when 0 resizable textfont 4
     }
     Fl_Return_Button code_panel_ok {
       label OK
-      xywh {115 145 80 25} hotspot
+      xywh {250 357 180 25} hotspot shortcut 0xff0d
     }
     Fl_Button code_panel_cancel {
       label Cancel
-      xywh {205 145 80 25} shortcut 0xff1b
+      xywh {453 357 179 25} shortcut 0xff1b
     }
   }
 } 
@@ -67,25 +67,25 @@
 } {
   Fl_Window codeblock_panel {
     label codeblock
-    xywh {139 641 293 134} resizable modal visible
+    xywh {283 330 290 130} resizable modal visible
   } {
     Fl_Input code_before_input {
-      xywh {10 5 275 25} align 5 when 0 resizable
+      xywh {10 5 272 21} align 5 when 0 resizable textfont 4
     }
     Fl_Box {} {
       label {"{...child code...}" is inserted here}
-      xywh {10 35 270 25} align 20
+      xywh {10 31 268 25} align 20
     }
     Fl_Input code_after_input {
-      xywh {10 65 275 25} align 5 when 0
+      xywh {10 61 272 25} align 5 when 0 textfont 4
     }
     Fl_Return_Button codeblock_panel_ok {
       label OK
-      xywh {115 100 80 25} hotspot
+      xywh {114 96 79 25} hotspot shortcut 0xff0d
     }
     Fl_Button codeblock_panel_cancel {
       label Cancel
-      xywh {205 100 80 25} shortcut 0xff1b
+      xywh {203 96 79 25} shortcut 0xff1b
     }
   }
 } 
@@ -94,25 +94,25 @@
 } {
   Fl_Window declblock_panel {
     label {declaration block}
-    xywh {511 96 293 134} resizable modal visible
+    xywh {511 96 290 130} resizable modal visible
   } {
     Fl_Input decl_before_input {
-      xywh {15 10 275 25} align 5 when 0 resizable
+      xywh {15 10 272 21} align 5 when 0 resizable textfont 4
     }
     Fl_Box {} {
       label {"\\n...child code...\\n" is inserted here}
-      xywh {15 40 270 25} align 20
+      xywh {15 36 268 25} align 20
     }
     Fl_Input decl_after_input {
-      xywh {15 70 275 25} align 5 when 0
+      xywh {15 66 272 25} align 5 when 0 textfont 4
     }
     Fl_Return_Button declblock_panel_ok {
       label OK
-      xywh {120 105 80 25} hotspot
+      xywh {119 101 79 25} hotspot shortcut 0xff0d
     }
     Fl_Button declblock_panel_cancel {
       label Cancel
-      xywh {210 105 80 25} shortcut 0xff1b
+      xywh {208 101 79 25} shortcut 0xff1b
     }
   }
 } 
@@ -121,7 +121,7 @@
 } {
   Fl_Window decl_panel {
     label declaration
-    xywh {282 823 290 176} resizable visible
+    xywh {694 437 290 175} resizable visible
   } {
     Fl_Light_Button decl_public_button {
       label public
@@ -132,15 +132,15 @@
 an external symbol like "extern int foo();",
 a \#directive like "\#include <foo.h>",
 or a comment like "//foo" or "/*foo*/"}
-      xywh {10 50 270 25} align 6 when 0 resizable
+      xywh {10 50 270 24} align 6 when 0 resizable textfont 4
     }
     Fl_Return_Button decl_panel_ok {
       label OK
-      xywh {115 145 80 25} hotspot
+      xywh {115 144 80 25} hotspot shortcut 0xff0d
     }
     Fl_Button decl_panel_cancel {
       label Cancel
-      xywh {205 145 80 25} shortcut 0xff1b
+      xywh {205 144 80 25} shortcut 0xff1b
     }
   }
 } 
@@ -148,28 +148,28 @@
 Function {make_class_panel()} {open
 } {
   Fl_Window class_panel {
-    label class selected
-    xywh {517 813 287 173} resizable modal visible
+    label class
+    xywh {443 567 280 170} resizable modal visible
   } {
     Fl_Light_Button c_public_button {
       label public
-      xywh {10 10 65 25} when 0 labelsize 10
+      xywh {10 10 64 25} when 0 labelsize 10
     }
     Fl_Input c_name_input {
       label {name:}
-      xywh {10 55 270 25} align 5 when 0 resizable
+      xywh {10 55 263 22} align 5 when 0 resizable textfont 4
     }
     Fl_Input c_subclass_input {
       label {subclass of (text between : and \{)}
-      xywh {10 100 270 25} align 5 when 0
+      xywh {10 97 263 25} align 5 when 0 textfont 4
     }
     Fl_Return_Button c_panel_ok {
       label OK
-      xywh {110 135 80 25} hotspot
+      xywh {108 132 78 25} hotspot shortcut 0xff0d
     }
     Fl_Button c_panel_cancel {
       label Cancel
-      xywh {200 135 80 25} shortcut 0xff1b
+      xywh {196 132 77 25} shortcut 0xff1b
     }
   }
 } 
diff -Nru ./fluid/image_file_panel.cxx ../fltk-2-cvs/fluid/image_file_panel.cxx
--- ./fluid/image_file_panel.cxx	Tue Jan 23 20:47:54 2001
+++ ../fltk-2-cvs/fluid/image_file_panel.cxx	Tue Jul 10 20:03:09 2001
@@ -5,44 +5,48 @@
 
 static void cb_images_dir_window(Fl_Window*, void*) {
   images_dir_window->hide();
-modal=0;
+  modal=0;
+
 }
 
 Fl_Input *images_dir_input=(Fl_Input *)0;
 
 static void cb_Browse(Fl_Button*, void*) {
   browse_dir_cb();
+
 }
 
 static void cb_Cancel(Fl_Button*, void*) {
   images_dir_window->hide();
-modal=0; cancel=1;
+  modal=0; cancel=1;
+
 }
 
 static void cb_OK(Fl_Return_Button*, void*) {
   images_dir_window->hide();
-modal=0;
+  modal=0;
+
 }
 
 Fl_Window* make_images_dir_window() {
   Fl_Window* w;
-  { Fl_Window* o = images_dir_window = new Fl_Window(310, 100, "Images root directory");
+   {  Fl_Window* o = images_dir_window = new Fl_Window(310, 100, "Images root directory");
     w = o;
     o->callback((Fl_Callback*)cb_images_dir_window);
-    { Fl_Input* o = images_dir_input = new Fl_Input(10, 15, 220, 20);
+     {    Fl_Input* o = images_dir_input = new Fl_Input(10, 15, 220, 20);
       ((Fl_Window*)(o->parent()))->hotspot(o);
     }
-    { Fl_Button* o = new Fl_Button(230, 15, 70, 20, "Browse ...");
+     {    Fl_Button* o = new Fl_Button(230, 15, 70, 20, "Browse ...");
       o->callback((Fl_Callback*)cb_Browse);
     }
-    { Fl_Box* o = new Fl_Box(10, 40, 220, 20, "(relative to the location of the .fl file)");
+     {    Fl_Box* o = new Fl_Box(10, 40, 220, 20, "(relative to the location of the .fl file)");
       o->label_size(10);
       o->align(133|FL_ALIGN_INSIDE);
     }
-    { Fl_Button* o = new Fl_Button(180, 70, 60, 20, "Cancel");
+     {    Fl_Button* o = new Fl_Button(180, 70, 60, 20, "Cancel");
       o->callback((Fl_Callback*)cb_Cancel);
     }
-    { Fl_Return_Button* o = new Fl_Return_Button(250, 70, 50, 20, "OK");
+     {    Fl_Return_Button* o = new Fl_Return_Button(250, 70, 50, 20, "OK");
       o->shortcut(0xff0d);
       o->callback((Fl_Callback*)cb_OK);
     }
diff -Nru ./fluid/widget_panel.cxx ../fltk-2-cvs/fluid/widget_panel.cxx
--- ./fluid/widget_panel.cxx	Tue Jan 23 20:47:54 2001
+++ ../fltk-2-cvs/fluid/widget_panel.cxx	Tue Jul 10 20:03:12 2001
@@ -26,85 +26,85 @@
 
 Fl_Window* make_widget_panel() {
   Fl_Window* w;
-  { Fl_Window* o = new Fl_Window(380, 375);
+   {  Fl_Window* o = new Fl_Window(380, 375);
     w = o;
     ((Fl_Window*)(o))->hotspot(o);
-    { Fl_Tabs* o = panel_tabs = new Fl_Tabs(10, 10, 365, 320);
+     {    Fl_Tabs* o = panel_tabs = new Fl_Tabs(10, 10, 365, 320);
       o->callback((Fl_Callback*)propagate_tabs);
-      { Fl_Group* o = new Fl_Group(0, 25, 365, 295, "GUI");
+       {      Fl_Group* o = new Fl_Group(0, 25, 365, 295, "GUI");
         o->callback((Fl_Callback*)propagate_group);
-        { Fl_Input* o = new Fl_Input(80, 10, 275, 25, "Label:");
+         {        Fl_Input* o = new Fl_Input(80, 10, 275, 25, "Label:");
           o->callback((Fl_Callback*)label_cb);
           o->when(FL_WHEN_CHANGED);
           o->tooltip("Text displayed on or next to the widget");
         }
-        { Fl_Box* o = image_label = new Fl_Box(9, 35, 71, 20, "Image:");
+         {        Fl_Box* o = image_label = new Fl_Box(9, 35, 71, 20, "Image:");
           o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
         }
-        { Fl_Button* o = new Fl_Button(80, 35, 195, 25, "Image name");
+         {        Fl_Button* o = new Fl_Button(80, 35, 195, 25, "Image name");
           o->callback((Fl_Callback*)image_cb);
           o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
           o->tooltip("Select an image to label the widget");
           o->color(o->text_background());
           o->box(o->text_box());
         }
-        { Fl_Light_Button* o = include_image_button = new Fl_Light_Button(275, 35, 80, 25, "image inlined");
+         {        Fl_Light_Button* o = include_image_button = new Fl_Light_Button(275, 35, 80, 25, "image inlined");
           o->label_size(10);
           o->callback((Fl_Callback*)image_inlined_cb);
           o->align(132|FL_ALIGN_INSIDE);
           o->tooltip("Include the datas of the image inlined in \nthe code or keep it in an externa\
 l file");
         }
-        { Fl_Box* o = new Fl_Box(10, 65, 70, 20, "Alignment:");
+         {        Fl_Box* o = new Fl_Box(10, 65, 70, 20, "Alignment:");
           o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
         }
-        { Fl_Button* o = new Fl_Button(80, 65, 44, 20, "tiled");
+         {        Fl_Button* o = new Fl_Button(80, 65, 44, 20, "tiled");
           o->type(101);
           o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_TILED));
           o->tooltip("Draw the image tiled");
         }
-        { Fl_Button* o = new Fl_Button(124, 65, 43, 20, "clip");
+         {        Fl_Button* o = new Fl_Button(124, 65, 43, 20, "clip");
           o->type(101);
           o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_CLIP));
           o->tooltip("Turn on clipping to the widget\'s area when drawing\nlabel.  This is slower s\
 o it should be left off if label will fit");
         }
-        { Fl_Button* o = new Fl_Button(167, 65, 43, 20, "wrap");
+         {        Fl_Button* o = new Fl_Button(167, 65, 43, 20, "wrap");
           o->type(101);
           o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_WRAP));
           o->tooltip("Word-wrap the label");
         }
-        { Fl_Button* o = new Fl_Button(255, 65, 20, 20, "@-1<-");
+         {        Fl_Button* o = new Fl_Button(255, 65, 20, 20, "@-1<-");
           o->type(101);
           o->label_type(FL_SYMBOL_LABEL);
           o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_LEFT));
           o->tooltip("Places label on the left of the widget");
         }
-        { Fl_Button* o = new Fl_Button(275, 65, 20, 20, "@-1->");
+         {        Fl_Button* o = new Fl_Button(275, 65, 20, 20, "@-1->");
           o->type(101);
           o->label_type(FL_SYMBOL_LABEL);
           o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_RIGHT));
           o->tooltip("Places label on the right of the widget");
         }
-        { Fl_Button* o = new Fl_Button(295, 65, 20, 20, "@-18");
+         {        Fl_Button* o = new Fl_Button(295, 65, 20, 20, "@-18");
           o->type(101);
           o->label_type(FL_SYMBOL_LABEL);
           o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_TOP));
           o->tooltip("Places label on the top of the widget");
         }
-        { Fl_Button* o = new Fl_Button(315, 65, 20, 20, "@-12");
+         {        Fl_Button* o = new Fl_Button(315, 65, 20, 20, "@-12");
           o->type(101);
           o->label_type(FL_SYMBOL_LABEL);
           o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_BOTTOM));
           o->tooltip("Places label on the bottom of the widget");
         }
-        { Fl_Button* o = new Fl_Button(335, 65, 20, 20, "@-3square");
+         {        Fl_Button* o = new Fl_Button(335, 65, 20, 20, "@-3square");
           o->type(101);
           o->label_type(FL_SYMBOL_LABEL);
           o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_INSIDE));
           o->tooltip("Places label inside the widget");
         }
-        { Fl_Value_Input* o = widget_x = new Fl_Value_Input(80, 100, 55, 25, "X:");
+         {        Fl_Value_Input* o = widget_x = new Fl_Value_Input(80, 100, 55, 25, "X:");
           o->label_size(10);
           o->maximum(2000);
           o->step(1);
@@ -113,7 +113,7 @@
           o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
           o->tooltip("The x coordinate of the widget.");
         }
-        { Fl_Value_Input* o = widget_y = new Fl_Value_Input(135, 100, 55, 25, "Y:");
+         {        Fl_Value_Input* o = widget_y = new Fl_Value_Input(135, 100, 55, 25, "Y:");
           o->label_size(10);
           o->maximum(2000);
           o->step(1);
@@ -122,7 +122,7 @@
           o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
           o->tooltip("The y coordinate of the widget.");
         }
-        { Fl_Value_Input* o = widget_width = new Fl_Value_Input(190, 100, 55, 25, "Width:");
+         {        Fl_Value_Input* o = widget_width = new Fl_Value_Input(190, 100, 55, 25, "Width:");
           o->label_size(10);
           o->maximum(2000);
           o->step(1);
@@ -131,7 +131,7 @@
           o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
           o->tooltip("The width of the widget.");
         }
-        { Fl_Value_Input* o = widget_height = new Fl_Value_Input(245, 100, 55, 25, "Height:");
+         {        Fl_Value_Input* o = widget_height = new Fl_Value_Input(245, 100, 55, 25, "Height:");
           o->label_size(10);
           o->maximum(2000);
           o->step(1);
@@ -140,48 +140,48 @@
           o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
           o->tooltip("The height of the widget.");
         }
-        { Fl_Light_Button* o = set_xy = new Fl_Light_Button(300, 100, 55, 25, "Set xy");
+         {        Fl_Light_Button* o = set_xy = new Fl_Light_Button(300, 100, 55, 25, "Set xy");
           o->label_size(10);
           o->callback((Fl_Callback*)set_xy_cb);
           o->tooltip("Determines if a window is initially set to a given position.");
         }
-        { Fl_Input* o = new Fl_Input(80, 130, 95, 25, "X Class:");
+         {        Fl_Input* o = new Fl_Input(80, 130, 95, 25, "X Class:");
           o->callback((Fl_Callback*)xclass_cb);
           o->when(FL_WHEN_CHANGED);
           o->tooltip("The X class name which should be used for this widget.  This can be used to c\
 hoose icons.");
         }
-        { Fl_Light_Button* o = new Fl_Light_Button(175, 130, 55, 25, "Border");
+         {        Fl_Light_Button* o = new Fl_Light_Button(175, 130, 55, 25, "Border");
           o->label_size(10);
           o->callback((Fl_Callback*)border_cb);
           o->tooltip("Enable the window manager border");
         }
-        { Fl_Light_Button* o = new Fl_Light_Button(230, 130, 55, 25, "Modal");
+         {        Fl_Light_Button* o = new Fl_Light_Button(230, 130, 55, 25, "Modal");
           o->label_size(10);
           o->callback((Fl_Callback*)modal_cb);
           o->tooltip("This window will stay on top of others in the\napplication and will prevent e\
 vents from going to other windows.");
         }
-        { Fl_Light_Button* o = new Fl_Light_Button(285, 130, 70, 25, "Nonmodal");
+         {        Fl_Light_Button* o = new Fl_Light_Button(285, 130, 70, 25, "Nonmodal");
           o->label_size(10);
           o->callback((Fl_Callback*)non_modal_cb);
           o->tooltip("This window will stay on top of others in the application.");
         }
-        { Fl_Value_Input* o = new Fl_Value_Input(80, 135, 53, 20, "Value:");
+         {        Fl_Value_Input* o = new Fl_Value_Input(80, 135, 53, 20, "Value:");
           o->label_size(10);
           o->callback((Fl_Callback*)value_cb);
           o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
           o->hide();
           o->tooltip("The initial value (integer) of this widget");
         }
-        { Fl_Value_Input* o = new Fl_Value_Input(133, 135, 53, 20, "Minimum:");
+         {        Fl_Value_Input* o = new Fl_Value_Input(133, 135, 53, 20, "Minimum:");
           o->label_size(10);
           o->callback((Fl_Callback*)min_cb);
           o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
           o->hide();
           o->tooltip("The minimum value for this valuator");
         }
-        { Fl_Value_Input* o = new Fl_Value_Input(186, 135, 53, 20, "Maximum:");
+         {        Fl_Value_Input* o = new Fl_Value_Input(186, 135, 53, 20, "Maximum:");
           o->label_size(10);
           o->value(1);
           o->callback((Fl_Callback*)max_cb);
@@ -189,34 +189,34 @@
           o->hide();
           o->tooltip("The maximum value for this valuator");
         }
-        { Fl_Value_Input* o = new Fl_Value_Input(239, 135, 53, 20, "Size:");
+         {        Fl_Value_Input* o = new Fl_Value_Input(239, 135, 53, 20, "Size:");
           o->label_size(10);
           o->callback((Fl_Callback*)slider_size_cb);
           o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
           o->hide();
           o->tooltip("The size of the scroller");
         }
-        { Fl_Value_Input* o = new Fl_Value_Input(292, 135, 63, 20, "Step:");
+         {        Fl_Value_Input* o = new Fl_Value_Input(292, 135, 63, 20, "Step:");
           o->label_size(10);
           o->callback((Fl_Callback*)step_cb);
           o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
           o->hide();
           o->tooltip("Amount to change this valuator when mouse moves 1 pixel");
         }
-        { Fl_Group* o = new Fl_Group(80, 155, 275, 25, "Attributes:");
+         {        Fl_Group* o = new Fl_Group(80, 155, 275, 25, "Attributes:");
           o->callback((Fl_Callback*)propagate_group);
           o->align(FL_ALIGN_LEFT);
-          { Fl_Light_Button* o = new Fl_Light_Button(0, 0, 70, 25, "Visible");
+           {          Fl_Light_Button* o = new Fl_Light_Button(0, 0, 70, 25, "Visible");
             o->label_size(10);
             o->callback((Fl_Callback*)visible_cb);
             o->tooltip("Determines whether the widget is initially visible");
           }
-          { Fl_Light_Button* o = new Fl_Light_Button(70, 0, 65, 25, "Active");
+           {          Fl_Light_Button* o = new Fl_Light_Button(70, 0, 65, 25, "Active");
             o->label_size(10);
             o->callback((Fl_Callback*)active_cb);
             o->tooltip("Determines whether the widget is initially active (enabled)");
           }
-          { Fl_Light_Button* o = new Fl_Light_Button(135, 0, 70, 25, "Resizable");
+           {          Fl_Light_Button* o = new Fl_Light_Button(135, 0, 70, 25, "Resizable");
             o->label_size(10);
             o->callback((Fl_Callback*)resizable_cb);
             o->when(FL_WHEN_CHANGED);
@@ -225,7 +225,7 @@
 e same distance from all four sides of the parent.  If this is off this widget\
  will not resize, unless it overlaps a resizable sibling.");
           }
-          { Fl_Light_Button* o = new Fl_Light_Button(205, 0, 70, 25, "Hotspot");
+           {          Fl_Light_Button* o = new Fl_Light_Button(205, 0, 70, 25, "Hotspot");
             o->label_size(10);
             o->callback((Fl_Callback*)hotspot_cb);
             o->when(FL_WHEN_CHANGED);
@@ -234,19 +234,19 @@
           }
           o->end();
         }
-        { Shortcut_Button* o = new Shortcut_Button(80, 180, 275, 25, "Shortcut:");
+         {        Shortcut_Button* o = new Shortcut_Button(80, 180, 275, 25, "Shortcut:");
           o->callback((Fl_Callback*)shortcut_in_cb);
           o->align(FL_ALIGN_LEFT);
           o->tooltip("To set a shortcut click here, then type the key combination you want.  To del\
 ete the shortcut type backspace.  To stop setting the shortcut click the mouse\
  on some other field.");
         }
-        { Fl_Input* o = new Fl_Input(80, 205, 275, 80, "Tooltip:");
+         {        Fl_Input* o = new Fl_Input(80, 205, 275, 80, "Tooltip:");
           o->type(4);
           o->callback((Fl_Callback*)tooltip_cb);
           o->tooltip("The pop up tooltip which should be used for the widget.");
         }
-        { Fl_Box* o = new Fl_Box(80, 205, 275, 80, "resizable");
+         {        Fl_Box* o = new Fl_Box(80, 205, 275, 80, "resizable");
           o->hide();
           o->deactivate();
           Fl_Group::current()->resizable(o);
@@ -254,180 +254,188 @@
         o->end();
         Fl_Group::current()->resizable(o);
       }
-      { Fl_Group* o = new Fl_Group(0, 25, 365, 295, "Style");
+       {      Fl_Group* o = new Fl_Group(0, 25, 365, 295, "Style");
         o->callback((Fl_Callback*)propagate_group);
         o->hide();
-        { Fl_Choice* o = new Fl_Choice(85, 10, 270, 25, "Box:"); o->begin();
+         {        Fl_Choice* o = new Fl_Choice(85, 10, 270, 25, "Box:"); o->begin();
           o->callback((Fl_Callback*)box_cb);
           o->tooltip("Type of box to draw around the widget (or the raised parts such as buttons of\
  a complex widget)");
           o->menu(boxmenu);
           o->end();
         }
-        { Fl_Choice* o = new Fl_Choice(85, 35, 270, 25, "Text Box:"); o->begin();
+         {        Fl_Choice* o = new Fl_Choice(85, 35, 270, 25, "Text Box:"); o->begin();
           o->callback((Fl_Callback*)text_box_cb);
           o->tooltip("Type of box to draw around a text display or other sunken area of the widget.");
           o->menu(boxmenu);
           o->end();
         }
-        { Fl_Choice* o = new Fl_Choice(85, 60, 270, 25, "Label Type:"); o->begin();
+         {        Fl_Choice* o = new Fl_Choice(85, 60, 270, 25, "Label Type:"); o->begin();
           o->callback((Fl_Callback*)labeltype_cb);
           o->tooltip("How to draw the label");
           o->menu(labeltypemenu);
           o->end();
         }
-        { Fl_Choice* o = new Fl_Choice(85, 85, 215, 25, "Label Font:"); o->begin();
+         {        Fl_Choice* o = new Fl_Choice(85, 85, 215, 25, "Label Font:"); o->begin();
           o->callback((Fl_Callback*)labelfont_cb);
           o->tooltip("Font to use for the label");
           o->menu(fontmenu);
           o->end();
         }
-        { Fl_Value_Input* o = new Fl_Value_Input(300, 85, 55, 25);
+         {        Fl_Value_Input* o = new Fl_Value_Input(300, 85, 55, 25);
           o->maximum(100);
           o->step(1);
           o->value(14);
           o->callback((Fl_Callback*)labelsize_cb);
           o->tooltip("Size of the font to use for the label");
         }
-        { Fl_Choice* o = new Fl_Choice(85, 110, 215, 25, "Text Font:"); o->begin();
+         {        Fl_Choice* o = new Fl_Choice(85, 110, 215, 25, "Text Font:"); o->begin();
           o->callback((Fl_Callback*)textfont_cb);
           o->tooltip("Font to use for text displayed inside the widget");
           o->menu(fontmenu);
           o->end();
         }
-        { Fl_Value_Input* o = new Fl_Value_Input(300, 110, 55, 25);
+         {        Fl_Value_Input* o = new Fl_Value_Input(300, 110, 55, 25);
           o->maximum(100);
           o->step(1);
           o->value(14);
           o->callback((Fl_Callback*)textsize_cb);
           o->tooltip("Size of the font to use for text displayed inside the widget");
         }
-        { Fl_Light_Button* o = new Fl_Light_Button(85, 145, 135, 25, "Color");
+         {        Fl_Light_Button* o = new Fl_Light_Button(85, 145, 135, 25, "Color");
           o->label_size(10);
           o->callback((Fl_Callback*)color_cb);
           o->tooltip("Color of the widget (or of raised parts such as buttons of a complex widget)");
           o->type(0);
         }
-        { Fl_Light_Button* o = new Fl_Light_Button(220, 145, 135, 25, "Label Color");
+         {        Fl_Light_Button* o = new Fl_Light_Button(220, 145, 135, 25, "Label Color");
           o->label_size(10);
           o->callback((Fl_Callback*)labelcolor_cb);
           o->tooltip("Color to draw the label");
           o->type(0);
         }
-        { Fl_Light_Button* o = new Fl_Light_Button(85, 170, 135, 25, "Highlight Color");
+         {        Fl_Light_Button* o = new Fl_Light_Button(85, 170, 135, 25, "Highlight Color");
           o->label_size(10);
           o->callback((Fl_Callback*)highlightcolor_cb);
           o->tooltip("Color to use to draw the widget highlighted.  Use color zero (the black top-l\
 eft chip in the color chooser) to disable highlighting.");
           o->type(0);
         }
-        { Fl_Light_Button* o = new Fl_Light_Button(220, 170, 135, 25, "Highlight Label Color");
+         {        Fl_Light_Button* o = new Fl_Light_Button(220, 170, 135, 25, "Highlight Label Color");
           o->label_size(10);
           o->callback((Fl_Callback*)highlight_label_color_cb);
           o->tooltip("Color to draw the label when the widget is highlighted.  Use color zero (the \
 black top-left chip in the color chooser) to leave the label colors unchanged.");
           o->type(0);
         }
-        { Fl_Box* o = new Fl_Box(20, 185, 63, 20, "Colors:");
+         {        Fl_Box* o = new Fl_Box(20, 185, 63, 20, "Colors:");
           o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
         }
-        { Fl_Light_Button* o = new Fl_Light_Button(85, 195, 135, 25, "Window Color");
+         {        Fl_Light_Button* o = new Fl_Light_Button(85, 195, 135, 25, "Window Color");
           o->label_size(10);
           o->callback((Fl_Callback*)color3_cb);
           o->tooltip("Color to draw a text display or other sunken area.");
           o->type(0);
         }
-        { Fl_Light_Button* o = new Fl_Light_Button(220, 195, 135, 25, "Text Color");
+         {        Fl_Light_Button* o = new Fl_Light_Button(220, 195, 135, 25, "Text Color");
           o->label_size(10);
           o->callback((Fl_Callback*)textcolor_cb);
           o->tooltip("Color to draw text displayed inside the widget");
           o->type(0);
         }
-        { Fl_Light_Button* o = new Fl_Light_Button(85, 220, 135, 25, "Selection Color");
+         {        Fl_Light_Button* o = new Fl_Light_Button(85, 220, 135, 25, "Selection Color");
           o->label_size(10);
           o->callback((Fl_Callback*)color2_cb);
           o->tooltip("Color to draw behind selected text, or to color in buttons that are turned on\
 .");
           o->type(0);
         }
-        { Fl_Light_Button* o = new Fl_Light_Button(220, 220, 135, 25, "Selected Text Color");
+         {        Fl_Light_Button* o = new Fl_Light_Button(220, 220, 135, 25, "Selected Text Color");
           o->label_size(10);
           o->callback((Fl_Callback*)selected_textcolor_cb);
           o->tooltip("Color to draw selected text inside the widget");
           o->type(0);
         }
-        { Fl_Box* o = new Fl_Box(85, 145, 270, 100, "resizable");
+         {        Fl_Box* o = new Fl_Box(85, 145, 270, 100, "resizable");
           o->hide();
           o->deactivate();
           Fl_Group::current()->resizable(o);
         }
-        { Fl_Button* o = new Fl_Button(85, 260, 124, 25, "Reset to default");
+         {        Fl_Button* o = new Fl_Button(85, 260, 124, 25, "Reset to default");
           o->callback((Fl_Callback*)default_cb);
           o->tooltip("Resets the style to this widget\'s default values");
         }
         o->end();
       }
-      { Fl_Group* o = new Fl_Group(0, 25, 365, 295, "C++");
+       {      Fl_Group* o = new Fl_Group(0, 25, 365, 295, "C++");
         o->callback((Fl_Callback*)propagate_group);
         o->hide();
-        { Fl_Input* o = new Fl_Input(80, 10, 170, 25, "Class:");
+         {        Fl_Input* o = new Fl_Input(80, 10, 170, 25, "Class:");
+          o->text_font(fl_fonts()+4);
           o->callback((Fl_Callback*)subclass_cb, (void*)(4));
           o->when(FL_WHEN_CHANGED);
           o->tooltip("This allows you to name a user-defined class that this widget is an instance \
 of, rather than an fltk built-in class. You will need to add a #include declar\
 ation so that the definition of your class is included in the fluid output.");
         }
-        { Fl_Choice* o = new Fl_Choice(250, 10, 105, 25); o->begin();
+         {        Fl_Choice* o = new Fl_Choice(250, 10, 105, 25); o->begin();
           o->callback((Fl_Callback*)subtype_cb);
           o->tooltip("Selects a value for type() for this widget");
           o->end();
         }
-        { Fl_Input* o = new Fl_Input(80, 35, 220, 25, "Name:");
+         {        Fl_Input* o = new Fl_Input(80, 35, 220, 25, "Name:");
+          o->text_font(fl_fonts()+4);
           o->callback((Fl_Callback*)name_cb);
           o->when(FL_WHEN_CHANGED);
           o->tooltip("The variable or member name in which to store a pointer to this widget.");
         }
-        { Fl_Light_Button* o = new Fl_Light_Button(300, 35, 55, 25, "public");
+         {        Fl_Light_Button* o = new Fl_Light_Button(300, 35, 55, 25, "public");
           o->label_size(10);
           o->callback((Fl_Callback*)name_public_cb);
           o->when(FL_WHEN_CHANGED);
           o->tooltip("Make the variable public");
         }
-        { Fl_Input* o = v_input[0] = new Fl_Input(80, 60, 275, 25, "Extra Code:");
+         {        Fl_Input* o = v_input[0] = new Fl_Input(80, 60, 275, 25, "Extra Code:");
+          o->text_font(fl_fonts()+4);
           o->callback((Fl_Callback*)v_input_cb, (void*)(0));
           o->tooltip("Extra code to be exectuted when the widget is created");
         }
-        { Fl_Input* o = v_input[1] = new Fl_Input(80, 85, 275, 25);
+         {        Fl_Input* o = v_input[1] = new Fl_Input(80, 85, 275, 25);
+          o->text_font(fl_fonts()+4);
           o->callback((Fl_Callback*)v_input_cb, (void*)(1));
           o->tooltip("Extra code to be exectuted when the widget is created");
         }
-        { Fl_Input* o = v_input[2] = new Fl_Input(80, 110, 275, 25);
+         {        Fl_Input* o = v_input[2] = new Fl_Input(80, 110, 275, 25);
+          o->text_font(fl_fonts()+4);
           o->callback((Fl_Callback*)v_input_cb, (void*)(2));
           o->tooltip("Extra code to be exectuted when the widget is created");
         }
-        { Fl_Input* o = v_input[3] = new Fl_Input(80, 135, 275, 25);
+         {        Fl_Input* o = v_input[3] = new Fl_Input(80, 135, 275, 25);
+          o->text_font(fl_fonts()+4);
           o->callback((Fl_Callback*)v_input_cb, (void*)(3));
           o->tooltip("Extra code to be exectuted when the widget is created");
         }
-        { Fl_Box* o = callback_label = new Fl_Box(10, 160, 70, 20, "Callback:");
+         {        Fl_Box* o = callback_label = new Fl_Box(10, 160, 70, 20, "Callback:");
           o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
         }
-        { Fl_Input* o = new Fl_Input(80, 160, 275, 80);
+         {        Fl_Input* o = new Fl_Input(80, 160, 275, 80);
           o->type(4);
+          o->text_font(fl_fonts()+4);
           o->callback((Fl_Callback*)callback_cb);
           o->tooltip("The name of the callback function, or code body of the callback function");
         }
-        { Fl_Box* o = new Fl_Box(80, 165, 165, 65, "resizable");
+         {        Fl_Box* o = new Fl_Box(80, 165, 165, 65, "resizable");
           o->hide();
           o->deactivate();
           Fl_Group::current()->resizable(o);
         }
-        { Fl_Input* o = new Fl_Input(80, 240, 130, 25, "User Data:");
+         {        Fl_Input* o = new Fl_Input(80, 240, 130, 25, "User Data:");
+          o->text_font(fl_fonts()+4);
           o->callback((Fl_Callback*)user_data_cb);
           o->tooltip("Value passed as the second argument to the callback.  This must be of the typ\
 e given below.");
         }
-        { Fl_Choice* o = new Fl_Choice(245, 240, 110, 25, "When:"); o->begin();
+         {        Fl_Choice* o = new Fl_Choice(245, 240, 110, 25, "When:"); o->begin();
           o->label_size(10);
           o->callback((Fl_Callback*)when_cb);
           o->when(FL_WHEN_NEVER);
@@ -435,11 +443,12 @@
           o->menu(whenmenu);
           o->end();
         }
-        { Fl_Input* o = new Fl_Input(80, 265, 130, 25, "Type:");
+         {        Fl_Input* o = new Fl_Input(80, 265, 130, 25, "Type:");
+          o->text_font(fl_fonts()+4);
           o->callback((Fl_Callback*)user_data_type_cb);
           o->tooltip("Type of the user data (must \\\"long\\\" or a pointer type)");
         }
-        { Fl_Light_Button* o = new Fl_Light_Button(245, 265, 110, 25, "no change");
+         {        Fl_Light_Button* o = new Fl_Light_Button(245, 265, 110, 25, "no change");
           o->label_size(10);
           o->callback((Fl_Callback*)when_button_cb);
           o->when(FL_WHEN_NEVER);
@@ -451,18 +460,18 @@
       o->end();
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Group* o = new Fl_Group(95, 340, 275, 25);
-      { Fl_Light_Button* o = overlaybutton = new Fl_Light_Button(0, 0, 90, 25, "&Overlays");
+     {    Fl_Group* o = new Fl_Group(95, 340, 275, 25);
+       {      Fl_Light_Button* o = overlaybutton = new Fl_Light_Button(0, 0, 90, 25, "&Overlays");
         o->callback((Fl_Callback*)overlay_cb);
         o->tooltip("Turns overlays (red outlines)  of the selected  widgets on or off");
         o->value(!overlays_invisible);
       }
-      { Fl_Return_Button* o = new Fl_Return_Button(130, 0, 65, 25, "OK");
+       {      Fl_Return_Button* o = new Fl_Return_Button(130, 0, 65, 25, "OK");
         o->shortcut(0xff0d);
         o->callback((Fl_Callback*)ok_cb);
         o->tooltip("Closes this attribute window");
       }
-      { Fl_Button* o = new Fl_Button(205, 0, 70, 25, "Cancel");
+       {      Fl_Button* o = new Fl_Button(205, 0, 70, 25, "Cancel");
         o->callback((Fl_Callback*)cancel_cb);
       }
       o->end();
diff -Nru ./fluid/widget_panel.fl ../fltk-2-cvs/fluid/widget_panel.fl
--- ./fluid/widget_panel.fl	Tue Jan 23 20:47:54 2001
+++ ../fltk-2-cvs/fluid/widget_panel.fl	Tue Jul 10 20:00:12 2001
@@ -1,15 +1,15 @@
 # data file for the FLTK User Interface Designer (FLUID)
-version 2.0000 
+version 2.0001 
 images_dir ./ 
 header_name {.h} 
 code_name {.cxx} 
 gridx 5 
 gridy 5 
 snap 2
-Function {make_widget_panel()} {open
+Function {make_widget_panel()} {open selected
 } {
   Fl_Window {} {open
-    xywh {94 248 380 375} resizable hotspot visible
+    xywh {94 248 380 375} hide resizable hotspot
   } {
     Fl_Tabs panel_tabs {
       callback propagate_tabs open
@@ -18,23 +18,23 @@
       Fl_Group {} {
         label GUI
         callback propagate_group open
-        xywh {10 35 365 295} resizable
+        xywh {0 25 365 295} resizable
       } {
         Fl_Input {} {
           label {Label:}
           callback label_cb
           tooltip {Text displayed on or next to the widget}
-          xywh {90 45 275 25} when 1
+          xywh {80 10 275 25} when 1
         }
         Fl_Box image_label {
           label {Image:}
-          xywh {19 70 71 20} align 24
+          xywh {9 35 71 20} align 24
         }
         Fl_Button {} {
           label {Image name}
           callback image_cb
           tooltip {Select an image to label the widget}
-          xywh {90 70 195 25} align 524308
+          xywh {80 35 195 25} align 524308
           code0 {o->color(o->text_background());}
           code1 {o->box(o->text_box());}
         }
@@ -43,18 +43,18 @@
           callback image_inlined_cb
           tooltip {Include the datas of the image inlined in 
 the code or keep it in an external file}
-          xywh {285 70 80 25} align 524436 labelsize 10
+          xywh {275 35 80 25} align 524436 labelsize 10
         }
         Fl_Box {} {
           label {Alignment:}
-          xywh {20 100 70 20} align 24
+          xywh {10 65 70 20} align 24
         }
         Fl_Button {} {
           label tiled
           user_data FL_ALIGN_TILED
           callback align_cb
           tooltip {Draw the image tiled}
-          xywh {90 100 44 20} type Toggle
+          xywh {80 65 44 20} type Toggle
         }
         Fl_Button {} {
           label clip
@@ -62,170 +62,170 @@
           callback align_cb
           tooltip {Turn on clipping to the widget's area when drawing
 label.  This is slower so it should be left off if label will fit}
-          xywh {134 100 43 20} type Toggle
+          xywh {124 65 43 20} type Toggle
         }
         Fl_Button {} {
           label wrap
           user_data FL_ALIGN_WRAP
           callback align_cb
           tooltip {Word-wrap the label}
-          xywh {177 100 43 20} type Toggle
+          xywh {167 65 43 20} type Toggle
         }
         Fl_Button {} {
           label {@-1<-}
           user_data FL_ALIGN_LEFT
           callback align_cb
           tooltip {Places label on the left of the widget}
-          xywh {265 100 20 20} type Toggle labeltype SYMBOL_LABEL
+          xywh {255 65 20 20} type Toggle labeltype SYMBOL_LABEL
         }
         Fl_Button {} {
           label {@-1->}
           user_data FL_ALIGN_RIGHT
           callback align_cb
           tooltip {Places label on the right of the widget}
-          xywh {285 100 20 20} type Toggle labeltype SYMBOL_LABEL
+          xywh {275 65 20 20} type Toggle labeltype SYMBOL_LABEL
         }
         Fl_Button {} {
           label {@-18}
           user_data FL_ALIGN_TOP
           callback align_cb
           tooltip {Places label on the top of the widget}
-          xywh {305 100 20 20} type Toggle labeltype SYMBOL_LABEL
+          xywh {295 65 20 20} type Toggle labeltype SYMBOL_LABEL
         }
         Fl_Button {} {
           label {@-12}
           user_data FL_ALIGN_BOTTOM
           callback align_cb
           tooltip {Places label on the bottom of the widget}
-          xywh {325 100 20 20} type Toggle labeltype SYMBOL_LABEL
+          xywh {315 65 20 20} type Toggle labeltype SYMBOL_LABEL
         }
         Fl_Button {} {
           label {@-3square}
           user_data FL_ALIGN_INSIDE
           callback align_cb
           tooltip {Places label inside the widget}
-          xywh {345 100 20 20} type Toggle labeltype SYMBOL_LABEL
+          xywh {335 65 20 20} type Toggle labeltype SYMBOL_LABEL
         }
         Fl_Value_Input widget_x {
           label {X:}
-          callback x_cb selected
+          callback x_cb
           tooltip {The x coordinate of the widget.}
-          xywh {90 135 55 25} align 5 labelsize 10 maximum 2000 step 1 value 10
+          xywh {80 100 55 25} align 5 labelsize 10 maximum 2000 step 1 value 10
         }
         Fl_Value_Input widget_y {
           label {Y:}
-          callback y_cb selected
+          callback y_cb
           tooltip {The y coordinate of the widget.}
-          xywh {145 135 55 25} align 5 labelsize 10 maximum 2000 step 1 value 10
+          xywh {135 100 55 25} align 5 labelsize 10 maximum 2000 step 1 value 10
         }
         Fl_Value_Input widget_width {
           label {Width:}
-          callback width_cb selected
+          callback width_cb
           tooltip {The width of the widget.}
-          xywh {200 135 55 25} align 5 labelsize 10 maximum 2000 step 1 value 10
+          xywh {190 100 55 25} align 5 labelsize 10 maximum 2000 step 1 value 10
         }
         Fl_Value_Input widget_height {
           label {Height:}
-          callback height_cb selected
+          callback height_cb
           tooltip {The height of the widget.}
-          xywh {255 135 55 25} align 5 labelsize 10 maximum 2000 step 1 value 10
+          xywh {245 100 55 25} align 5 labelsize 10 maximum 2000 step 1 value 10
         }
         Fl_Light_Button set_xy {
           label {Set xy}
-          callback set_xy_cb selected
+          callback set_xy_cb
           tooltip {Determines if a window is initially set to a given position.}
-          xywh {310 135 55 25} labelsize 10
+          xywh {300 100 55 25} labelsize 10
         }
         Fl_Input {} {
           label {X Class:}
           callback xclass_cb
           tooltip {The X class name which should be used for this widget.  This can be used to choose icons.}
-          xywh {90 165 95 25} when 1
+          xywh {80 130 95 25} when 1
         }
         Fl_Light_Button {} {
           label Border
           callback border_cb
           tooltip {Enable the window manager border}
-          xywh {185 165 55 25} labelsize 10
+          xywh {175 130 55 25} labelsize 10
         }
         Fl_Light_Button {} {
           label Modal
           callback modal_cb
           tooltip {This window will stay on top of others in the
 application and will prevent events from going to other windows.}
-          xywh {240 165 55 25} labelsize 10
+          xywh {230 130 55 25} labelsize 10
         }
         Fl_Light_Button {} {
           label Nonmodal
           callback non_modal_cb
           tooltip {This window will stay on top of others in the application.}
-          xywh {295 165 70 25} labelsize 10
+          xywh {285 130 70 25} labelsize 10
         }
         Fl_Value_Input {} {
           label {Value:}
           callback value_cb
           tooltip {The initial value (integer) of this widget}
-          xywh {90 170 53 20} align 4101 hide labelsize 10
+          xywh {80 135 53 20} align 4101 hide labelsize 10
         }
         Fl_Value_Input {} {
           label {Minimum:}
           callback min_cb
           tooltip {The minimum value for this valuator}
-          xywh {143 170 53 20} align 4101 hide labelsize 10
+          xywh {133 135 53 20} align 4101 hide labelsize 10
         }
         Fl_Value_Input {} {
           label {Maximum:}
           callback max_cb
           tooltip {The maximum value for this valuator}
-          xywh {196 170 53 20} align 4101 hide labelsize 10 value 1
+          xywh {186 135 53 20} align 4101 hide labelsize 10 value 1
         }
         Fl_Value_Input {} {
           label {Size:}
           callback slider_size_cb
           tooltip {The size of the scroller}
-          xywh {249 170 53 20} align 4101 hide labelsize 10
+          xywh {239 135 53 20} align 4101 hide labelsize 10
         }
         Fl_Value_Input {} {
           label {Step:}
           callback step_cb
           tooltip {Amount to change this valuator when mouse moves 1 pixel}
-          xywh {302 170 63 20} align 4101 hide labelsize 10
+          xywh {292 135 63 20} align 4101 hide labelsize 10
         }
         Fl_Group {} {
           label {Attributes:}
           callback propagate_group open
-          xywh {90 190 275 25} align 4
+          xywh {80 155 275 25} align 4
         } {
           Fl_Light_Button {} {
             label Visible
             callback visible_cb
             tooltip {Determines whether the widget is initially visible}
-            xywh {90 190 70 25} labelsize 10
+            xywh {0 0 70 25} labelsize 10
           }
           Fl_Light_Button {} {
             label Active
             callback active_cb
             tooltip {Determines whether the widget is initially active (enabled)}
-            xywh {160 190 65 25} labelsize 10
+            xywh {70 0 65 25} labelsize 10
           }
           Fl_Light_Button {} {
             label Resizable
             callback resizable_cb
             tooltip {If on, this widget and all it's parents are resizable.  When the parent resizes it moves/resizes all it's children so that this widget's edges remain the same distance from all four sides of the parent.  If this is off this widget will not resize, unless it overlaps a resizable sibling.}
-            xywh {225 190 70 25} when 1 labelsize 10
+            xywh {135 0 70 25} when 1 labelsize 10
           }
           Fl_Light_Button {} {
             label Hotspot
             callback hotspot_cb
             tooltip {Positions the window so this widget is under the mouse.  This is done when show() is called.}
-            xywh {295 190 70 25} when 1 labelsize 10
+            xywh {205 0 70 25} when 1 labelsize 10
           }
         }
         Fl_Button {} {
           label {Shortcut:}
           callback shortcut_in_cb
           tooltip {To set a shortcut click here, then type the key combination you want.  To delete the shortcut type backspace.  To stop setting the shortcut click the mouse on some other field.}
-          xywh {90 215 275 25} align 524292
+          xywh {80 180 275 25} align 524292
           code0 {\#include "Shortcut_Button.h"}
           class Shortcut_Button
         }
@@ -233,23 +233,23 @@
           label {Tooltip:}
           callback tooltip_cb
           tooltip {The pop up tooltip which should be used for the widget.}
-          xywh {90 240 275 80} type Multiline
+          xywh {80 205 275 80} type Multiline
         }
         Fl_Box {} {
           label resizable
-          xywh {90 240 275 80} hide deactivate resizable
+          xywh {80 205 275 80} hide deactivate resizable
         }
       }
       Fl_Group {} {
         label Style
         callback propagate_group
-        xywh {10 35 365 295} hide
+        xywh {0 25 365 295} hide
       } {
         Fl_Choice {} {
           label {Box:}
           callback box_cb
           tooltip {Type of box to draw around the widget (or the raised parts such as buttons of a complex widget)}
-          xywh {95 45 270 25}
+          xywh {85 10 270 25}
           code0 {extern Fl_Menu_Item boxmenu[];}
           code1 {o->menu(boxmenu);}
         } {}
@@ -257,7 +257,7 @@
           label {Text Box:}
           callback text_box_cb
           tooltip {Type of box to draw around a text display or other sunken area of the widget.}
-          xywh {95 70 270 25}
+          xywh {85 35 270 25}
           code0 {extern Fl_Menu_Item boxmenu[];}
           code1 {o->menu(boxmenu);}
         } {}
@@ -265,7 +265,7 @@
           label {Label Type:}
           callback labeltype_cb
           tooltip {How to draw the label}
-          xywh {95 95 270 25}
+          xywh {85 60 270 25}
           code0 {extern Fl_Menu_Item labeltypemenu[];}
           code1 {o->menu(labeltypemenu);}
         } {}
@@ -273,177 +273,177 @@
           label {Label Font:}
           callback labelfont_cb
           tooltip {Font to use for the label}
-          xywh {95 120 215 25}
+          xywh {85 85 215 25}
           code0 {extern Fl_Menu_Item fontmenu[];}
           code1 {o->menu(fontmenu);}
         } {}
         Fl_Value_Input {} {
           callback labelsize_cb
           tooltip {Size of the font to use for the label}
-          xywh {310 120 55 25} maximum 100 step 1 value 14
+          xywh {300 85 55 25} maximum 100 step 1 value 14
         }
         Fl_Choice {} {
           label {Text Font:}
           callback textfont_cb
           tooltip {Font to use for text displayed inside the widget}
-          xywh {95 145 215 25}
+          xywh {85 110 215 25}
           code0 {extern Fl_Menu_Item fontmenu[];}
           code1 {o->menu(fontmenu);}
         } {}
         Fl_Value_Input {} {
           callback textsize_cb
           tooltip {Size of the font to use for text displayed inside the widget}
-          xywh {310 145 55 25} maximum 100 step 1 value 14
+          xywh {300 110 55 25} maximum 100 step 1 value 14
         }
         Fl_Light_Button {} {
           label Color
           callback color_cb
           tooltip {Color of the widget (or of raised parts such as buttons of a complex widget)}
-          xywh {95 180 135 25} labelsize 10
+          xywh {85 145 135 25} labelsize 10
           code0 {o->type(0);}
         }
         Fl_Light_Button {} {
           label {Label Color}
           callback labelcolor_cb
           tooltip {Color to draw the label}
-          xywh {230 180 135 25} labelsize 10
+          xywh {220 145 135 25} labelsize 10
           code0 {o->type(0);}
         }
         Fl_Light_Button {} {
           label {Highlight Color}
           callback highlightcolor_cb
           tooltip {Color to use to draw the widget highlighted.  Use color zero (the black top-left chip in the color chooser) to disable highlighting.}
-          xywh {95 205 135 25} labelsize 10
+          xywh {85 170 135 25} labelsize 10
           code0 {o->type(0);}
         }
         Fl_Light_Button {} {
           label {Highlight Label Color}
           callback highlight_label_color_cb
           tooltip {Color to draw the label when the widget is highlighted.  Use color zero (the black top-left chip in the color chooser) to leave the label colors unchanged.}
-          xywh {230 205 135 25} labelsize 10
+          xywh {220 170 135 25} labelsize 10
           code0 {o->type(0);}
         }
         Fl_Box {} {
           label {Colors:}
-          xywh {30 220 63 20} align 24
+          xywh {20 185 63 20} align 24
         }
         Fl_Light_Button {} {
           label {Window Color}
           callback color3_cb
           tooltip {Color to draw a text display or other sunken area.}
-          xywh {95 230 135 25} labelsize 10
+          xywh {85 195 135 25} labelsize 10
           code0 {o->type(0);}
         }
         Fl_Light_Button {} {
           label {Text Color}
           callback textcolor_cb
           tooltip {Color to draw text displayed inside the widget}
-          xywh {230 230 135 25} labelsize 10
+          xywh {220 195 135 25} labelsize 10
           code0 {o->type(0);}
         }
         Fl_Light_Button {} {
           label {Selection Color}
           callback color2_cb
           tooltip {Color to draw behind selected text, or to color in buttons that are turned on.}
-          xywh {95 255 135 25} labelsize 10
+          xywh {85 220 135 25} labelsize 10
           code0 {o->type(0);}
         }
         Fl_Light_Button {} {
           label {Selected Text Color}
           callback selected_textcolor_cb
           tooltip {Color to draw selected text inside the widget}
-          xywh {230 255 135 25} labelsize 10
+          xywh {220 220 135 25} labelsize 10
           code0 {o->type(0);}
         }
         Fl_Box {} {
           label resizable
-          xywh {95 180 270 100} hide deactivate resizable
+          xywh {85 145 270 100} hide deactivate resizable
         }
         Fl_Button {} {
           label {Reset to default}
           callback default_cb
           tooltip {Resets the style to this widget's default values}
-          xywh {95 295 124 25}
+          xywh {85 260 124 25}
         }
       }
       Fl_Group {} {
         label {C++}
         callback propagate_group open
-        xywh {10 35 365 295} hide
+        xywh {0 25 365 295} hide
       } {
         Fl_Input {} {
           label {Class:}
           user_data 4
           callback subclass_cb
           tooltip {This allows you to name a user-defined class that this widget is an instance of, rather than an fltk built-in class. You will need to add a \#include declaration so that the definition of your class is included in the fluid output.}
-          xywh {90 45 170 25} when 1
+          xywh {80 10 170 25} when 1 textfont 4
         }
         Fl_Choice {} {
           callback subtype_cb
           tooltip {Selects a value for type() for this widget}
-          xywh {260 45 105 25}
+          xywh {250 10 105 25}
         } {}
         Fl_Input {} {
           label {Name:}
           callback name_cb
           tooltip {The variable or member name in which to store a pointer to this widget.}
-          xywh {90 70 220 25} when 1
+          xywh {80 35 220 25} when 1 textfont 4
         }
         Fl_Light_Button {} {
           label public
           callback name_public_cb
           tooltip {Make the variable public}
-          xywh {310 70 55 25} when 1 labelsize 10
+          xywh {300 35 55 25} when 1 labelsize 10
         }
         Fl_Input {v_input[0]} {
           label {Extra Code:}
           user_data 0
           callback v_input_cb
           tooltip {Extra code to be exectuted when the widget is created}
-          xywh {90 95 275 25}
+          xywh {80 60 275 25} textfont 4
         }
         Fl_Input {v_input[1]} {
           user_data 1
           callback v_input_cb
           tooltip {Extra code to be exectuted when the widget is created}
-          xywh {90 120 275 25}
+          xywh {80 85 275 25} textfont 4
         }
         Fl_Input {v_input[2]} {
           user_data 2
           callback v_input_cb
           tooltip {Extra code to be exectuted when the widget is created}
-          xywh {90 145 275 25}
+          xywh {80 110 275 25} textfont 4
         }
         Fl_Input {v_input[3]} {
           user_data 3
           callback v_input_cb
           tooltip {Extra code to be exectuted when the widget is created}
-          xywh {90 170 275 25}
+          xywh {80 135 275 25} textfont 4
         }
         Fl_Box callback_label {
           label {Callback:}
-          xywh {20 195 70 20} align 24
+          xywh {10 160 70 20} align 24
         }
         Fl_Input {} {
           callback callback_cb
           tooltip {The name of the callback function, or code body of the callback function}
-          xywh {90 195 275 80} type Multiline
+          xywh {80 160 275 80} type Multiline textfont 4
         }
         Fl_Box {} {
           label resizable
-          xywh {90 200 165 65} hide deactivate resizable
+          xywh {80 165 165 65} hide deactivate resizable
         }
         Fl_Input {} {
           label {User Data:}
           callback user_data_cb
           tooltip {Value passed as the second argument to the callback.  This must be of the type given below.}
-          xywh {90 275 130 25}
+          xywh {80 240 130 25} textfont 4
         }
         Fl_Choice {} {
           label {When:}
           callback when_cb
           tooltip {What actions cause the callback to be called.}
-          xywh {255 275 110 25} when 0 labelsize 10
+          xywh {245 240 110 25} when 0 labelsize 10
           code0 {extern Fl_Menu_Item whenmenu[];}
           code1 {o->menu(whenmenu);}
         } {}
@@ -451,13 +451,13 @@
           label {Type:}
           callback user_data_type_cb
           tooltip {Type of the user data (must \\"long\\" or a pointer type)}
-          xywh {90 300 130 25}
+          xywh {80 265 130 25} textfont 4
         }
         Fl_Light_Button {} {
           label {no change}
           callback when_button_cb
           tooltip {Further modifies When so that the callback is done even if the widget's value has not changed.}
-          xywh {255 300 110 25} when 0 labelsize 10
+          xywh {245 265 110 25} when 0 labelsize 10
         }
       }
     }
@@ -468,7 +468,7 @@
         label {&Overlays}
         callback overlay_cb
         tooltip {Turns overlays (red outlines)  of the selected  widgets on or off}
-        xywh {95 340 90 25}
+        xywh {0 0 90 25}
         code0 {extern int overlays_invisible;}
         code1 {o->value(!overlays_invisible);}
       }
@@ -476,12 +476,12 @@
         label OK
         callback ok_cb
         tooltip {Closes this attribute window}
-        xywh {225 340 65 25} shortcut 0xff0d
+        xywh {130 0 65 25} shortcut 0xff0d
       }
       Fl_Button {} {
         label Cancel
         callback cancel_cb
-        xywh {300 340 70 25}
+        xywh {205 0 70 25}
       }
     }
   }
diff -Nru ./src/Fl_Browser.cxx ../fltk-2-cvs/src/Fl_Browser.cxx
--- ./src/Fl_Browser.cxx	Thu Mar 22 22:18:27 2001
+++ ../fltk-2-cvs/src/Fl_Browser.cxx	Tue Jul 10 20:00:12 2001
@@ -359,8 +359,8 @@
       fl_rectf(X, y+1, W, h-2);
       fl_color(c0 <= FL_LIGHT1 ? c1 : Fl_Color(FL_LIGHT1));
       //fl_color(fl_color_average(c1, c0, 1.9));
-      fl_xyline(X, y, X+W);
-      fl_xyline(X, y+h-1, X+W);
+      fl_line(X, y, X+W, y);
+      fl_line(X, y+h-1, X+W, y+h-1);
     } else {
       fl_color(c0);
       fl_rectf(X, y, W, h);
diff -Nru ./src/Fl_Choice.cxx ../fltk-2-cvs/src/Fl_Choice.cxx
--- ./src/Fl_Choice.cxx	Thu Mar  8 09:39:05 2001
+++ ../fltk-2-cvs/src/Fl_Choice.cxx	Tue Jul 10 20:00:12 2001
@@ -28,7 +28,7 @@
 #include <FL/fl_draw.H>
 
 // Set this to 1 for "classic fltk" rather than Windows style:
-#define MOTIF_STYLE 1
+#define MOTIF_STYLE 0
 
 // The dimensions for the glyph in this and the Fl_Menu_Button are exactly
 // the same, so that glyphs may be shared between them.
diff -Nru ./src/Fl_Item.cxx ../fltk-2-cvs/src/Fl_Item.cxx
--- ./src/Fl_Item.cxx	Thu Mar 22 22:18:27 2001
+++ ../fltk-2-cvs/src/Fl_Item.cxx	Tue Jul 10 20:00:12 2001
@@ -81,7 +81,7 @@
 	int i = 0;
 	while(column_widths()[i])
 	{
-	  char hold;
+	  char hold = 0;
 	  int cw = column_widths()[i];
 	  char *pTemp = pRemainder;
 	  pRemainder = strchr(pTemp, column_char());
diff -Nru ./src/Fl_Menu.cxx ../fltk-2-cvs/src/Fl_Menu.cxx
--- ./src/Fl_Menu.cxx	Tue Jul 10 11:14:38 2001
+++ ../fltk-2-cvs/src/Fl_Menu.cxx	Tue Jul 10 20:00:12 2001
@@ -57,6 +57,9 @@
 // behind the events.  This communication is unfortunately extremely
 // messy.
 
+#define MENU_PAD_LEFT  8
+#define MENU_PAD_RIGHT 8
+
 #define MAX_LEVELS 30
 
 class MenuWindow;
@@ -259,6 +262,10 @@
   }
 
   int dh = box->dh();
+  
+  W+=MENU_PAD_LEFT;
+  W+=MENU_PAD_RIGHT;
+  
   x(X); w(W); h(H + dh);
   if (selected >= 0) Y += Hp/2-selected_y-box->dy(); else Y += Hp;
   y(Y); // if !group: else {y(Y-2); w(1); h(1);}
@@ -310,7 +317,9 @@
 
 void MenuWindow::draw() {
   if (damage() != FL_DAMAGE_CHILD) box()->draw(this,0,0,w(),h(),0);
-  int x=0; int y=0; int w=this->w(); int h=0; box()->inset(x,y,w,h);
+  int x=0;   
+  int y=0; int w=this->w(); int h=0; box()->inset(x,y,w,h);
+  
   int selected = level <= menustate->level ? menustate->indexes[level] : -1;
   int leading = menustate->widget->leading(); // +2 ?
   for (int i = 0; ; i++) {
@@ -339,9 +348,10 @@
 	}
       }
       if (!widget->active_r()) flags |= FL_INACTIVE;
-      fl_x_ = x;
+      fl_x_ = x+MENU_PAD_LEFT;
       fl_y_ = y+leading/2;
-      int save_w = widget->w(); widget->w(w);
+      int save_w = widget->w(); widget->w(w-MENU_PAD_LEFT-MENU_PAD_RIGHT);
+
       widget->draw();
       widget->w(save_w);
       Fl::pushed_ = 0;
@@ -350,12 +360,13 @@
       if (is_parent(i)) {
 	// Use the item's fontsize for the size of the arrow, rather than h:
         int nh = fl_height(widget->label_font(), widget->label_size());
-        draw_glyph(FL_GLYPH_RIGHT, x+w-nh, y+(ih-nh)/2, nh, nh, flags);
+        int nh2 = nh/2;
+        draw_glyph(FL_GLYPH_RIGHT, x+w-nh+(nh2/2), y+(ih-nh2)/2, nh2, nh2, flags);
       } else if (widget->shortcut()) {
         Fl_Color c = widget->get_label_color(flags);
         //fl_font(widget->text_font(), widget->text_size());
 	widget->label_type()->draw(Fl::key_name(widget->shortcut()),
-				   x, y, w-3, ih, c, flags | FL_ALIGN_RIGHT);
+				   x+MENU_PAD_LEFT, y, w-3-MENU_PAD_RIGHT-MENU_PAD_LEFT, ih, c, flags | FL_ALIGN_RIGHT);
       }
     }
     y += ih;
diff -Nru ./src/Fl_Slider.cxx ../fltk-2-cvs/src/Fl_Slider.cxx
--- ./src/Fl_Slider.cxx	Wed Feb 21 08:15:44 2001
+++ ../fltk-2-cvs/src/Fl_Slider.cxx	Tue Jul 10 20:00:12 2001
@@ -38,12 +38,6 @@
   } else if (type() == FL_HOR_NICE_SLIDER) {
     FL_THIN_DOWN_BOX->draw(x, y+h/2-2, w, 4, fl_inactive(FL_BLACK, f), f);
   }
-  if (focused()) {
-    fl_color(FL_BLACK);
-    fl_line_style(FL_DOT);
-    fl_rect(x+1,y+1,w-2,h-2);
-    fl_line_style(0);
-  }
 }
 
 // Return how big the slider should be if area is of size WxH:
@@ -95,12 +89,12 @@
   }
 
   if (X > 0) {
-    if (horizontal()) draw_bg(x, y, X, h, f);
-    else draw_bg(x, y, w, X, f);
+    if (horizontal()) draw_bg(x, y, X+1, h, f);
+    else draw_bg(x, y, w, X+1, f);
   }
   if (X+S < W) {
-    if (horizontal()) draw_bg(x+X+S, y, w-X-S, h, f);
-    else draw_bg(x, y+X+S, w, h-X-S, f);
+    if (horizontal()) draw_bg(x+X+S-1, y, w-X-S+1, h, f);
+    else draw_bg(x, y+X+S-1, w, h-X-S+1, f);
   }
 
   // Sigh. Special case for "nice" sliders
@@ -109,14 +103,38 @@
     if (type() == FL_HOR_NICE_SLIDER) g = FL_GLYPH_HNSLIDER;
     else if (type() == FL_HOR_FILL_SLIDER) g = 0;
     else g = FL_GLYPH_HSLIDER;
+    
+    if (!focused()) {
+    
     draw_glyph(g, x+X, y, S, h, f);
+    
+    } else {
+      draw_glyph(g, x+X+1, y+1, S-2, h-2, f);
+      fl_color(fl_contrast(FL_BLACK, color()));
+      fl_line_style(FL_SOLID);
+      fl_rect(x+X,y,S,h);
+      fl_line_style(0);
+    }
+    
     draw_inside_label(x+X, y, S, h, f);
   } else {
     int g;
     if (type() == FL_VERT_NICE_SLIDER) g = FL_GLYPH_VNSLIDER;
     else if (type() == FL_VERT_FILL_SLIDER) g = 0;
     else g = FL_GLYPH_VSLIDER;
+
+    if (!focused()) {
+    
     draw_glyph(g, x, y+X, w, S, f);
+
+    } else {
+      draw_glyph(g, x+1, y+X+1, w-2, S-2, f);
+      fl_color(fl_contrast(FL_BLACK, color()));
+      fl_line_style(FL_SOLID);
+      fl_rect(x,y+X,w,S);
+      fl_line_style(0);
+    }
+    
     draw_inside_label(x, y+X, w, S, f);
   }
 }
diff -Nru ./src/Fl_Tabs.cxx ../fltk-2-cvs/src/Fl_Tabs.cxx
--- ./src/Fl_Tabs.cxx	Tue Feb 20 08:59:50 2001
+++ ../fltk-2-cvs/src/Fl_Tabs.cxx	Tue Jul 10 20:00:12 2001
@@ -37,6 +37,8 @@
 #define TABSLOPE 5
 #define EXTRASPACE 5
 
+extern void __focus_rectangle(int x, int y, int w, int h, Fl_Color c);
+
 // return the left edges of each tab (plus a fake left edge for a tab
 // past the right-hand one).  These position are actually of the left
 // edge of the slope.  They are either seperated by the correct distance
@@ -366,12 +368,13 @@
   }
   if (W > TABSLOPE+EXTRASPACE/2) {
     if (sel && focused()) {
-      fl_color(FL_BLACK);
-      fl_line_style(FL_DOT);
-      fl_rect(x2-W+TABSLOPE,
-	      (H<0?h()+H-3:0)+1, W-TABSLOPE,
-	      (H<0?-H:H)+1);
-      fl_line_style(0);
+      
+      __focus_rectangle(x2-W+TABSLOPE,
+                        (H<0?h()+H-3:0)+2,
+                        W-TABSLOPE+1,
+                        (H<0?-H:H)-1,
+                        color());
+                         
     }
     o->draw_label((what==LEFT ? x1 : x2-W)+(TABSLOPE+EXTRASPACE/2),
 		  (H<0?h()+H-2:0), W-(TABSLOPE+EXTRASPACE/2),
diff -Nru ./src/fl_boxtype.cxx ../fltk-2-cvs/src/fl_boxtype.cxx
--- ./src/fl_boxtype.cxx	Tue Feb 20 08:59:50 2001
+++ ../fltk-2-cvs/src/fl_boxtype.cxx	Tue Jul 10 20:31:37 2001
@@ -35,20 +35,33 @@
 
 ////////////////////////////////////////////////////////////////
 
-static void focus_rectangle(int x, int y, int w, int h, Fl_Color c) {
+#define focus_rectangle __focus_rectangle
+
+void __focus_rectangle(int x, int y, int w, int h, Fl_Color c) {
   if (h > 4 && w > 4) {
+    int t;
     fl_color(fl_contrast(FL_BLACK, c));
-    fl_line_style(FL_DOT);
-    fl_rect(x+1,y+1,w-2,h-2);
-    fl_line_style(0);
+    for(t=0; t<(w-2); t+=2) {
+      fl_point(x+t+1,y+1);
+    }
+    for(t=!(h&1); t<(w-2); t+=2) {
+      fl_point(x+t+1,y+h-2);
+    }
+    for(t=0; t<(h-2); t+=2) {
+      fl_point(x+1,y+t+1);
+    }
+    for(t=!(w&1); t<(h-2); t+=2) {
+      fl_point(x+w-2,y+t+1);
+    }      
   }
 }
 
 void Fl_No_Box::draw(const Fl_Widget*,
 		     int x, int y, int w, int h, Fl_Flags f) const {
   if (!(f & FL_FRAME_ONLY) && (f & FL_FOCUSED))
-    focus_rectangle(x,y,w,h,FL_GRAY);
+    focus_rectangle(x,y,w,h,FL_GRAY);    
 }
+
 Fl_No_Box::Fl_No_Box(const char* name) : Fl_Boxtype_(name) {
   dx_ = dy_ = dw_ = dh_ = 0;
   fills_rectangle_ = 0;
@@ -74,7 +87,7 @@
 ////////////////////////////////////////////////////////////////
 
 FL_API void fl_to_inactive(const char* s, char* to) {
-  if (*s == '2') *to++ = *s++;
+  if ((*s == '2')||(*s == '1')) *to++ = *s++;
   while (*s) *to++ = 'M'+(*s++ - 'A')/3;
   *to = 0;
 }
@@ -89,8 +102,9 @@
   char buf[26]; if (f&FL_INACTIVE && Fl_Style::draw_boxes_inactive) {
     fl_to_inactive(s, buf); s = buf;}
   if (h > 0 && w > 0) {
-    if (*s == '2') {s++; goto HACK;}
     for (;;) {
+      if (!*s) break;        
+      if ((*s=='2')||(*s=='1')) {s++; goto HACK2;}          
       // draw top line:
       fl_color(*s++ + (FL_GRAY_RAMP-'A'));
       fl_line(x, y, x+w-1, y);
@@ -99,8 +113,10 @@
       fl_color(*s++ + (FL_GRAY_RAMP-'A'));
       fl_line(x, y+h-1, x, y);
       x++; if (--w <= 0) break;
-      if (!*s) break;
-    HACK:
+      
+    HACK2:
+      if (!*s) break;    
+      if ((*s=='2')||(*s=='1')) {s++; continue;}
       // draw bottom line:
       fl_color(*s++ + (FL_GRAY_RAMP-'A'));
       fl_line(x, y+h-1, x+w-1, y+h-1);
@@ -109,7 +125,6 @@
       fl_color(*s++ + (FL_GRAY_RAMP-'A'));
       fl_line(x+w-1, y+h-1, x+w-1, y);
       if (--w <= 0) break;
-      if (!*s) break;
     }
   }
   if (!(f & FL_FRAME_ONLY)) {
@@ -127,18 +142,33 @@
 #ifdef _MSC_VER
 #pragma warning(disable: 4355) // quiet warning about using this as base class init
 #endif
+
 Fl_Frame_Box::Fl_Frame_Box(const char* n, const char* s, const Fl_Frame_Box* d)
   : Fl_Boxtype_(n), data_(s), down(d ? d : this)
 {
+
+#define INC_S if (!(*(++s))) break;
+
   fills_rectangle_ = 1;
-  int i = strlen(s)/2;
-  dw_ = dh_ = i;
-  i /= 2;
-  dx_ = dy_ = i;
+  dx_ = dy_ = dw_ = dh_ = 0;
+  while(1) {
+  
+    INC_S
+    if ((*s!='1')&&(*s!='2'))
+      {dx_++;dw_++;INC_S dy_++;dh_++;}
+      
+    INC_S
+    if ((*s!='1')&&(*s!='2'))
+      {dw_++;INC_S dh_++;}    
+  }
+  
+#undef INC_S
 }
 
-const Fl_Frame_Box fl_down_box("down", "2WWMMPPAA", &fl_up_box);
-const Fl_Frame_Box fl_up_box("up", "2AAWWMMTT", &fl_down_box);
+//const Fl_Frame_Box fl_down_box("down", "2WWMMPPAA", &fl_up_box);
+//const Fl_Frame_Box fl_down_box("down", "2WWAARRJJ", &fl_up_box);
+//const Fl_Frame_Box fl_up_box("up", "2AAWWMMTT", &fl_down_box);
+//const Fl_Frame_Box fl_up_box("up", "2AAWWJJRR", &fl_down_box);
 
 const Fl_Frame_Box fl_thin_down_box("thin down", "2WWHH", &fl_thin_up_box);
 const Fl_Frame_Box fl_thin_up_box("thin up", "2HHWW", &fl_thin_down_box);
@@ -196,6 +226,196 @@
 }
 
 const Fl_Boxtype_* Fl_Boxtype_::first = 0;
+
+static int hexnt2dec(char hex)
+{
+    if ((hex>='0')&&(hex<='9')) return hex-'0';
+    if ((hex>='A')&&(hex<='Z')) return hex-'A'+10;
+    if ((hex>='a')&&(hex<='z')) return hex-'a'+10+26;    
+    if (hex=='.') return -1;
+    return 0;
+}
+/*
+class FL_API Fl_Mappy_Box : public Fl_Boxtype_ {
+protected:
+  const char* data_;
+  int data_sz_x,data_sz_y;
+  int data_sl_x,data_sl_y;
+  char at(int x,int y);
+public:
+  const char* data() const {return data_;}
+  void draw(int,int,int,int, Fl_Color, Fl_Flags=0) const;
+  void draw(const Fl_Widget*, int,int,int,int, Fl_Flags=0) const;
+  Fl_Mappy_Box(const char* n, const char* c, const Fl_Frame_Box* d=0);
+};
+*/
+
+Fl_Mappy_Box::Fl_Mappy_Box(const char* n, const char* c, const Fl_Frame_Box* d=0)
+  : Fl_Frame_Box(n,"AAAA",d), data2_(c)
+{
+  dx_ = dy_ = dw_ = dh_ = 0;
+  fills_rectangle_ = 0;
+  data_sz_x = hexnt2dec(c[0]);
+  data_sz_y = hexnt2dec(c[1]);  
+  data_sl_x = hexnt2dec(c[2]);
+  data_sl_y = hexnt2dec(c[3]);  
+  dx_ = data_sl_x;
+  dy_ = data_sl_y;  
+  dw_ = data_sz_x - 1;
+  dh_ = data_sz_y - 1;  
+}
+
+int high_contrast_flag=0;
+static int hicontrast(int p)
+{
+    float z='W'-'A';
+    int t;    
+    p-='A';
+    for(t=0;t<high_contrast_flag;t++)
+    {
+        p=(int)(sin(p*3.14159265358*0.5/z)*z);
+    }
+    p+='A';
+    return p;
+}
+char Fl_Mappy_Box::at(int x,int y) const
+{
+  int p=(data2_+4)[data_sz_x*y+x];
+  if (high_contrast_flag) p=hicontrast(p);
+  return p;
+}
+
+void Fl_Mappy_Box::draw(int x, int y, int w, int h, Fl_Color c, Fl_Flags f=0) const
+{
+    int xx,yy;
+    if (f & FL_VALUE)
+    {
+        down->draw(x,y,w,h,c,f&(~FL_VALUE));
+        return;
+    }
+    
+    for(yy=0;yy<data_sl_y;yy++)    
+     for(xx=0;xx<data_sl_x;xx++)
+      if (at(xx,yy)!='.')
+       {fl_color(at(xx,yy) + (FL_GRAY_RAMP-'A'));fl_point(x+xx,y+yy);}
+      
+    for(yy=0;yy<data_sl_y;yy++)    
+     for(xx=data_sl_x+1;xx<data_sz_x;xx++)
+      if (at(xx,yy)!='.')
+       {fl_color(at(xx,yy) + (FL_GRAY_RAMP-'A'));
+        fl_point(x+w-data_sz_x+xx,y+yy);}
+
+    for(yy=data_sl_y+1;yy<data_sz_y;yy++)    
+     for(xx=0;xx<data_sl_x;xx++)
+      if (at(xx,yy)!='.')
+       {fl_color(at(xx,yy) + (FL_GRAY_RAMP-'A'));
+        fl_point(x+xx,y+h-data_sz_y+yy);}
+
+    for(yy=data_sl_y+1;yy<data_sz_y;yy++)    
+     for(xx=data_sl_x+1;xx<data_sz_x;xx++)
+      if (at(xx,yy)!='.')
+       {fl_color(at(xx,yy) + (FL_GRAY_RAMP-'A'));
+        fl_point(x+w-data_sz_x+xx,y+h-data_sz_y+yy);}
+
+
+
+    for(xx=0;xx<data_sl_x;xx++) {
+      fl_color(at(xx,data_sl_y) + (FL_GRAY_RAMP-'A'));
+      fl_line(x+xx,y+data_sl_y,
+              x+xx,y+h-dh_+2);
+    }
+
+    for(yy=0;yy<data_sl_y;yy++) {
+      fl_color(at(data_sl_x,yy) + (FL_GRAY_RAMP-'A'));
+      fl_line(x+data_sl_x,y+yy,
+              x+w-dw_+2,y+yy);
+    }
+    
+    for(xx=data_sl_x+1;xx<data_sz_x;xx++) {
+      fl_color(at(xx,data_sl_y) + (FL_GRAY_RAMP-'A'));
+      fl_line(x+w-data_sz_x+xx,y+data_sl_y,
+              x+w-data_sz_x+xx,y+h-dh_+2);
+    }
+
+    for(yy=data_sl_y+1;yy<data_sz_y;yy++) {
+      fl_color(at(data_sl_x,yy) + (FL_GRAY_RAMP-'A'));
+      fl_line(x+data_sl_x,y+h-data_sz_y+yy,
+              x+w-dw_+2,y+h-data_sz_y+yy);
+    }
+
+    
+    fl_color(at(data_sl_x,data_sl_y) + (FL_GRAY_RAMP-'A'));
+    fl_rectf(x+dx_,y+dy_,w-dw_,h-dh_);
+    if (f&FL_FOCUSED)
+    {
+        __focus_rectangle(x+dx_,y+dy_,w-dw_,h-dh_,at(data_sl_x,data_sl_y) + (FL_GRAY_RAMP-'A'));
+    }
+    
+}
+
+void Fl_Mappy_Box::draw(const Fl_Widget* widget, int x,int y,int w,int h, Fl_Flags f=0) const
+{
+    draw(x,y,w,h, widget->get_box_color(f), f);
+}
+
+const Fl_Mappy_Box fl_down_box("down", 
+"7733"
+
+"SAA" "A" "ASS"
+"AAJ" "J" "JJS"
+"AJS" "S" "SWJ"
+
+"AJS" "S" "SWS"
+
+"AJS" "S" "SWS"
+"SJW" "W" "WWS"
+"SSJ" "S" "SSS"
+
+,
+
+ &fl_up_box);
+
+const Fl_Mappy_Box __btn_down("__btn_down", 
+"7733"
+
+"SAA" "A" "ASS"
+"AAJ" "J" "JJS"
+"AJK" "K" "KWJ"
+
+"AJK" "K" "KWS"
+
+"AJK" "K" "KWS"
+"SJW" "W" "WWS"
+"SSJ" "S" "SSS"
+
+,
+
+ &fl_up_box);
+
+
+
+
+const Fl_Mappy_Box fl_up_box("up", 
+"7733"
+
+"SSS" "S" "JSS"
+"SWW" "W" "WJS"
+"SWS" "S" "SJA"
+
+"SWS" "S" "SJA"
+
+"JWS" "S" "SJA"
+"SJJ" "J" "JAA"
+"SSA" "A" "AAS"
+
+,
+
+ &__btn_down);
+
+
+
+
+
 
 //
 // End of "$Id: fl_boxtype.cxx,v 1.45 2001/02/20 06:59:50 spitzak Exp $".
