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

1 files changed, 230 insertions, 83 deletions

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$".
+//