Bug fixes and UI tweaking...

src/Fl_Menu_.cxx:
    - Fl_Menu_::find_item(): wasn't checking for a non-NULL label()...

fluid/alignment_panel.*:
fluid/widget_panel.*:
    - Use small controls, normalize layout.
    - Add FLTK header/footer comments.

fluid/Fluid_Image.cxx:
    - Use relative paths for images.


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

7 files changed, 630 insertions, 274 deletions

diff --git a/fluid/Fluid_Image.cxx b/fluid/Fluid_Image.cxx
index 19574e42e..e29600836 100644
--- a/fluid/Fluid_Image.cxx
+++ b/fluid/Fluid_Image.cxx
@@ -212,7 +212,7 @@ Fluid_Image::~Fluid_Image() {
 const char *ui_find_image_name;
 Fluid_Image *ui_find_image(const char *oldname) {
   goto_source_dir();
-  const char *name = fl_file_chooser("Image?","Image Files (*.{bm,bmp,gif,jpg,pbm,pgm,png,ppm,xbm,xpm})",oldname);
+  const char *name = fl_file_chooser("Image?","Image Files (*.{bm,bmp,gif,jpg,pbm,pgm,png,ppm,xbm,xpm})",oldname,1);
   ui_find_image_name = name;
   Fluid_Image *ret = (name && *name) ? Fluid_Image::find(name) : 0;
   leave_source_dir();
diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index fdca44967..deb481c51 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -1,3 +1,30 @@
+//
+// "$Id$"
+//
+// Setting and shell dialogs for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2005 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
 // generated by Fast Light User Interface Designer (fluid) version 1.0107
 
 #include "alignment_panel.h"
@@ -33,40 +60,43 @@ Fl_Input *i18n_function_input=(Fl_Input *)0;
 
 Fl_Double_Window* make_project_window() {
   Fl_Double_Window* w;
-  { Fl_Double_Window* o = project_window = new Fl_Double_Window(365, 210, "Project Settings");
+  { Fl_Double_Window* o = project_window = new Fl_Double_Window(345, 185, "Project Settings");
     w = o;
-    { Fl_Button* o = new Fl_Button(295, 175, 60, 25, "Close");
+    { Fl_Button* o = new Fl_Button(293, 156, 42, 20, "Close");
       o->tooltip("Close this dialog.");
+      o->labelsize(11);
       o->callback((Fl_Callback*)cb_Close);
     }
-    { Fl_Tabs* o = new Fl_Tabs(10, 10, 345, 154);
+    { Fl_Tabs* o = new Fl_Tabs(10, 10, 325, 138);
+      o->selection_color(FL_INACTIVE_COLOR);
       o->labelsize(11);
-      { Fl_Group* o = new Fl_Group(10, 30, 345, 134, "Output");
+      { Fl_Group* o = new Fl_Group(10, 30, 325, 116, "Output");
         o->labelsize(11);
-        o->hide();
-        { Fl_Box* o = new Fl_Box(23, 40, 319, 15, "Use \"name.ext\" to set name or just \".ext\" to set only extension.");
+        { Fl_Box* o = new Fl_Box(20, 40, 304, 15, "Use \"name.ext\" to set name or just \".ext\" to set extension.");
           o->labelsize(11);
           o->align(132|FL_ALIGN_INSIDE);
         }
-        { Fl_Input* o = header_file_input = new Fl_Input(97, 60, 245, 20, "Header File:");
+        { Fl_Input* o = header_file_input = new Fl_Input(96, 60, 228, 20, "Header File:");
           o->tooltip("The name of the generated header file.");
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textfont(4);
           o->textsize(11);
           o->callback((Fl_Callback*)header_input_cb, (void*)(1));
           o->when(FL_WHEN_CHANGED);
         }
-        { Fl_Input* o = code_file_input = new Fl_Input(98, 85, 244, 20, "Code File:");
+        { Fl_Input* o = code_file_input = new Fl_Input(97, 85, 227, 20, "Code File:");
           o->tooltip("The name of the generated code file.");
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textfont(4);
           o->textsize(11);
           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(177, 110, 165, 20, "Include Header from Code");
+        { Fl_Light_Button* o = include_H_from_C_button = new Fl_Light_Button(166, 110, 158, 20, "Include Header from Code");
           o->tooltip("Include the header file from the code file.");
           o->value(1);
           o->labelsize(11);
@@ -74,45 +104,51 @@ Fl_Double_Window* make_project_window() {
         }
         o->end();
       }
-      { Fl_Group* o = new Fl_Group(10, 30, 345, 134, "Internationalization");
+      { Fl_Group* o = new Fl_Group(10, 30, 325, 116, "Internationalization");
         o->labelsize(11);
-        { Fl_Choice* o = i18n_type_chooser = new Fl_Choice(100, 42, 100, 20, "Use:");
+        o->hide();
+        { Fl_Choice* o = i18n_type_chooser = new Fl_Choice(80, 42, 100, 20, "Use:");
           o->tooltip("Type of internationalization to use.");
           o->box(FL_THIN_UP_BOX);
           o->down_box(FL_BORDER_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textsize(11);
           o->callback((Fl_Callback*)i18n_type_cb);
           o->menu(menu_i18n_type_chooser);
         }
-        { Fl_Input* o = i18n_include_input = new Fl_Input(100, 67, 245, 20, "#include:");
+        { Fl_Input* o = i18n_include_input = new Fl_Input(80, 67, 245, 20, "#include:");
           o->tooltip("The include file for internationalization.");
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textfont(4);
           o->textsize(11);
           o->callback((Fl_Callback*)i18n_text_cb);
         }
-        { Fl_Input* o = i18n_file_input = new Fl_Input(100, 92, 245, 20, "File:");
+        { Fl_Input* o = i18n_file_input = new Fl_Input(80, 92, 245, 20, "File:");
           o->tooltip("The name of the message catalog.");
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textfont(4);
           o->textsize(11);
           o->callback((Fl_Callback*)i18n_text_cb);
         }
-        { Fl_Input* o = i18n_set_input = new Fl_Input(100, 117, 245, 20, "Set:");
+        { Fl_Input* o = i18n_set_input = new Fl_Input(80, 117, 245, 20, "Set:");
           o->tooltip("The message set number.");
           o->type(2);
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textfont(4);
           o->textsize(11);
           o->callback((Fl_Callback*)i18n_text_cb);
         }
-        { Fl_Input* o = i18n_function_input = new Fl_Input(100, 92, 245, 20, "Function:");
+        { Fl_Input* o = i18n_function_input = new Fl_Input(80, 92, 245, 20, "Function:");
           o->tooltip("The function to call to internationalize the labels and tooltips.");
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textfont(4);
           o->textsize(11);
@@ -162,39 +198,48 @@ static void cb_prevpos_button(Fl_Check_Button*, void*) {
 
 Fl_Double_Window* make_settings_window() {
   Fl_Double_Window* w;
-  { Fl_Double_Window* o = settings_window = new Fl_Double_Window(255, 210, "GUI Settings");
+  { Fl_Double_Window* o = settings_window = new Fl_Double_Window(215, 185, "GUI Settings");
     w = o;
-    { Fl_Button* o = new Fl_Button(185, 179, 60, 25, "Close");
+    o->labelsize(11);
+    { Fl_Button* o = new Fl_Button(163, 155, 42, 20, "Close");
       o->tooltip("Close this dialog.");
+      o->labelsize(11);
       o->callback((Fl_Callback*)cb_Close1);
     }
-    { Fl_Tabs* o = new Fl_Tabs(10, 10, 235, 158);
-      { Fl_Group* o = new Fl_Group(10, 35, 235, 133, "GUI:");
+    { Fl_Tabs* o = new Fl_Tabs(10, 10, 195, 135);
+      o->selection_color(FL_INACTIVE_COLOR);
+      o->labelsize(11);
+      { Fl_Group* o = new Fl_Group(10, 30, 195, 115, "GUI:");
+        o->labelsize(11);
         o->align(FL_ALIGN_TOP_LEFT);
-        { Fl_Check_Button* o = tooltips_button = new Fl_Check_Button(20, 45, 215, 20, "Show Tooltips");
+        { Fl_Check_Button* o = tooltips_button = new Fl_Check_Button(20, 40, 97, 20, "Show Tooltips");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_tooltips_button);
           int b;
           fluid_prefs.get("show_tooltips", b, 1);
           tooltips_button->value(b);
           Fl_Tooltip::enable(b);
         }
-        { Fl_Check_Button* o = completion_button = new Fl_Check_Button(20, 75, 215, 20, "Show Completion Dialogs");
+        { Fl_Check_Button* o = completion_button = new Fl_Check_Button(20, 65, 152, 20, "Show Completion Dialogs");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_completion_button);
           int b;
           fluid_prefs.get("show_completion_dialogs", b, 1);
           completion_button->value(b);
         }
-        { Fl_Check_Button* o = openlast_button = new Fl_Check_Button(20, 105, 215, 20, "Open Previous File on Startup");
+        { Fl_Check_Button* o = openlast_button = new Fl_Check_Button(20, 90, 175, 20, "Open Previous File on Startup");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_openlast_button);
           int b;
           fluid_prefs.get("open_previous_file", b, 0);
           openlast_button->value(b);
         }
-        { Fl_Check_Button* o = prevpos_button = new Fl_Check_Button(20, 135, 215, 20, "Remember Window Positions");
+        { Fl_Check_Button* o = prevpos_button = new Fl_Check_Button(20, 115, 175, 20, "Remember Window Positions");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_prevpos_button);
           int b;
           fluid_prefs.get("prev_window_pos", b, 1);
@@ -251,33 +296,42 @@ Fl_Text_Display *shell_run_display=(Fl_Text_Display *)0;
 
 Fl_Double_Window* make_shell_window() {
   Fl_Double_Window* w;
-  { Fl_Double_Window* o = shell_window = new Fl_Double_Window(450, 145, "Shell Command");
+  { Fl_Double_Window* o = shell_window = new Fl_Double_Window(335, 135, "Shell Command");
     w = o;
-    { Fl_Tabs* o = new Fl_Tabs(10, 10, 430, 90);
-      { Fl_Group* o = new Fl_Group(10, 30, 430, 70, "Shell Command");
+    o->labelsize(11);
+    { Fl_Tabs* o = new Fl_Tabs(10, 10, 314, 85);
+      o->selection_color(FL_INACTIVE_COLOR);
+      o->labelsize(11);
+      { Fl_Group* o = new Fl_Group(10, 30, 314, 65, "Shell Command");
+        o->labelsize(11);
         o->align(FL_ALIGN_TOP_LEFT);
-        { Fl_Input* o = shell_command_input = new Fl_Input(20, 40, 410, 20);
+        { Fl_Input* o = shell_command_input = new Fl_Input(20, 40, 294, 21);
+          o->labelsize(11);
+          o->textsize(11);
           o->callback((Fl_Callback*)cb_shell_command_input);
           char buf[1024];
           fluid_prefs.get("shell_command", buf, "", sizeof(buf));
           shell_command_input->value(buf);
         }
-        { Fl_Check_Button* o = shell_savefl_button = new Fl_Check_Button(20, 65, 110, 20, "Save .FL File");
+        { Fl_Check_Button* o = shell_savefl_button = new Fl_Check_Button(20, 66, 93, 19, "Save .FL File");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_shell_savefl_button);
           int b;
           fluid_prefs.get("shell_savefl", b, 1);
           shell_savefl_button->value(b);
         }
-        { Fl_Check_Button* o = shell_writecode_button = new Fl_Check_Button(140, 65, 95, 20, "Write Code");
+        { Fl_Check_Button* o = shell_writecode_button = new Fl_Check_Button(118, 66, 83, 19, "Write Code");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_shell_writecode_button);
           int b;
           fluid_prefs.get("shell_writecode", b, 1);
           shell_writecode_button->value(b);
         }
-        { Fl_Check_Button* o = shell_writemsgs_button = new Fl_Check_Button(245, 65, 130, 20, "Write Messages");
+        { Fl_Check_Button* o = shell_writemsgs_button = new Fl_Check_Button(206, 66, 108, 19, "Write Messages");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_shell_writemsgs_button);
           int b;
           fluid_prefs.get("shell_writemsgs", b, 0);
@@ -287,22 +341,27 @@ Fl_Double_Window* make_shell_window() {
       }
       o->end();
     }
-    { Fl_Button* o = new Fl_Button(375, 110, 65, 25, "Cancel");
+    { Fl_Button* o = new Fl_Button(276, 105, 48, 20, "Cancel");
+      o->labelsize(11);
       o->callback((Fl_Callback*)cb_Cancel);
     }
-    { Fl_Return_Button* o = new Fl_Return_Button(225, 110, 140, 25, "Run Command");
+    { Fl_Return_Button* o = new Fl_Return_Button(162, 105, 109, 20, "Run Command");
+      o->labelsize(11);
       o->callback((Fl_Callback*)do_shell_command);
     }
     o->end();
   }
-  { Fl_Double_Window* o = shell_run_window = new Fl_Double_Window(555, 435, "Shell Command Output");
+  { Fl_Double_Window* o = shell_run_window = new Fl_Double_Window(555, 430, "Shell Command Output");
     w = o;
-    { Fl_Return_Button* o = shell_run_button = new Fl_Return_Button(465, 400, 80, 25, "Close");
+    o->labelsize(11);
+    { Fl_Return_Button* o = shell_run_button = new Fl_Return_Button(486, 400, 59, 20, "Close");
+      o->labelsize(11);
       o->callback((Fl_Callback*)cb_shell_run_button);
     }
     { Fl_Text_Display* o = shell_run_display = new Fl_Text_Display(10, 10, 530, 380);
+      o->labelsize(11);
       o->textfont(4);
-      o->textsize(12);
+      o->textsize(11);
       Fl_Group::current()->resizable(o);
       shell_run_buffer = new Fl_Text_Buffer();
       shell_run_display->buffer(shell_run_buffer);
@@ -328,47 +387,66 @@ static void cb_Close2(Fl_Button*, void*) {
 
 Fl_Double_Window* make_grid_window() {
   Fl_Double_Window* w;
-  { Fl_Double_Window* o = grid_window = new Fl_Double_Window(155, 205, "Grid");
+  { Fl_Double_Window* o = grid_window = new Fl_Double_Window(145, 180, "Grid");
     w = o;
-    { Fl_Tabs* o = new Fl_Tabs(10, 10, 135, 150);
+    o->labelsize(11);
+    { Fl_Tabs* o = new Fl_Tabs(10, 10, 124, 131);
+      o->selection_color(FL_INACTIVE_COLOR);
+      o->labelsize(11);
       o->align(FL_ALIGN_TOP_LEFT);
-      { Fl_Group* o = new Fl_Group(10, 30, 135, 130, "Grid");
+      { Fl_Group* o = new Fl_Group(10, 30, 124, 111, "Grid");
+        o->labelsize(11);
         o->align(FL_ALIGN_TOP_LEFT);
-        { Fl_Input* o = horizontal_input = new Fl_Input(95, 40, 40, 20, "Horizontal:");
+        { Fl_Input* o = horizontal_input = new Fl_Input(84, 40, 40, 20, "Horizontal:");
           o->tooltip("Horizontal grid spacing.");
           o->type(2);
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
+          o->labelsize(11);
+          o->textsize(11);
           o->callback((Fl_Callback*)grid_cb, (void*)(1));
           o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
         }
-        { Fl_Input* o = vertical_input = new Fl_Input(95, 70, 40, 20, "Vertical:");
+        { Fl_Input* o = vertical_input = new Fl_Input(84, 65, 40, 20, "Vertical:");
           o->tooltip("Vertical grid spacing.");
           o->type(2);
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
+          o->labelsize(11);
+          o->textsize(11);
           o->callback((Fl_Callback*)grid_cb, (void*)(2));
           o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
         }
-        { Fl_Input* o = snap_input = new Fl_Input(95, 100, 40, 20, "Snap:");
+        { Fl_Input* o = snap_input = new Fl_Input(84, 90, 40, 20, "Snap:");
           o->tooltip("Snap to grid within this many pixels.");
           o->type(2);
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
+          o->labelsize(11);
+          o->textsize(11);
           o->callback((Fl_Callback*)grid_cb, (void*)(3));
           o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
         }
-        { Fl_Check_Button* o = guides_toggle = new Fl_Check_Button(30, 125, 105, 25, "Show Guides");
+        { Fl_Check_Button* o = guides_toggle = new Fl_Check_Button(30, 115, 94, 16, "Show Guides");
           o->tooltip("Show distance and alignment guides in overlay");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)guides_cb, (void*)(4));
         }
         o->end();
       }
       o->end();
     }
-    { Fl_Button* o = new Fl_Button(85, 170, 60, 25, "Close");
+    { Fl_Button* o = new Fl_Button(92, 151, 42, 20, "Close");
       o->tooltip("Close this dialog.");
+      o->labelsize(11);
       o->callback((Fl_Callback*)cb_Close2);
     }
     o->end();
   }
   return w;
 }
+
+//
+// End of "$Id$".
+//
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index c7a8cc574..17cccccb8 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -2,6 +2,35 @@
 version 1.0107 
 header_name {.h} 
 code_name {.cxx}
+comment {//
+// "$Id$"
+//
+// Setting and shell dialogs for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2005 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+} {in_source in_header
+} 
+
 decl {\#include <FL/Fl_Text_Buffer.H>} {public
 } 
 
@@ -12,52 +41,52 @@ Function {make_project_window()} {open
 } {
   Fl_Window project_window {
     label {Project Settings} open
-    xywh {312 395 365 210} type Double
+    xywh {312 395 345 185} type Double hide
     code0 {\#include <FL/Fl_Preferences.H>}
-    code1 {\#include <FL/Fl_Tooltip.H>} modal visible
+    code1 {\#include <FL/Fl_Tooltip.H>} modal
   } {
     Fl_Button {} {
       label Close
       callback {project_window->hide();}
-      tooltip {Close this dialog.} xywh {295 175 60 25}
+      tooltip {Close this dialog.} xywh {293 156 42 20} labelsize 11
     }
-    Fl_Tabs {} {open selected
-      xywh {10 10 345 154} labelsize 11
+    Fl_Tabs {} {open
+      xywh {10 10 325 138} selection_color 8 labelsize 11
     } {
       Fl_Group {} {
         label Output open
-        xywh {10 30 345 134} labelsize 11 hide
+        xywh {10 30 325 116} labelsize 11
       } {
         Fl_Box {} {
-          label {Use "name.ext" to set name or just ".ext" to set only extension.}
-          xywh {23 40 319 15} labelsize 11 align 148
+          label {Use "name.ext" to set name or just ".ext" to set extension.}
+          xywh {20 40 304 15} labelsize 11 align 148
         }
         Fl_Input header_file_input {
           label {Header File:}
           user_data 1 user_data_type {void*}
           callback header_input_cb
-          tooltip {The name of the generated header file.} xywh {97 60 245 20} box THIN_DOWN_BOX labelsize 11 when 1 textfont 4 textsize 11
+          tooltip {The name of the generated header file.} xywh {96 60 228 20} box THIN_DOWN_BOX labelfont 1 labelsize 11 when 1 textfont 4 textsize 11
         }
         Fl_Input code_file_input {
           label {Code File:}
           user_data 1 user_data_type {void*}
           callback code_input_cb
-          tooltip {The name of the generated code file.} xywh {98 85 244 20} box THIN_DOWN_BOX labelsize 11 when 1 textfont 4 textsize 11
+          tooltip {The name of the generated code file.} xywh {97 85 227 20} box THIN_DOWN_BOX labelfont 1 labelsize 11 when 1 textfont 4 textsize 11
         }
         Fl_Light_Button include_H_from_C_button {
           label {Include Header from Code}
           callback include_H_from_C_button_cb
-          tooltip {Include the header file from the code file.} xywh {177 110 165 20} value 1 labelsize 11
+          tooltip {Include the header file from the code file.} xywh {166 110 158 20} value 1 labelsize 11
         }
       }
       Fl_Group {} {
         label Internationalization open
-        xywh {10 30 345 134} labelsize 11
+        xywh {10 30 325 116} labelsize 11 hide
       } {
         Fl_Choice i18n_type_chooser {
           label {Use:}
           callback i18n_type_cb open
-          tooltip {Type of internationalization to use.} xywh {100 42 100 20} box THIN_UP_BOX down_box BORDER_BOX labelsize 11 textsize 11
+          tooltip {Type of internationalization to use.} xywh {80 42 100 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11
         } {
           menuitem {} {
             label None
@@ -75,22 +104,22 @@ Function {make_project_window()} {open
         Fl_Input i18n_include_input {
           label {\#include:}
           callback i18n_text_cb
-          tooltip {The include file for internationalization.} xywh {100 67 245 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11
+          tooltip {The include file for internationalization.} xywh {80 67 245 20} box THIN_DOWN_BOX labelfont 1 labelsize 11 textfont 4 textsize 11
         }
         Fl_Input i18n_file_input {
           label {File:}
           callback i18n_text_cb
-          tooltip {The name of the message catalog.} xywh {100 92 245 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11
+          tooltip {The name of the message catalog.} xywh {80 92 245 20} box THIN_DOWN_BOX labelfont 1 labelsize 11 textfont 4 textsize 11
         }
         Fl_Input i18n_set_input {
           label {Set:}
           callback i18n_text_cb
-          tooltip {The message set number.} xywh {100 117 245 20} type Int box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11
+          tooltip {The message set number.} xywh {80 117 245 20} type Int box THIN_DOWN_BOX labelfont 1 labelsize 11 textfont 4 textsize 11
         }
         Fl_Input i18n_function_input {
           label {Function:}
           callback i18n_text_cb
-          tooltip {The function to call to internationalize the labels and tooltips.} xywh {100 92 245 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11
+          tooltip {The function to call to internationalize the labels and tooltips.} xywh {80 92 245 20} box THIN_DOWN_BOX labelfont 1 labelsize 11 textfont 4 textsize 11
         }
       }
     }
@@ -110,25 +139,25 @@ Function {make_settings_window()} {open
 } {
   Fl_Window settings_window {
     label {GUI Settings} open
-    xywh {321 150 255 210} type Double visible
+    xywh {321 150 215 185} type Double labelsize 11 hide
   } {
     Fl_Button {} {
       label Close
       callback {settings_window->hide();}
-      tooltip {Close this dialog.} xywh {185 179 60 25}
+      tooltip {Close this dialog.} xywh {163 155 42 20} labelsize 11
     }
     Fl_Tabs {} {
-      xywh {10 10 235 158}
+      xywh {10 10 195 135} selection_color 8 labelsize 11
     } {
       Fl_Group {} {
         label {GUI:}
-        xywh {10 35 235 133} align 5
+        xywh {10 30 195 115} labelsize 11 align 5
       } {
         Fl_Check_Button tooltips_button {
           label {Show Tooltips}
           callback {Fl_Tooltip::enable(tooltips_button->value());
 fluid_prefs.set("show_tooltips", tooltips_button->value());}
-          xywh {20 45 215 20} down_box DOWN_BOX
+          xywh {20 40 97 20} down_box DOWN_BOX labelsize 11
           code0 {int b;}
           code1 {fluid_prefs.get("show_tooltips", b, 1);}
           code2 {tooltips_button->value(b);}
@@ -137,7 +166,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
         Fl_Check_Button completion_button {
           label {Show Completion Dialogs}
           callback {fluid_prefs.set("show_completion_dialogs", completion_button->value());}
-          xywh {20 75 215 20} down_box DOWN_BOX
+          xywh {20 65 152 20} down_box DOWN_BOX labelsize 11
           code0 {int b;}
           code1 {fluid_prefs.get("show_completion_dialogs", b, 1);}
           code2 {completion_button->value(b);}
@@ -145,7 +174,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
         Fl_Check_Button openlast_button {
           label {Open Previous File on Startup}
           callback {fluid_prefs.set("open_previous_file", openlast_button->value());}
-          xywh {20 105 215 20} down_box DOWN_BOX
+          xywh {20 90 175 20} down_box DOWN_BOX labelsize 11
           code0 {int b;}
           code1 {fluid_prefs.get("open_previous_file", b, 0);}
           code2 {openlast_button->value(b);}
@@ -153,7 +182,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
         Fl_Check_Button prevpos_button {
           label {Remember Window Positions}
           callback {fluid_prefs.set("prev_window_pos", prevpos_button->value());}
-          xywh {20 135 215 20} down_box DOWN_BOX
+          xywh {20 115 175 20} down_box DOWN_BOX labelsize 11
           code0 {int b;}
           code1 {fluid_prefs.get("prev_window_pos", b, 1);}
           code2 {prevpos_button->value(b);}
@@ -167,18 +196,18 @@ Function {make_shell_window()} {open
 } {
   Fl_Window shell_window {
     label {Shell Command} open
-    xywh {588 153 450 145} type Double visible
+    xywh {588 153 335 135} type Double labelsize 11 hide
   } {
     Fl_Tabs {} {open
-      xywh {10 10 430 90}
+      xywh {10 10 314 85} selection_color 8 labelsize 11
     } {
       Fl_Group {} {
         label {Shell Command} open
-        xywh {10 30 430 70} align 5
+        xywh {10 30 314 65} labelsize 11 align 5
       } {
         Fl_Input shell_command_input {
           callback {fluid_prefs.set("shell_command", shell_command_input->value());}
-          xywh {20 40 410 20}
+          xywh {20 40 294 21} labelsize 11 textsize 11
           code0 {char buf[1024];}
           code1 {fluid_prefs.get("shell_command", buf, "", sizeof(buf));}
           code2 {shell_command_input->value(buf);}
@@ -186,7 +215,7 @@ Function {make_shell_window()} {open
         Fl_Check_Button shell_savefl_button {
           label {Save .FL File}
           callback {fluid_prefs.set("shell_savefl", shell_savefl_button->value());}
-          xywh {20 65 110 20} down_box DOWN_BOX
+          xywh {20 66 93 19} down_box DOWN_BOX labelsize 11
           code0 {int b;}
           code1 {fluid_prefs.get("shell_savefl", b, 1);}
           code2 {shell_savefl_button->value(b);}
@@ -194,7 +223,7 @@ Function {make_shell_window()} {open
         Fl_Check_Button shell_writecode_button {
           label {Write Code}
           callback {fluid_prefs.set("shell_writecode", shell_writecode_button->value());}
-          xywh {140 65 95 20} down_box DOWN_BOX
+          xywh {118 66 83 19} down_box DOWN_BOX labelsize 11
           code0 {int b;}
           code1 {fluid_prefs.get("shell_writecode", b, 1);}
           code2 {shell_writecode_button->value(b);}
@@ -202,7 +231,7 @@ Function {make_shell_window()} {open
         Fl_Check_Button shell_writemsgs_button {
           label {Write Messages}
           callback {fluid_prefs.set("shell_writemsgs", shell_writemsgs_button->value());}
-          xywh {245 65 130 20} down_box DOWN_BOX
+          xywh {206 66 108 19} down_box DOWN_BOX labelsize 11
           code0 {int b;}
           code1 {fluid_prefs.get("shell_writemsgs", b, 0);}
           code2 {shell_writemsgs_button->value(b);}
@@ -212,25 +241,25 @@ Function {make_shell_window()} {open
     Fl_Button {} {
       label Cancel
       callback {shell_window->hide();}
-      xywh {375 110 65 25}
+      xywh {276 105 48 20} labelsize 11
     }
     Fl_Return_Button {} {
       label {Run Command}
       callback do_shell_command
-      xywh {225 110 140 25}
+      xywh {162 105 109 20} labelsize 11
     }
   }
   Fl_Window shell_run_window {
     label {Shell Command Output} open
-    xywh {592 332 555 435} type Double resizable visible
+    xywh {592 332 555 430} type Double labelsize 11 resizable visible
   } {
     Fl_Return_Button shell_run_button {
       label Close
       callback {shell_run_window->hide();}
-      xywh {465 400 80 25}
+      xywh {486 400 59 20} labelsize 11
     }
-    Fl_Text_Display shell_run_display {
-      xywh {10 10 530 380} textfont 4 textsize 12 resizable
+    Fl_Text_Display shell_run_display {selected
+      xywh {10 10 530 380} labelsize 11 textfont 4 textsize 11 resizable
       code0 {shell_run_buffer = new Fl_Text_Buffer();}
       code1 {shell_run_display->buffer(shell_run_buffer);}
     }
@@ -241,48 +270,54 @@ Function {make_grid_window()} {open
 } {
   Fl_Window grid_window {
     label Grid open
-    xywh {51 589 155 205} type Double visible
+    xywh {51 589 145 180} type Double labelsize 11 hide
   } {
     Fl_Tabs {} {
-      xywh {10 10 135 150} align 5
+      xywh {10 10 124 131} selection_color 8 labelsize 11 align 5
     } {
       Fl_Group {} {
         label Grid
-        xywh {10 30 135 130} align 5
+        xywh {10 30 124 111} labelsize 11 align 5
       } {
         Fl_Input horizontal_input {
           label {Horizontal:}
           user_data 1 user_data_type long
           callback grid_cb
-          tooltip {Horizontal grid spacing.} xywh {95 40 40 20} type Int box THIN_DOWN_BOX
+          tooltip {Horizontal grid spacing.} xywh {84 40 40 20} type Int box THIN_DOWN_BOX labelfont 1 labelsize 11 textsize 11
           code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
         }
         Fl_Input vertical_input {
           label {Vertical:}
           user_data 2 user_data_type long
           callback grid_cb
-          tooltip {Vertical grid spacing.} xywh {95 70 40 20} type Int box THIN_DOWN_BOX
+          tooltip {Vertical grid spacing.} xywh {84 65 40 20} type Int box THIN_DOWN_BOX labelfont 1 labelsize 11 textsize 11
           code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
         }
         Fl_Input snap_input {
           label {Snap:}
           user_data 3 user_data_type long
           callback grid_cb
-          tooltip {Snap to grid within this many pixels.} xywh {95 100 40 20} type Int box THIN_DOWN_BOX
+          tooltip {Snap to grid within this many pixels.} xywh {84 90 40 20} type Int box THIN_DOWN_BOX labelfont 1 labelsize 11 textsize 11
           code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
         }
         Fl_Check_Button guides_toggle {
           label {Show Guides}
           user_data 4 user_data_type long
           callback guides_cb
-          tooltip {Show distance and alignment guides in overlay} xywh {30 125 105 25} down_box DOWN_BOX
+          tooltip {Show distance and alignment guides in overlay} xywh {30 115 94 16} down_box DOWN_BOX labelsize 11
         }
       }
     }
     Fl_Button {} {
       label Close
       callback {grid_window->hide();}
-      tooltip {Close this dialog.} xywh {85 170 60 25}
+      tooltip {Close this dialog.} xywh {92 151 42 20} labelsize 11
     }
   }
 } 
+
+comment {
+//
+// End of "$Id$".
+//} {in_source in_header
+} 
diff --git a/fluid/alignment_panel.h b/fluid/alignment_panel.h
index 87d51339b..21f6c8d64 100644
--- a/fluid/alignment_panel.h
+++ b/fluid/alignment_panel.h
@@ -1,3 +1,30 @@
+//
+// "$Id$"
+//
+// Setting and shell dialogs for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2005 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
 // generated by Fast Light User Interface Designer (fluid) version 1.0107
 
 #ifndef alignment_panel_h
@@ -62,3 +89,7 @@ extern void guides_cb(Fl_Check_Button*, long);
 extern Fl_Check_Button *guides_toggle;
 Fl_Double_Window* make_grid_window();
 #endif
+
+//
+// End of "$Id$".
+//
diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx
index bfee31004..62890c997 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -1,3 +1,30 @@
+//
+// "$Id$"
+//
+// Widget panel for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2005 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
 // generated by Fast Light User Interface Designer (fluid) version 1.0107
 
 #include "widget_panel.h"
@@ -18,268 +45,323 @@ Fl_Input *v_input[4]={(Fl_Input *)0};
 
 Fl_Double_Window* make_widget_panel() {
   Fl_Double_Window* w;
-  { Fl_Double_Window* o = new Fl_Double_Window(415, 370);
+  { Fl_Double_Window* o = new Fl_Double_Window(415, 365);
     w = o;
+    o->labelsize(11);
     w->hotspot(o);
-    { Fl_Tabs* o = new Fl_Tabs(10, 10, 395, 315);
+    { Fl_Tabs* o = new Fl_Tabs(9, 10, 396, 315);
+      o->selection_color(FL_INACTIVE_COLOR);
+      o->labelsize(11);
       o->callback((Fl_Callback*)cb_);
       o->when(FL_WHEN_NEVER);
-      { Fl_Group* o = new Fl_Group(10, 30, 395, 295, "GUI");
+      { Fl_Group* o = new Fl_Group(9, 30, 395, 295, "GUI");
+        o->labelsize(11);
         o->callback((Fl_Callback*)propagate_load);
         o->when(FL_WHEN_NEVER);
-        { Fl_Group* o = new Fl_Group(95, 40, 301, 280);
+        o->hide();
+        { Fl_Group* o = new Fl_Group(85, 40, 314, 285);
+          o->labelsize(11);
           o->callback((Fl_Callback*)propagate_load);
-          { Fl_Group* o = new Fl_Group(95, 40, 300, 20);
+          { Fl_Group* o = new Fl_Group(94, 40, 300, 20);
+            o->labelsize(11);
             o->callback((Fl_Callback*)propagate_load);
-            { Fl_Input* o = new Fl_Input(95, 40, 195, 20, "Label:");
+            { Fl_Input* o = new Fl_Input(94, 40, 195, 20, "Label:");
               o->tooltip("The label text for the widget.");
+              o->labelfont(1);
+              o->labelsize(11);
+              o->textsize(11);
               o->callback((Fl_Callback*)label_cb);
               o->when(FL_WHEN_CHANGED);
               Fl_Group::current()->resizable(o);
             }
-            { Fl_Choice* o = new Fl_Choice(290, 40, 105, 20);
+            { Fl_Choice* o = new Fl_Choice(289, 40, 105, 20);
               o->tooltip("The label style for the widget.");
               o->box(FL_THIN_UP_BOX);
               o->down_box(FL_BORDER_BOX);
+              o->labelsize(11);
+              o->textsize(11);
               o->callback((Fl_Callback*)labeltype_cb);
               o->menu(labeltypemenu);
             }
             o->end();
           }
-          { Fl_Group* o = new Fl_Group(95, 65, 300, 20);
+          { Fl_Group* o = new Fl_Group(94, 65, 300, 20);
+            o->labelsize(11);
             o->callback((Fl_Callback*)propagate_load);
-            { Fl_Input* o = new Fl_Input(95, 65, 195, 20, "Image:");
+            { Fl_Input* o = new Fl_Input(94, 65, 240, 20, "Image:");
               o->tooltip("The active image for the widget.");
+              o->labelfont(1);
+              o->labelsize(11);
+              o->textsize(11);
               o->callback((Fl_Callback*)image_cb);
               Fl_Group::current()->resizable(o);
             }
-            { Fl_Button* o = new Fl_Button(290, 65, 105, 20, "Browse...");
+            { Fl_Button* o = new Fl_Button(334, 65, 60, 20, "Browse...");
               o->tooltip("Click to choose the active image.");
+              o->labelsize(11);
               o->callback((Fl_Callback*)image_browse_cb);
             }
             o->end();
           }
-          { Fl_Group* o = new Fl_Group(95, 90, 300, 20);
+          { Fl_Group* o = new Fl_Group(94, 90, 300, 20);
+            o->labelsize(11);
             o->callback((Fl_Callback*)propagate_load);
-            { Fl_Input* o = new Fl_Input(95, 90, 195, 20, "Inactive:");
+            { Fl_Input* o = new Fl_Input(94, 90, 240, 20, "Inactive:");
               o->tooltip("The inactive image for the widget.");
+              o->labelfont(1);
+              o->labelsize(11);
+              o->textsize(11);
               o->callback((Fl_Callback*)inactive_cb);
               Fl_Group::current()->resizable(o);
             }
-            { Fl_Button* o = new Fl_Button(290, 90, 105, 20, "Browse...");
+            { Fl_Button* o = new Fl_Button(334, 90, 60, 20, "Browse...");
               o->tooltip("Click to choose the inactive image.");
+              o->labelsize(11);
               o->callback((Fl_Callback*)inactive_browse_cb);
             }
             o->end();
           }
-          { Fl_Group* o = new Fl_Group(95, 115, 300, 21, "Alignment:");
+          { Fl_Group* o = new Fl_Group(95, 114, 304, 21, "Alignment:");
+            o->labelfont(1);
+            o->labelsize(11);
             o->callback((Fl_Callback*)propagate_load);
             o->align(FL_ALIGN_LEFT);
-            { Fl_Button* o = new Fl_Button(95, 115, 40, 20, "clip");
+            { Fl_Button* o = new Fl_Button(95, 115, 30, 20, "Clip");
               o->tooltip("Clip the label to the inside of the widget.");
               o->type(1);
-              o->labelsize(8);
+              o->labelsize(11);
               o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_CLIP));
             }
-            { Fl_Button* o = new Fl_Button(135, 115, 40, 20, "wrap");
+            { Fl_Button* o = new Fl_Button(125, 115, 38, 20, "Wrap");
               o->tooltip("Wrap the label text.");
               o->type(1);
-              o->labelsize(8);
+              o->labelsize(11);
               o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_WRAP));
             }
-            { Fl_Button* o = new Fl_Button(175, 115, 55, 20, "text\nimage");
+            { Fl_Button* o = new Fl_Button(162, 115, 69, 20, "Text/Image");
               o->tooltip("Show the label text over the image.");
               o->type(1);
-              o->labelsize(8);
+              o->labelsize(11);
               o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_TEXT_OVER_IMAGE));
             }
-            { Fl_Button* o = new Fl_Button(295, 115, 20, 20, "@-1<-");
+            { Fl_Button* o = new Fl_Button(234, 115, 20, 20, "@-1<-");
               o->tooltip("Left-align the label.");
               o->type(1);
+              o->labelsize(11);
               o->labelcolor(FL_INACTIVE_COLOR);
               o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_LEFT));
             }
-            { Fl_Button* o = new Fl_Button(315, 115, 20, 20, "@-1->");
+            { Fl_Button* o = new Fl_Button(254, 115, 20, 20, "@-1->");
               o->tooltip("Right-align the label.");
               o->type(1);
+              o->labelsize(11);
               o->labelcolor(FL_INACTIVE_COLOR);
               o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_RIGHT));
             }
-            { Fl_Button* o = new Fl_Button(335, 115, 20, 20, "@-18");
+            { Fl_Button* o = new Fl_Button(274, 115, 20, 20, "@-18");
               o->tooltip("Top-align the label.");
               o->type(1);
+              o->labelsize(11);
               o->labelcolor(FL_INACTIVE_COLOR);
               o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_TOP));
             }
-            { Fl_Button* o = new Fl_Button(355, 115, 20, 20, "@-12");
+            { Fl_Button* o = new Fl_Button(294, 115, 20, 20, "@-12");
               o->tooltip("Bottom-align the label.");
               o->type(1);
+              o->labelsize(11);
               o->labelcolor(FL_INACTIVE_COLOR);
               o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_BOTTOM));
             }
-            { Fl_Button* o = new Fl_Button(375, 115, 20, 20, "@-3square");
+            { Fl_Button* o = new Fl_Button(314, 115, 20, 20, "@-3square");
               o->tooltip("Show the label inside the widget.");
               o->type(1);
+              o->labelsize(11);
               o->labelcolor(FL_INACTIVE_COLOR);
               o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_INSIDE));
             }
-            { Fl_Box* o = new Fl_Box(256, 116, 20, 20);
+            { Fl_Box* o = new Fl_Box(376, 115, 18, 20);
+              o->labelsize(11);
               Fl_Group::current()->resizable(o);
             }
             o->end();
           }
-          { Fl_Value_Input* o = widget_x_input = new Fl_Value_Input(95, 150, 60, 20, "X:");
+          { Fl_Value_Input* o = widget_x_input = new Fl_Value_Input(94, 150, 60, 20, "X:");
             o->tooltip("The X position of the widget.");
-            o->labelsize(10);
+            o->labelsize(11);
             o->maximum(2048);
             o->step(1);
+            o->textsize(11);
             o->callback((Fl_Callback*)x_cb);
             o->align(FL_ALIGN_TOP_LEFT);
           }
-          { Fl_Box* o = new Fl_Box(95, 150, 0, 20, "Position:");
+          { Fl_Box* o = new Fl_Box(94, 150, 0, 20, "Position:");
+            o->labelfont(1);
+            o->labelsize(11);
             o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
           }
-          { Fl_Value_Input* o = widget_y_input = new Fl_Value_Input(155, 150, 60, 20, "Y:");
+          { Fl_Value_Input* o = widget_y_input = new Fl_Value_Input(154, 150, 60, 20, "Y:");
             o->tooltip("The Y position of the widget.");
-            o->labelsize(10);
+            o->labelsize(11);
             o->maximum(2048);
             o->step(1);
+            o->textsize(11);
             o->callback((Fl_Callback*)y_cb);
             o->align(FL_ALIGN_TOP_LEFT);
           }
-          { Fl_Value_Input* o = widget_w_input = new Fl_Value_Input(215, 150, 60, 20, "Width:");
+          { Fl_Value_Input* o = widget_w_input = new Fl_Value_Input(214, 150, 60, 20, "Width:");
             o->tooltip("The width of the widget.");
-            o->labelsize(10);
+            o->labelsize(11);
             o->maximum(2048);
             o->step(1);
+            o->textsize(11);
             o->callback((Fl_Callback*)w_cb);
             o->align(FL_ALIGN_TOP_LEFT);
           }
-          { Fl_Value_Input* o = widget_h_input = new Fl_Value_Input(275, 150, 60, 20, "Height:");
+          { Fl_Value_Input* o = widget_h_input = new Fl_Value_Input(274, 150, 60, 20, "Height:");
             o->tooltip("The height of the widget.");
-            o->labelsize(10);
+            o->labelsize(11);
             o->maximum(2048);
             o->step(1);
+            o->textsize(11);
             o->callback((Fl_Callback*)h_cb);
             o->align(FL_ALIGN_TOP_LEFT);
           }
-          { Fl_Box* o = new Fl_Box(95, 185, 0, 20, "Values:");
+          { Fl_Box* o = new Fl_Box(94, 185, 0, 20, "Values:");
+            o->labelfont(1);
+            o->labelsize(11);
             o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
           }
-          { Fl_Value_Input* o = new Fl_Value_Input(95, 185, 60, 20, "Size:");
+          { Fl_Value_Input* o = new Fl_Value_Input(94, 185, 60, 20, "Size:");
             o->tooltip("The size of the slider.");
-            o->labelsize(10);
+            o->labelsize(11);
             o->step(0.010101);
+            o->textsize(11);
             o->callback((Fl_Callback*)slider_size_cb);
             o->align(FL_ALIGN_TOP_LEFT);
           }
-          { Fl_Value_Input* o = new Fl_Value_Input(155, 185, 60, 20, "Minimum:");
+          { Fl_Value_Input* o = new Fl_Value_Input(154, 185, 60, 20, "Minimum:");
             o->tooltip("The minimum value of the widget.");
-            o->labelsize(10);
+            o->labelsize(11);
+            o->textsize(11);
             o->callback((Fl_Callback*)min_cb);
             o->align(FL_ALIGN_TOP_LEFT);
           }
-          { Fl_Value_Input* o = new Fl_Value_Input(215, 185, 60, 20, "Maximum:");
+          { Fl_Value_Input* o = new Fl_Value_Input(214, 185, 60, 20, "Maximum:");
             o->tooltip("The maximum value of the widget.");
-            o->labelsize(10);
+            o->labelsize(11);
             o->value(1);
+            o->textsize(11);
             o->callback((Fl_Callback*)max_cb);
             o->align(FL_ALIGN_TOP_LEFT);
           }
-          { Fl_Value_Input* o = new Fl_Value_Input(275, 185, 60, 20, "Step:");
+          { Fl_Value_Input* o = new Fl_Value_Input(274, 185, 60, 20, "Step:");
             o->tooltip("The resolution of the widget value.");
-            o->labelsize(10);
+            o->labelsize(11);
+            o->textsize(11);
             o->callback((Fl_Callback*)step_cb);
             o->align(FL_ALIGN_TOP_LEFT);
           }
-          { Fl_Value_Input* o = new Fl_Value_Input(335, 185, 60, 20, "Value:");
+          { Fl_Value_Input* o = new Fl_Value_Input(334, 185, 60, 20, "Value:");
             o->tooltip("The current widget value.");
-            o->labelsize(10);
+            o->labelsize(11);
+            o->textsize(11);
             o->callback((Fl_Callback*)value_cb);
             o->align(FL_ALIGN_TOP_LEFT);
           }
-          { Shortcut_Button* o = new Shortcut_Button(95, 210, 300, 20, "Shortcut:");
+          { Shortcut_Button* o = new Shortcut_Button(94, 210, 300, 20, "Shortcut:");
             o->tooltip("The shortcut key for the widget.");
             o->box(FL_DOWN_BOX);
             o->color(FL_BACKGROUND2_COLOR);
             o->selection_color(FL_BACKGROUND2_COLOR);
             o->labeltype(FL_NORMAL_LABEL);
-            o->labelfont(0);
-            o->labelsize(14);
+            o->labelfont(1);
+            o->labelsize(11);
             o->labelcolor(FL_BLACK);
             o->callback((Fl_Callback*)shortcut_in_cb);
             o->align(FL_ALIGN_LEFT);
             o->when(FL_WHEN_RELEASE);
           }
-          { Fl_Group* o = new Fl_Group(95, 235, 300, 20);
+          { Fl_Group* o = new Fl_Group(94, 235, 300, 21);
+            o->labelsize(11);
             o->callback((Fl_Callback*)propagate_load);
-            { Fl_Input* o = new Fl_Input(95, 235, 115, 20, "X Class:");
+            { Fl_Input* o = new Fl_Input(94, 235, 115, 20, "X Class:");
               o->tooltip("The X resource class.");
+              o->labelfont(1);
+              o->labelsize(11);
+              o->textsize(11);
               o->callback((Fl_Callback*)xclass_cb);
               Fl_Group::current()->resizable(o);
             }
-            { Fl_Light_Button* o = new Fl_Light_Button(210, 235, 60, 20, "Border");
+            { Fl_Light_Button* o = new Fl_Light_Button(209, 235, 57, 20, "Border");
               o->tooltip("Add a border around the window.");
               o->selection_color((Fl_Color)1);
-              o->labelsize(10);
+              o->labelsize(11);
               o->callback((Fl_Callback*)border_cb);
             }
-            { Fl_Light_Button* o = new Fl_Light_Button(270, 235, 55, 20, "Modal");
+            { Fl_Light_Button* o = new Fl_Light_Button(266, 235, 54, 20, "Modal");
               o->tooltip("Make the window modal.");
               o->selection_color((Fl_Color)1);
-              o->labelsize(10);
+              o->labelsize(11);
               o->callback((Fl_Callback*)modal_cb);
             }
-            { Fl_Light_Button* o = new Fl_Light_Button(325, 235, 70, 20, "Nonmodal");
+            { Fl_Light_Button* o = new Fl_Light_Button(320, 235, 74, 21, "Nonmodal");
               o->tooltip("Make the window non-modal.");
               o->selection_color((Fl_Color)1);
-              o->labelsize(9);
+              o->labelsize(11);
               o->callback((Fl_Callback*)non_modal_cb);
               o->align(132|FL_ALIGN_INSIDE);
             }
             o->end();
           }
-          { Fl_Group* o = new Fl_Group(95, 260, 301, 20);
+          { Fl_Group* o = new Fl_Group(94, 260, 301, 20);
+            o->labelsize(11);
             o->callback((Fl_Callback*)propagate_load);
-            { Fl_Light_Button* o = new Fl_Light_Button(95, 260, 70, 20, "Visible");
+            { Fl_Light_Button* o = new Fl_Light_Button(94, 260, 55, 20, "Visible");
               o->tooltip("Show the widget.");
               o->selection_color((Fl_Color)1);
-              o->labelsize(10);
+              o->labelsize(11);
               o->callback((Fl_Callback*)visible_cb);
             }
-            { Fl_Box* o = new Fl_Box(95, 260, 0, 20, "Attributes:");
+            { Fl_Box* o = new Fl_Box(94, 260, 0, 20, "Attributes:");
+              o->labelfont(1);
+              o->labelsize(11);
               o->align(FL_ALIGN_LEFT);
             }
-            { Fl_Light_Button* o = new Fl_Light_Button(165, 260, 70, 20, "Active");
+            { Fl_Light_Button* o = new Fl_Light_Button(149, 260, 55, 20, "Active");
               o->tooltip("Activate the widget.");
               o->selection_color((Fl_Color)1);
-              o->labelsize(10);
+              o->labelsize(11);
               o->callback((Fl_Callback*)active_cb);
             }
-            { Fl_Light_Button* o = new Fl_Light_Button(235, 260, 70, 20, "Resizable");
+            { Fl_Light_Button* o = new Fl_Light_Button(204, 260, 72, 20, "Resizable");
               o->tooltip("Make the widget resizable.");
               o->selection_color((Fl_Color)1);
-              o->labelsize(10);
+              o->labelsize(11);
               o->callback((Fl_Callback*)resizable_cb);
               o->when(FL_WHEN_CHANGED);
             }
-            { Fl_Light_Button* o = new Fl_Light_Button(305, 260, 70, 20, "Hotspot");
+            { Fl_Light_Button* o = new Fl_Light_Button(276, 260, 61, 20, "Hotspot");
               o->tooltip("Center the window under this widget.");
               o->selection_color((Fl_Color)1);
-              o->labelsize(10);
+              o->labelsize(11);
               o->callback((Fl_Callback*)hotspot_cb);
               o->when(FL_WHEN_CHANGED);
             }
-            { Fl_Box* o = new Fl_Box(376, 260, 20, 20);
+            { Fl_Box* o = new Fl_Box(375, 260, 20, 20);
+              o->labelsize(11);
               Fl_Group::current()->resizable(o);
             }
             o->end();
           }
-          { Fl_Input* o = new Fl_Input(95, 285, 300, 20, "Tooltip:");
+          { Fl_Input* o = new Fl_Input(94, 285, 300, 20, "Tooltip:");
             o->tooltip("The tooltip text for the widget.");
+            o->labelfont(1);
+            o->labelsize(11);
+            o->textsize(11);
             o->callback((Fl_Callback*)tooltip_cb);
           }
-          { Fl_Box* o = new Fl_Box(95, 308, 300, 12);
+          { Fl_Box* o = new Fl_Box(94, 305, 300, 20);
+            o->labelsize(11);
             Fl_Group::current()->resizable(o);
           }
           o->end();
@@ -289,91 +371,110 @@ Fl_Double_Window* make_widget_panel() {
         Fl_Group::current()->resizable(o);
       }
       { Fl_Group* o = new Fl_Group(10, 30, 395, 295, "Style");
+        o->labelsize(11);
         o->callback((Fl_Callback*)propagate_load);
         o->when(FL_WHEN_NEVER);
         o->hide();
         { Fl_Group* o = new Fl_Group(100, 40, 295, 276);
+          o->labelsize(11);
           o->callback((Fl_Callback*)propagate_load);
           { Fl_Group* o = new Fl_Group(100, 40, 295, 95);
+            o->labelsize(11);
             o->callback((Fl_Callback*)propagate_load);
             { Fl_Group* o = new Fl_Group(100, 40, 295, 20);
+              o->labelsize(11);
               o->callback((Fl_Callback*)propagate_load);
               { Fl_Choice* o = new Fl_Choice(100, 40, 155, 20, "Label Font:");
                 o->tooltip("The style of the label text.");
                 o->box(FL_THIN_UP_BOX);
                 o->down_box(FL_BORDER_BOX);
+                o->labelfont(1);
+                o->labelsize(11);
                 o->callback((Fl_Callback*)labelfont_cb);
                 Fl_Group::current()->resizable(o);
                 o->menu(fontmenu);
               }
               { Fl_Value_Input* o = new Fl_Value_Input(255, 40, 50, 20);
                 o->tooltip("The size of the label text.");
+                o->labelsize(11);
                 o->maximum(100);
                 o->step(1);
                 o->value(14);
+                o->textsize(11);
                 o->callback((Fl_Callback*)labelsize_cb);
               }
               { Fl_Button* o = new Fl_Button(305, 40, 90, 20, "Label Color");
                 o->tooltip("The color of the label text.");
-                o->labelsize(8);
+                o->labelsize(11);
                 o->callback((Fl_Callback*)labelcolor_cb);
               }
               o->end();
             }
             { Fl_Group* o = new Fl_Group(100, 65, 295, 20);
+              o->labelsize(11);
               o->callback((Fl_Callback*)propagate_load);
               { Fl_Choice* o = new Fl_Choice(100, 65, 205, 20, "Box:");
                 o->tooltip("The \"up\" box of the widget.");
                 o->box(FL_THIN_UP_BOX);
                 o->down_box(FL_BORDER_BOX);
+                o->labelfont(1);
+                o->labelsize(11);
                 o->callback((Fl_Callback*)box_cb);
                 Fl_Group::current()->resizable(o);
                 o->menu(boxmenu);
               }
               { Fl_Button* o = new Fl_Button(305, 65, 90, 20, "Color");
                 o->tooltip("The background color of the widget.");
-                o->labelsize(8);
+                o->labelsize(11);
                 o->callback((Fl_Callback*)color_cb);
               }
               o->end();
             }
             { Fl_Group* o = new Fl_Group(100, 90, 295, 20);
+              o->labelsize(11);
               o->callback((Fl_Callback*)propagate_load);
               { Fl_Choice* o = new Fl_Choice(100, 90, 205, 20, "Down Box:");
                 o->tooltip("The \"down\" box of the widget.");
                 o->box(FL_THIN_UP_BOX);
                 o->down_box(FL_BORDER_BOX);
+                o->labelfont(1);
+                o->labelsize(11);
                 o->callback((Fl_Callback*)down_box_cb);
                 Fl_Group::current()->resizable(o);
                 o->menu(boxmenu);
               }
               { Fl_Button* o = new Fl_Button(305, 90, 90, 20, "Select Color");
                 o->tooltip("The selection color of the widget.");
-                o->labelsize(8);
+                o->labelsize(11);
                 o->callback((Fl_Callback*)color2_cb);
               }
               o->end();
             }
             { Fl_Group* o = new Fl_Group(100, 115, 295, 20);
+              o->labelsize(11);
               o->callback((Fl_Callback*)propagate_load);
               { Fl_Choice* o = new Fl_Choice(100, 115, 155, 20, "Text Font:");
                 o->tooltip("The value text style.");
                 o->box(FL_DOWN_BOX);
                 o->down_box(FL_BORDER_BOX);
+                o->labelfont(1);
+                o->labelsize(11);
                 o->callback((Fl_Callback*)textfont_cb);
                 Fl_Group::current()->resizable(o);
                 o->menu(fontmenu);
               }
               { Fl_Value_Input* o = new Fl_Value_Input(255, 115, 50, 20);
                 o->tooltip("The value text size.");
+                o->labelsize(11);
                 o->maximum(100);
                 o->step(1);
                 o->value(14);
+                o->textsize(11);
                 o->callback((Fl_Callback*)textsize_cb);
               }
               { Fl_Button* o = new Fl_Button(305, 115, 90, 20, "Text Color");
                 o->tooltip("The value text color.");
-                o->labelsize(8);
+                o->labelsize(11);
                 o->callback((Fl_Callback*)textcolor_cb);
               }
               o->end();
@@ -381,6 +482,7 @@ Fl_Double_Window* make_widget_panel() {
             o->end();
           }
           { Fl_Box* o = new Fl_Box(100, 304, 295, 12);
+            o->labelsize(11);
             Fl_Group::current()->resizable(o);
           }
           o->end();
@@ -389,16 +491,21 @@ Fl_Double_Window* make_widget_panel() {
         o->end();
       }
       { Fl_Group* o = new Fl_Group(10, 30, 395, 295, "C++");
+        o->labelsize(11);
         o->callback((Fl_Callback*)propagate_load);
         o->when(FL_WHEN_NEVER);
-        o->hide();
         { Fl_Group* o = new Fl_Group(100, 40, 295, 132);
+          o->labelsize(11);
           o->callback((Fl_Callback*)propagate_load);
           { Fl_Group* o = new Fl_Group(100, 40, 295, 20);
+            o->labelsize(11);
             o->callback((Fl_Callback*)propagate_load);
             { Fl_Input* o = new Fl_Input(100, 40, 160, 20, "Class:");
               o->tooltip("The widget subclass.");
+              o->labelfont(1);
+              o->labelsize(11);
               o->textfont(4);
+              o->textsize(11);
               o->callback((Fl_Callback*)subclass_cb, (void*)(4));
               Fl_Group::current()->resizable(o);
             }
@@ -406,21 +513,26 @@ Fl_Double_Window* make_widget_panel() {
               o->tooltip("The widget subtype.");
               o->box(FL_THIN_UP_BOX);
               o->down_box(FL_BORDER_BOX);
+              o->labelsize(11);
               o->callback((Fl_Callback*)subtype_cb);
             }
             o->end();
           }
           { Fl_Group* o = new Fl_Group(100, 65, 295, 20);
+            o->labelsize(11);
             o->callback((Fl_Callback*)propagate_load);
             { Fl_Input* o = new Fl_Input(100, 65, 230, 20, "Name:");
               o->tooltip("The name of the widget.");
+              o->labelfont(1);
+              o->labelsize(11);
+              o->textsize(11);
               o->callback((Fl_Callback*)name_cb);
               Fl_Group::current()->resizable(o);
             }
             { Fl_Light_Button* o = new Fl_Light_Button(330, 65, 65, 20, "public");
               o->tooltip("Make the widget publicly accessible.");
               o->selection_color((Fl_Color)1);
-              o->labelsize(10);
+              o->labelsize(11);
               o->callback((Fl_Callback*)name_public_cb);
               o->when(FL_WHEN_CHANGED);
             }
@@ -428,33 +540,46 @@ Fl_Double_Window* make_widget_panel() {
           }
           { Fl_Input* o = v_input[0] = new Fl_Input(100, 90, 295, 20, "Extra Code:");
             o->tooltip("Extra initialization code for the widget.");
+            o->labelfont(1);
+            o->labelsize(11);
             o->textfont(4);
+            o->textsize(11);
             o->callback((Fl_Callback*)v_input_cb, (void*)(0));
           }
           { Fl_Input* o = v_input[1] = new Fl_Input(100, 110, 295, 20);
             o->tooltip("Extra initialization code for the widget.");
+            o->labelsize(11);
             o->textfont(4);
+            o->textsize(11);
             o->callback((Fl_Callback*)v_input_cb, (void*)(1));
           }
           { Fl_Input* o = v_input[2] = new Fl_Input(100, 130, 295, 20);
             o->tooltip("Extra initialization code for the widget.");
+            o->labelsize(11);
             o->textfont(4);
+            o->textsize(11);
             o->callback((Fl_Callback*)v_input_cb, (void*)(2));
           }
           { Fl_Input* o = v_input[3] = new Fl_Input(100, 150, 295, 20);
             o->tooltip("Extra initialization code for the widget.");
+            o->labelsize(11);
             o->textfont(4);
+            o->textsize(11);
             o->callback((Fl_Callback*)v_input_cb, (void*)(3));
           }
           o->end();
         }
         { Fl_Group* o = new Fl_Group(100, 175, 295, 90);
           o->box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)propagate_load);
           { Fl_Text_Editor* o = new Fl_Text_Editor(102, 177, 291, 86, "Callback:");
             o->tooltip("The callback function or code for the widget.");
             o->box(FL_NO_BOX);
+            o->labelfont(1);
+            o->labelsize(11);
             o->textfont(4);
+            o->textsize(11);
             o->callback((Fl_Callback*)callback_cb);
             o->align(FL_ALIGN_LEFT);
             Fl_Group::current()->resizable(o);
@@ -465,12 +590,17 @@ Fl_Double_Window* make_widget_panel() {
           Fl_Group::current()->resizable(o);
         }
         { Fl_Group* o = new Fl_Group(100, 270, 295, 45);
+          o->labelsize(11);
           o->callback((Fl_Callback*)propagate_load);
           { Fl_Group* o = new Fl_Group(100, 270, 295, 20);
+            o->labelsize(11);
             o->callback((Fl_Callback*)propagate_load);
             { Fl_Input* o = new Fl_Input(100, 270, 140, 20, "User Data:");
               o->tooltip("The user data to pass into the callback code.");
+              o->labelfont(1);
+              o->labelsize(11);
               o->textfont(4);
+              o->textsize(11);
               o->callback((Fl_Callback*)user_data_cb);
               Fl_Group::current()->resizable(o);
             }
@@ -478,6 +608,8 @@ Fl_Double_Window* make_widget_panel() {
               o->tooltip("When to call the callback function.");
               o->box(FL_THIN_UP_BOX);
               o->down_box(FL_BORDER_BOX);
+              o->labelfont(1);
+              o->labelsize(11);
               o->callback((Fl_Callback*)when_cb);
               o->when(FL_WHEN_CHANGED);
               o->menu(whenmenu);
@@ -485,17 +617,21 @@ Fl_Double_Window* make_widget_panel() {
             o->end();
           }
           { Fl_Group* o = new Fl_Group(100, 295, 295, 20);
+            o->labelsize(11);
             o->callback((Fl_Callback*)propagate_load);
             { Fl_Input* o = new Fl_Input(100, 295, 140, 20, "Type:");
               o->tooltip("The type of the user data.");
+              o->labelfont(1);
+              o->labelsize(11);
               o->textfont(4);
+              o->textsize(11);
               o->callback((Fl_Callback*)user_data_type_cb);
               Fl_Group::current()->resizable(o);
             }
             { Fl_Light_Button* o = new Fl_Light_Button(290, 295, 105, 20, "No Change");
               o->tooltip("Call the callback even if the value has not changed.");
               o->selection_color((Fl_Color)1);
-              o->labelsize(10);
+              o->labelsize(11);
               o->callback((Fl_Callback*)when_button_cb);
             }
             o->end();
@@ -503,6 +639,7 @@ Fl_Double_Window* make_widget_panel() {
           o->end();
         }
         { Fl_Box* o = new Fl_Box(95, 325, 100, 0, "label");
+          o->labelsize(11);
           o->hide();
           o->deactivate();
         }
@@ -511,23 +648,29 @@ Fl_Double_Window* make_widget_panel() {
       o->end();
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Group* o = new Fl_Group(10, 335, 395, 25);
-      { Fl_Box* o = new Fl_Box(12, 335, 12, 25);
+    { Fl_Group* o = new Fl_Group(8, 335, 396, 20);
+      o->labelsize(11);
+      { Fl_Box* o = new Fl_Box(8, 335, 20, 0);
+        o->labelsize(11);
         Fl_Group::current()->resizable(o);
       }
-      { Fl_Button* o = new Fl_Button(215, 335, 100, 25, "No &Overlay");
+      { Fl_Button* o = new Fl_Button(274, 335, 77, 19, "No &Overlay");
         o->tooltip("Hide the widget overlay box.");
+        o->labelsize(11);
         o->labelcolor((Fl_Color)1);
         o->callback((Fl_Callback*)overlay_cb);
       }
-      { Fl_Button* o = new Fl_Button(155, 335, 80, 25, "Revert");
+      { Fl_Button* o = new Fl_Button(159, 335, 80, 0, "Revert");
+        o->labelsize(11);
         o->callback((Fl_Callback*)revert_cb);
         o->hide();
       }
-      { Fl_Return_Button* o = new Fl_Return_Button(325, 335, 80, 25, "OK");
+      { Fl_Return_Button* o = new Fl_Return_Button(356, 335, 48, 19, "OK");
+        o->labelsize(11);
         o->callback((Fl_Callback*)ok_cb);
       }
-      { Fl_Button* o = new Fl_Button(325, 335, 80, 25, "Cancel");
+      { Fl_Button* o = new Fl_Button(329, 335, 75, 0, "Cancel");
+        o->labelsize(11);
         o->callback((Fl_Callback*)cancel_cb);
         o->hide();
       }
@@ -537,3 +680,7 @@ Fl_Double_Window* make_widget_panel() {
   }
   return w;
 }
+
+//
+// End of "$Id$".
+//
diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index 4ce690629..37c778ccd 100644
--- a/fluid/widget_panel.fl
+++ b/fluid/widget_panel.fl
@@ -2,492 +2,526 @@
 version 1.0107 
 header_name {.h} 
 code_name {.cxx}
+comment {//
+// "$Id$"
+//
+// Widget panel for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2005 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+} {in_source in_header
+} 
+
 Function {make_widget_panel()} {open
 } {
   Fl_Window {} {open
-    xywh {851 210 415 370} type Double resizable hotspot visible
+    xywh {4 21 415 365} type Double labelsize 11 resizable hotspot visible
   } {
     Fl_Tabs {} {
       callback {propagate_load((Fl_Group *)o,v);} open
-      xywh {10 10 395 315} when 0 resizable
+      xywh {9 10 396 315} selection_color 8 labelsize 11 when 0 resizable
     } {
       Fl_Group {} {
         label GUI
-        callback propagate_load open selected
-        xywh {10 30 395 295} when 0 resizable
+        callback propagate_load
+        xywh {9 30 395 295} labelsize 11 when 0 hide resizable
       } {
         Fl_Group {} {
           callback propagate_load open
-          xywh {95 40 301 280} resizable
+          xywh {85 40 314 285} labelsize 11 resizable
         } {
           Fl_Group {} {
             callback propagate_load open
-            xywh {95 40 300 20}
+            xywh {94 40 300 20} labelsize 11
           } {
             Fl_Input {} {
               label {Label:}
               callback label_cb
-              tooltip {The label text for the widget.} xywh {95 40 195 20} when 1 resizable
+              tooltip {The label text for the widget.} xywh {94 40 195 20} labelfont 1 labelsize 11 when 1 textsize 11 resizable
             }
             Fl_Choice {} {
               callback labeltype_cb open
-              tooltip {The label style for the widget.} xywh {290 40 105 20} box THIN_UP_BOX down_box BORDER_BOX
+              tooltip {The label style for the widget.} xywh {289 40 105 20} box THIN_UP_BOX down_box BORDER_BOX labelsize 11 textsize 11
               code0 {extern Fl_Menu_Item labeltypemenu[];}
               code1 {o->menu(labeltypemenu);}
             } {}
           }
           Fl_Group {} {
             callback propagate_load open
-            xywh {95 65 300 20}
+            xywh {94 65 300 20} labelsize 11
           } {
             Fl_Input {} {
               label {Image:}
               callback image_cb
-              tooltip {The active image for the widget.} xywh {95 65 195 20} resizable
+              tooltip {The active image for the widget.} xywh {94 65 240 20} labelfont 1 labelsize 11 textsize 11 resizable
             }
             Fl_Button {} {
               label {Browse...}
               callback image_browse_cb
-              tooltip {Click to choose the active image.} xywh {290 65 105 20}
+              tooltip {Click to choose the active image.} xywh {334 65 60 20} labelsize 11
             }
           }
           Fl_Group {} {
             callback propagate_load open
-            xywh {95 90 300 20}
+            xywh {94 90 300 20} labelsize 11
           } {
             Fl_Input {} {
               label {Inactive:}
               callback inactive_cb
-              tooltip {The inactive image for the widget.} xywh {95 90 195 20} resizable
+              tooltip {The inactive image for the widget.} xywh {94 90 240 20} labelfont 1 labelsize 11 textsize 11 resizable
             }
             Fl_Button {} {
               label {Browse...}
               callback inactive_browse_cb
-              tooltip {Click to choose the inactive image.} xywh {290 90 105 20}
+              tooltip {Click to choose the inactive image.} xywh {334 90 60 20} labelsize 11
             }
           }
           Fl_Group {} {
             label {Alignment:}
             callback propagate_load open
-            xywh {95 115 300 21} align 4
+            xywh {95 114 304 21} labelfont 1 labelsize 11 align 4
           } {
             Fl_Button {} {
-              label clip
+              label Clip
               user_data FL_ALIGN_CLIP
               callback align_cb
-              tooltip {Clip the label to the inside of the widget.} xywh {95 115 40 20} type Toggle labelsize 8
+              tooltip {Clip the label to the inside of the widget.} xywh {95 115 30 20} type Toggle labelsize 11
             }
             Fl_Button {} {
-              label wrap
+              label Wrap
               user_data FL_ALIGN_WRAP
               callback align_cb
-              tooltip {Wrap the label text.} xywh {135 115 40 20} type Toggle labelsize 8
+              tooltip {Wrap the label text.} xywh {125 115 38 20} type Toggle labelsize 11
             }
             Fl_Button {} {
-              label {text
-image}
+              label {Text/Image}
               user_data FL_ALIGN_TEXT_OVER_IMAGE
               callback align_cb
-              tooltip {Show the label text over the image.} xywh {175 115 55 20} type Toggle labelsize 8
+              tooltip {Show the label text over the image.} xywh {162 115 69 20} type Toggle labelsize 11
             }
             Fl_Button {} {
               label {@-1<-}
               user_data FL_ALIGN_LEFT
               callback align_cb
-              tooltip {Left-align the label.} xywh {295 115 20 20} type Toggle labelcolor 8
+              tooltip {Left-align the label.} xywh {234 115 20 20} type Toggle labelsize 11 labelcolor 8
             }
             Fl_Button {} {
               label {@-1->}
               user_data FL_ALIGN_RIGHT
               callback align_cb
-              tooltip {Right-align the label.} xywh {315 115 20 20} type Toggle labelcolor 8
+              tooltip {Right-align the label.} xywh {254 115 20 20} type Toggle labelsize 11 labelcolor 8
             }
             Fl_Button {} {
               label {@-18}
               user_data FL_ALIGN_TOP
               callback align_cb
-              tooltip {Top-align the label.} xywh {335 115 20 20} type Toggle labelcolor 8
+              tooltip {Top-align the label.} xywh {274 115 20 20} type Toggle labelsize 11 labelcolor 8
             }
             Fl_Button {} {
               label {@-12}
               user_data FL_ALIGN_BOTTOM
               callback align_cb
-              tooltip {Bottom-align the label.} xywh {355 115 20 20} type Toggle labelcolor 8
+              tooltip {Bottom-align the label.} xywh {294 115 20 20} type Toggle labelsize 11 labelcolor 8
             }
             Fl_Button {} {
               label {@-3square}
               user_data FL_ALIGN_INSIDE
               callback align_cb
-              tooltip {Show the label inside the widget.} xywh {375 115 20 20} type Toggle labelcolor 8
+              tooltip {Show the label inside the widget.} xywh {314 115 20 20} type Toggle labelsize 11 labelcolor 8
             }
             Fl_Box {} {
-              xywh {256 116 20 20} resizable
+              xywh {376 115 18 20} labelsize 11 resizable
             }
           }
           Fl_Value_Input widget_x_input {
             label {X:}
             callback x_cb
-            tooltip {The X position of the widget.} xywh {95 150 60 20} labelsize 10 align 5 maximum 2048 step 1
+            tooltip {The X position of the widget.} xywh {94 150 60 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11
           }
           Fl_Box {} {
             label {Position:}
-            xywh {95 150 0 20} align 24
+            xywh {94 150 0 20} labelfont 1 labelsize 11 align 24
           }
           Fl_Value_Input widget_y_input {
             label {Y:}
             callback y_cb
-            tooltip {The Y position of the widget.} xywh {155 150 60 20} labelsize 10 align 5 maximum 2048 step 1
+            tooltip {The Y position of the widget.} xywh {154 150 60 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11
           }
           Fl_Value_Input widget_w_input {
             label {Width:}
             callback w_cb
-            tooltip {The width of the widget.} xywh {215 150 60 20} labelsize 10 align 5 maximum 2048 step 1
+            tooltip {The width of the widget.} xywh {214 150 60 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11
           }
           Fl_Value_Input widget_h_input {
             label {Height:}
             callback h_cb
-            tooltip {The height of the widget.} xywh {275 150 60 20} labelsize 10 align 5 maximum 2048 step 1
+            tooltip {The height of the widget.} xywh {274 150 60 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11
           }
           Fl_Box {} {
             label {Values:}
-            xywh {95 185 0 20} align 24
+            xywh {94 185 0 20} labelfont 1 labelsize 11 align 24
           }
           Fl_Value_Input {} {
             label {Size:}
             callback slider_size_cb
-            tooltip {The size of the slider.} xywh {95 185 60 20} labelsize 10 align 5 step 0.010101
+            tooltip {The size of the slider.} xywh {94 185 60 20} labelsize 11 align 5 step 0.010101 textsize 11
           }
           Fl_Value_Input {} {
             label {Minimum:}
             callback min_cb
-            tooltip {The minimum value of the widget.} xywh {155 185 60 20} labelsize 10 align 5
+            tooltip {The minimum value of the widget.} xywh {154 185 60 20} labelsize 11 align 5 textsize 11
           }
           Fl_Value_Input {} {
             label {Maximum:}
             callback max_cb
-            tooltip {The maximum value of the widget.} xywh {215 185 60 20} labelsize 10 align 5 value 1
+            tooltip {The maximum value of the widget.} xywh {214 185 60 20} labelsize 11 align 5 value 1 textsize 11
           }
           Fl_Value_Input {} {
             label {Step:}
             callback step_cb
-            tooltip {The resolution of the widget value.} xywh {275 185 60 20} labelsize 10 align 5
+            tooltip {The resolution of the widget value.} xywh {274 185 60 20} labelsize 11 align 5 textsize 11
           }
           Fl_Value_Input {} {
             label {Value:}
             callback value_cb
-            tooltip {The current widget value.} xywh {335 185 60 20} labelsize 10 align 5
+            tooltip {The current widget value.} xywh {334 185 60 20} labelsize 11 align 5 textsize 11
           }
           Fl_Button {} {
             label {Shortcut:}
             callback shortcut_in_cb
-            tooltip {The shortcut key for the widget.} xywh {95 210 300 20} box DOWN_BOX color 7 selection_color 7 align 4
+            tooltip {The shortcut key for the widget.} xywh {94 210 300 20} box DOWN_BOX color 7 selection_color 7 labelfont 1 labelsize 11 align 4
             code0 {\#include "Shortcut_Button.h"}
             class Shortcut_Button
           }
           Fl_Group {} {
             callback propagate_load open
-            xywh {95 235 300 20}
+            xywh {94 235 300 21} labelsize 11
           } {
             Fl_Input {} {
               label {X Class:}
               callback xclass_cb
-              tooltip {The X resource class.} xywh {95 235 115 20} resizable
+              tooltip {The X resource class.} xywh {94 235 115 20} labelfont 1 labelsize 11 textsize 11 resizable
             }
             Fl_Light_Button {} {
               label Border
               callback border_cb
-              tooltip {Add a border around the window.} xywh {210 235 60 20} selection_color 1 labelsize 10
+              tooltip {Add a border around the window.} xywh {209 235 57 20} selection_color 1 labelsize 11
             }
             Fl_Light_Button {} {
               label Modal
               callback modal_cb
-              tooltip {Make the window modal.} xywh {270 235 55 20} selection_color 1 labelsize 10
+              tooltip {Make the window modal.} xywh {266 235 54 20} selection_color 1 labelsize 11
             }
             Fl_Light_Button {} {
               label Nonmodal
               callback non_modal_cb
-              tooltip {Make the window non-modal.} xywh {325 235 70 20} selection_color 1 labelsize 9 align 148
+              tooltip {Make the window non-modal.} xywh {320 235 74 21} selection_color 1 labelsize 11 align 148
             }
           }
           Fl_Group {} {
             callback propagate_load open
-            xywh {95 260 301 20}
+            xywh {94 260 301 20} labelsize 11
           } {
             Fl_Light_Button {} {
               label Visible
               callback visible_cb
-              tooltip {Show the widget.} xywh {95 260 70 20} selection_color 1 labelsize 10
+              tooltip {Show the widget.} xywh {94 260 55 20} selection_color 1 labelsize 11
             }
             Fl_Box {} {
               label {Attributes:}
-              xywh {95 260 0 20} align 4
+              xywh {94 260 0 20} labelfont 1 labelsize 11 align 4
             }
             Fl_Light_Button {} {
               label Active
               callback active_cb
-              tooltip {Activate the widget.} xywh {165 260 70 20} selection_color 1 labelsize 10
+              tooltip {Activate the widget.} xywh {149 260 55 20} selection_color 1 labelsize 11
             }
             Fl_Light_Button {} {
               label Resizable
               callback resizable_cb
-              tooltip {Make the widget resizable.} xywh {235 260 70 20} selection_color 1 labelsize 10 when 1
+              tooltip {Make the widget resizable.} xywh {204 260 72 20} selection_color 1 labelsize 11 when 1
             }
             Fl_Light_Button {} {
               label Hotspot
               callback hotspot_cb
-              tooltip {Center the window under this widget.} xywh {305 260 70 20} selection_color 1 labelsize 10 when 1
+              tooltip {Center the window under this widget.} xywh {276 260 61 20} selection_color 1 labelsize 11 when 1
             }
             Fl_Box {} {
-              xywh {376 260 20 20} resizable
+              xywh {375 260 20 20} labelsize 11 resizable
             }
           }
           Fl_Input {} {
             label {Tooltip:}
             callback tooltip_cb
-            tooltip {The tooltip text for the widget.} xywh {95 285 300 20}
+            tooltip {The tooltip text for the widget.} xywh {94 285 300 20} labelfont 1 labelsize 11 textsize 11
           }
           Fl_Box {} {
-            xywh {95 308 300 12} resizable
+            xywh {94 305 300 20} labelsize 11 resizable
           }
         }
       }
       Fl_Group {} {
         label Style
         callback propagate_load
-        xywh {10 30 395 295} when 0 hide
+        xywh {10 30 395 295} labelsize 11 when 0 hide
       } {
         Fl_Group {} {
           callback propagate_load open
-          xywh {100 40 295 276} resizable
+          xywh {100 40 295 276} labelsize 11 resizable
         } {
           Fl_Group {} {
             callback propagate_load open
-            xywh {100 40 295 95}
+            xywh {100 40 295 95} labelsize 11
           } {
             Fl_Group {} {
               callback propagate_load open
-              xywh {100 40 295 20}
+              xywh {100 40 295 20} labelsize 11
             } {
               Fl_Choice {} {
                 label {Label Font:}
                 callback labelfont_cb open
-                tooltip {The style of the label text.} xywh {100 40 155 20} box THIN_UP_BOX down_box BORDER_BOX resizable
+                tooltip {The style of the label text.} xywh {100 40 155 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable
                 code0 {extern Fl_Menu_Item fontmenu[];}
                 code1 {o->menu(fontmenu);}
               } {}
               Fl_Value_Input {} {
                 callback labelsize_cb
-                tooltip {The size of the label text.} xywh {255 40 50 20} maximum 100 step 1 value 14
+                tooltip {The size of the label text.} xywh {255 40 50 20} labelsize 11 maximum 100 step 1 value 14 textsize 11
               }
               Fl_Button {} {
                 label {Label Color}
                 callback labelcolor_cb
-                tooltip {The color of the label text.} xywh {305 40 90 20} labelsize 8
+                tooltip {The color of the label text.} xywh {305 40 90 20} labelsize 11
               }
             }
             Fl_Group {} {
               callback propagate_load open
-              xywh {100 65 295 20}
+              xywh {100 65 295 20} labelsize 11
             } {
               Fl_Choice {} {
                 label {Box:}
                 callback box_cb open
-                tooltip {The "up" box of the widget.} xywh {100 65 205 20} box THIN_UP_BOX down_box BORDER_BOX resizable
+                tooltip {The "up" box of the widget.} xywh {100 65 205 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable
                 code0 {extern Fl_Menu_Item boxmenu[];}
                 code1 {o->menu(boxmenu);}
               } {}
               Fl_Button {} {
                 label Color
                 callback color_cb
-                tooltip {The background color of the widget.} xywh {305 65 90 20} labelsize 8
+                tooltip {The background color of the widget.} xywh {305 65 90 20} labelsize 11
               }
             }
             Fl_Group {} {
               callback propagate_load open
-              xywh {100 90 295 20}
+              xywh {100 90 295 20} labelsize 11
             } {
               Fl_Choice {} {
                 label {Down Box:}
                 callback down_box_cb open
-                tooltip {The "down" box of the widget.} xywh {100 90 205 20} box THIN_UP_BOX down_box BORDER_BOX resizable
+                tooltip {The "down" box of the widget.} xywh {100 90 205 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable
                 code0 {extern Fl_Menu_Item boxmenu[];}
                 code1 {o->menu(boxmenu);}
               } {}
               Fl_Button {} {
                 label {Select Color}
                 callback color2_cb
-                tooltip {The selection color of the widget.} xywh {305 90 90 20} labelsize 8
+                tooltip {The selection color of the widget.} xywh {305 90 90 20} labelsize 11
               }
             }
             Fl_Group {} {
               callback propagate_load open
-              xywh {100 115 295 20}
+              xywh {100 115 295 20} labelsize 11
             } {
               Fl_Choice {} {
                 label {Text Font:}
                 callback textfont_cb open
-                tooltip {The value text style.} xywh {100 115 155 20} box DOWN_BOX down_box BORDER_BOX resizable
+                tooltip {The value text style.} xywh {100 115 155 20} box DOWN_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable
                 code0 {extern Fl_Menu_Item fontmenu[];}
                 code1 {o->menu(fontmenu);}
               } {}
               Fl_Value_Input {} {
                 callback textsize_cb
-                tooltip {The value text size.} xywh {255 115 50 20} maximum 100 step 1 value 14
+                tooltip {The value text size.} xywh {255 115 50 20} labelsize 11 maximum 100 step 1 value 14 textsize 11
               }
               Fl_Button {} {
                 label {Text Color}
                 callback textcolor_cb
-                tooltip {The value text color.} xywh {305 115 90 20} labelsize 8
+                tooltip {The value text color.} xywh {305 115 90 20} labelsize 11
               }
             }
           }
           Fl_Box {} {
-            xywh {100 304 295 12} resizable
+            xywh {100 304 295 12} labelsize 11 resizable
           }
         }
       }
       Fl_Group {} {
         label {C++}
-        callback propagate_load
-        xywh {10 30 395 295} when 0 hide
+        callback propagate_load selected
+        xywh {10 30 395 295} labelsize 11 when 0
       } {
         Fl_Group {} {
           callback propagate_load open
-          xywh {100 40 295 132}
+          xywh {100 40 295 132} labelsize 11
         } {
           Fl_Group {} {
             callback propagate_load open
-            xywh {100 40 295 20}
+            xywh {100 40 295 20} labelsize 11
           } {
             Fl_Input {} {
               label {Class:}
               user_data 4
               callback subclass_cb
-              tooltip {The widget subclass.} xywh {100 40 160 20} textfont 4 resizable
+              tooltip {The widget subclass.} xywh {100 40 160 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
             }
             Fl_Choice {} {
               callback subtype_cb open
-              tooltip {The widget subtype.} xywh {260 40 135 20} box THIN_UP_BOX down_box BORDER_BOX
+              tooltip {The widget subtype.} xywh {260 40 135 20} box THIN_UP_BOX down_box BORDER_BOX labelsize 11
             } {}
           }
           Fl_Group {} {
             callback propagate_load open
-            xywh {100 65 295 20}
+            xywh {100 65 295 20} labelsize 11
           } {
             Fl_Input {} {
               label {Name:}
               callback name_cb
-              tooltip {The name of the widget.} xywh {100 65 230 20} resizable
+              tooltip {The name of the widget.} xywh {100 65 230 20} labelfont 1 labelsize 11 textsize 11 resizable
             }
             Fl_Light_Button {} {
               label public
               callback name_public_cb
-              tooltip {Make the widget publicly accessible.} xywh {330 65 65 20} selection_color 1 labelsize 10 when 1
+              tooltip {Make the widget publicly accessible.} xywh {330 65 65 20} selection_color 1 labelsize 11 when 1
             }
           }
           Fl_Input {v_input[0]} {
             label {Extra Code:}
             user_data 0
             callback v_input_cb
-            tooltip {Extra initialization code for the widget.} xywh {100 90 295 20} textfont 4
+            tooltip {Extra initialization code for the widget.} xywh {100 90 295 20} labelfont 1 labelsize 11 textfont 4 textsize 11
           }
           Fl_Input {v_input[1]} {
             user_data 1
             callback v_input_cb
-            tooltip {Extra initialization code for the widget.} xywh {100 110 295 20} textfont 4
+            tooltip {Extra initialization code for the widget.} xywh {100 110 295 20} labelsize 11 textfont 4 textsize 11
           }
           Fl_Input {v_input[2]} {
             user_data 2
             callback v_input_cb
-            tooltip {Extra initialization code for the widget.} xywh {100 130 295 20} textfont 4
+            tooltip {Extra initialization code for the widget.} xywh {100 130 295 20} labelsize 11 textfont 4 textsize 11
           }
           Fl_Input {v_input[3]} {
             user_data 3
             callback v_input_cb
-            tooltip {Extra initialization code for the widget.} xywh {100 150 295 20} textfont 4
+            tooltip {Extra initialization code for the widget.} xywh {100 150 295 20} labelsize 11 textfont 4 textsize 11
           }
         }
         Fl_Group {} {
           callback propagate_load open
-          xywh {100 175 295 90} box DOWN_BOX resizable
+          xywh {100 175 295 90} box DOWN_BOX labelsize 11 resizable
         } {
           Fl_Text_Editor {} {
             label {Callback:}
             callback callback_cb
-            tooltip {The callback function or code for the widget.} xywh {102 177 291 86} box NO_BOX align 4 textfont 4 resizable
+            tooltip {The callback function or code for the widget.} xywh {102 177 291 86} box NO_BOX labelfont 1 labelsize 11 align 4 textfont 4 textsize 11 resizable
             code0 {o->buffer(new Fl_Text_Buffer());}
             code1 {o->textfont(FL_COURIER);}
           }
         }
         Fl_Group {} {
           callback propagate_load open
-          xywh {100 270 295 45}
+          xywh {100 270 295 45} labelsize 11
         } {
           Fl_Group {} {
             callback propagate_load open
-            xywh {100 270 295 20}
+            xywh {100 270 295 20} labelsize 11
           } {
             Fl_Input {} {
               label {User Data:}
               callback user_data_cb
-              tooltip {The user data to pass into the callback code.} xywh {100 270 140 20} textfont 4 resizable
+              tooltip {The user data to pass into the callback code.} xywh {100 270 140 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
             }
             Fl_Choice {} {
               label {When:}
               callback when_cb open
-              tooltip {When to call the callback function.} xywh {290 270 105 20} box THIN_UP_BOX down_box BORDER_BOX when 1
+              tooltip {When to call the callback function.} xywh {290 270 105 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 when 1
               code0 {extern Fl_Menu_Item whenmenu[];}
               code1 {o->menu(whenmenu);}
             } {}
           }
           Fl_Group {} {
             callback propagate_load open
-            xywh {100 295 295 20}
+            xywh {100 295 295 20} labelsize 11
           } {
             Fl_Input {} {
               label {Type:}
               callback user_data_type_cb
-              tooltip {The type of the user data.} xywh {100 295 140 20} textfont 4 resizable
+              tooltip {The type of the user data.} xywh {100 295 140 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
             }
             Fl_Light_Button {} {
               label {No Change}
               callback when_button_cb
-              tooltip {Call the callback even if the value has not changed.} xywh {290 295 105 20} selection_color 1 labelsize 10
+              tooltip {Call the callback even if the value has not changed.} xywh {290 295 105 20} selection_color 1 labelsize 11
             }
           }
         }
         Fl_Box {} {
           label label
-          xywh {95 325 100 0} hide deactivate
+          xywh {95 325 100 0} labelsize 11 hide deactivate
         }
       }
     }
     Fl_Group {} {
-      xywh {10 335 395 25}
+      xywh {8 335 396 20} labelsize 11
     } {
       Fl_Box {} {
-        xywh {12 335 12 25} resizable
+        xywh {8 335 20 0} labelsize 11 resizable
       }
       Fl_Button {} {
         label {No &Overlay}
         callback overlay_cb
-        tooltip {Hide the widget overlay box.} xywh {215 335 100 25} labelcolor 1
+        tooltip {Hide the widget overlay box.} xywh {274 335 77 19} labelsize 11 labelcolor 1
       }
       Fl_Button {} {
         label Revert
         callback revert_cb
-        xywh {155 335 80 25} hide
+        xywh {159 335 80 0} labelsize 11 hide
       }
       Fl_Return_Button {} {
         label OK
         callback ok_cb
-        xywh {325 335 80 25}
+        xywh {356 335 48 19} labelsize 11
       }
       Fl_Button {} {
         label Cancel
         callback cancel_cb
-        xywh {325 335 80 25} hide
+        xywh {329 335 75 0} labelsize 11 hide
       }
     }
   }
 } 
+
+comment {
+//
+// End of "$Id$".
+//} {in_source in_header
+} 
diff --git a/fluid/widget_panel.h b/fluid/widget_panel.h
index 6105b18b9..f4784cab3 100644
--- a/fluid/widget_panel.h
+++ b/fluid/widget_panel.h
@@ -1,3 +1,30 @@
+//
+// "$Id$"
+//
+// Widget panel for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2005 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
 // generated by Fast Light User Interface Designer (fluid) version 1.0107
 
 #ifndef widget_panel_h
@@ -77,3 +104,7 @@ extern void ok_cb(Fl_Return_Button*, void*);
 extern void cancel_cb(Fl_Button*, void*);
 Fl_Double_Window* make_widget_panel();
 #endif
+
+//
+// End of "$Id$".
+//