Bump version numbers to 1.3.3.

All fluid .fl files have been rewritten with fluid 1.3.3 and may differ
somehow, but there are no significant changes.


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

39 files changed, 124 insertions, 109 deletions

diff --git a/CMake/setup.cmake b/CMake/setup.cmake
index a44f344f2..60c8e59e3 100644
--- a/CMake/setup.cmake
+++ b/CMake/setup.cmake
@@ -4,7 +4,7 @@
 # CMakeLists.txt to build the FLTK project using CMake (www.cmake.org)
 # Written by Michael Surette
 #
-# Copyright 1998-2010 by Bill Spitzak and others.
+# Copyright 1998-2014 by Bill Spitzak and others.
 #
 # This library is free software. Distribution and use rights are outlined in
 # the file "COPYING" which should have been included with this file.  If this
@@ -23,7 +23,7 @@
 # The FLTK version
 set(FLTK_VERSION_MAJOR "1")
 set(FLTK_VERSION_MINOR "3")
-set(FLTK_VERSION_PATCH "2")
+set(FLTK_VERSION_PATCH "3")
 set(FLTK_VERSION "${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}")
 set(FLTK_VERSION_FULL "${FLTK_VERSION}.${FLTK_VERSION_PATCH}")
 
diff --git a/CREDITS b/CREDITS
index 34e90317e..bc640e2b5 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,4 +1,4 @@
-CREDITS - Fast Light Tool Kit (FLTK) Version 1.3.2
+CREDITS - Fast Light Tool Kit (FLTK) Version 1.3.3
 --------------------------------------------------
 
     This file lists the people responsible for the toolkit you are
diff --git a/FL/Enumerations.H b/FL/Enumerations.H
index 13df541aa..b4a384313 100644
--- a/FL/Enumerations.H
+++ b/FL/Enumerations.H
@@ -59,7 +59,7 @@
 
    FLTK remains binary compatible between patches.
  */
-#define FL_PATCH_VERSION	2
+#define FL_PATCH_VERSION	3
 
 /**
     The FLTK version number as a \em double.
diff --git a/README b/README
index 404f9d0f4..d853d464b 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README - Fast Light Tool Kit (FLTK) Version 1.3.2
+README - Fast Light Tool Kit (FLTK) Version 1.3.3
 -------------------------------------------------
 
 WHAT IS FLTK?
diff --git a/cairo/Makefile b/cairo/Makefile
index 636cc7705..0cc8d3b8e 100644
--- a/cairo/Makefile
+++ b/cairo/Makefile
@@ -53,7 +53,7 @@ libfltk_cairo.1.3.dylib: $(CAIROOBJECTS) ../src/libfltk.1.3.dylib
 	echo $(DSOCOMMAND) $@ ...
 	$(DSOCOMMAND) $@ \
 		-install_name $(libdir)/$@ \
-		-current_version 1.3.2 \
+		-current_version 1.3.3 \
 		-compatibility_version 1.3.0 \
 		$(CAIROOBJECTS)  -L../src $(LDLIBS) $(CAIROLIBS) -lfltk
 	$(RM) libfltk_cairo.dylib
diff --git a/documentation/Doxybook b/documentation/Doxybook
index 33bc07d1d..5eddae5c7 100644
--- a/documentation/Doxybook
+++ b/documentation/Doxybook
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "FLTK 1.3.2"
+PROJECT_NAME           = "FLTK 1.3.3"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
diff --git a/documentation/Doxyfile b/documentation/Doxyfile
index 137751418..20d03318c 100644
--- a/documentation/Doxyfile
+++ b/documentation/Doxyfile
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "FLTK 1.3.2"
+PROJECT_NAME           = "FLTK 1.3.3"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
diff --git a/documentation/src/index.dox b/documentation/src/index.dox
index 0e28fe29e..78cc36926 100644
--- a/documentation/src/index.dox
+++ b/documentation/src/index.dox
@@ -8,12 +8,12 @@
     \image latex FL200.png "" width=5cm
   </CENTER></TD>
   <TD><CENTER>
-    <B>FLTK 1.3.2 Programming Manual</B>
+    <B>FLTK 1.3.3 Programming Manual</B>
 
     Revision 9 by F.&nbsp;Costantini, D.&nbsp;Gibson, M.&nbsp;Melcher,
     A.&nbsp;Schlosser, B.&nbsp;Spitzak and M.&nbsp;Sweet.
 
-    Copyright 1998-2012 by Bill Spitzak and others.
+    Copyright 1998-2014 by Bill Spitzak and others.
   </CENTER></TD>
 </TR>
 </TABLE>
diff --git a/documentation/src/preface.dox b/documentation/src/preface.dox
index d7c3d3588..dbbdf2e54 100644
--- a/documentation/src/preface.dox
+++ b/documentation/src/preface.dox
@@ -3,7 +3,7 @@
  \page preface Preface
 
 This manual describes the Fast Light Tool Kit ("FLTK")
-version 1.3.2, a C++ Graphical User Interface
+version 1.3.3, a C++ Graphical User Interface
 ("GUI") toolkit for UNIX, Microsoft Windows and Apple OS X. Each
 of the chapters in this manual is designed as a tutorial for
 using FLTK, while the appendices provide a convenient reference
@@ -75,7 +75,7 @@ was dropped after FLTK 1.0.10. FLTK uses the preprocessor definition
 
 \section preface_copyrights Copyrights and Trademarks
 
-FLTK is Copyright 1998-2012 by Bill Spitzak and others.  Use and
+FLTK is Copyright 1998-2014 by Bill Spitzak and others.  Use and
 distribution of FLTK is governed by the GNU Library General Public
 License with 4 exceptions, located in \ref license.
 
diff --git a/fluid/about_panel.cxx b/fluid/about_panel.cxx
index 665feed09..cdf3f57c6 100644
--- a/fluid/about_panel.cxx
+++ b/fluid/about_panel.cxx
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0302
+// generated by Fast Light User Interface Designer (fluid) version 1.0303
 
 #include "about_panel.h"
 void show_help(const char *name); 
diff --git a/fluid/about_panel.fl b/fluid/about_panel.fl
index 7de8ae393..96dfb1fe1 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.0302 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 comment {//
@@ -29,7 +29,7 @@ Function {make_about_panel()} {open
 } {
   Fl_Window about_panel {
     label {About FLUID} open
-    xywh {680 247 345 180} type Double color 50 selection_color 47 hotspot non_modal visible
+    xywh {513 213 345 180} type Double color 50 selection_color 47 hotspot non_modal visible
   } {
     Fl_Box {} {
       image {icons/fluid-96.xpm} xywh {10 10 115 120}
@@ -37,7 +37,7 @@ Function {make_about_panel()} {open
     Fl_Box {} {
       label {FLTK User
 Interface Designer
-Version x.x.x} selected
+Version x.x.x}
       xywh {135 10 205 75} color 12 selection_color 47 labelfont 1 labelsize 18 align 21
       code0 {char about[80]; // uses less than 60}
       code1 {snprintf(about,sizeof(about),"FLTK User\\nInterface Designer\\nVersion %d.%d.%d",FL_MAJOR_VERSION,FL_MINOR_VERSION,FL_PATCH_VERSION);}
@@ -45,7 +45,7 @@ Version x.x.x} selected
     }
     Fl_Box {} {
       label {Copyright 1998-2014 by
-Bill Spitzak and others}
+Bill Spitzak and others} selected
       xywh {135 90 200 45} align 148
     }
     Fl_Button {} {
diff --git a/fluid/about_panel.h b/fluid/about_panel.h
index 59504cd3d..b41275472 100644
--- a/fluid/about_panel.h
+++ b/fluid/about_panel.h
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0302
+// generated by Fast Light User Interface Designer (fluid) version 1.0303
 
 #ifndef about_panel_h
 #define about_panel_h
diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index 5904a463e..16a2a2a6e 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0302
+// generated by Fast Light User Interface Designer (fluid) version 1.0303
 
 #include "alignment_panel.h"
 #include <FL/Fl_Preferences.H>
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index 61de5a3c4..7594640ee 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 1.0302 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 comment {//
@@ -58,10 +58,11 @@ decl {extern Fl_Preferences fluid_prefs;} {public local
 decl {Fl_Text_Buffer *shell_run_buffer;} {public local
 } 
 
-Function {make_project_window()} {} {
+Function {make_project_window()} {open
+} {
   Fl_Window project_window {
     label {Project Settings} open
-    xywh {393 460 399 252} type Double
+    xywh {396 475 399 252} type Double
     code0 {\#include <FL/Fl_Preferences.H>}
     code1 {\#include <FL/Fl_Tooltip.H>} modal visible
   } {
@@ -128,7 +129,7 @@ Function {make_project_window()} {} {
         }
         Fl_Input i18n_include_input {
           label {\#include:}
-          callback i18n_text_cb
+          callback i18n_text_cb selected
           tooltip {The include file for internationalization.} xywh {100 78 272 20} box THIN_DOWN_BOX labelfont 1 textfont 4
         }
         Fl_Input i18n_file_input {
@@ -264,7 +265,7 @@ load_history();}
 Function {make_shell_window()} {} {
   Fl_Window shell_window {
     label {Shell Command} open
-    xywh {741 195 365 125} type Double visible
+    xywh {761 190 365 125} type Double visible
   } {
     Fl_Input shell_command_input {
       label {Command:}
@@ -329,7 +330,7 @@ Function {make_shell_window()} {} {
 Function {make_layout_window()} {} {
   Fl_Window grid_window {
     label {Layout Settings} open
-    xywh {760 427 310 245} type Double non_modal visible
+    xywh {812 369 310 245} type Double non_modal visible
   } {
     Fl_Input horizontal_input {
       label x
@@ -519,14 +520,13 @@ fl_message(
 	"ALL users on this machine.\\n\\n"
 	"Please choose these settings carefully, or reset\\n"
 	"user and system settings to \\"default\\".");
-global_settings_window->show();} {selected
-  }
+global_settings_window->show();} {}
 } 
 
 Function {make_global_settings_window()} {} {
   Fl_Window global_settings_window {
     label {FLTK Preferences} open
-    xywh {1148 148 400 378} type Double color 50 visible
+    xywh {1147 190 400 378} type Double color 50 visible
   } {
     Fl_Group {} {
       label {Keyboard Focus Options} open
diff --git a/fluid/alignment_panel.h b/fluid/alignment_panel.h
index 6724ad3b1..bb0aacea6 100644
--- a/fluid/alignment_panel.h
+++ b/fluid/alignment_panel.h
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0302
+// generated by Fast Light User Interface Designer (fluid) version 1.0303
 
 #ifndef alignment_panel_h
 #define alignment_panel_h
diff --git a/fluid/function_panel.cxx b/fluid/function_panel.cxx
index 21e610d34..175d848fc 100644
--- a/fluid/function_panel.cxx
+++ b/fluid/function_panel.cxx
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 1.0303
 
 #include "function_panel.h"
 #include <FL/Fl_Pixmap.H>
@@ -1074,7 +1074,6 @@ Fl_Double_Window* make_sourceview() {
       sv_tab->callback((Fl_Callback*)update_sourceview_position_cb);
       { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Source");
         o->labelsize(13);
-        o->hide();
         { sv_source = new CodeViewer(20, 50, 480, 390);
           sv_source->box(FL_DOWN_FRAME);
           sv_source->color(FL_BACKGROUND2_COLOR);
@@ -1094,6 +1093,7 @@ Fl_Double_Window* make_sourceview() {
       } // Fl_Group* o
       { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Header");
         o->labelsize(13);
+        o->hide();
         { sv_header = new CodeViewer(20, 50, 480, 390);
           sv_header->box(FL_DOWN_FRAME);
           sv_header->color(FL_BACKGROUND2_COLOR);
diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl
index 657b1f360..a5d44c4d2 100644
--- a/fluid/function_panel.fl
+++ b/fluid/function_panel.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0300 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 comment {//
@@ -132,7 +132,7 @@ Function {make_code_panel()} {open
     label {Code Properties}
     callback {if (Fl::event()==FL_SHORTCUT && Fl::event_key()==FL_Escape) 
     return; // ignore Escape
-code_panel->hide(); // otherwise hide..} open selected
+code_panel->hide(); // otherwise hide..} open
     xywh {353 262 540 180} type Double labelsize 11 resizable
     code0 {o->size_range(200, 150);} modal visible
   } {
@@ -410,7 +410,7 @@ Function {make_data_panel()} {open
 Function {make_class_panel()} {} {
   Fl_Window class_panel {
     label {Class Properties} open
-    xywh {395 191 342 196} type Double labelsize 11 resizable modal size_range {343 188 0 0} visible
+    xywh {783 191 342 196} type Double labelsize 11 hide resizable modal size_range {343 188 0 0}
   } {
     Fl_Group {} {open
       xywh {10 10 280 20} hide
@@ -456,8 +456,8 @@ Function {make_class_panel()} {} {
 
 Function {make_comment_panel()} {} {
   Fl_Window comment_panel {
-    label {Comment Properties} open
-    xywh {422 190 550 280} type Double labelsize 11 resizable
+    label {Comment Properties} open selected
+    xywh {780 296 550 280} type Double labelsize 11 resizable
     code0 {o->size_range(320, 180);} modal visible
   } {
     Fl_Text_Editor comment_input {
@@ -528,7 +528,7 @@ Function {make_widgetbin()} {open
   exit_cb((Fl_Widget*)o, v);
 else  
   toggle_widgetbin_cb((Fl_Widget*)o, v);} open
-    xywh {410 171 574 85} type Single align 80 non_modal visible
+    xywh {410 171 574 85} type Single align 80 hide non_modal
   } {
     Fl_Group {} {
       xywh {3 3 79 79}
@@ -881,7 +881,7 @@ Function {make_sourceview()} {} {
   Fl_Window sourceview_panel {
     label {Code View}
     callback toggle_sourceview_cb
-    xywh {430 273 520 490} type Double align 80 resizable size_range {384 120 0 0} visible
+    xywh {430 273 520 490} type Double align 80 hide resizable size_range {384 120 0 0}
   } {
     Fl_Tabs sv_tab {
       callback update_sourceview_position_cb
@@ -889,7 +889,7 @@ Function {make_sourceview()} {} {
     } {
       Fl_Group {} {
         label Source open
-        xywh {10 35 500 415} labelsize 13 hide resizable
+        xywh {10 35 500 415} labelsize 13 resizable
       } {
         Fl_Text_Editor sv_source {
           xywh {20 50 480 390} textfont 4 textsize 11 resizable
@@ -899,7 +899,7 @@ Function {make_sourceview()} {} {
       }
       Fl_Group {} {
         label Header open
-        xywh {10 35 500 415} labelsize 13
+        xywh {10 35 500 415} labelsize 13 hide
       } {
         Fl_Text_Editor sv_header {
           xywh {20 50 480 390} textfont 4 textsize 11 resizable
diff --git a/fluid/function_panel.h b/fluid/function_panel.h
index 90b663309..7863cef6b 100644
--- a/fluid/function_panel.h
+++ b/fluid/function_panel.h
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 1.0303
 
 #ifndef function_panel_h
 #define function_panel_h
diff --git a/fluid/print_panel.cxx b/fluid/print_panel.cxx
index 5266d47cf..aaa79d7a7 100644
--- a/fluid/print_panel.cxx
+++ b/fluid/print_panel.cxx
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0302
+// generated by Fast Light User Interface Designer (fluid) version 1.0303
 
 #include "print_panel.h"
 #include <stdio.h>
diff --git a/fluid/print_panel.fl b/fluid/print_panel.fl
index 4d84dd32f..cd00025de 100644
--- a/fluid/print_panel.fl
+++ b/fluid/print_panel.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0107 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 comment {//
@@ -22,21 +22,26 @@ comment {//
 } {in_source in_header
 } 
 
-decl {\#include <stdio.h>} {} 
+decl {\#include <stdio.h>} {private local
+} 
 
-decl {\#include <stdlib.h>} {} 
+decl {\#include <stdlib.h>} {private local
+} 
 
-decl {\#include "../src/flstring.h"} {} 
+decl {\#include "../src/flstring.h"} {private local
+} 
 
-decl {\#include <FL/Fl_Preferences.H>} {} 
+decl {\#include <FL/Fl_Preferences.H>} {private local
+} 
 
-decl {extern Fl_Preferences fluid_prefs;} {} 
+decl {extern Fl_Preferences fluid_prefs;} {private local
+} 
 
 Function {make_print_panel()} {open
 } {
   Fl_Window print_panel {
     label Print open
-    xywh {342 21 465 235} type Double modal visible
+    xywh {394 209 465 235} type Double modal visible
   } {
     Fl_Group print_panel_controls {open
       xywh {10 10 447 216}
@@ -48,7 +53,7 @@ Function {make_print_panel()} {open
       } {}
       Fl_Button print_properties {
         label {Properties...}
-        callback {print_properties_panel->show();}
+        callback {print_properties_panel->show();} selected
         xywh {294 10 105 25}
       }
       Fl_Box print_status {
@@ -100,7 +105,7 @@ print_to->deactivate();}
   print_collate_button->activate();
   print_collate_group[0]->activate();
   print_collate_group[1]->activate();
-}} selected
+}}
           xywh {321 96 45 25} when 1
         }
         Fl_Check_Button print_collate_button {
@@ -210,7 +215,7 @@ print_collate_group[1 - i]->hide();}
     label {Printer Properties}
     callback {print_properties_panel->hide();
 print_update_status();} open
-    xywh {340 213 290 130} type Double modal visible
+    xywh {400 537 290 130} type Double modal visible
   } {
     Fl_Choice print_page_size {
       label {Page Size:}
@@ -274,7 +279,7 @@ print_update_status();}
   }
 } 
 
-decl {void print_cb(Fl_Return_Button *, void *);} {public
+decl {void print_cb(Fl_Return_Button *, void *);} {public local
 } 
 
 Function {print_load()} {open return_type void
diff --git a/fluid/print_panel.h b/fluid/print_panel.h
index 38d097ff9..118595dd8 100644
--- a/fluid/print_panel.h
+++ b/fluid/print_panel.h
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0302
+// generated by Fast Light User Interface Designer (fluid) version 1.0303
 
 #ifndef print_panel_h
 #define print_panel_h
diff --git a/fluid/template_panel.cxx b/fluid/template_panel.cxx
index 157c8e8f3..afd987175 100644
--- a/fluid/template_panel.cxx
+++ b/fluid/template_panel.cxx
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0302
+// generated by Fast Light User Interface Designer (fluid) version 1.0303
 
 #include "template_panel.h"
 #include <stdio.h>
diff --git a/fluid/template_panel.fl b/fluid/template_panel.fl
index eacdb35f9..6c95092d3 100644
--- a/fluid/template_panel.fl
+++ b/fluid/template_panel.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0300 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 comment {//
@@ -22,32 +22,45 @@ comment {//
 } {in_source in_header
 } 
 
-decl {\#include <stdio.h>} {} 
+decl {\#include <stdio.h>} {private local
+} 
 
-decl {\#include <stdlib.h>} {} 
+decl {\#include <stdlib.h>} {private local
+} 
 
-decl {\#include "../src/flstring.h"} {} 
+decl {\#include "../src/flstring.h"} {private local
+} 
 
-decl {\#include <errno.h>} {} 
+decl {\#include <errno.h>} {private local
+} 
 
-decl {\#include <FL/filename.H>} {} 
+decl {\#include <FL/filename.H>} {private local
+} 
 
-decl {\#include <FL/fl_ask.H>} {} 
+decl {\#include <FL/fl_ask.H>} {private local
+} 
 
-decl {\#include <FL/Fl_Shared_Image.H>} {} 
+decl {\#include <FL/Fl_Shared_Image.H>} {private local
+} 
 
-decl {\#include <FL/Fl_Preferences.H>} {} 
+decl {\#include <FL/Fl_Preferences.H>} {private local
+} 
 
 declblock {\#if defined(WIN32) && !defined(__CYGWIN__)} {after {\#endif // WIN32 && !__CYGWIN__}
 } {
-  decl {\#include <io.h>} {}
-  decl {\#else} {}
-  decl {\#include <unistd.h>} {}
+  decl {\#include <io.h>} {private local
+  }
+  decl {\#else} {private local
+  }
+  decl {\#include <unistd.h>} {private local
+  }
 } 
 
-decl {extern Fl_Preferences fluid_prefs;} {} 
+decl {extern Fl_Preferences fluid_prefs;} {private local
+} 
 
-Function {make_template_panel()} {} {
+Function {make_template_panel()} {open
+} {
   Fl_Window template_panel {
     label {New/Save Template}
     callback {Fl_Shared_Image *img = (Fl_Shared_Image *)template_preview->image();
@@ -58,7 +71,7 @@ template_browser->deselect();
 template_name->value("");
 template_instance->value("");
 template_panel->hide();} open
-    xywh {340 237 460 355} type Double resizable modal visible
+    xywh {398 200 460 355} type Double resizable modal visible
   } {
     Fl_Browser template_browser {
       label {Available Templates:}
@@ -116,7 +129,7 @@ if (img) {
       callback {if (strlen(template_name->value())) {
   template_submit->activate();
   if (Fl::event_key() == FL_Enter) template_panel->hide();
-} else template_submit->deactivate();}
+} else template_submit->deactivate();} selected
       xywh {144 288 306 25} labelfont 1 when 3 textfont 4
     }
     Fl_Input template_instance {
@@ -172,7 +185,7 @@ template_browser->deselect();
 template_browser->clear();} {}
 } 
 
-Function {template_delete_cb(Fl_Button *, void *)} {selected return_type void
+Function {template_delete_cb(Fl_Button *, void *)} {return_type void
 } {
   code {int item = template_browser->value();
 if (item < 1) return;
diff --git a/fluid/template_panel.h b/fluid/template_panel.h
index 10a07c52c..7cad1a5e8 100644
--- a/fluid/template_panel.h
+++ b/fluid/template_panel.h
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0302
+// generated by Fast Light User Interface Designer (fluid) version 1.0303
 
 #ifndef template_panel_h
 #define template_panel_h
diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx
index 4809f259c..27fc37ece 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0302
+// generated by Fast Light User Interface Designer (fluid) version 1.0303
 
 #include "widget_panel.h"
 
diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index aff63039b..2d5f14119 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 1.0300 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 comment {//
@@ -43,7 +43,7 @@ Function {make_widget_panel()} {open
           xywh {95 40 309 20} labelfont 1 labelsize 11 align 4
         } {
           Fl_Input {} {
-            callback label_cb
+            callback label_cb selected
             tooltip {The label text for the widget.
 Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 1 textsize 11 resizable
           }
@@ -126,7 +126,7 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 1 te
             tooltip {Bottom-align the label.} xywh {353 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 hide
           }
           Fl_Choice {} {
-            callback align_text_image_cb open selected
+            callback align_text_image_cb open
             xywh {172 115 110 20} down_box BORDER_BOX labelsize 11 textsize 11
           } {
             MenuItem {} {
diff --git a/fluid/widget_panel.h b/fluid/widget_panel.h
index bb9b0d4b2..5840bd3df 100644
--- a/fluid/widget_panel.h
+++ b/fluid/widget_panel.h
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-// generated by Fast Light User Interface Designer (fluid) version 1.0302
+// generated by Fast Light User Interface Designer (fluid) version 1.0303
 
 #ifndef widget_panel_h
 #define widget_panel_h
diff --git a/src/Makefile b/src/Makefile
index 0247ed793..3d9656c8e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,7 +3,7 @@
 #
 # Library makefile for the Fast Light Tool Kit (FLTK).
 #
-# Copyright 1998-2010 by Bill Spitzak and others.
+# Copyright 1998-2014 by Bill Spitzak and others.
 #
 # This library is free software. Distribution and use rights are outlined in
 # the file "COPYING" which should have been included with this file.  If this
@@ -251,7 +251,7 @@ libfltk.1.3.dylib: $(OBJECTS)
 	echo $(DSOCOMMAND) $@ ...
 	$(DSOCOMMAND) $@ \
 		-install_name $(libdir)/$@ \
-		-current_version 1.3.2 \
+		-current_version 1.3.3 \
 		-compatibility_version 1.3.0 \
 		$(OBJECTS) $(LDLIBS)
 	$(RM) libfltk.dylib
@@ -287,7 +287,7 @@ libfltk_forms.1.3.dylib: $(FLOBJECTS) libfltk.1.3.dylib
 	echo $(DSOCOMMAND) $@ ...
 	$(DSOCOMMAND) $@ \
 		-install_name $(libdir)/$@ \
-		-current_version 1.3.2 \
+		-current_version 1.3.3 \
 		-compatibility_version 1.3.0 \
 		$(FLOBJECTS) -L. $(LDLIBS) -lfltk
 	$(RM) libfltk_forms.dylib
@@ -323,7 +323,7 @@ libfltk_gl.1.3.dylib: $(GLOBJECTS) libfltk.1.3.dylib
 	echo $(DSOCOMMAND) $@ ...
 	$(DSOCOMMAND) $@ \
 		-install_name $(libdir)/$@ \
-		-current_version 1.3.2 \
+		-current_version 1.3.3 \
 		-compatibility_version 1.3.0 \
 		$(GLOBJECTS) -L. $(GLDLIBS) -lfltk
 	$(RM) libfltk_gl.dylib
@@ -359,7 +359,7 @@ libfltk_images.1.3.dylib: $(IMGOBJECTS) libfltk.1.3.dylib
 	echo $(DSOCOMMAND) $@ ...
 	$(DSOCOMMAND) $@ \
 		-install_name $(libdir)/$@ \
-		-current_version 1.3.2 \
+		-current_version 1.3.3 \
 		-compatibility_version 1.3.0 \
 		$(IMGOBJECTS)  -L. $(LDLIBS) $(IMAGELIBS) -lfltk
 	$(RM) libfltk_images.dylib
diff --git a/test/CubeViewUI.fl b/test/CubeViewUI.fl
index da8e196e0..899db38a7 100644
--- a/test/CubeViewUI.fl
+++ b/test/CubeViewUI.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0108 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 class CubeViewUI {open
diff --git a/test/fast_slow.fl b/test/fast_slow.fl
index 63e3762b3..6c534431e 100644
--- a/test/fast_slow.fl
+++ b/test/fast_slow.fl
@@ -1,14 +1,11 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.00 
+version 1.0303 
 header_name {.h} 
-code_name {.cxx} 
-gridx 10 
-gridy 10 
-snap 3
+code_name {.cxx}
 Function {} {open
 } {
   Fl_Window {} {open
-    xywh {143 188 318 443} resizable visible
+    xywh {397 202 318 443} type Double resizable visible
   } {
     Fl_Slider control {
       label {move
diff --git a/test/inactive.fl b/test/inactive.fl
index e8e90377f..cfe016ef5 100644
--- a/test/inactive.fl
+++ b/test/inactive.fl
@@ -1,11 +1,11 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0107 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 Function {} {open
 } {
   Fl_Window {} {open
-    xywh {379 190 420 369} type Double resizable visible
+    xywh {390 200 420 369} type Double resizable visible
   } {
     Fl_Group the_group {
       label {activate()/deactivate() called on this Fl_Group} open
@@ -62,23 +62,23 @@ Function {} {open
       } {
         MenuItem {} {
           label item
-          xywh {0 0 100 20} labelsize 14
+          xywh {0 0 100 20}
         }
         MenuItem {} {
           label item
-          xywh {10 10 100 20} labelsize 14
+          xywh {10 10 100 20}
         }
         MenuItem {} {
           label item
-          xywh {20 20 100 20} labelsize 14
+          xywh {20 20 100 20}
         }
         MenuItem {} {
           label item
-          xywh {30 30 100 20} labelsize 14
+          xywh {30 30 100 20}
         }
         MenuItem {} {
           label item
-          xywh {40 40 100 20} labelsize 14
+          xywh {40 40 100 20}
         }
       }
       Fl_Value_Output {} {
diff --git a/test/keyboard_ui.fl b/test/keyboard_ui.fl
index 4cc78bd1c..3f6bdad7e 100644
--- a/test/keyboard_ui.fl
+++ b/test/keyboard_ui.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0300 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 Function {make_window()} {open
diff --git a/test/mandelbrot_ui.fl b/test/mandelbrot_ui.fl
index 7f206a739..b77c7759b 100644
--- a/test/mandelbrot_ui.fl
+++ b/test/mandelbrot_ui.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0302 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 decl {\#include "mandelbrot.h"} {public local
diff --git a/test/preferences.fl b/test/preferences.fl
index a72ab28c2..e836eaa0f 100644
--- a/test/preferences.fl
+++ b/test/preferences.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0300 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 decl {\#include <FL/Fl_Preferences.H>} {public local
@@ -45,7 +45,7 @@ Function {} {open return_type int
   Fl_Window myWindow {
     label {My Preferences}
     callback closeWindowCB open
-    xywh {709 76 298 311} type Double visible
+    xywh {408 202 298 311} type Double visible
   } {
     Fl_Button {} {
       label Cancel
diff --git a/test/radio.fl b/test/radio.fl
index e8ec5e6d1..35ad146f1 100644
--- a/test/radio.fl
+++ b/test/radio.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0300 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 Function {button_cb(Fl_Button *b, void *)} {
diff --git a/test/resize.fl b/test/resize.fl
index 3b2180153..79c5f63ef 100644
--- a/test/resize.fl
+++ b/test/resize.fl
@@ -1,11 +1,11 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0300 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 Function {} {open
 } {
   Fl_Window {} {open
-    xywh {333 489 366 261} type Double resizable visible
+    xywh {401 207 366 261} type Double resizable visible
   } {
     Fl_Button {} {
       label {@<-}
diff --git a/test/tabs.fl b/test/tabs.fl
index 29b8b3738..0f1393f75 100644
--- a/test/tabs.fl
+++ b/test/tabs.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0108 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 Function {} {open
diff --git a/test/tree.fl b/test/tree.fl
index 7d1779fa0..d7a375cea 100644
--- a/test/tree.fl
+++ b/test/tree.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0302 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 decl {\#include <stdio.h>} {public global
@@ -346,7 +346,7 @@ Function {} {open
 } {
   Fl_Window window {
     label tree open
-    xywh {1 234 1045 580} type Double visible
+    xywh {115 293 1045 580} type Double visible
   } {
     Fl_Group tree {
       label Tree
diff --git a/test/valuators.fl b/test/valuators.fl
index 668a462f6..25b272a7d 100644
--- a/test/valuators.fl
+++ b/test/valuators.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0107 
+version 1.0303 
 header_name {.h} 
 code_name {.cxx}
 Function {callback(Fl_Widget* o, void*)} {open private return_type void
@@ -12,7 +12,7 @@ Function {} {open
 } {
   Fl_Window {} {
     label {Valuator classes, showing values for type()} open
-    xywh {479 151 580 510} type Double color 43 selection_color 43
+    xywh {400 199 580 510} type Double color 43 selection_color 43
     code0 {\#include <stdio.h>} visible
   } {
     Fl_Box {} {