Documentation updates for 1.0.8.

FLUID GUI tweeks (OK and Cancel use now consistent, spacing now consistent,
Courier font for code, etc.)


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

24 files changed, 281 insertions, 197 deletions

diff --git a/documentation/Fl_Tile.html b/documentation/Fl_Tile.html
index e906105a0..8c281da97 100644
--- a/documentation/Fl_Tile.html
+++ b/documentation/Fl_Tile.html
@@ -5,11 +5,9 @@
 <H3>Class Hierarchy</H3>
 <UL>
 <PRE>
-<A href=Fl_Widget.html#Fl_Widget>Fl_Widget</A>
+<A href=Fl_Group.html#Fl_Group>Fl_Group</A>
    |
    +----<B>Fl_Tile</B>
-           |
-           +----<A href=Fl_Pack.html#Fl_Pack>Fl_Pack</A>, <A href=Fl_Scroll.html#Fl_Scroll>Fl_Scroll</A>, <A href=Fl_Tabs.html#Fl_Tabs>Fl_Tabs</A>, <A href=#Fl_Tile>Fl_Tile</A>, <A href=Fl_Window.html#Fl_Window>Fl_Window</A>
 </PRE>
 </UL>
 <H3>Include Files</H3>
diff --git a/documentation/Fl_Window.html b/documentation/Fl_Window.html
index 9ed982880..350a28c7c 100644
--- a/documentation/Fl_Window.html
+++ b/documentation/Fl_Window.html
@@ -145,12 +145,11 @@ also the maximum size (so the window cannot resize in  that direction). </LI>
  It is undefined what happens if the current size does not fit in the 
 constraints passed to <TT>size_range()</TT>. 
 <H4><A name=Fl_Window.show>virtual void Fl_Window::show()
-<BR> int Fl_Window::show(int argc, char **argv, int i)
 <BR> void Fl_Window::show(int argc, char **argv)</A></H4>
- Put the window on the screen.  Usually this has the side effect of 
-opening the display. The second two forms are used for top-level 
+Put the window on the screen.  Usually this has the side effect of 
+opening the display. The second form is used for top-level 
 windows and allow standard arguments to be parsed from the 
-command-line. 
+command-line.
 <P>If the window is already shown then it is restored and raised to the 
 top.  This is really convenient because your program can call <TT>show()</TT>
  at any time, even if the window is already up.  It also means that <TT>
diff --git a/documentation/basics.html b/documentation/basics.html
index 959e67641..b31186dc7 100644
--- a/documentation/basics.html
+++ b/documentation/basics.html
@@ -50,8 +50,8 @@ gcc ... -L/usr/local/lib -lfltk -lXext -lX11 -lm
  In Visual C++ you will need to tell the compiler where to find the 
 FLTK header files.  This can be done by selecting &quot;Settings&quot; from the 
 &quot;Project&quot; menu and then changing the &quot;Preprocessor&quot; settings under the 
-&quot;C/C++&quot; tab. Similarly, you will need to add the FLTK library to the 
-&quot;Link&quot; settings. 
+&quot;C/C++&quot; tab. You will also need to add the FLTK and WinSock (WSOCK32.LIB)
+libraries to the &quot;Link&quot; settings.
 <P>You can build your Microsoft Windows applications as Console or 
 WIN32 applications.  If you want to use the standard C <TT>main()</TT>
  function as the entry point, FLTK includes a <TT>WinMain()</TT>
diff --git a/documentation/drawing.html b/documentation/drawing.html
index 49c973a6e..7549576be 100644
--- a/documentation/drawing.html
+++ b/documentation/drawing.html
@@ -89,6 +89,8 @@ will be duplicated exactly on any platform FLTK is ported to.  It is
 undefined whether these are affected by the <A href=#complex_shapes>
 transformation matrix</A>, so you should only call these while it is 
 the identity. 
+<H4>void fl_point(int x, int y)</H4>
+Draw a single pixel at the given coordinates.
 <H4>void fl_rectf(int x, int y, int w, int h)</H4>
  Color a rectangle that exactly fills the given bounding box. 
 <H4>void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b)</H4>
diff --git a/documentation/fluid.html b/documentation/fluid.html
index 670a981fb..d336309d3 100644
--- a/documentation/fluid.html
+++ b/documentation/fluid.html
@@ -538,10 +538,11 @@ grid that all widgets snap to when you move and resize them, and for the
 "snap" which is how far a widget has to be dragged from its original position 
 to actually change.
 </TD>
-<TD VALIGN=TOP><IMG SRC="fluid_prefs.gif"></TD>
+<TD VALIGN=TOP WIDTH=226><IMG SRC="fluid_prefs.gif"></TD>
 </TR>
 </TABLE>
-The output filenames control the extensions or names of the files the are
+
+<P>The output filenames control the extensions or names of the files the are
 generated by FLUID.  If you check the "Include .h from .cxx" button the code
 file will include the header file automatically.
 
@@ -580,8 +581,7 @@ which is described later in this chapter. </P>
 <H4>Help/About FLUID</H4>
 Pops up a panel showing the version of FLUID. 
 <H3>The Widget Panel</H3>
-<TABLE cellpadding=0 cellspacing=0 width=100%>
-<TR><TD>When you double-click on a widget or a set of widgets you will get 
+When you double-click on a widget or a set of widgets you will get 
 the &quot;widget attribute panel&quot;. 
 <P>When you change attributes using this panel, the changes are 
 reflected immediately in the window. It is useful to hit the &quot;no 
@@ -591,7 +591,9 @@ the widgets more accurately, especially when setting the box type.
 for the fields.  In this case the value for <I>one</I> of the widgets 
 is shown.  But if you change this value, <I>all</I> of the selected 
 widgets are changed to the new value.
-<P>Hitting &quot;OK&quot; makes the changes permanent.  Selecting a different 
+<TABLE cellpadding=0 cellspacing=0 width=100%>
+<TR>
+<TD VALIGN=TOP>Hitting &quot;OK&quot; makes the changes permanent.  Selecting a different 
 widget also makes the changes permanent.  FLUID checks for simple 
 syntax errors such as mismatched parenthesis in any code before 
 saving any text.
@@ -600,8 +602,6 @@ the panel or hit OK.  However in the current version of FLUID, changes
 to &quot;visible&quot; attributes (such as the color, label, box) are not undone 
 by revert or cancel.  Changes to code like the callbacks are undone, 
 however.
-</TD><TD><IMG src="fluid_widget.gif"></TD></TR>
-</TABLE>
 <H3><A name=widget_attributes>Widget Attributes</A></H3>
 <H4>Name (text field)</H4>
 Name of a variable to declare, and to store a pointer to this 
@@ -611,6 +611,8 @@ blank then no variable is created.
 etc.  This will cause FLUID to declare an array of pointers.  The array 
 is big enough that the highest number found can be stored.  All widgets 
 that in the array must be the same type. </P>
+</TD><TD VALIGN=TOP WIDTH=378><IMG src="fluid_widget.gif"></TD></TR>
+</TABLE>
 <H4>Type (upper-right pulldown menu)</H4>
  Some classes have subtypes that modify their appearance or behavior. 
 You pick the subtype off of this menu. 
diff --git a/documentation/glut.html b/documentation/glut.html
index 80fc12be3..0fdb92417 100644
--- a/documentation/glut.html
+++ b/documentation/glut.html
@@ -126,10 +126,70 @@ not work.  If you do <TT>show()</TT> the window, call <TT>make_current()</TT>
  again to set the context. </P>
 <P><TT>~Fl_Glut_Window()</TT> is the same as <TT>glutDestroyWindow()</TT>
 . </P>
+<H3>Members</H3>
+The <TT>Fl_Glut_Window</TT> class contains several public members that can
+be altered directly:
+<CENTER><TABLE WIDTH="80%" BORDER">
+<TR>
+	<TH>member</TH>
+	<TH>description</TH>
+</TR>
+<TR>
+	<TD>display</TD>
+	<TD>A pointer to the function to call to draw the normal planes.</TD>
+</TR>
+<TR>
+	<TD>entry</TD>
+	<TD>A pointer to the function to call when the mouse moves into
+	or out of the window.</TD>
+</TR>
+<TR>
+	<TD>keyboard</TD>
+	<TD>A pointer to the function to call when a regular key is pressed.</TD>
+</TR>
+<TR>
+	<TD>menu[3]</TD>
+	<TD>The menu to post when one of the mouse buttons is pressed.</TD>
+</TR>
+<TR>
+	<TD>mouse</TD>
+	<TD>A pointer to the function to call when a button is pressed or
+	released.</TD>
+</TR>
+<TR>
+	<TD>motion</TD>
+	<TD>A pointer to the function to call when the mouse is moved with
+	a button down.</TD>
+</TR>
+<TR>
+	<TD>overlaydisplay</TD>
+	<TD>A pointer to the function to call to draw the overlay planes.</TD>
+</TR>
+<TR>
+	<TD>passivemotion</TD>
+	<TD>A pointer to the function to call when the mouse is moved with
+	no buttons down.</TD>
+</TR>
+<TR>
+	<TD>reshape</TD>
+	<TD>A pointer to the function to call when the window is resized.</TD>
+</TR>
+<TR>
+	<TD>special</TD>
+	<TD>A pointer to the function to call when a special key is pressed.</TD>
+</TR>
+<TR>
+	<TD>visibility</TD>
+	<TD>A pointer to the function to call when the window is iconified
+	or restored (made visible.)</TD>
+</TR>
+</TABLE></CENTER>
+
 <H3>Methods</H3>
 <UL>
 <LI><A href=#Fl_Glut_Window.Fl_Glut_Window>Fl_Glut_Window</A></LI>
 <LI><A href=#Fl_Glut_Window.~Fl_Glut_Window>~Fl_Glut_Window</A></LI>
+<LI><A href=#Fl_Glut_Window.make_current>make_current</A></LI>
 </UL>
 <H4><A name=Fl_Glut_Window.Fl_Glut_Window>
 Fl_Glut_Window::Fl_Glut_Window(int x, int y, int w, int h, const char 
@@ -142,4 +202,9 @@ will create the window with a preset size, but the window manager will
 choose the position according to it's own whims. 
 <H4><A name=Fl_Glut_Window.~Fl_Glut_Window>virtual 
 Fl_Glut_Window::~Fl_Glut_Window()</A></H4>
- Destroys the GLUT window. </BODY></HTML>
+ Destroys the GLUT window.
+<H4><A name="Fl_Glut_Window.make_current">void Fl_Glut_Window::make_current()</A></H4>
+Switches all drawing functions to the GLUT window.
+
+</BODY>
+</HTML>
diff --git a/documentation/index.html b/documentation/index.html
index c29e6d540..2c95634d0 100644
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -1,6 +1,6 @@
 <HTML>
 <HEAD><meta name="robots" content="noindex">
-	<TITLE>FLTK 1.0.4 Programming Manual</TITLE>
+	<TITLE>FLTK 1.0.8 Programming Manual</TITLE>
 </HEAD>
 <BODY>
 
@@ -8,9 +8,9 @@
 <TR>
 <TD ALIGN=CENTER VALIGN=MIDDLE><IMG SRC=FL.gif ALIGN=ABSMIDDLE></TD>
 <TD ALIGN=CENTER VALIGN=MIDDLE>
-<H1>FLTK 1.0.4 Programming Manual</H1>
-Revision 11 by Michael Sweet, Craig P. Earls, and Bill Spitzak<BR>
-Copyright 1998-1999 by Bill Spitzak and others.<BR>
+<H1>FLTK 1.0.8 Programming Manual</H1>
+Revision 12 by Michael Sweet, Craig P. Earls, and Bill Spitzak<BR>
+Copyright 1998-2000 by Bill Spitzak and others.<BR>
 </TD>
 </TR>
 <TR>
diff --git a/documentation/intro.html b/documentation/intro.html
index 1e827babf..19b9ca680 100644
--- a/documentation/intro.html
+++ b/documentation/intro.html
@@ -73,8 +73,6 @@ carefully optimized for code size and performance.</LI>
 (only about 10% of the code is different).</LI>
 <LI>Interactive user interface builder program. Output is 
  human-readable and editable C++ source code.</LI>
-<LI>Support for the X11 double buffering extension (emulation  if not 
-available and under Windows.)</LI>
 <LI>Support for X11 overlay hardware (emulation if none and  under 
 WIN32.)</LI>
 <LI>Very small &amp; fast portable 2-D drawing library to hide  Xlib and 
diff --git a/documentation/opengl.html b/documentation/opengl.html
index 8a5ab0aa7..2de7430e3 100644
--- a/documentation/opengl.html
+++ b/documentation/opengl.html
@@ -104,8 +104,8 @@ int MyWindow::handle(int event) {
     ... Return 1 if you understand/use the shortcut event, 0 otherwise...
     return 1;
   default:
-    // tell FLTK that I don't understand other events
-    return 0;
+    // pass other events to the base class...
+    return Fl_Gl_Window::handle(event);
   }
 }
 </PRE>
diff --git a/documentation/osissues.html b/documentation/osissues.html
index 83f6d6897..f9ec4a51a 100644
--- a/documentation/osissues.html
+++ b/documentation/osissues.html
@@ -232,10 +232,10 @@ MyWindow::~MyWindow() {
 </PRE>
 </UL>
 <H3>Setting the Icon of a Window</H3>
- FLTK currently supports setting a window's icon *before* it is shown 
+FLTK currently supports setting a window's icon *before* it is shown 
 using the <TT>Fl_Window::icon()</TT> method. 
 <H4>void Fl_Window::icon(char *)</H4>
- Sets the icon for the window to the passed pointer.  You will need to 
+Sets the icon for the window to the passed pointer.  You will need to 
 cast the icon <TT>Pixmap</TT> to a <TT>char *</TT> when calling this 
 method. To set the icon using a bitmap compiled with your application 
 use: 
@@ -249,6 +249,11 @@ Pixmap p = XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display),
 window-&gt;icon((char *)p);
 </PRE>
 </UL>
+
+<P><B>Note:</B> you must call <A HREF="Fl_Window.html#Fl_Window.show">
+<TT>Fl_Window::show(argc, argv)</TT></A> for the icon to be used. The
+<TT>Fl_Window::show()</TT> method does not bind the icon to the window.
+
 <H2>WIN32-Specific Interface</H2>
 <UL>
 <PRE>
@@ -330,6 +335,14 @@ application use:
 window-&gt;icon((char *)LoadIcon(fl_display, MAKEINTRESOURCE(IDI_ICON)));
 </PRE>
 </UL>
+
+You can also use the <TT>LoadImage()</TT> and related functions to load
+specific resolutions or create the icon from bitmap data.
+
+<P><B>Note:</B> you must call <A HREF="Fl_Window.html#Fl_Window.show">
+<TT>Fl_Window::show(argc, argv)</TT></A> for the icon to be used. The
+<TT>Fl_Window::show()</TT> method does not bind the icon to the window.
+
 <H3>How to Not Get a MSDOS Console Window</H3>
  WIN32 has a really stupid mode switch stored in the executables that 
 controls whether or not to make a console window. 
@@ -360,4 +373,4 @@ feature, not a bug. </P>
 <P><TT>SetCapture</TT> (used by <TT>Fl::grab()</TT>) doesn't work, and 
 the main window title bar turns gray while menus are popped up. </P>
 <P>FLUID does not support BMP files yet. </P>
-</BODY></HTML>
\ No newline at end of file
+</BODY></HTML>
diff --git a/documentation/preface.html b/documentation/preface.html
index de053541b..228bc437b 100644
--- a/documentation/preface.html
+++ b/documentation/preface.html
@@ -1,9 +1,9 @@
 <HTML>
 <HEAD>
 	<META CONTENT="Written by Michael Sweet, Craig P. Earls, and Bill Spitzak" NAME=Author>
-	<META CONTENT="Copyright 1998-1999 by Bill Spitzak and Others." NAME=Copyright>
-	<META CONTENT="Revision 11" NAME=DocNumber>
-	<TITLE>FLTK 1.0.4 Programming Manual</TITLE>
+	<META CONTENT="Copyright 1998-2000 by Bill Spitzak and Others." NAME=Copyright>
+	<META CONTENT="Revision 12" NAME=DocNumber>
+	<TITLE>FLTK 1.0.8 Programming Manual</TITLE>
 </HEAD>
 <BODY>
 <H1 ALIGN=RIGHT><A NAME=preface>Preface</A></H1>
diff --git a/documentation/subclassing.html b/documentation/subclassing.html
index 943b954eb..6df01be99 100644
--- a/documentation/subclassing.html
+++ b/documentation/subclassing.html
@@ -218,7 +218,7 @@ int MyClass::handle(int event) {
       }
       return 0;
     default:
-      return 0;
+      return Fl_Widget::handle(event);
   }
 }
 </PRE>
diff --git a/fluid/about_panel.cxx b/fluid/about_panel.cxx
index 53757f388..9694b5b6a 100644
--- a/fluid/about_panel.cxx
+++ b/fluid/about_panel.cxx
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.00
+// generated by Fast Light User Interface Designer (fluid) version 1.0008
 
 #include "about_panel.h"
 
@@ -96,7 +96,7 @@ Fl_Window* make_about_panel(const char *copyright) {
         o->labelsize(18);
         o->labelcolor(7);
       }
-      { Fl_Button* o = new Fl_Button(181, 176, 115, 30, "\251""1998-1999 by\nBill Spitzak and others");
+      { Fl_Button* o = new Fl_Button(181, 176, 115, 30, "\251""1998-2000 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 c0744c6e5..e4e5fc259 100644
--- a/fluid/about_panel.fl
+++ b/fluid/about_panel.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.00 
+version 1.0008 
 header_name {.h} 
 code_name {.cxx} 
 gridx 10 
@@ -9,7 +9,7 @@ Function {make_about_panel(const char *copyright)} {open
 } {
   Fl_Window about_panel {
     label {about fluid} open
-    xywh {345 417 309 258} box UP_BOX color 97 selection_color 47 hotspot non_modal visible
+    xywh {345 417 309 258} box UP_BOX color 97 selection_color 47 hide hotspot non_modal
   } {
     Fl_Group display_group {open
       xywh {10 10 289 240}
@@ -49,18 +49,18 @@ Function {make_about_panel(const char *copyright)} {open
         label {FLTK User
 Interface
 Designer
-Version 1.0}
+Version 1.0} selected
         xywh {150 27 140 113} box OVAL_BOX color 12 selection_color 47 labeltype SHADOW_LABEL labelfont 1 labelsize 18 labelcolor 7
       }
       Fl_Button {} {
-        label {©1998-1999 by
+        label {©1998-2000 by
 Bill Spitzak and others}
         callback {display_group->hide();
 copyright_box->show();}
         xywh {181 176 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 5f82833b6..bc9a9ab81 100644
--- a/fluid/about_panel.h
+++ b/fluid/about_panel.h
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.00
+// generated by Fast Light User Interface Designer (fluid) version 1.0008
 
 #ifndef about_panel_h
 #define about_panel_h
@@ -12,7 +12,4 @@ extern Fl_Group *display_group;
 extern Fl_Box *copyright_box;
 #include <FL/Fl_Return_Button.H>
 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 efe89cc09..fc9da9f62 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.00
+// generated by Fast Light User Interface Designer (fluid) version 1.0008
 
 #include "alignment_panel.h"
 
@@ -22,54 +22,54 @@ 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 = new Fl_Window(210, 310, "fluid Preferences");
+  { Fl_Window* o = alignment_window = new Fl_Window(210, 320, "Preferences");
     w = o;
-    { Fl_Box* o = new Fl_Box(10, 20, 190, 100, "Alignment:");
+    { Fl_Box* o = new Fl_Box(10, 25, 190, 100, "Alignment:");
       o->box(FL_ENGRAVED_FRAME);
       o->labelsize(12);
       o->align(FL_ALIGN_TOP_LEFT);
     }
-    { Fl_Input* o = horizontal_input = new Fl_Input(90, 30, 100, 20, "Horizontal:");
+    { Fl_Input* o = horizontal_input = new Fl_Input(90, 35, 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, 65, 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, 95, 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(140, 280, 60, 20, "Close");
+    { Fl_Button* o = new Fl_Button(140, 285, 60, 25, "Close");
       o->callback((Fl_Callback*)cb_Close);
     }
-    { Fl_Box* o = new Fl_Box(10, 140, 190, 130, "Output File Names:");
+    { Fl_Box* o = new Fl_Box(10, 145, 190, 130, "Output File Names:");
       o->box(FL_ENGRAVED_FRAME);
       o->labelsize(12);
       o->align(FL_ALIGN_TOP_LEFT);
     }
-    { Fl_Box* o = new Fl_Box(20, 150, 170, 30, "Use \"name.ext\" to set name or just \".ext\" to set only extension.");
+    { Fl_Box* o = new Fl_Box(20, 155, 170, 30, "Use \"name.ext\" to set name or just \".ext\" to set only extension.");
       o->labelsize(10);
       o->align(132|FL_ALIGN_INSIDE);
     }
-    { Fl_Input* o = header_file_input = new Fl_Input(100, 180, 90, 20, "Header File:");
+    { Fl_Input* o = header_file_input = new Fl_Input(100, 185, 90, 20, "Header File:");
       o->box(FL_THIN_DOWN_BOX);
       o->callback((Fl_Callback*)header_input_cb, (void*)(1));
       o->when(FL_WHEN_CHANGED);
     }
-    { Fl_Input* o = code_file_input = new Fl_Input(100, 210, 90, 20, "Code File:");
+    { Fl_Input* o = code_file_input = new Fl_Input(100, 215, 90, 20, "Code File:");
       o->box(FL_THIN_DOWN_BOX);
       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(20, 240, 170, 20, "Include Header from Code");
+    { Fl_Light_Button* o = include_H_from_C_button = new Fl_Light_Button(20, 245, 170, 20, "Include Header from Code");
       o->value(1);
       o->labelsize(12);
       o->callback((Fl_Callback*)include_H_from_C_button_cb);
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index a2b0f444a..15ec80b96 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -1,70 +1,70 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.00 
+version 1.0008 
 header_name {.h} 
 code_name {.cxx} 
-gridx 10 
-gridy 10 
+gridx 5 
+gridy 5 
 snap 3
 Function {make_alignment_window()} {open
 } {
   Fl_Window alignment_window {
-    label {fluid Preferences} open
-    xywh {15 22 210 310} modal visible
+    label Preferences open selected
+    xywh {658 262 210 320} modal visible
   } {
     Fl_Box {} {
       label {Alignment:}
-      xywh {10 20 190 100} box ENGRAVED_FRAME labelsize 12 align 5
+      xywh {10 25 190 100} box ENGRAVED_FRAME labelsize 12 align 5
     }
     Fl_Input horizontal_input {
       label {Horizontal:}
       user_data 1 user_data_type long
       callback alignment_cb
-      xywh {90 30 100 20} type Int box THIN_DOWN_BOX
+      xywh {90 35 100 20} type Int box THIN_DOWN_BOX
       code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
     }
     Fl_Input vertical_input {
       label {Vertical:}
       user_data 2 user_data_type long
       callback alignment_cb
-      xywh {90 60 100 20} type Int box THIN_DOWN_BOX
+      xywh {90 65 100 20} type Int box THIN_DOWN_BOX
       code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
     }
     Fl_Input snap_input {
       label {Snap:}
       user_data 3 user_data_type long
-      callback alignment_cb selected
-      xywh {90 90 100 20} type Int box THIN_DOWN_BOX
+      callback alignment_cb
+      xywh {90 95 100 20} type Int box THIN_DOWN_BOX
       code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
     }
     Fl_Button {} {
       label Close
       callback {alignment_window->hide();}
-      xywh {140 280 60 20}
+      xywh {140 285 60 25}
     }
     Fl_Box {} {
       label {Output File Names:}
-      xywh {10 140 190 130} box ENGRAVED_FRAME labelsize 12 align 5
+      xywh {10 145 190 130} box ENGRAVED_FRAME labelsize 12 align 5
     }
     Fl_Box {} {
       label {Use "name.ext" to set name or just ".ext" to set only extension.}
-      xywh {20 150 170 30} labelsize 10 align 148
+      xywh {20 155 170 30} labelsize 10 align 148
     }
     Fl_Input header_file_input {
       label {Header File:}
       user_data 1 user_data_type {void*}
       callback header_input_cb
-      xywh {100 180 90 20} box THIN_DOWN_BOX when 1
+      xywh {100 185 90 20} box THIN_DOWN_BOX when 1
     }
     Fl_Input code_file_input {
       label {Code File:}
       user_data 1 user_data_type {void*}
       callback code_input_cb
-      xywh {100 210 90 20} box THIN_DOWN_BOX when 1
+      xywh {100 215 90 20} box THIN_DOWN_BOX when 1
     }
     Fl_Light_Button include_H_from_C_button {
       label {Include Header from Code}
       callback include_H_from_C_button_cb
-      xywh {20 240 170 20} value 1 labelsize 12
+      xywh {20 245 170 20} value 1 labelsize 12
     }
   }
 } 
diff --git a/fluid/alignment_panel.h b/fluid/alignment_panel.h
index 2c1acd542..dcf8d3863 100644
--- a/fluid/alignment_panel.h
+++ b/fluid/alignment_panel.h
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.00
+// generated by Fast Light User Interface Designer (fluid) version 1.0008
 
 #ifndef alignment_panel_h
 #define alignment_panel_h
@@ -20,11 +20,4 @@ extern Fl_Input *code_file_input;
 extern void include_H_from_C_button_cb(Fl_Light_Button*, void*);
 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 120339120..c199ae960 100644
--- a/fluid/function_panel.cxx
+++ b/fluid/function_panel.cxx
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.00
+// generated by Fast Light User Interface Designer (fluid) version 1.0008
 
 #include "function_panel.h"
 
@@ -18,30 +18,32 @@ Fl_Button *f_panel_cancel=(Fl_Button *)0;
 
 Fl_Window* make_function_panel() {
   Fl_Window* w;
-  { Fl_Window* o = function_panel = new Fl_Window(287, 173, "function/method");
+  { Fl_Window* o = function_panel = new Fl_Window(285, 170, "function/method");
     w = o;
-    { Fl_Light_Button* o = f_public_button = new Fl_Light_Button(10, 15, 65, 25, "public");
+    { Fl_Light_Button* o = f_public_button = new Fl_Light_Button(10, 10, 65, 25, "public");
       o->labelsize(10);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Light_Button* o = f_c_button = new Fl_Light_Button(90, 15, 90, 25, "C declaration");
+    { Fl_Light_Button* o = f_c_button = new Fl_Light_Button(80, 10, 90, 25, "C declaration");
       o->labelsize(10);
     }
-    { Fl_Input* o = f_name_input = new Fl_Input(10, 60, 270, 25, "Name(args): (blank for main())");
+    { Fl_Input* o = f_name_input = new Fl_Input(10, 55, 265, 25, "Name(args): (blank for main())");
       o->labelsize(12);
+      o->textfont(4);
       o->align(FL_ALIGN_TOP_LEFT);
       o->when(FL_WHEN_NEVER);
       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, 100, 265, 25, "Return Type: (blank to return outermost widget)");
       o->labelsize(12);
+      o->textfont(4);
       o->align(FL_ALIGN_TOP_LEFT);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Return_Button* o = f_panel_ok = new Fl_Return_Button(110, 140, 80, 25, "OK");
+    { Fl_Return_Button* o = f_panel_ok = new Fl_Return_Button(110, 135, 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(195, 135, 80, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
@@ -60,19 +62,20 @@ Fl_Button *code_panel_cancel=(Fl_Button *)0;
 
 Fl_Window* make_code_panel() {
   Fl_Window* w;
-  { Fl_Window* o = code_panel = new Fl_Window(291, 178, "code");
+  { Fl_Window* o = code_panel = new Fl_Window(290, 175, "code");
     w = o;
-    { Fl_Input* o = code_input = new Fl_Input(6, 5, 280, 135);
+    { Fl_Input* o = code_input = new Fl_Input(10, 10, 270, 120);
       o->type(4);
       o->labelsize(12);
+      o->textfont(4);
       o->align(FL_ALIGN_CENTER);
       o->when(FL_WHEN_NEVER);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Return_Button* o = code_panel_ok = new Fl_Return_Button(115, 145, 80, 25, "OK");
+    { Fl_Return_Button* o = code_panel_ok = new Fl_Return_Button(115, 140, 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(200, 140, 80, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
@@ -93,10 +96,11 @@ Fl_Button *codeblock_panel_cancel=(Fl_Button *)0;
 
 Fl_Window* make_codeblock_panel() {
   Fl_Window* w;
-  { Fl_Window* o = codeblock_panel = new Fl_Window(293, 134, "codeblock");
+  { Fl_Window* o = codeblock_panel = new Fl_Window(295, 130, "codeblock");
     w = o;
-    { Fl_Input* o = code_before_input = new Fl_Input(10, 5, 275, 25);
+    { Fl_Input* o = code_before_input = new Fl_Input(10, 10, 275, 25);
       o->labelsize(12);
+      o->textfont(4);
       o->align(FL_ALIGN_TOP_LEFT);
       o->when(FL_WHEN_NEVER);
       Fl_Group::current()->resizable(o);
@@ -104,15 +108,16 @@ Fl_Window* make_codeblock_panel() {
     { Fl_Box* o = new Fl_Box(10, 35, 270, 25, "\"{...child code...}\" is inserted here");
       o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
     }
-    { Fl_Input* o = code_after_input = new Fl_Input(10, 65, 275, 25);
+    { Fl_Input* o = code_after_input = new Fl_Input(10, 60, 275, 25);
       o->labelsize(12);
+      o->textfont(4);
       o->align(FL_ALIGN_TOP_LEFT);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Return_Button* o = codeblock_panel_ok = new Fl_Return_Button(115, 100, 80, 25, "OK");
+    { Fl_Return_Button* o = codeblock_panel_ok = new Fl_Return_Button(120, 95, 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, 95, 80, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
@@ -133,26 +138,28 @@ Fl_Button *declblock_panel_cancel=(Fl_Button *)0;
 
 Fl_Window* make_declblock_panel() {
   Fl_Window* w;
-  { Fl_Window* o = declblock_panel = new Fl_Window(293, 134, "declaration block");
+  { Fl_Window* o = declblock_panel = new Fl_Window(295, 130, "declaration block");
     w = o;
-    { Fl_Input* o = decl_before_input = new Fl_Input(15, 10, 275, 25);
+    { Fl_Input* o = decl_before_input = new Fl_Input(10, 10, 275, 25);
       o->labelsize(12);
+      o->textfont(4);
       o->align(FL_ALIGN_TOP_LEFT);
       o->when(FL_WHEN_NEVER);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Box* o = new Fl_Box(15, 40, 270, 25, "\"\\n...child code...\\n\" is inserted here");
+    { Fl_Box* o = new Fl_Box(10, 35, 275, 25, "\"\\n...child code...\\n\" is inserted here");
       o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
     }
-    { Fl_Input* o = decl_after_input = new Fl_Input(15, 70, 275, 25);
+    { Fl_Input* o = decl_after_input = new Fl_Input(10, 60, 275, 25);
       o->labelsize(12);
+      o->textfont(4);
       o->align(FL_ALIGN_TOP_LEFT);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Return_Button* o = declblock_panel_ok = new Fl_Return_Button(120, 105, 80, 25, "OK");
+    { Fl_Return_Button* o = declblock_panel_ok = new Fl_Return_Button(120, 95, 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(205, 95, 80, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
@@ -173,16 +180,17 @@ Fl_Button *decl_panel_cancel=(Fl_Button *)0;
 
 Fl_Window* make_decl_panel() {
   Fl_Window* w;
-  { Fl_Window* o = decl_panel = new Fl_Window(290, 176, "declaration");
+  { Fl_Window* o = decl_panel = new Fl_Window(290, 180, "declaration");
     w = o;
-    { Fl_Light_Button* o = decl_public_button = new Fl_Light_Button(10, 15, 65, 25, "public");
+    { Fl_Light_Button* o = decl_public_button = new Fl_Light_Button(10, 10, 65, 25, "public");
       o->labelsize(10);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Input* o = decl_input = new Fl_Input(10, 50, 270, 25, "can be any declartion, like \"int x;\",\nan external symbol like \"extern int\
- foo();\",\na #directive like \"#include <foo.h>\",\nor a comment like \"//foo\
-\" or \"/*foo*/\",\nor typedef like \"typedef char byte;\"");
+    { Fl_Input* o = decl_input = new Fl_Input(10, 40, 270, 25, "Can be any declaration, like \"int x;\",\nan external symbol like \"extern in\
+t foo();\",\na #directive like \"#include <foo.h>\",\nor a comment like \"//fo\
+o\" or \"/*foo*/\",\nor typedef like \"typedef char byte;\"");
       o->labelsize(12);
+      o->textfont(4);
       o->align(FL_ALIGN_BOTTOM_LEFT);
       o->when(FL_WHEN_NEVER);
       Fl_Group::current()->resizable(o);
@@ -190,7 +198,7 @@ Fl_Window* make_decl_panel() {
     { 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(200, 145, 80, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->end();
@@ -212,27 +220,29 @@ Fl_Button *c_panel_cancel=(Fl_Button *)0;
 
 Fl_Window* make_class_panel() {
   Fl_Window* w;
-  { Fl_Window* o = class_panel = new Fl_Window(287, 173, "class");
+  { Fl_Window* o = class_panel = new Fl_Window(285, 170, "class");
     w = o;
     { Fl_Light_Button* o = c_public_button = new Fl_Light_Button(10, 10, 65, 25, "public");
       o->labelsize(10);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Input* o = c_name_input = new Fl_Input(10, 55, 270, 25, "name:");
+    { Fl_Input* o = c_name_input = new Fl_Input(10, 55, 265, 25, "Name:");
       o->labelsize(12);
+      o->textfont(4);
       o->align(FL_ALIGN_TOP_LEFT);
       o->when(FL_WHEN_NEVER);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Input* o = c_subclass_input = new Fl_Input(10, 100, 270, 25, "subclass of (text between : and {)");
+    { Fl_Input* o = c_subclass_input = new Fl_Input(10, 100, 265, 25, "Subclass of (text between : and {)");
       o->labelsize(12);
+      o->textfont(4);
       o->align(FL_ALIGN_TOP_LEFT);
       o->when(FL_WHEN_NEVER);
     }
     { 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(195, 135, 80, 25, "Cancel");
       o->shortcut(0xff1b);
     }
     o->set_modal();
diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl
index f025a6174..6f73e80c3 100644
--- a/fluid/function_panel.fl
+++ b/fluid/function_panel.fl
@@ -1,39 +1,39 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.00 
+version 1.0008 
 header_name {.h} 
 code_name {.cxx} 
-gridx 10 
+gridx 5 
 gridy 5 
 snap 3
 Function {make_function_panel()} {open
 } {
   Fl_Window function_panel {
     label {function/method} open
-    xywh {774 432 287 173} hide resizable modal
+    xywh {774 432 285 170} resizable modal visible
   } {
     Fl_Light_Button f_public_button {
       label public
-      xywh {10 15 65 25} labelsize 10 when 0
+      xywh {10 10 65 25} labelsize 10 when 0
     }
     Fl_Light_Button f_c_button {
       label {C declaration}
-      xywh {90 15 90 25} labelsize 10
+      xywh {80 10 90 25} labelsize 10
     }
     Fl_Input f_name_input {
       label {Name(args): (blank for main())}
-      xywh {10 60 270 25} labelsize 12 align 5 when 0 resizable
+      xywh {10 55 265 25} labelsize 12 align 5 when 0 textfont 4 resizable
     }
     Fl_Input f_return_type_input {
       label {Return Type: (blank to return outermost widget)}
-      xywh {10 105 270 25} labelsize 12 align 5 when 0
+      xywh {10 100 265 25} labelsize 12 align 5 when 0 textfont 4
     }
     Fl_Return_Button f_panel_ok {
       label OK
-      xywh {110 140 80 25} hotspot
+      xywh {110 135 80 25} hotspot
     }
     Fl_Button f_panel_cancel {
       label Cancel
-      xywh {200 140 80 25} shortcut 0xff1b
+      xywh {195 135 80 25} shortcut 0xff1b
     }
   }
 } 
@@ -42,18 +42,18 @@ Function {make_code_panel()} {open
 } {
   Fl_Window code_panel {
     label code open
-    xywh {260 242 291 178} hide resizable modal
+    xywh {260 242 290 175} resizable modal visible
   } {
     Fl_Input code_input {
-      xywh {6 5 280 135} type Multiline labelsize 12 align 0 when 0 resizable
+      xywh {10 10 270 120} type Multiline labelsize 12 align 0 when 0 textfont 4 resizable
     }
     Fl_Return_Button code_panel_ok {
       label OK
-      xywh {115 145 80 25} hotspot
+      xywh {115 140 80 25} hotspot
     }
     Fl_Button code_panel_cancel {
       label Cancel
-      xywh {205 145 80 25} shortcut 0xff1b
+      xywh {200 140 80 25} shortcut 0xff1b
     }
   }
 } 
@@ -62,25 +62,25 @@ Function {make_codeblock_panel()} {open
 } {
   Fl_Window codeblock_panel {
     label codeblock open
-    xywh {289 462 293 134} hide resizable modal
+    xywh {289 462 295 130} resizable modal visible
   } {
     Fl_Input code_before_input {
-      xywh {10 5 275 25} labelsize 12 align 5 when 0 resizable
+      xywh {10 10 275 25} labelsize 12 align 5 when 0 textfont 4 resizable
     }
     Fl_Box {} {
       label {"{...child code...}" is inserted here}
       xywh {10 35 270 25} align 20
     }
     Fl_Input code_after_input {
-      xywh {10 65 275 25} labelsize 12 align 5 when 0
+      xywh {10 60 275 25} labelsize 12 align 5 when 0 textfont 4
     }
     Fl_Return_Button codeblock_panel_ok {
       label OK
-      xywh {115 100 80 25} hotspot
+      xywh {120 95 80 25} hotspot
     }
     Fl_Button codeblock_panel_cancel {
       label Cancel
-      xywh {205 100 80 25} shortcut 0xff1b
+      xywh {205 95 80 25} shortcut 0xff1b
     }
   }
 } 
@@ -89,25 +89,25 @@ Function {make_declblock_panel()} {open
 } {
   Fl_Window declblock_panel {
     label {declaration block} open
-    xywh {517 141 293 134} hide resizable modal
+    xywh {314 255 295 130} resizable modal visible
   } {
     Fl_Input decl_before_input {
-      xywh {15 10 275 25} labelsize 12 align 5 when 0 resizable
+      xywh {10 10 275 25} labelsize 12 align 5 when 0 textfont 4 resizable
     }
     Fl_Box {} {
       label {"\\n...child code...\\n" is inserted here}
-      xywh {15 40 270 25} align 20
+      xywh {10 35 275 25} align 20
     }
     Fl_Input decl_after_input {
-      xywh {15 70 275 25} labelsize 12 align 5 when 0
+      xywh {10 60 275 25} labelsize 12 align 5 when 0 textfont 4
     }
     Fl_Return_Button declblock_panel_ok {
       label OK
-      xywh {120 105 80 25} hotspot
+      xywh {120 95 80 25} hotspot
     }
     Fl_Button declblock_panel_cancel {
       label Cancel
-      xywh {210 105 80 25} shortcut 0xff1b
+      xywh {205 95 80 25} shortcut 0xff1b
     }
   }
 } 
@@ -116,19 +116,19 @@ Function {make_decl_panel()} {open
 } {
   Fl_Window decl_panel {
     label declaration open
-    xywh {282 823 290 176} resizable visible
+    xywh {393 601 290 180} resizable visible
   } {
     Fl_Light_Button decl_public_button {
       label public
-      xywh {10 15 65 25} labelsize 10 when 0
+      xywh {10 10 65 25} labelsize 10 when 0
     }
     Fl_Input decl_input {
-      label {can be any declartion, like "int x;",
+      label {Can be any declaration, like "int x;",
 an external symbol like "extern int foo();",
 a \#directive like "\#include <foo.h>",
 or a comment like "//foo" or "/*foo*/",
 or typedef like "typedef char byte;"}
-      xywh {10 50 270 25} labelsize 12 align 6 when 0 resizable
+      xywh {10 40 270 25} labelsize 12 align 6 when 0 textfont 4 resizable
     }
     Fl_Return_Button decl_panel_ok {
       label OK
@@ -136,7 +136,7 @@ or typedef like "typedef char byte;"}
     }
     Fl_Button decl_panel_cancel {
       label Cancel
-      xywh {205 145 80 25} shortcut 0xff1b
+      xywh {200 145 80 25} shortcut 0xff1b
     }
   }
 } 
@@ -144,20 +144,20 @@ or typedef like "typedef char byte;"}
 Function {make_class_panel()} {open
 } {
   Fl_Window class_panel {
-    label class open
-    xywh {517 813 287 173} hide resizable modal
+    label class open selected
+    xywh {517 813 285 170} resizable modal visible
   } {
     Fl_Light_Button c_public_button {
       label public
       xywh {10 10 65 25} labelsize 10 when 0
     }
     Fl_Input c_name_input {
-      label {name:}
-      xywh {10 55 270 25} labelsize 12 align 5 when 0 resizable
+      label {Name:}
+      xywh {10 55 265 25} labelsize 12 align 5 when 0 textfont 4 resizable
     }
     Fl_Input c_subclass_input {
-      label {subclass of (text between : and \{)}
-      xywh {10 100 270 25} labelsize 12 align 5 when 0
+      label {Subclass of (text between : and \{)}
+      xywh {10 100 265 25} labelsize 12 align 5 when 0 textfont 4
     }
     Fl_Return_Button c_panel_ok {
       label OK
@@ -165,7 +165,7 @@ Function {make_class_panel()} {open
     }
     Fl_Button c_panel_cancel {
       label Cancel
-      xywh {200 135 80 25} shortcut 0xff1b
+      xywh {195 135 80 25} shortcut 0xff1b
     }
   }
 } 
diff --git a/fluid/function_panel.h b/fluid/function_panel.h
index ea8c2bbb9..f344b6fc8 100644
--- a/fluid/function_panel.h
+++ b/fluid/function_panel.h
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.00
+// generated by Fast Light User Interface Designer (fluid) version 1.0008
 
 #ifndef function_panel_h
 #define function_panel_h
diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx
index bcdbe1d1e..8a9612a3d 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.00
+// generated by Fast Light User Interface Designer (fluid) version 1.0008
 
 #include "widget_panel.h"
 
@@ -6,7 +6,7 @@ Fl_Input *v_input[4]={(Fl_Input *)0};
 
 Fl_Window* make_widget_panel() {
   Fl_Window* w;
-  { Fl_Window* o = new Fl_Window(370, 480);
+  { Fl_Window* o = new Fl_Window(370, 485);
     w = o;
     w->hotspot(o);
     { Fl_Input* o = new Fl_Input(90, 10, 210, 20, "Name:");
@@ -23,6 +23,7 @@ Fl_Window* make_widget_panel() {
     }
     { Fl_Input* o = new Fl_Input(90, 35, 170, 20, "Class:");
       o->box(FL_THIN_UP_BOX);
+      o->textfont(4);
       o->callback((Fl_Callback*)subclass_cb, (void*)(4));
       o->when(FL_WHEN_NEVER);
     }
@@ -156,27 +157,27 @@ Fl_Window* make_widget_panel() {
       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(40, 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(FL_ALIGN_TOP_LEFT);
     }
-    { Fl_Value_Input* o = new Fl_Value_Input(90, 205, 60, 20, "Minimum:");
+    { Fl_Value_Input* o = new Fl_Value_Input(105, 205, 60, 20, "Minimum:");
       o->box(FL_THIN_UP_BOX);
       o->labelsize(10);
       o->callback((Fl_Callback*)min_cb);
       o->align(FL_ALIGN_TOP_LEFT);
     }
-    { Fl_Value_Input* o = new Fl_Value_Input(160, 205, 60, 20, "Maximum:");
+    { Fl_Value_Input* o = new Fl_Value_Input(170, 205, 60, 20, "Maximum:");
       o->box(FL_THIN_UP_BOX);
       o->labelsize(10);
       o->value(1);
       o->callback((Fl_Callback*)max_cb);
       o->align(FL_ALIGN_TOP_LEFT);
     }
-    { Fl_Value_Input* o = new Fl_Value_Input(230, 205, 60, 20, "Step:");
+    { Fl_Value_Input* o = new Fl_Value_Input(235, 205, 60, 20, "Step:");
       o->box(FL_THIN_UP_BOX);
       o->labelsize(10);
       o->callback((Fl_Callback*)step_cb);
@@ -191,38 +192,38 @@ Fl_Window* make_widget_panel() {
     { Fl_Group* o = new Fl_Group(20, 230, 340, 20);
       o->callback((Fl_Callback*)propagate_load);
       o->align(FL_ALIGN_TOP_LEFT);
-      { Fl_Light_Button* o = new Fl_Light_Button(20, 230, 70, 20, "non_modal");
+      { Fl_Light_Button* o = new Fl_Light_Button(30, 230, 70, 20, "non_modal");
         o->box(FL_THIN_UP_BOX);
         o->selection_color(1);
         o->labelsize(9);
         o->callback((Fl_Callback*)non_modal_cb);
         o->align(132|FL_ALIGN_INSIDE);
       }
-      { Fl_Light_Button* o = new Fl_Light_Button(90, 230, 60, 20, "visible");
+      { Fl_Light_Button* o = new Fl_Light_Button(105, 230, 60, 20, "visible");
         o->box(FL_THIN_UP_BOX);
         o->selection_color(1);
         o->labelsize(10);
         o->callback((Fl_Callback*)visible_cb);
       }
-      { Fl_Light_Button* o = new Fl_Light_Button(90, 230, 60, 20, "modal");
+      { Fl_Light_Button* o = new Fl_Light_Button(105, 230, 60, 20, "modal");
         o->box(FL_THIN_UP_BOX);
         o->selection_color(1);
         o->labelsize(10);
         o->callback((Fl_Callback*)modal_cb);
       }
-      { Fl_Light_Button* o = new Fl_Light_Button(160, 230, 60, 20, "active");
+      { Fl_Light_Button* o = new Fl_Light_Button(170, 230, 60, 20, "active");
         o->box(FL_THIN_UP_BOX);
         o->selection_color(1);
         o->labelsize(10);
         o->callback((Fl_Callback*)active_cb);
       }
-      { Fl_Light_Button* o = new Fl_Light_Button(160, 230, 60, 20, "border");
+      { Fl_Light_Button* o = new Fl_Light_Button(170, 230, 60, 20, "border");
         o->box(FL_THIN_UP_BOX);
         o->selection_color(1);
         o->labelsize(10);
         o->callback((Fl_Callback*)border_cb);
       }
-      { Fl_Light_Button* o = new Fl_Light_Button(230, 230, 60, 20, "resizable");
+      { Fl_Light_Button* o = new Fl_Light_Button(235, 230, 60, 20, "resizable");
         o->box(FL_THIN_UP_BOX);
         o->selection_color(1);
         o->labelsize(10);
@@ -240,21 +241,25 @@ Fl_Window* make_widget_panel() {
     }
     { Fl_Input* o = v_input[0] = new Fl_Input(90, 260, 270, 20, "Extra Code:");
       o->box(FL_THIN_UP_BOX);
+      o->textfont(4);
       o->callback((Fl_Callback*)v_input_cb, (void*)(0));
       o->when(FL_WHEN_NEVER);
     }
     { Fl_Input* o = v_input[1] = new Fl_Input(90, 280, 270, 20);
       o->box(FL_THIN_UP_BOX);
+      o->textfont(4);
       o->callback((Fl_Callback*)v_input_cb, (void*)(1));
       o->when(FL_WHEN_NEVER);
     }
     { Fl_Input* o = v_input[2] = new Fl_Input(90, 300, 270, 20);
       o->box(FL_THIN_UP_BOX);
+      o->textfont(4);
       o->callback((Fl_Callback*)v_input_cb, (void*)(2));
       o->when(FL_WHEN_NEVER);
     }
     { Fl_Input* o = v_input[3] = new Fl_Input(90, 320, 270, 20);
       o->box(FL_THIN_UP_BOX);
+      o->textfont(4);
       o->callback((Fl_Callback*)v_input_cb, (void*)(3));
       o->when(FL_WHEN_NEVER);
     }
@@ -264,6 +269,7 @@ Fl_Window* make_widget_panel() {
     { Fl_Input* o = new Fl_Input(90, 350, 270, 50);
       o->type(4);
       o->box(FL_THIN_UP_BOX);
+      o->textfont(4);
       o->callback((Fl_Callback*)callback_cb);
       o->when(FL_WHEN_NEVER);
     }
@@ -274,11 +280,13 @@ Fl_Window* make_widget_panel() {
     }
     { Fl_Input* o = new Fl_Input(90, 400, 170, 20, "user_data:");
       o->box(FL_THIN_UP_BOX);
+      o->textfont(4);
       o->callback((Fl_Callback*)user_data_cb);
       o->when(FL_WHEN_NEVER);
     }
     { Fl_Input* o = new Fl_Input(300, 400, 60, 20, "Type:");
       o->box(FL_THIN_UP_BOX);
+      o->textfont(4);
       o->callback((Fl_Callback*)user_data_type_cb);
       o->when(FL_WHEN_NEVER);
     }
@@ -295,18 +303,18 @@ Fl_Window* make_widget_panel() {
       o->callback((Fl_Callback*)when_button_cb);
       o->when(FL_WHEN_NEVER);
     }
-    { Fl_Group* o = new Fl_Group(10, 450, 350, 20);
-      { Fl_Button* o = new Fl_Button(10, 450, 80, 20, "no &overlay");
+    { Fl_Group* o = new Fl_Group(10, 450, 350, 25);
+      { Fl_Button* o = new Fl_Button(25, 450, 80, 25, "no &overlay");
         o->labelcolor(1);
         o->callback((Fl_Callback*)overlay_cb);
       }
-      { Fl_Button* o = new Fl_Button(100, 450, 80, 20, "Revert");
+      { Fl_Button* o = new Fl_Button(110, 450, 80, 25, "Revert");
         o->callback((Fl_Callback*)revert_cb);
       }
-      { Fl_Button* o = new Fl_Button(190, 450, 80, 20, "Cancel");
+      { Fl_Button* o = new Fl_Button(280, 450, 80, 25, "Cancel");
         o->callback((Fl_Callback*)cancel_cb);
       }
-      { Fl_Return_Button* o = new Fl_Return_Button(280, 450, 80, 20, "OK");
+      { Fl_Return_Button* o = new Fl_Return_Button(195, 450, 80, 25, "OK");
         o->callback((Fl_Callback*)ok_cb);
       }
       o->end();
diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index fe0d7f7ad..a72c6addc 100644
--- a/fluid/widget_panel.fl
+++ b/fluid/widget_panel.fl
@@ -1,14 +1,14 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.00 
+version 1.0008 
 header_name {.h} 
 code_name {.cxx} 
-gridx 10 
+gridx 5 
 gridy 5 
 snap 3
 Function {make_widget_panel()} {open
 } {
   Fl_Window {} {open
-    xywh {189 164 370 480} resizable hotspot visible
+    xywh {728 171 370 485} resizable hotspot visible
   } {
     Fl_Input {} {
       label {Name:}
@@ -24,7 +24,7 @@ Function {make_widget_panel()} {open
       label {Class:}
       user_data 4
       callback subclass_cb
-      xywh {90 35 170 20} box THIN_UP_BOX when 0
+      xywh {90 35 170 20} box THIN_UP_BOX when 0 textfont 4
     }
     Fl_Choice {} {
       callback subtype_cb
@@ -155,22 +155,22 @@ Function {make_widget_panel()} {open
     Fl_Value_Input {} {
       label {Size:}
       callback slider_size_cb
-      xywh {20 205 60 20} box THIN_UP_BOX labelsize 10 align 5 step 0.010101
+      xywh {40 205 60 20} box THIN_UP_BOX labelsize 10 align 5 step 0.010101
     }
     Fl_Value_Input {} {
       label {Minimum:}
       callback min_cb
-      xywh {90 205 60 20} box THIN_UP_BOX labelsize 10 align 5
+      xywh {105 205 60 20} box THIN_UP_BOX labelsize 10 align 5
     }
     Fl_Value_Input {} {
       label {Maximum:}
       callback max_cb
-      xywh {160 205 60 20} box THIN_UP_BOX labelsize 10 align 5 value 1
+      xywh {170 205 60 20} box THIN_UP_BOX labelsize 10 align 5 value 1
     }
     Fl_Value_Input {} {
       label {Step:}
       callback step_cb
-      xywh {230 205 60 20} box THIN_UP_BOX labelsize 10 align 5
+      xywh {235 205 60 20} box THIN_UP_BOX labelsize 10 align 5
     }
     Fl_Value_Input {} {
       label {Value:}
@@ -178,38 +178,38 @@ Function {make_widget_panel()} {open
       xywh {300 205 60 20} box THIN_UP_BOX labelsize 10 align 5
     }
     Fl_Group {} {
-      callback propagate_load open
+      callback propagate_load
       xywh {20 230 340 20} align 5
     } {
       Fl_Light_Button {} {
         label non_modal
         callback non_modal_cb
-        xywh {20 230 70 20} box THIN_UP_BOX selection_color 1 labelsize 9 align 148
+        xywh {30 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 selection_color 1 labelsize 10
+        xywh {105 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 selection_color 1 labelsize 10
+        xywh {105 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 selection_color 1 labelsize 10
+        xywh {170 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 selection_color 1 labelsize 10
+        xywh {170 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 selection_color 1 labelsize 10 when 1
+        xywh {235 230 60 20} box THIN_UP_BOX selection_color 1 labelsize 10 when 1
       }
       Fl_Light_Button {} {
         label hotspot
@@ -221,22 +221,22 @@ Function {make_widget_panel()} {open
       label {Extra Code:}
       user_data 0
       callback v_input_cb
-      xywh {90 260 270 20} box THIN_UP_BOX when 0
+      xywh {90 260 270 20} box THIN_UP_BOX when 0 textfont 4
     }
     Fl_Input {v_input[1]} {
       user_data 1
       callback v_input_cb
-      xywh {90 280 270 20} box THIN_UP_BOX when 0
+      xywh {90 280 270 20} box THIN_UP_BOX when 0 textfont 4
     }
     Fl_Input {v_input[2]} {
       user_data 2
       callback v_input_cb
-      xywh {90 300 270 20} box THIN_UP_BOX when 0
+      xywh {90 300 270 20} box THIN_UP_BOX when 0 textfont 4
     }
     Fl_Input {v_input[3]} {
       user_data 3
       callback v_input_cb
-      xywh {90 320 270 20} box THIN_UP_BOX when 0
+      xywh {90 320 270 20} box THIN_UP_BOX when 0 textfont 4
     }
     Fl_Box {} {
       label {Callback:}
@@ -244,7 +244,7 @@ Function {make_widget_panel()} {open
     }
     Fl_Input {} {
       callback callback_cb
-      xywh {90 350 270 50} type Multiline box THIN_UP_BOX when 0
+      xywh {90 350 270 50} type Multiline box THIN_UP_BOX when 0 textfont 4
     }
     Fl_Box {} {
       label label
@@ -253,16 +253,16 @@ Function {make_widget_panel()} {open
     Fl_Input {} {
       label {user_data:}
       callback user_data_cb
-      xywh {90 400 170 20} box THIN_UP_BOX when 0
+      xywh {90 400 170 20} box THIN_UP_BOX when 0 textfont 4
     }
     Fl_Input {} {
       label {Type:}
       callback user_data_type_cb
-      xywh {300 400 60 20} box THIN_UP_BOX when 0
+      xywh {300 400 60 20} box THIN_UP_BOX when 0 textfont 4
     }
     Fl_Choice {} {
       label {When:}
-      callback when_cb selected
+      callback when_cb
       xywh {90 420 100 20} box THIN_UP_BOX when 0
       code0 {extern Fl_Menu_Item whenmenu[];}
       code1 {o->menu(whenmenu);}
@@ -273,27 +273,27 @@ Function {make_widget_panel()} {open
       xywh {190 420 70 20} box THIN_UP_BOX selection_color 1 labelsize 10 when 0
     }
     Fl_Group {} {open
-      xywh {10 450 350 20}
+      xywh {10 450 350 25}
     } {
       Fl_Button {} {
         label {no &overlay}
         callback overlay_cb
-        xywh {10 450 80 20} labelcolor 1
+        xywh {25 450 80 25} labelcolor 1
       }
       Fl_Button {} {
         label Revert
         callback revert_cb
-        xywh {100 450 80 20}
+        xywh {110 450 80 25}
       }
       Fl_Button {} {
         label Cancel
         callback cancel_cb
-        xywh {190 450 80 20}
+        xywh {280 450 80 25}
       }
       Fl_Return_Button {} {
         label OK
-        callback ok_cb
-        xywh {280 450 80 20}
+        callback ok_cb selected
+        xywh {195 450 80 25}
       }
     }
   }
diff --git a/fluid/widget_panel.h b/fluid/widget_panel.h
index d5e3a9e46..44dd3888e 100644
--- a/fluid/widget_panel.h
+++ b/fluid/widget_panel.h
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.00
+// generated by Fast Light User Interface Designer (fluid) version 1.0008
 
 #ifndef widget_panel_h
 #define widget_panel_h
@@ -61,5 +61,4 @@ extern void cancel_cb(Fl_Button*, void*);
 #include <FL/Fl_Return_Button.H>
 extern void ok_cb(Fl_Return_Button*, void*);
 Fl_Window* make_widget_panel();
-extern Fl_Input *v_input[4];
 #endif