Lots of little GUI tweeks, capitalization changes, copyright update, etc.

git-svn-id: file:///fltk/svn/fltk/trunk@247 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

12 files changed, 255 insertions, 187 deletions

diff --git a/fluid/about_panel.cxx b/fluid/about_panel.cxx
index 331a72897..4bda9f92b 100644
--- a/fluid/about_panel.cxx
+++ b/fluid/about_panel.cxx
@@ -2,16 +2,16 @@
 
 #include "about_panel.h"
 
-Fl_Window *about_panel;
+Fl_Window *about_panel=(Fl_Window *)0;
 
-Fl_Group *display_group;
+Fl_Group *display_group=(Fl_Group *)0;
 
 static void cb_1998(Fl_Button*, void*) {
   display_group->hide();
 copyright_box->show();
 }
 
-Fl_Box *copyright_box;
+Fl_Box *copyright_box=(Fl_Box *)0;
 
 static void cb_OK(Fl_Return_Button* o, void*) {
   ((Fl_Window*)(o->parent()))->hide();
@@ -19,7 +19,8 @@ static void cb_OK(Fl_Return_Button* o, void*) {
 
 Fl_Window* make_about_panel(const char *copyright) {
   Fl_Window* w;
-  { Fl_Window* o = about_panel = w = new Fl_Window(309, 221, "about fluid");
+  { Fl_Window* o = about_panel = new Fl_Window(309, 221, "about fluid");
+    w = o;
     o->box(FL_UP_BOX);
     o->color(97);
     o->selection_color(47);
@@ -86,7 +87,7 @@ Fl_Window* make_about_panel(const char *copyright) {
         o->labelcolor(7);
         o->align(17);
       }
-      { Fl_Box* o = new Fl_Box(159, 27, 131, 95, "Fltk User\nInterface\nDesigner\nVersion 1.00");
+      { Fl_Box* o = new Fl_Box(159, 27, 131, 95, "FLTK User\nInterface\nDesigner\nVersion 1.0");
         o->box(FL_OVAL_BOX);
         o->color(12);
         o->selection_color(47);
@@ -95,7 +96,7 @@ Fl_Window* make_about_panel(const char *copyright) {
         o->labelsize(18);
         o->labelcolor(7);
       }
-      { Fl_Button* o = new Fl_Button(169, 138, 115, 30, "\xa9\x31\x39\x39\x38 Bill Spitzak\n(click here)");
+      { Fl_Button* o = new Fl_Button(169, 138, 115, 30, "\251\061\071\071\070-1999 by\nBill Spitzak and others");
         o->box(FL_THIN_UP_BOX);
         o->labelsize(10);
         o->labelcolor(136);
diff --git a/fluid/about_panel.fl b/fluid/about_panel.fl
index b35c59251..08e68a243 100644
--- a/fluid/about_panel.fl
+++ b/fluid/about_panel.fl
@@ -1,5 +1,7 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 0.99 
+version 1.00 
+header_name {.h} 
+code_name {.cxx} 
 gridx 2 
 gridy 2 
 snap 3
@@ -7,58 +9,58 @@ Function {make_about_panel(const char *copyright)} {open
 } {
   Fl_Window about_panel {
     label {about fluid} open
-    xywh {345 417 309 221} box UP_BOX color {97 47} hide hotspot non_modal noborder
+    xywh {345 417 309 221} box UP_BOX color 97 selection_color 47 hide hotspot non_modal noborder
   } {
     Fl_Group display_group {open
       xywh {24 14 275 186}
     } {
       Fl_Box {} {
-        xywh {64 14 50 126} box ROUND_UP_BOX color {14 47} labelcolor 6
+        xywh {64 14 50 126} box ROUND_UP_BOX color 14 selection_color 47 labelcolor 6
       }
       Fl_Box {} {
-        xywh {54 14 70 16} box FLAT_BOX color {97 47}
+        xywh {54 14 70 16} box FLAT_BOX color 97 selection_color 47
       }
       Fl_Box {} {
-        xywh {68 30 42 50} box DOWN_BOX color {6 47}
+        xywh {68 30 42 50} box DOWN_BOX color 6 selection_color 47
       }
       Fl_Box {} {
-        xywh {54 20 70 20} box ROUND_UP_BOX color {6 47} labelcolor 6 align 16
+        xywh {54 20 70 20} box ROUND_UP_BOX color 6 selection_color 47 labelcolor 6 align 16
       }
       Fl_Box {} {
         label fluid
-        xywh {24 110 130 90} box ROUND_UP_BOX color {14 47} labeltype SHADOW_LABEL labelfont 1 labelsize 40 labelcolor 6
+        xywh {24 110 130 90} box ROUND_UP_BOX color 14 selection_color 47 labeltype SHADOW_LABEL labelfont 1 labelsize 40 labelcolor 6
       }
       Fl_Box {} {
-        xywh {67 110 44 10} box FLAT_BOX color {14 47}
+        xywh {67 110 44 10} box FLAT_BOX color 14 selection_color 47
       }
       Fl_Box {} {
         label {` }
-        xywh {84 120 15 15} box OVAL_BOX color {6 47} labelsize 20 labelcolor 7 align 17
+        xywh {84 120 15 15} box OVAL_BOX color 6 selection_color 47 labelsize 20 labelcolor 7 align 17
       }
       Fl_Box {} {
         label {` }
-        xywh {75 105 15 15} box OVAL_BOX color {6 47} labelsize 20 labelcolor 7 align 17
+        xywh {75 105 15 15} box OVAL_BOX color 6 selection_color 47 labelsize 20 labelcolor 7 align 17
       }
       Fl_Box {} {
         label {` }
-        xywh {89 85 15 15} box OVAL_BOX color {6 47} labelsize 20 labelcolor 7 align 17
+        xywh {89 85 15 15} box OVAL_BOX color 6 selection_color 47 labelsize 20 labelcolor 7 align 17
       }
       Fl_Box {} {
-        label {Fltk User
+        label {FLTK User
 Interface
 Designer
-Version 1.00}
-        xywh {159 27 131 95} box OVAL_BOX color {12 47} labeltype SHADOW_LABEL labelfont 1 labelsize 18 labelcolor 7
+Version 1.0} selected
+        xywh {159 27 131 95} box OVAL_BOX color 12 selection_color 47 labeltype SHADOW_LABEL labelfont 1 labelsize 18 labelcolor 7
       }
       Fl_Button {} {
-        label {©1998 Bill Spitzak
-(click here)}
+        label {©1998-1999 by
+Bill Spitzak and others}
         callback {display_group->hide();
 copyright_box->show();}
         xywh {169 138 115 30} box THIN_UP_BOX labelsize 10 labelcolor 136
       }
     }
-    Fl_Box copyright_box {selected
+    Fl_Box copyright_box {
       xywh {5 5 300 210} labelsize 8 labelcolor 6 align 148 hide
       code0 {o->label(copyright);}
     }
diff --git a/fluid/about_panel.h b/fluid/about_panel.h
index ece923b69..bd05e658c 100644
--- a/fluid/about_panel.h
+++ b/fluid/about_panel.h
@@ -1,5 +1,7 @@
 // generated by Fast Light User Interface Designer (fluid) version 1.00
 
+#ifndef about_panel_h
+#define about_panel_h
 #include <FL/Fl.H>
 #include <FL/Fl_Box.H>
 #include <FL/Fl_Button.H>
@@ -10,3 +12,7 @@ extern Fl_Window *about_panel;
 extern Fl_Group *display_group;
 extern Fl_Box *copyright_box;
 Fl_Window* make_about_panel(const char *copyright);
+extern Fl_Window *about_panel;
+extern Fl_Group *display_group;
+extern Fl_Box *copyright_box;
+#endif
diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index 59c4bfbdd..0726959e4 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -2,74 +2,76 @@
 
 #include "alignment_panel.h"
 
-Fl_Window *alignment_window;
+Fl_Window *alignment_window=(Fl_Window *)0;
 
-Fl_Input *horizontal_input;
+Fl_Input *horizontal_input=(Fl_Input *)0;
 
-Fl_Input *vertical_input;
+Fl_Input *vertical_input=(Fl_Input *)0;
 
-Fl_Input *snap_input;
+Fl_Input *snap_input=(Fl_Input *)0;
 
-static void cb_close(Fl_Button*, void*) {
+static void cb_Close(Fl_Button*, void*) {
   alignment_window->hide();
 }
 
-Fl_Input *header_file_input;
+Fl_Input *header_file_input=(Fl_Input *)0;
 
-Fl_Input *code_file_input;
+Fl_Input *code_file_input=(Fl_Input *)0;
 
-Fl_Light_Button *include_H_from_C_button;
+Fl_Light_Button *include_H_from_C_button=(Fl_Light_Button *)0;
 
 Fl_Window* make_alignment_window() {
   Fl_Window* w;
-  { Fl_Window* o = alignment_window = w = new Fl_Window(210, 310, "fluid Preferences");
-    { Fl_Box* o = new Fl_Box(10, 20, 190, 100, "ALIGNMENT:");
+  { Fl_Window* o = alignment_window = new Fl_Window(210, 310, "fluid Preferences");
+    w = o;
+    { Fl_Box* o = new Fl_Box(10, 20, 190, 100, "Alignment:");
       o->box(FL_ENGRAVED_FRAME);
-      o->labelsize(10);
+      o->labelsize(12);
       o->align(5);
     }
-    { Fl_Input* o = horizontal_input = new Fl_Input(90, 30, 100, 20, "horizontal:");
+    { Fl_Input* o = horizontal_input = new Fl_Input(90, 30, 100, 20, "Horizontal:");
       o->type(2);
       o->box(FL_THIN_DOWN_BOX);
       o->callback((Fl_Callback*)alignment_cb, (void*)(1));
       o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
     }
-    { Fl_Input* o = vertical_input = new Fl_Input(90, 60, 100, 20, "vertical:");
+    { Fl_Input* o = vertical_input = new Fl_Input(90, 60, 100, 20, "Vertical:");
       o->type(2);
       o->box(FL_THIN_DOWN_BOX);
       o->callback((Fl_Callback*)alignment_cb, (void*)(2));
       o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
     }
-    { Fl_Input* o = snap_input = new Fl_Input(90, 90, 100, 20, "snap:");
+    { Fl_Input* o = snap_input = new Fl_Input(90, 90, 100, 20, "Snap:");
       o->type(2);
       o->box(FL_THIN_DOWN_BOX);
       o->callback((Fl_Callback*)alignment_cb, (void*)(3));
       o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
     }
-    { Fl_Button* o = new Fl_Button(10, 280, 190, 20, "close");
-      o->callback((Fl_Callback*)cb_close);
+    { Fl_Button* o = new Fl_Button(140, 280, 60, 20, "Close");
+      o->callback((Fl_Callback*)cb_Close);
     }
-    { Fl_Box* o = new Fl_Box(10, 140, 190, 100, "OUTPUT FILE NAMES:");
+    { Fl_Box* o = new Fl_Box(10, 140, 190, 130, "Output File Names:");
       o->box(FL_ENGRAVED_FRAME);
-      o->labelsize(10);
+      o->labelsize(12);
       o->align(5);
     }
-    { Fl_Box* o = new Fl_Box(10, 140, 190, 40, "Use \"name.ext\" to set name, use just \".ext\" to set only extension.");
+    { Fl_Box* o = new Fl_Box(20, 150, 170, 30, "Use \"name.ext\" to set name or just \".ext\" to set only extension.");
       o->labelsize(10);
-      o->align(128);
+      o->align(148);
     }
-    { Fl_Input* o = header_file_input = new Fl_Input(90, 180, 100, 20, "header file:");
+    { Fl_Input* o = header_file_input = new Fl_Input(100, 180, 90, 20, "Header File:");
       o->box(FL_THIN_DOWN_BOX);
       o->callback((Fl_Callback*)header_input_cb, (void*)(1));
       o->when(1);
     }
-    { Fl_Input* o = code_file_input = new Fl_Input(90, 210, 100, 20, "code file:");
+    { Fl_Input* o = code_file_input = new Fl_Input(100, 210, 90, 20, "Code File:");
       o->box(FL_THIN_DOWN_BOX);
       o->callback((Fl_Callback*)code_input_cb, (void*)(1));
       o->when(1);
     }
-    { Fl_Light_Button* o = include_H_from_C_button = new Fl_Light_Button(60, 250, 140, 20, "Include .h from .cxx");
+    { Fl_Light_Button* o = include_H_from_C_button = new Fl_Light_Button(20, 240, 170, 20, "Include Header from Code");
       o->value(1);
+      o->labelsize(12);
       o->callback((Fl_Callback*)include_H_from_C_button_cb);
     }
     o->set_modal();
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index c7ddcbcbf..a2b0f444a 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 0.99 
+version 1.00 
 header_name {.h} 
 code_name {.cxx} 
 gridx 10 
@@ -9,62 +9,62 @@ Function {make_alignment_window()} {open
 } {
   Fl_Window alignment_window {
     label {fluid Preferences} open
-    xywh {0 22 210 310} modal visible
+    xywh {15 22 210 310} modal visible
   } {
     Fl_Box {} {
-      label {ALIGNMENT:}
-      xywh {10 20 190 100} box ENGRAVED_FRAME labelsize 10 align 5
+      label {Alignment:}
+      xywh {10 20 190 100} box ENGRAVED_FRAME labelsize 12 align 5
     }
     Fl_Input horizontal_input {
-      label {horizontal:}
+      label {Horizontal:}
       user_data 1 user_data_type long
       callback alignment_cb
       xywh {90 30 100 20} type Int box THIN_DOWN_BOX
       code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
     }
     Fl_Input vertical_input {
-      label {vertical:}
+      label {Vertical:}
       user_data 2 user_data_type long
       callback alignment_cb
       xywh {90 60 100 20} type Int box THIN_DOWN_BOX
       code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
     }
     Fl_Input snap_input {
-      label {snap:}
+      label {Snap:}
       user_data 3 user_data_type long
-      callback alignment_cb
+      callback alignment_cb selected
       xywh {90 90 100 20} type Int box THIN_DOWN_BOX
       code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
     }
     Fl_Button {} {
-      label close
+      label Close
       callback {alignment_window->hide();}
-      xywh {10 280 190 20}
+      xywh {140 280 60 20}
     }
     Fl_Box {} {
-      label {OUTPUT FILE NAMES:}
-      xywh {10 140 190 100} box ENGRAVED_FRAME labelsize 10 align 5
+      label {Output File Names:}
+      xywh {10 140 190 130} box ENGRAVED_FRAME labelsize 12 align 5
     }
     Fl_Box {} {
-      label {Use "name.ext" to set name, use just ".ext" to set only extension.}
-      xywh {10 140 190 40} labelsize 10 align 128
+      label {Use "name.ext" to set name or just ".ext" to set only extension.}
+      xywh {20 150 170 30} labelsize 10 align 148
     }
     Fl_Input header_file_input {
-      label {header file:}
+      label {Header File:}
       user_data 1 user_data_type {void*}
       callback header_input_cb
-      xywh {90 180 100 20} box THIN_DOWN_BOX when 1
+      xywh {100 180 90 20} box THIN_DOWN_BOX when 1
     }
     Fl_Input code_file_input {
-      label {code file:}
+      label {Code File:}
       user_data 1 user_data_type {void*}
       callback code_input_cb
-      xywh {90 210 100 20} box THIN_DOWN_BOX when 1
+      xywh {100 210 90 20} box THIN_DOWN_BOX when 1
     }
     Fl_Light_Button include_H_from_C_button {
-      label {Include .H from .C}
+      label {Include Header from Code}
       callback include_H_from_C_button_cb
-      xywh {60 250 140 20} value 1
+      xywh {20 240 170 20} value 1 labelsize 12
     }
   }
 } 
diff --git a/fluid/alignment_panel.h b/fluid/alignment_panel.h
index 5e4fd16bb..81cfd2df3 100644
--- a/fluid/alignment_panel.h
+++ b/fluid/alignment_panel.h
@@ -1,5 +1,7 @@
 // generated by Fast Light User Interface Designer (fluid) version 1.00
 
+#ifndef alignment_panel_h
+#define alignment_panel_h
 #include <FL/Fl.H>
 #include <FL/Fl_Box.H>
 #include <FL/Fl_Button.H>
@@ -18,3 +20,11 @@ extern Fl_Input *header_file_input;
 extern Fl_Input *code_file_input;
 extern Fl_Light_Button *include_H_from_C_button;
 Fl_Window* make_alignment_window();
+extern Fl_Window *alignment_window;
+extern Fl_Input *horizontal_input;
+extern Fl_Input *vertical_input;
+extern Fl_Input *snap_input;
+extern Fl_Input *header_file_input;
+extern Fl_Input *code_file_input;
+extern Fl_Light_Button *include_H_from_C_button;
+#endif
diff --git a/fluid/function_panel.cxx b/fluid/function_panel.cxx
index e4b2db024..0c5818621 100644
--- a/fluid/function_panel.cxx
+++ b/fluid/function_panel.cxx
@@ -2,32 +2,33 @@
 
 #include "function_panel.h"
 
-Fl_Window *function_panel;
+Fl_Window *function_panel=(Fl_Window *)0;
 
-Fl_Light_Button *f_public_button;
+Fl_Light_Button *f_public_button=(Fl_Light_Button *)0;
 
-Fl_Input *f_name_input;
+Fl_Input *f_name_input=(Fl_Input *)0;
 
-Fl_Input *f_return_type_input;
+Fl_Input *f_return_type_input=(Fl_Input *)0;
 
-Fl_Return_Button *f_panel_ok;
+Fl_Return_Button *f_panel_ok=(Fl_Return_Button *)0;
 
-Fl_Button *f_panel_cancel;
+Fl_Button *f_panel_cancel=(Fl_Button *)0;
 
 Fl_Window* make_function_panel() {
   Fl_Window* w;
-  { Fl_Window* o = function_panel = w = new Fl_Window(287, 173, "function/method");
+  { Fl_Window* o = function_panel = new Fl_Window(287, 173, "function/method");
+    w = o;
     { Fl_Light_Button* o = f_public_button = new Fl_Light_Button(10, 15, 65, 25, "public");
       o->labelsize(10);
       o->when(0);
     }
-    { Fl_Input* o = f_name_input = new Fl_Input(10, 60, 270, 25, "name(args): (blank for main())");
+    { Fl_Input* o = f_name_input = new Fl_Input(10, 60, 270, 25, "Name(args): (blank for main())");
       o->labelsize(12);
       o->align(5);
       o->when(0);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Input* o = f_return_type_input = new Fl_Input(10, 105, 270, 25, "return type: (blank to return outermost widget)");
+    { Fl_Input* o = f_return_type_input = new Fl_Input(10, 105, 270, 25, "Return Type: (blank to return outermost widget)");
       o->labelsize(12);
       o->align(5);
       o->when(0);
@@ -35,7 +36,7 @@ Fl_Window* make_function_panel() {
     { Fl_Return_Button* o = f_panel_ok = new Fl_Return_Button(110, 140, 80, 25, "OK");
       w->hotspot(o);
     }
-    { Fl_Button* o = f_panel_cancel = new Fl_Button(200, 140, 80, 25, "cancel");
+    { Fl_Button* o = f_panel_cancel = new Fl_Button(200, 140, 80, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
@@ -44,17 +45,18 @@ Fl_Window* make_function_panel() {
   return w;
 }
 
-Fl_Window *code_panel;
+Fl_Window *code_panel=(Fl_Window *)0;
 
-Fl_Input *code_input;
+Fl_Input *code_input=(Fl_Input *)0;
 
-Fl_Return_Button *code_panel_ok;
+Fl_Return_Button *code_panel_ok=(Fl_Return_Button *)0;
 
-Fl_Button *code_panel_cancel;
+Fl_Button *code_panel_cancel=(Fl_Button *)0;
 
 Fl_Window* make_code_panel() {
   Fl_Window* w;
-  { Fl_Window* o = code_panel = w = new Fl_Window(291, 178, "code");
+  { Fl_Window* o = code_panel = new Fl_Window(291, 178, "code");
+    w = o;
     { Fl_Input* o = code_input = new Fl_Input(6, 5, 280, 135);
       o->type(4);
       o->labelsize(12);
@@ -65,7 +67,7 @@ Fl_Window* make_code_panel() {
     { Fl_Return_Button* o = code_panel_ok = new Fl_Return_Button(115, 145, 80, 25, "OK");
       w->hotspot(o);
     }
-    { Fl_Button* o = code_panel_cancel = new Fl_Button(205, 145, 80, 25, "cancel");
+    { Fl_Button* o = code_panel_cancel = new Fl_Button(205, 145, 80, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
@@ -74,19 +76,20 @@ Fl_Window* make_code_panel() {
   return w;
 }
 
-Fl_Window *codeblock_panel;
+Fl_Window *codeblock_panel=(Fl_Window *)0;
 
-Fl_Input *code_before_input;
+Fl_Input *code_before_input=(Fl_Input *)0;
 
-Fl_Input *code_after_input;
+Fl_Input *code_after_input=(Fl_Input *)0;
 
-Fl_Return_Button *codeblock_panel_ok;
+Fl_Return_Button *codeblock_panel_ok=(Fl_Return_Button *)0;
 
-Fl_Button *codeblock_panel_cancel;
+Fl_Button *codeblock_panel_cancel=(Fl_Button *)0;
 
 Fl_Window* make_codeblock_panel() {
   Fl_Window* w;
-  { Fl_Window* o = codeblock_panel = w = new Fl_Window(293, 134, "codeblock");
+  { Fl_Window* o = codeblock_panel = new Fl_Window(293, 134, "codeblock");
+    w = o;
     { Fl_Input* o = code_before_input = new Fl_Input(10, 5, 275, 25);
       o->labelsize(12);
       o->align(5);
@@ -104,7 +107,7 @@ Fl_Window* make_codeblock_panel() {
     { Fl_Return_Button* o = codeblock_panel_ok = new Fl_Return_Button(115, 100, 80, 25, "OK");
       w->hotspot(o);
     }
-    { Fl_Button* o = codeblock_panel_cancel = new Fl_Button(205, 100, 80, 25, "cancel");
+    { Fl_Button* o = codeblock_panel_cancel = new Fl_Button(205, 100, 80, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
@@ -113,19 +116,20 @@ Fl_Window* make_codeblock_panel() {
   return w;
 }
 
-Fl_Window *declblock_panel;
+Fl_Window *declblock_panel=(Fl_Window *)0;
 
-Fl_Input *decl_before_input;
+Fl_Input *decl_before_input=(Fl_Input *)0;
 
-Fl_Input *decl_after_input;
+Fl_Input *decl_after_input=(Fl_Input *)0;
 
-Fl_Return_Button *declblock_panel_ok;
+Fl_Return_Button *declblock_panel_ok=(Fl_Return_Button *)0;
 
-Fl_Button *declblock_panel_cancel;
+Fl_Button *declblock_panel_cancel=(Fl_Button *)0;
 
 Fl_Window* make_declblock_panel() {
   Fl_Window* w;
-  { Fl_Window* o = declblock_panel = w = new Fl_Window(293, 134, "declaration block");
+  { Fl_Window* o = declblock_panel = new Fl_Window(293, 134, "declaration block");
+    w = o;
     { Fl_Input* o = decl_before_input = new Fl_Input(15, 10, 275, 25);
       o->labelsize(12);
       o->align(5);
@@ -143,7 +147,7 @@ Fl_Window* make_declblock_panel() {
     { Fl_Return_Button* o = declblock_panel_ok = new Fl_Return_Button(120, 105, 80, 25, "OK");
       w->hotspot(o);
     }
-    { Fl_Button* o = declblock_panel_cancel = new Fl_Button(210, 105, 80, 25, "cancel");
+    { Fl_Button* o = declblock_panel_cancel = new Fl_Button(210, 105, 80, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
@@ -152,19 +156,20 @@ Fl_Window* make_declblock_panel() {
   return w;
 }
 
-Fl_Window *decl_panel;
+Fl_Window *decl_panel=(Fl_Window *)0;
 
-Fl_Light_Button *decl_public_button;
+Fl_Light_Button *decl_public_button=(Fl_Light_Button *)0;
 
-Fl_Input *decl_input;
+Fl_Input *decl_input=(Fl_Input *)0;
 
-Fl_Return_Button *decl_panel_ok;
+Fl_Return_Button *decl_panel_ok=(Fl_Return_Button *)0;
 
-Fl_Button *decl_panel_cancel;
+Fl_Button *decl_panel_cancel=(Fl_Button *)0;
 
 Fl_Window* make_decl_panel() {
   Fl_Window* w;
-  { Fl_Window* o = decl_panel = w = new Fl_Window(290, 176, "declaration");
+  { Fl_Window* o = decl_panel = new Fl_Window(290, 176, "declaration");
+    w = o;
     { Fl_Light_Button* o = decl_public_button = new Fl_Light_Button(10, 15, 65, 25, "public");
       o->labelsize(10);
       o->when(0);
@@ -180,7 +185,7 @@ int foo();\",\na #directive like \"#include <foo.h>\",\nor a comment like \"\
     { Fl_Return_Button* o = decl_panel_ok = new Fl_Return_Button(115, 145, 80, 25, "OK");
       w->hotspot(o);
     }
-    { Fl_Button* o = decl_panel_cancel = new Fl_Button(205, 145, 80, 25, "cancel");
+    { Fl_Button* o = decl_panel_cancel = new Fl_Button(205, 145, 80, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->end();
@@ -188,21 +193,22 @@ int foo();\",\na #directive like \"#include <foo.h>\",\nor a comment like \"\
   return w;
 }
 
-Fl_Window *class_panel;
+Fl_Window *class_panel=(Fl_Window *)0;
 
-Fl_Light_Button *c_public_button;
+Fl_Light_Button *c_public_button=(Fl_Light_Button *)0;
 
-Fl_Input *c_name_input;
+Fl_Input *c_name_input=(Fl_Input *)0;
 
-Fl_Input *c_subclass_input;
+Fl_Input *c_subclass_input=(Fl_Input *)0;
 
-Fl_Return_Button *c_panel_ok;
+Fl_Return_Button *c_panel_ok=(Fl_Return_Button *)0;
 
-Fl_Button *c_panel_cancel;
+Fl_Button *c_panel_cancel=(Fl_Button *)0;
 
 Fl_Window* make_class_panel() {
   Fl_Window* w;
-  { Fl_Window* o = class_panel = w = new Fl_Window(287, 173, "class");
+  { Fl_Window* o = class_panel = new Fl_Window(287, 173, "class");
+    w = o;
     { Fl_Light_Button* o = c_public_button = new Fl_Light_Button(10, 10, 65, 25, "public");
       o->labelsize(10);
       o->when(0);
@@ -221,7 +227,7 @@ Fl_Window* make_class_panel() {
     { Fl_Return_Button* o = c_panel_ok = new Fl_Return_Button(110, 135, 80, 25, "OK");
       w->hotspot(o);
     }
-    { Fl_Button* o = c_panel_cancel = new Fl_Button(200, 135, 80, 25, "cancel");
+    { Fl_Button* o = c_panel_cancel = new Fl_Button(200, 135, 80, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl
index e4ad307f1..637c0bdd4 100644
--- a/fluid/function_panel.fl
+++ b/fluid/function_panel.fl
@@ -1,5 +1,7 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 0.99 
+version 1.00 
+header_name {.h} 
+code_name {.cxx} 
 gridx 10 
 gridy 5 
 snap 3
@@ -7,18 +9,18 @@ Function {make_function_panel()} {open
 } {
   Fl_Window function_panel {
     label {function/method} open
-    xywh {281 608 287 173} modal visible
+    xywh {281 608 287 173} resizable modal visible
   } {
     Fl_Light_Button f_public_button {
       label public
       xywh {10 15 65 25} labelsize 10 when 0
     }
     Fl_Input f_name_input {
-      label {name(args): (blank for main())}
+      label {Name(args): (blank for main())}
       xywh {10 60 270 25} labelsize 12 align 5 when 0 resizable
     }
     Fl_Input f_return_type_input {
-      label {return type: (blank to return outermost widget)}
+      label {Return Type: (blank to return outermost widget)} selected
       xywh {10 105 270 25} labelsize 12 align 5 when 0
     }
     Fl_Return_Button f_panel_ok {
@@ -26,7 +28,7 @@ Function {make_function_panel()} {open
       xywh {110 140 80 25} hotspot
     }
     Fl_Button f_panel_cancel {
-      label cancel
+      label Cancel
       xywh {200 140 80 25} shortcut 0xff1b
     }
   }
@@ -36,7 +38,7 @@ Function {make_code_panel()} {open
 } {
   Fl_Window code_panel {
     label code open
-    xywh {256 219 291 178} modal visible
+    xywh {256 219 291 178} resizable modal visible
   } {
     Fl_Input code_input {
       xywh {6 5 280 135} type Multiline labelsize 12 align 0 when 0 resizable
@@ -46,7 +48,7 @@ Function {make_code_panel()} {open
       xywh {115 145 80 25} hotspot
     }
     Fl_Button code_panel_cancel {
-      label cancel
+      label Cancel
       xywh {205 145 80 25} shortcut 0xff1b
     }
   }
@@ -56,7 +58,7 @@ Function {make_codeblock_panel()} {open
 } {
   Fl_Window codeblock_panel {
     label codeblock open
-    xywh {285 439 293 134} modal visible
+    xywh {285 439 293 134} resizable modal visible
   } {
     Fl_Input code_before_input {
       xywh {10 5 275 25} labelsize 12 align 5 when 0 resizable
@@ -73,7 +75,7 @@ Function {make_codeblock_panel()} {open
       xywh {115 100 80 25} hotspot
     }
     Fl_Button codeblock_panel_cancel {
-      label cancel
+      label Cancel
       xywh {205 100 80 25} shortcut 0xff1b
     }
   }
@@ -83,7 +85,7 @@ Function {make_declblock_panel()} {open
 } {
   Fl_Window declblock_panel {
     label {declaration block} open
-    xywh {296 118 293 134} modal visible
+    xywh {296 118 293 134} resizable modal visible
   } {
     Fl_Input decl_before_input {
       xywh {15 10 275 25} labelsize 12 align 5 when 0 resizable
@@ -100,7 +102,7 @@ Function {make_declblock_panel()} {open
       xywh {120 105 80 25} hotspot
     }
     Fl_Button declblock_panel_cancel {
-      label cancel
+      label Cancel
       xywh {210 105 80 25} shortcut 0xff1b
     }
   }
@@ -110,7 +112,7 @@ Function {make_decl_panel()} {open
 } {
   Fl_Window decl_panel {
     label declaration open
-    xywh {278 800 290 176} visible
+    xywh {278 800 290 176} resizable visible
   } {
     Fl_Light_Button decl_public_button {
       label public
@@ -128,7 +130,7 @@ or a comment like "//foo" or "/*foo*/"}
       xywh {115 145 80 25} hotspot
     }
     Fl_Button decl_panel_cancel {
-      label cancel
+      label Cancel
       xywh {205 145 80 25} shortcut 0xff1b
     }
   }
@@ -137,8 +139,8 @@ or a comment like "//foo" or "/*foo*/"}
 Function {make_class_panel()} {open
 } {
   Fl_Window class_panel {
-    label class open selected
-    xywh {291 618 287 173} modal visible
+    label class open
+    xywh {513 790 287 173} resizable modal visible
   } {
     Fl_Light_Button c_public_button {
       label public
@@ -157,7 +159,7 @@ Function {make_class_panel()} {open
       xywh {110 135 80 25} hotspot
     }
     Fl_Button c_panel_cancel {
-      label cancel
+      label Cancel
       xywh {200 135 80 25} shortcut 0xff1b
     }
   }
diff --git a/fluid/function_panel.h b/fluid/function_panel.h
index 016d846d3..9e152077b 100644
--- a/fluid/function_panel.h
+++ b/fluid/function_panel.h
@@ -1,5 +1,7 @@
 // generated by Fast Light User Interface Designer (fluid) version 1.00
 
+#ifndef function_panel_h
+#define function_panel_h
 #include <FL/Fl.H>
 #include <FL/Fl_Box.H>
 #include <FL/Fl_Button.H>
@@ -14,29 +16,54 @@ extern Fl_Input *f_return_type_input;
 extern Fl_Return_Button *f_panel_ok;
 extern Fl_Button *f_panel_cancel;
 Fl_Window* make_function_panel();
+extern Fl_Window *function_panel;
+extern Fl_Light_Button *f_public_button;
+extern Fl_Input *f_name_input;
+extern Fl_Input *f_return_type_input;
+extern Fl_Return_Button *f_panel_ok;
+extern Fl_Button *f_panel_cancel;
 extern Fl_Window *code_panel;
 extern Fl_Input *code_input;
 extern Fl_Return_Button *code_panel_ok;
 extern Fl_Button *code_panel_cancel;
 Fl_Window* make_code_panel();
+extern Fl_Window *code_panel;
+extern Fl_Input *code_input;
+extern Fl_Return_Button *code_panel_ok;
+extern Fl_Button *code_panel_cancel;
 extern Fl_Window *codeblock_panel;
 extern Fl_Input *code_before_input;
 extern Fl_Input *code_after_input;
 extern Fl_Return_Button *codeblock_panel_ok;
 extern Fl_Button *codeblock_panel_cancel;
 Fl_Window* make_codeblock_panel();
+extern Fl_Window *codeblock_panel;
+extern Fl_Input *code_before_input;
+extern Fl_Input *code_after_input;
+extern Fl_Return_Button *codeblock_panel_ok;
+extern Fl_Button *codeblock_panel_cancel;
 extern Fl_Window *declblock_panel;
 extern Fl_Input *decl_before_input;
 extern Fl_Input *decl_after_input;
 extern Fl_Return_Button *declblock_panel_ok;
 extern Fl_Button *declblock_panel_cancel;
 Fl_Window* make_declblock_panel();
+extern Fl_Window *declblock_panel;
+extern Fl_Input *decl_before_input;
+extern Fl_Input *decl_after_input;
+extern Fl_Return_Button *declblock_panel_ok;
+extern Fl_Button *declblock_panel_cancel;
 extern Fl_Window *decl_panel;
 extern Fl_Light_Button *decl_public_button;
 extern Fl_Input *decl_input;
 extern Fl_Return_Button *decl_panel_ok;
 extern Fl_Button *decl_panel_cancel;
 Fl_Window* make_decl_panel();
+extern Fl_Window *decl_panel;
+extern Fl_Light_Button *decl_public_button;
+extern Fl_Input *decl_input;
+extern Fl_Return_Button *decl_panel_ok;
+extern Fl_Button *decl_panel_cancel;
 extern Fl_Window *class_panel;
 extern Fl_Light_Button *c_public_button;
 extern Fl_Input *c_name_input;
@@ -44,3 +71,10 @@ extern Fl_Input *c_subclass_input;
 extern Fl_Return_Button *c_panel_ok;
 extern Fl_Button *c_panel_cancel;
 Fl_Window* make_class_panel();
+extern Fl_Window *class_panel;
+extern Fl_Light_Button *c_public_button;
+extern Fl_Input *c_name_input;
+extern Fl_Input *c_subclass_input;
+extern Fl_Return_Button *c_panel_ok;
+extern Fl_Button *c_panel_cancel;
+#endif
diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx
index e685b21e6..847ea1006 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -2,13 +2,14 @@
 
 #include "widget_panel.h"
 
-Fl_Input *v_input[4];
+Fl_Input *v_input[4]={(Fl_Input *)0};
 
 Fl_Window* make_widget_panel() {
   Fl_Window* w;
-  { Fl_Window* o = w = new Fl_Window(370, 480);
+  { Fl_Window* o = new Fl_Window(370, 480);
+    w = o;
     w->hotspot(o);
-    { Fl_Input* o = new Fl_Input(90, 10, 210, 20, "name:");
+    { Fl_Input* o = new Fl_Input(90, 10, 210, 20, "Name:");
       o->box(FL_THIN_UP_BOX);
       o->callback((Fl_Callback*)name_cb);
       o->when(0);
@@ -20,7 +21,7 @@ Fl_Window* make_widget_panel() {
       o->callback((Fl_Callback*)name_public_cb);
       o->when(1);
     }
-    { Fl_Input* o = new Fl_Input(90, 35, 170, 20, "class:");
+    { Fl_Input* o = new Fl_Input(90, 35, 170, 20, "Class:");
       o->box(FL_THIN_UP_BOX);
       o->callback((Fl_Callback*)subclass_cb, (void*)(4));
       o->when(0);
@@ -29,12 +30,12 @@ Fl_Window* make_widget_panel() {
       o->box(FL_THIN_UP_BOX);
       o->callback((Fl_Callback*)subtype_cb);
     }
-    { Fl_Input* o = new Fl_Input(90, 60, 270, 20, "label:");
+    { Fl_Input* o = new Fl_Input(90, 60, 270, 20, "Label:");
       o->box(FL_THIN_UP_BOX);
       o->callback((Fl_Callback*)label_cb);
       o->when(1);
     }
-    { Fl_Choice* o = new Fl_Choice(90, 80, 150, 20, "labeltype:");
+    { Fl_Choice* o = new Fl_Choice(90, 80, 150, 20, "Label Type:");
       o->box(FL_THIN_UP_BOX);
       o->callback((Fl_Callback*)labeltype_cb);
       o->menu(labeltypemenu);
@@ -86,7 +87,7 @@ Fl_Window* make_widget_panel() {
       o->labelsize(8);
       o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_CLIP));
     }
-    { Fl_Choice* o = new Fl_Choice(90, 100, 170, 20, "labelfont:");
+    { Fl_Choice* o = new Fl_Choice(90, 100, 170, 20, "Label Font:");
       o->box(FL_THIN_UP_BOX);
       o->callback((Fl_Callback*)labelfont_cb);
       o->menu(fontmenu);
@@ -98,32 +99,32 @@ Fl_Window* make_widget_panel() {
       o->value(14);
       o->callback((Fl_Callback*)labelsize_cb);
     }
-    { Fl_Button* o = new Fl_Button(310, 100, 50, 20, "labelcolor");
+    { Fl_Button* o = new Fl_Button(310, 100, 50, 20, "Label Color");
       o->box(FL_THIN_UP_BOX);
       o->labelsize(8);
       o->callback((Fl_Callback*)labelcolor_cb);
     }
-    { Fl_Choice* o = new Fl_Choice(90, 125, 220, 20, "box:");
+    { Fl_Choice* o = new Fl_Choice(90, 125, 220, 20, "Box:");
       o->box(FL_THIN_UP_BOX);
       o->callback((Fl_Callback*)box_cb);
       o->menu(boxmenu);
     }
-    { Fl_Button* o = new Fl_Button(310, 125, 50, 20, "color");
+    { Fl_Button* o = new Fl_Button(310, 125, 50, 20, "Color");
       o->box(FL_THIN_UP_BOX);
       o->labelsize(8);
       o->callback((Fl_Callback*)color_cb);
     }
-    { Fl_Choice* o = new Fl_Choice(90, 145, 220, 20, "down_box:");
+    { Fl_Choice* o = new Fl_Choice(90, 145, 220, 20, "Down Box:");
       o->box(FL_THIN_UP_BOX);
       o->callback((Fl_Callback*)down_box_cb);
       o->menu(boxmenu);
     }
-    { Fl_Button* o = new Fl_Button(310, 145, 50, 20, "select color");
+    { Fl_Button* o = new Fl_Button(310, 145, 50, 20, "Select Color");
       o->box(FL_THIN_UP_BOX);
       o->labelsize(8);
       o->callback((Fl_Callback*)color2_cb);
     }
-    { Fl_Choice* o = new Fl_Choice(90, 170, 170, 20, "textfont:");
+    { Fl_Choice* o = new Fl_Choice(90, 170, 170, 20, "Text Font:");
       o->box(FL_THIN_UP_BOX);
       o->callback((Fl_Callback*)textfont_cb);
       o->hide();
@@ -134,7 +135,7 @@ Fl_Window* make_widget_panel() {
       o->callback((Fl_Callback*)xclass_cb);
       o->when(0);
     }
-    { Shortcut_Button* o = new Shortcut_Button(90, 170, 270, 20, "shortcut:");
+    { Shortcut_Button* o = new Shortcut_Button(90, 170, 270, 20, "Shortcut:");
       o->box(FL_THIN_UP_BOX);
       o->color(7);
       o->selection_color(7);
@@ -149,39 +150,39 @@ Fl_Window* make_widget_panel() {
       o->callback((Fl_Callback*)textsize_cb);
       o->hide();
     }
-    { Fl_Button* o = new Fl_Button(310, 170, 50, 20, "textcolor");
+    { Fl_Button* o = new Fl_Button(310, 170, 50, 20, "Text Color");
       o->box(FL_THIN_UP_BOX);
       o->labelsize(8);
       o->callback((Fl_Callback*)textcolor_cb);
       o->hide();
     }
-    { Fl_Value_Input* o = new Fl_Value_Input(20, 205, 60, 20, "size:");
+    { Fl_Value_Input* o = new Fl_Value_Input(20, 205, 60, 20, "Size:");
       o->box(FL_THIN_UP_BOX);
       o->labelsize(10);
       o->step(0.010101);
       o->callback((Fl_Callback*)slider_size_cb);
       o->align(5);
     }
-    { Fl_Value_Input* o = new Fl_Value_Input(90, 205, 60, 20, "minimum:");
+    { Fl_Value_Input* o = new Fl_Value_Input(90, 205, 60, 20, "Minimum:");
       o->box(FL_THIN_UP_BOX);
       o->labelsize(10);
       o->callback((Fl_Callback*)min_cb);
       o->align(5);
     }
-    { Fl_Value_Input* o = new Fl_Value_Input(160, 205, 60, 20, "maximum:");
+    { Fl_Value_Input* o = new Fl_Value_Input(160, 205, 60, 20, "Maximum:");
       o->box(FL_THIN_UP_BOX);
       o->labelsize(10);
       o->value(1);
       o->callback((Fl_Callback*)max_cb);
       o->align(5);
     }
-    { Fl_Value_Input* o = new Fl_Value_Input(230, 205, 60, 20, "step:");
+    { Fl_Value_Input* o = new Fl_Value_Input(230, 205, 60, 20, "Step:");
       o->box(FL_THIN_UP_BOX);
       o->labelsize(10);
       o->callback((Fl_Callback*)step_cb);
       o->align(5);
     }
-    { Fl_Value_Input* o = new Fl_Value_Input(300, 205, 60, 20, "value:");
+    { Fl_Value_Input* o = new Fl_Value_Input(300, 205, 60, 20, "Value:");
       o->box(FL_THIN_UP_BOX);
       o->labelsize(10);
       o->callback((Fl_Callback*)value_cb);
@@ -237,7 +238,7 @@ Fl_Window* make_widget_panel() {
       }
       o->end();
     }
-    { Fl_Input* o = v_input[0] = new Fl_Input(90, 260, 270, 20, "extra code:");
+    { Fl_Input* o = v_input[0] = new Fl_Input(90, 260, 270, 20, "Extra Code:");
       o->box(FL_THIN_UP_BOX);
       o->callback((Fl_Callback*)v_input_cb, (void*)(0));
       o->when(0);
@@ -257,7 +258,7 @@ Fl_Window* make_widget_panel() {
       o->callback((Fl_Callback*)v_input_cb, (void*)(3));
       o->when(0);
     }
-    { Fl_Box* o = new Fl_Box(0, 350, 90, 20, "callback:");
+    { Fl_Box* o = new Fl_Box(0, 350, 90, 20, "Callback:");
       o->align(24);
     }
     { Fl_Input* o = new Fl_Input(90, 350, 270, 50);
@@ -276,12 +277,12 @@ Fl_Window* make_widget_panel() {
       o->callback((Fl_Callback*)user_data_cb);
       o->when(0);
     }
-    { Fl_Input* o = new Fl_Input(300, 400, 60, 20, "type:");
+    { Fl_Input* o = new Fl_Input(300, 400, 60, 20, "Type:");
       o->box(FL_THIN_UP_BOX);
       o->callback((Fl_Callback*)user_data_type_cb);
       o->when(0);
     }
-    { Fl_Choice* o = new Fl_Choice(90, 420, 100, 20, "when:");
+    { Fl_Choice* o = new Fl_Choice(90, 420, 100, 20, "When:");
       o->box(FL_THIN_UP_BOX);
       o->callback((Fl_Callback*)when_cb);
       o->when(0);
diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index 7ecaf55d0..fe0d7f7ad 100644
--- a/fluid/widget_panel.fl
+++ b/fluid/widget_panel.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 0.99 
+version 1.00 
 header_name {.h} 
 code_name {.cxx} 
 gridx 10 
@@ -8,20 +8,20 @@ snap 3
 Function {make_widget_panel()} {open
 } {
   Fl_Window {} {open
-    xywh {189 164 370 480} hotspot visible
+    xywh {189 164 370 480} resizable hotspot visible
   } {
     Fl_Input {} {
-      label {name:}
+      label {Name:}
       callback name_cb
       xywh {90 10 210 20} box THIN_UP_BOX when 0
     }
     Fl_Light_Button {} {
       label public
       callback name_public_cb
-      xywh {300 10 60 20} box THIN_UP_BOX color {49 1} labelsize 10 when 1
+      xywh {300 10 60 20} box THIN_UP_BOX selection_color 1 labelsize 10 when 1
     }
     Fl_Input {} {
-      label {class:}
+      label {Class:}
       user_data 4
       callback subclass_cb
       xywh {90 35 170 20} box THIN_UP_BOX when 0
@@ -31,12 +31,12 @@ Function {make_widget_panel()} {open
       xywh {260 35 100 20} box THIN_UP_BOX
     } {}
     Fl_Input {} {
-      label {label:}
+      label {Label:}
       callback label_cb
       xywh {90 60 270 20} box THIN_UP_BOX when 1
     }
     Fl_Choice {} {
-      label {labeltype:}
+      label {Label Type:}
       callback labeltype_cb
       xywh {90 80 150 20} box THIN_UP_BOX
       code0 {extern Fl_Menu_Item labeltypemenu[];}
@@ -85,7 +85,7 @@ Function {make_widget_panel()} {open
       xywh {340 90 20 10} type Toggle box THIN_UP_BOX labelsize 8
     }
     Fl_Choice {} {
-      label {labelfont:}
+      label {Label Font:}
       callback labelfont_cb
       xywh {90 100 170 20} box THIN_UP_BOX
       code0 {extern Fl_Menu_Item fontmenu[];}
@@ -96,37 +96,37 @@ Function {make_widget_panel()} {open
       xywh {260 100 50 20} box THIN_UP_BOX maximum 100 step 1 value 14
     }
     Fl_Button {} {
-      label labelcolor
+      label {Label Color}
       callback labelcolor_cb
       xywh {310 100 50 20} box THIN_UP_BOX labelsize 8
     }
     Fl_Choice {} {
-      label {box:}
+      label {Box:}
       callback box_cb
       xywh {90 125 220 20} box THIN_UP_BOX
       code0 {extern Fl_Menu_Item boxmenu[];}
       code1 {o->menu(boxmenu);}
     } {}
     Fl_Button {} {
-      label color
+      label Color
       callback color_cb
       xywh {310 125 50 20} box THIN_UP_BOX labelsize 8
     }
     Fl_Choice {} {
-      label {down_box:}
+      label {Down Box:}
       callback down_box_cb
       xywh {90 145 220 20} box THIN_UP_BOX
       code0 {extern Fl_Menu_Item boxmenu[];}
       code1 {o->menu(boxmenu);}
     } {}
     Fl_Button {} {
-      label {select color}
+      label {Select Color}
       callback color2_cb
       xywh {310 145 50 20} box THIN_UP_BOX labelsize 8
     }
     Fl_Choice {} {
-      label {textfont:}
-      callback textfont_cb selected
+      label {Text Font:}
+      callback textfont_cb
       xywh {90 170 170 20} box THIN_UP_BOX hide
       code0 {extern Fl_Menu_Item fontmenu[];}
       code1 {o->menu(fontmenu);}
@@ -137,9 +137,9 @@ Function {make_widget_panel()} {open
       xywh {90 170 170 20} box THIN_UP_BOX when 0
     }
     Fl_Button {} {
-      label {shortcut:}
+      label {Shortcut:}
       callback shortcut_in_cb
-      xywh {90 170 270 20} box THIN_UP_BOX color {7 7} align 4
+      xywh {90 170 270 20} box THIN_UP_BOX color 7 selection_color 7 align 4
       code0 {\#include "Shortcut_Button.h"}
       class Shortcut_Button
     }
@@ -148,32 +148,32 @@ Function {make_widget_panel()} {open
       xywh {260 170 50 20} box THIN_UP_BOX maximum 100 step 1 value 14 hide
     }
     Fl_Button {} {
-      label textcolor
+      label {Text Color}
       callback textcolor_cb
       xywh {310 170 50 20} box THIN_UP_BOX labelsize 8 hide
     }
     Fl_Value_Input {} {
-      label {size:}
+      label {Size:}
       callback slider_size_cb
       xywh {20 205 60 20} box THIN_UP_BOX labelsize 10 align 5 step 0.010101
     }
     Fl_Value_Input {} {
-      label {minimum:}
+      label {Minimum:}
       callback min_cb
       xywh {90 205 60 20} box THIN_UP_BOX labelsize 10 align 5
     }
     Fl_Value_Input {} {
-      label {maximum:}
+      label {Maximum:}
       callback max_cb
       xywh {160 205 60 20} box THIN_UP_BOX labelsize 10 align 5 value 1
     }
     Fl_Value_Input {} {
-      label {step:}
+      label {Step:}
       callback step_cb
       xywh {230 205 60 20} box THIN_UP_BOX labelsize 10 align 5
     }
     Fl_Value_Input {} {
-      label {value:}
+      label {Value:}
       callback value_cb
       xywh {300 205 60 20} box THIN_UP_BOX labelsize 10 align 5
     }
@@ -184,41 +184,41 @@ Function {make_widget_panel()} {open
       Fl_Light_Button {} {
         label non_modal
         callback non_modal_cb
-        xywh {20 230 70 20} box THIN_UP_BOX color {49 1} labelsize 9 align 148
+        xywh {20 230 70 20} box THIN_UP_BOX selection_color 1 labelsize 9 align 148
       }
       Fl_Light_Button {} {
         label visible
         callback visible_cb
-        xywh {90 230 60 20} box THIN_UP_BOX color {49 1} labelsize 10
+        xywh {90 230 60 20} box THIN_UP_BOX selection_color 1 labelsize 10
       }
       Fl_Light_Button {} {
         label modal
         callback modal_cb
-        xywh {90 230 60 20} box THIN_UP_BOX color {49 1} labelsize 10
+        xywh {90 230 60 20} box THIN_UP_BOX selection_color 1 labelsize 10
       }
       Fl_Light_Button {} {
         label active
         callback active_cb
-        xywh {160 230 60 20} box THIN_UP_BOX color {49 1} labelsize 10
+        xywh {160 230 60 20} box THIN_UP_BOX selection_color 1 labelsize 10
       }
       Fl_Light_Button {} {
         label border
         callback border_cb
-        xywh {160 230 60 20} box THIN_UP_BOX color {49 1} labelsize 10
+        xywh {160 230 60 20} box THIN_UP_BOX selection_color 1 labelsize 10
       }
       Fl_Light_Button {} {
         label resizable
         callback resizable_cb
-        xywh {230 230 60 20} box THIN_UP_BOX color {49 1} labelsize 10 when 1
+        xywh {230 230 60 20} box THIN_UP_BOX selection_color 1 labelsize 10 when 1
       }
       Fl_Light_Button {} {
         label hotspot
         callback hotspot_cb
-        xywh {300 230 60 20} box THIN_UP_BOX color {49 1} labelsize 10 when 1
+        xywh {300 230 60 20} box THIN_UP_BOX selection_color 1 labelsize 10 when 1
       }
     }
     Fl_Input {v_input[0]} {
-      label {extra code:}
+      label {Extra Code:}
       user_data 0
       callback v_input_cb
       xywh {90 260 270 20} box THIN_UP_BOX when 0
@@ -239,7 +239,7 @@ Function {make_widget_panel()} {open
       xywh {90 320 270 20} box THIN_UP_BOX when 0
     }
     Fl_Box {} {
-      label {callback:}
+      label {Callback:}
       xywh {0 350 90 20} align 24
     }
     Fl_Input {} {
@@ -256,13 +256,13 @@ Function {make_widget_panel()} {open
       xywh {90 400 170 20} box THIN_UP_BOX when 0
     }
     Fl_Input {} {
-      label {type:}
+      label {Type:}
       callback user_data_type_cb
       xywh {300 400 60 20} box THIN_UP_BOX when 0
     }
     Fl_Choice {} {
-      label {when:}
-      callback when_cb
+      label {When:}
+      callback when_cb selected
       xywh {90 420 100 20} box THIN_UP_BOX when 0
       code0 {extern Fl_Menu_Item whenmenu[];}
       code1 {o->menu(whenmenu);}
@@ -270,7 +270,7 @@ Function {make_widget_panel()} {open
     Fl_Light_Button {} {
       label {no change}
       callback when_button_cb
-      xywh {190 420 70 20} box THIN_UP_BOX color {49 1} labelsize 10 when 0
+      xywh {190 420 70 20} box THIN_UP_BOX selection_color 1 labelsize 10 when 0
     }
     Fl_Group {} {open
       xywh {10 450 350 20}
diff --git a/fluid/widget_panel.h b/fluid/widget_panel.h
index 9e499b499..56e11ab5c 100644
--- a/fluid/widget_panel.h
+++ b/fluid/widget_panel.h
@@ -1,5 +1,7 @@
 // generated by Fast Light User Interface Designer (fluid) version 1.00
 
+#ifndef widget_panel_h
+#define widget_panel_h
 #include "Shortcut_Button.h"
 #include <FL/Fl.H>
 #include <FL/Fl_Box.H>
@@ -59,3 +61,5 @@ extern void when_cb(Fl_Choice*, void*);
 extern void xclass_cb(Fl_Input*, void*);
 extern Fl_Input *v_input[4];
 Fl_Window* make_widget_panel();
+extern Fl_Input *v_input[4];
+#endif