Update fluid .fl files and generated code - remove trailing white space.

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

11 files changed, 188 insertions, 188 deletions

diff --git a/fluid/about_panel.cxx b/fluid/about_panel.cxx
index e19aa5e08..58f0fd479 100644
--- a/fluid/about_panel.cxx
+++ b/fluid/about_panel.cxx
@@ -295,7 +295,7 @@ Fl_Double_Window* make_about_panel() {
   return about_panel;
 }
 /**
-   Embedded image for internal fluid.html web page.
+ Embedded image for internal fluid.html web page.
 */
 unsigned char fluid_org_png[12690] = /* binary data included from ../documentation/src/fluid-org.png */
 {137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,2,161,0,0,1,14,8,4,0,0,0,
diff --git a/fluid/about_panel.fl b/fluid/about_panel.fl
index 7d166ccf6..6d4e9a849 100644
--- a/fluid/about_panel.fl
+++ b/fluid/about_panel.fl
@@ -1,6 +1,6 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0304 
-header_name {.h} 
+version 1.0304
+header_name {.h}
 code_name {.cxx}
 comment {//
 // "$Id$"
@@ -20,10 +20,10 @@ comment {//
 //     http://www.fltk.org/str.php
 //
 } {in_source in_header
-} 
+}
 
 decl {void show_help(const char *name);} {public local
-} 
+}
 
 Function {make_about_panel()} {open
 } {
@@ -60,14 +60,14 @@ Bill Spitzak and others}
       xywh {250 145 83 25}
     }
   }
-} 
+}
 
 data fluid_org_png {
   comment {Embedded image for internal fluid.html web page.} public local filename {../documentation/src/fluid-org.png}
-} 
+}
 
 comment {
 //
 // End of "$Id$".
 //} {in_source in_header
-} 
+}
diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index bb50bfbb1..f3e0d0af5 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -40,9 +40,9 @@ Fl_Check_Button *use_FL_COMMAND_button=(Fl_Check_Button *)0;
 Fl_Choice *i18n_type_chooser=(Fl_Choice *)0;
 
 Fl_Menu_Item menu_i18n_type_chooser[] = {
- {"None", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"GNU gettext", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"POSIX catgets", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"None", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"GNU gettext", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"POSIX catgets", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -149,11 +149,11 @@ Fl_Double_Window *settings_window=(Fl_Double_Window *)0;
 Fl_Choice *scheme_choice=(Fl_Choice *)0;
 
 Fl_Menu_Item menu_scheme_choice[] = {
- {"Default", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"None", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Plastic", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"GTK+", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Gleam", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"Default", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"None", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Plastic", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"GTK+", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Gleam", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -497,12 +497,12 @@ Fl_Double_Window* make_layout_window() {
   return grid_window;
 }
 /**
-   Copy of all options in user and system mode
+ Copy of all options in user and system mode
 */
 static int opt[10][2]; 
 
 /**
-   Update the UI using the values in the opt array
+ Update the UI using the values in the opt array
 */
 static void refreshUI() {
   int mode = wUserOrSystem->value();
@@ -514,7 +514,7 @@ static void refreshUI() {
 }
 
 /**
-   read all preferences and refresh the GUI
+ read all preferences and refresh the GUI
 */
 static void readPrefs() {
   // read all preferences and refresh the GUI
@@ -540,7 +540,7 @@ static void readPrefs() {
 }
 
 /**
-   write all preferences using the array
+ write all preferences using the array
 */
 static void writePrefs() {
   // write all preferences using the array
@@ -599,9 +599,9 @@ opt[Fl::OPTION_VISIBLE_FOCUS][mode] = wVisibleFocus->value();
 }
 
 Fl_Menu_Item menu_wVisibleFocus[] = {
- {"off", 0,  0, (void*)(0), 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"on", 0,  0, (void*)(1), 128, FL_NORMAL_LABEL, 0, 14, 0},
- {"default", 0,  0, (void*)(2), 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"off", 0,  0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"on", 0,  0, (void*)(1), 128, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"default", 0,  0, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -613,9 +613,9 @@ opt[Fl::OPTION_ARROW_FOCUS][mode] = wArrowFocus->value();
 }
 
 Fl_Menu_Item menu_wArrowFocus[] = {
- {"off", 0,  0, (void*)(0), 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"on", 0,  0, (void*)(1), 128, FL_NORMAL_LABEL, 0, 14, 0},
- {"default", 0,  0, (void*)(2), 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"off", 0,  0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"on", 0,  0, (void*)(1), 128, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"default", 0,  0, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -627,9 +627,9 @@ opt[Fl::OPTION_SHOW_TOOLTIPS][mode] = wShowTooltips->value();
 }
 
 Fl_Menu_Item menu_wShowTooltips[] = {
- {"off", 0,  0, (void*)(0), 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"on", 0,  0, (void*)(1), 128, FL_NORMAL_LABEL, 0, 14, 0},
- {"default", 0,  0, (void*)(2), 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"off", 0,  0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"on", 0,  0, (void*)(1), 128, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"default", 0,  0, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -641,9 +641,9 @@ opt[Fl::OPTION_DND_TEXT][mode] = wDNDText->value();
 }
 
 Fl_Menu_Item menu_wDNDText[] = {
- {"off", 0,  0, (void*)(0), 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"on", 0,  0, (void*)(1), 128, FL_NORMAL_LABEL, 0, 14, 0},
- {"default", 0,  0, (void*)(2), 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"off", 0,  0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"on", 0,  0, (void*)(1), 128, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"default", 0,  0, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -655,9 +655,9 @@ opt[Fl::OPTION_FNFC_USES_GTK ][mode] = wGTKText->value();
 }
 
 Fl_Menu_Item menu_wGTKText[] = {
- {"off", 0,  0, (void*)(0), 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"on", 0,  0, (void*)(1), 128, FL_NORMAL_LABEL, 0, 14, 0},
- {"default", 0,  0, (void*)(2), 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"off", 0,  0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"on", 0,  0, (void*)(1), 128, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"default", 0,  0, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -668,8 +668,8 @@ static void cb_wUserOrSystem(Fl_Choice*, void*) {
 }
 
 Fl_Menu_Item menu_wUserOrSystem[] = {
- {"User Settings", 0,  0, (void*)(0), 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"System Settings", 0,  0, (void*)(1), 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"User Settings", 0,  0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"System Settings", 0,  0, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index ac4753fbb..e8d67b0fb 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -1,6 +1,6 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0304 
-header_name {.h} 
+version 1.0304
+header_name {.h}
 code_name {.cxx}
 comment {//
 // "$Id$"
@@ -20,43 +20,43 @@ comment {//
 //     http://www.fltk.org/str.php
 //
 } {in_source in_header
-} 
+}
 
 decl {\#include <FL/Fl_Text_Buffer.H>} {public local
-} 
+}
 
 decl {\#include <FL/Fl_Text_Display.H>} {public local
-} 
+}
 
 decl {\#include <FL/filename.H>} {public local
-} 
+}
 
 decl {\#include <FL/Fl_Preferences.H>} {private global
-} 
+}
 
 decl {\#include <FL/fl_ask.H>} {private global
-} 
+}
 
 decl {extern void load_history();} {public local
-} 
+}
 
 decl {extern void redraw_browser();} {public local
-} 
+}
 
 decl {extern int show_comments;} {public local
-} 
+}
 
 decl {extern int show_coredevmenus;} {public local
-} 
+}
 
 decl {extern struct Fl_Menu_Item *dbmanager_item;} {public local
-} 
+}
 
 decl {extern Fl_Preferences fluid_prefs;} {public local
-} 
+}
 
 decl {Fl_Text_Buffer *shell_run_buffer;} {public local
-} 
+}
 
 Function {make_project_window()} {open
 } {
@@ -150,13 +150,13 @@ Function {make_project_window()} {open
       }
     }
   }
-} 
+}
 
 decl {extern void i18n_cb(Fl_Choice *,void *);} {public local
-} 
+}
 
 decl {void scheme_cb(Fl_Choice *, void *);} {public local
-} 
+}
 
 Function {make_settings_window()} {} {
   Fl_Window settings_window {
@@ -260,7 +260,7 @@ load_history();}
       tooltip {Close this dialog.} xywh {276 205 64 25}
     }
   }
-} 
+}
 
 Function {make_shell_window()} {} {
   Fl_Window shell_window {
@@ -325,7 +325,7 @@ Function {make_shell_window()} {} {
       xywh {468 395 77 25}
     }
   }
-} 
+}
 
 Function {make_layout_window()} {} {
   Fl_Window grid_window {
@@ -431,11 +431,11 @@ Function {make_layout_window()} {} {
       }
     }
   }
-} 
+}
 
 decl {int opt[10][2];} {
   comment {Copy of all options in user and system mode} private local
-} 
+}
 
 Function {refreshUI()} {
   comment {Update the UI using the values in the opt array} private return_type void
@@ -446,7 +446,7 @@ wArrowFocus->value(opt[Fl::OPTION_ARROW_FOCUS][mode]);
 wShowTooltips->value(opt[Fl::OPTION_SHOW_TOOLTIPS][mode]);
 wDNDText->value(opt[Fl::OPTION_DND_TEXT][mode]);
 wGTKText->value(opt[Fl::OPTION_FNFC_USES_GTK][mode]);} {}
-} 
+}
 
 Function {readPrefs()} {
   comment {read all preferences and refresh the GUI} private return_type void
@@ -471,7 +471,7 @@ Function {readPrefs()} {
   opt_prefs.get("FNFCUsesGTK", opt[Fl::OPTION_FNFC_USES_GTK ][0], 2);
 }
 refreshUI();} {}
-} 
+}
 
 Function {writePrefs()} {
   comment {write all preferences using the array} private return_type void
@@ -505,7 +505,7 @@ Function {writePrefs()} {
   if (opt[Fl::OPTION_FNFC_USES_GTK][0]==2) opt_prefs.deleteEntry("FNFCUsesGTK");
   else opt_prefs.set("FNFCUsesGTK", opt[Fl::OPTION_FNFC_USES_GTK][0]);
 }} {}
-} 
+}
 
 Function {show_global_settings_window()} {open return_type void
 } {
@@ -521,7 +521,7 @@ fl_message(
 	"Please choose these settings carefully, or reset\\n"
 	"user and system settings to \\"default\\".");
 global_settings_window->show();} {}
-} 
+}
 
 Function {make_global_settings_window()} {} {
   Fl_Window global_settings_window {
@@ -709,10 +709,10 @@ global_settings_window->hide();}
   }
   code {readPrefs();
   Fl::option(Fl::OPTION_SHOW_TOOLTIPS,1); // make sure tooltips are on !} {}
-} 
+}
 
 comment {
 //
 // End of "$Id$".
 //} {in_source in_header
-} 
+}
diff --git a/fluid/function_panel.cxx b/fluid/function_panel.cxx
index edff90cbb..1ca0d8285 100644
--- a/fluid/function_panel.cxx
+++ b/fluid/function_panel.cxx
@@ -40,17 +40,17 @@ Fl_Double_Window *function_panel=(Fl_Double_Window *)0;
 Fl_Choice *f_public_member_choice=(Fl_Choice *)0;
 
 Fl_Menu_Item menu_f_public_member_choice[] = {
- {"private", 0,  0, (void*)(0), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"public", 0,  0, (void*)(1), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"protected", 0,  0, (void*)(2), 0, FL_NORMAL_LABEL, 0, 11, 0},
+ {"private", 0,  0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"public", 0,  0, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"protected", 0,  0, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
 Fl_Choice *f_public_choice=(Fl_Choice *)0;
 
 Fl_Menu_Item menu_f_public_choice[] = {
- {"local", 0,  0, (void*)(0), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"global", 0,  0, (void*)(1), 0, FL_NORMAL_LABEL, 0, 11, 0},
+ {"local", 0,  0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"global", 0,  0, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -256,8 +256,8 @@ Fl_Double_Window *declblock_panel=(Fl_Double_Window *)0;
 Fl_Choice *declblock_public_choice=(Fl_Choice *)0;
 
 Fl_Menu_Item menu_declblock_public_choice[] = {
- {"in source code only", 0,  0, (void*)(0), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"in header and source", 0,  0, (void*)(1), 0, FL_NORMAL_LABEL, 0, 11, 0},
+ {"in source code only", 0,  0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"in header and source", 0,  0, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -337,19 +337,19 @@ Fl_Double_Window *decl_panel=(Fl_Double_Window *)0;
 Fl_Choice *decl_choice=(Fl_Choice *)0;
 
 Fl_Menu_Item menu_decl_choice[] = {
- {"in source file only", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"in header file only", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"\"static\" in source file", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"in source and \"extern\" in header", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
+ {"in source file only", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"in header file only", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"\"static\" in source file", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"in source and \"extern\" in header", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
 Fl_Choice *decl_class_choice=(Fl_Choice *)0;
 
 Fl_Menu_Item menu_decl_class_choice[] = {
- {"private", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"public", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"protected", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
+ {"private", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"public", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"protected", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -430,19 +430,19 @@ Fl_Double_Window *data_panel=(Fl_Double_Window *)0;
 Fl_Choice *data_choice=(Fl_Choice *)0;
 
 Fl_Menu_Item menu_data_choice[] = {
- {"in source file only", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"in header file only", 0,  0, 0, 16, FL_NORMAL_LABEL, 0, 11, 0},
- {"\"static\" in source file", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"in source and \"extern\" in header", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
+ {"in source file only", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"in header file only", 0,  0, 0, 16, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"\"static\" in source file", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"in source and \"extern\" in header", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
 Fl_Choice *data_class_choice=(Fl_Choice *)0;
 
 Fl_Menu_Item menu_data_class_choice[] = {
- {"private", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"public", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"protected", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
+ {"private", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"public", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"protected", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl
index 48bf1a301..7f02a5774 100644
--- a/fluid/function_panel.fl
+++ b/fluid/function_panel.fl
@@ -1,6 +1,6 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0304 
-header_name {.h} 
+version 1.0304
+header_name {.h}
 code_name {.cxx}
 comment {//
 // "$Id$"
@@ -20,42 +20,42 @@ comment {//
 //     http://www.fltk.org/str.php
 //
 } {in_source in_header
-} 
+}
 
 decl {\#include <FL/Fl_Pixmap.H>} {private local
-} 
+}
 
 decl {\#include "Fl_Type.h"} {private local
-} 
+}
 
 decl {\#include "undo.h"} {private local
-} 
+}
 
 decl {extern class Fl_Pixmap *pixmap[];} {private local
-} 
+}
 
 decl {extern class Fl_Type *Fl_Type_make(const char*);} {private local
-} 
+}
 
 decl {extern void select_only(Fl_Type*);} {private local
-} 
+}
 
 decl {extern void exit_cb(Fl_Widget*, void*);} {private global
-} 
+}
 
 decl {extern void toggle_widgetbin_cb(Fl_Widget*, void*);} {private global
-} 
+}
 
 Function {use_tab_navigation(int, Fl_Text_Editor*)} {
   comment {Allow widget navigation on text fields with Tab.} private return_type int
 } {
   code {return 0;} {}
-} 
+}
 
 Function {make_function_panel()} {} {
   Fl_Window function_panel {
     label {Function/Method Properties} open
-    xywh {557 523 343 232} type Double resizable modal visible
+    xywh {557 523 343 232} type Double hide resizable modal
   } {
     Fl_Group {} {open
       xywh {10 10 270 20}
@@ -131,7 +131,7 @@ Function {make_function_panel()} {} {
       }
     }
   }
-} 
+}
 
 Function {make_code_panel()} {} {
   Fl_Window code_panel {
@@ -139,8 +139,8 @@ Function {make_code_panel()} {} {
     callback {if (Fl::event()==FL_SHORTCUT && Fl::event_key()==FL_Escape) 
     return; // ignore Escape
 code_panel->hide(); // otherwise hide..} open
-    xywh {503 450 540 180} type Double labelsize 11 resizable
-    code0 {o->size_range(200, 150);} modal visible
+    xywh {503 450 540 180} type Double labelsize 11 hide resizable
+    code0 {o->size_range(200, 150);} modal
   } {
     Fl_Text_Editor code_input {
       xywh {10 10 520 130} box DOWN_BOX labelsize 11 textfont 4 textsize 11 resizable
@@ -164,13 +164,13 @@ code_panel->hide(); // otherwise hide..} open
       }
     }
   }
-} 
+}
 
 Function {make_codeblock_panel()} {} {
   Fl_Window codeblock_panel {
     label {Code Block Properties} open
-    xywh {468 221 300 115} type Double labelsize 11 resizable
-    code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal visible
+    xywh {468 221 300 115} type Double labelsize 11 hide resizable
+    code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal
   } {
     Fl_Input code_before_input {
       label {Conditional code block}
@@ -196,13 +196,13 @@ Function {make_codeblock_panel()} {} {
       }
     }
   }
-} 
+}
 
 Function {make_declblock_panel()} {} {
   Fl_Window declblock_panel {
     label {Declaration Block Properties} open
-    xywh {428 215 300 135} type Double labelsize 11 resizable
-    code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal visible
+    xywh {428 215 300 135} type Double labelsize 11 hide resizable
+    code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal
   } {
     Fl_Group {} {open
       xywh {10 10 280 20}
@@ -252,12 +252,12 @@ Function {make_declblock_panel()} {} {
       }
     }
   }
-} 
+}
 
 Function {make_decl_panel()} {} {
   Fl_Window decl_panel {
     label {Declaration Properties} open
-    xywh {480 333 343 237} type Double align 80 resizable size_range {343 237 0 0} visible
+    xywh {480 333 343 237} type Double align 80 hide resizable size_range {343 237 0 0}
   } {
     Fl_Group {} {open
       xywh {10 10 270 20}
@@ -328,12 +328,12 @@ Function {make_decl_panel()} {} {
       }
     }
   }
-} 
+}
 
 Function {make_data_panel()} {} {
   Fl_Window data_panel {
     label {Binary Data Properties} open
-    xywh {595 352 343 237} type Double align 80 resizable size_range {343 237 0 0} visible
+    xywh {595 352 343 237} type Double align 80 hide resizable size_range {343 237 0 0}
   } {
     Fl_Group {} {open
       xywh {10 10 270 20}
@@ -412,13 +412,13 @@ Function {make_data_panel()} {} {
       }
     }
   }
-} 
+}
 
 Function {make_class_panel()} {open
 } {
   Fl_Window class_panel {
     label {Class Properties} open
-    xywh {497 585 342 196} type Double labelsize 11 resizable modal size_range {343 188 0 0} visible
+    xywh {497 585 342 196} type Double labelsize 11 hide resizable modal size_range {343 188 0 0}
   } {
     Fl_Group {} {open
       xywh {10 10 280 20} hide
@@ -461,7 +461,7 @@ Function {make_class_panel()} {open
       }
     }
   }
-} 
+}
 
 Function {make_comment_panel()} {} {
   Fl_Window comment_panel {
@@ -513,7 +513,7 @@ Function {make_comment_panel()} {} {
       }
     }
   }
-} 
+}
 
 Function {type_make_cb(Fl_Widget*,void*d)} {return_type void
 } {
@@ -527,7 +527,7 @@ Function {type_make_cb(Fl_Widget*,void*d)} {return_type void
     undo_current --;
     undo_last --;
   }} {}
-} 
+}
 
 Function {make_widgetbin()} {} {
   Fl_Window widgetbin_panel {
@@ -883,7 +883,7 @@ else
       }
     }
   }
-} 
+}
 
 Function {make_sourceview()} {} {
   Fl_Window sourceview_panel {
@@ -943,10 +943,10 @@ Function {make_sourceview()} {} {
       }
     }
   }
-} 
+}
 
 comment {
 //
 // End of "$Id$".
 //} {in_source in_header
-} 
+}
diff --git a/fluid/print_panel.cxx b/fluid/print_panel.cxx
index b76ecb109..6f042a982 100644
--- a/fluid/print_panel.cxx
+++ b/fluid/print_panel.cxx
@@ -108,8 +108,8 @@ print_update_status();
 Fl_Choice *print_page_size=(Fl_Choice *)0;
 
 Fl_Menu_Item menu_print_page_size[] = {
- {"Letter", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"A4", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"Letter", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"A4", 0,  0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
diff --git a/fluid/print_panel.fl b/fluid/print_panel.fl
index 7a5ad7d5f..fe3ed4185 100644
--- a/fluid/print_panel.fl
+++ b/fluid/print_panel.fl
@@ -1,6 +1,6 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0304 
-header_name {.h} 
+version 1.0304
+header_name {.h}
 code_name {.cxx}
 comment {//
 // "$Id$"
@@ -20,22 +20,22 @@ comment {//
 //     http://www.fltk.org/str.php
 //
 } {in_source in_header
-} 
+}
 
 decl {\#include <stdio.h>} {private local
-} 
+}
 
 decl {\#include <stdlib.h>} {private local
-} 
+}
 
 decl {\#include "../src/flstring.h"} {private local
-} 
+}
 
 decl {\#include <FL/Fl_Preferences.H>} {private local
-} 
+}
 
 decl {extern Fl_Preferences fluid_prefs;} {private local
-} 
+}
 
 Function {make_print_panel()} {open
 } {
@@ -277,10 +277,10 @@ print_update_status();}
       xywh {60 95 53 25}
     }
   }
-} 
+}
 
 decl {void print_cb(Fl_Return_Button *, void *);} {public local
-} 
+}
 
 Function {print_load()} {open return_type void
 } {
@@ -328,7 +328,7 @@ if (defname[0]) {
 
 
 print_update_status();} {}
-} 
+}
 
 Function {print_update_status()} {open return_type void
 } {
@@ -357,10 +357,10 @@ print_page_size->value(val);
 snprintf(name, sizeof(name), "%s/output_mode", printer);
 fluid_prefs.get(name, val, 0);
 print_output_mode[val]->setonly();} {}
-} 
+}
 
 comment {
 //
 // End of "$Id$".
 //} {in_source in_header
-} 
+}
diff --git a/fluid/template_panel.fl b/fluid/template_panel.fl
index b1ca69e2a..987f3615b 100644
--- a/fluid/template_panel.fl
+++ b/fluid/template_panel.fl
@@ -1,6 +1,6 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0304 
-header_name {.h} 
+version 1.0304
+header_name {.h}
 code_name {.cxx}
 comment {//
 // "$Id$"
@@ -20,31 +20,31 @@ comment {//
 //     http://www.fltk.org/str.php
 //
 } {in_source in_header
-} 
+}
 
 decl {\#include <stdio.h>} {private local
-} 
+}
 
 decl {\#include <stdlib.h>} {private local
-} 
+}
 
 decl {\#include "../src/flstring.h"} {private local
-} 
+}
 
 decl {\#include <errno.h>} {private local
-} 
+}
 
 decl {\#include <FL/filename.H>} {private local
-} 
+}
 
 decl {\#include <FL/fl_ask.H>} {private local
-} 
+}
 
 decl {\#include <FL/Fl_Shared_Image.H>} {private local
-} 
+}
 
 decl {\#include <FL/Fl_Preferences.H>} {private local
-} 
+}
 
 declblock {\#if defined(WIN32) && !defined(__CYGWIN__)} {after {\#endif // WIN32 && !__CYGWIN__}
 } {
@@ -54,10 +54,10 @@ declblock {\#if defined(WIN32) && !defined(__CYGWIN__)} {after {\#endif // WIN32
   }
   decl {\#include <unistd.h>} {private local
   }
-} 
+}
 
 decl {extern Fl_Preferences fluid_prefs;} {private local
-} 
+}
 
 Function {make_template_panel()} {open
 } {
@@ -170,7 +170,7 @@ template_panel->hide();}
       }
     }
   }
-} 
+}
 
 Function {template_clear()} {return_type void
 } {
@@ -183,7 +183,7 @@ for (i = 1; i <= template_browser->size(); i ++) {
 
 template_browser->deselect();
 template_browser->clear();} {}
-} 
+}
 
 Function {template_delete_cb(Fl_Button *, void *)} {return_type void
 } {
@@ -204,7 +204,7 @@ if (unlink(flfile)) {
 
 template_browser->remove(item);
 template_browser->do_callback();} {}
-} 
+}
 
 Function {template_load()} {return_type void
 } {
@@ -238,10 +238,10 @@ for (i = 0; i < num_files; i ++) {
 }
 
 if (num_files > 0) free(files);} {}
-} 
+}
 
 comment {
 //
 // End of "$Id$".
 //} {in_source in_header
-} 
+}
diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx
index fdbe4e6fe..59e38c1d2 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -26,31 +26,31 @@ static void cb_(Fl_Tabs* o, void* v) {
 }
 
 Fl_Menu_Item menu_[] = {
- {"   Image Alignment   ", 0,  0, (void*)(0xFFFFFFFF), 1, FL_NORMAL_LABEL, 2, 11, 0},
- {"image over text", 0,  0, (void*)(FL_ALIGN_IMAGE_OVER_TEXT), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"text over image", 0,  0, (void*)(FL_ALIGN_TEXT_OVER_IMAGE), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"text next to image", 0,  0, (void*)(FL_ALIGN_TEXT_NEXT_TO_IMAGE), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"image next to text", 0,  0, (void*)(FL_ALIGN_IMAGE_NEXT_TO_TEXT), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"image is backdrop", 0,  0, (void*)(FL_ALIGN_IMAGE_BACKDROP), 0, FL_NORMAL_LABEL, 0, 11, 0},
+ {"   Image Alignment   ", 0,  0, (void*)(0xFFFFFFFF), 1, (uchar)FL_NORMAL_LABEL, 2, 11, 0},
+ {"image over text", 0,  0, (void*)(FL_ALIGN_IMAGE_OVER_TEXT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"text over image", 0,  0, (void*)(FL_ALIGN_TEXT_OVER_IMAGE), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"text next to image", 0,  0, (void*)(FL_ALIGN_TEXT_NEXT_TO_IMAGE), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"image next to text", 0,  0, (void*)(FL_ALIGN_IMAGE_NEXT_TO_TEXT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"image is backdrop", 0,  0, (void*)(FL_ALIGN_IMAGE_BACKDROP), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
 Fl_Menu_Item menu_1[] = {
- {"   Inside && Outside   ", 0,  0, (void*)(0xFFFFFFFF), 1, FL_NORMAL_LABEL, 2, 11, 0},
- {"top left", 0,  0, (void*)(FL_ALIGN_TOP_LEFT), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"top", 0,  0, (void*)(FL_ALIGN_TOP), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"top right", 0,  0, (void*)(FL_ALIGN_TOP_RIGHT), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"left", 0,  0, (void*)(FL_ALIGN_LEFT), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"center", 0,  0, (void*)(FL_ALIGN_CENTER), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"right", 0,  0, (void*)(FL_ALIGN_RIGHT), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"bottom left", 0,  0, (void*)(FL_ALIGN_BOTTOM_LEFT), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"bottom", 0,  0, (void*)(FL_ALIGN_BOTTOM), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"bottom right", 0,  0, (void*)(FL_ALIGN_BOTTOM_RIGHT), 128, FL_NORMAL_LABEL, 0, 11, 0},
- {"   Outside Alignment   ", 0,  0, (void*)(0xFFFFFFFF), 1, FL_NORMAL_LABEL, 2, 11, 0},
- {"left top", 0,  0, (void*)(FL_ALIGN_LEFT_TOP), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"right top", 0,  0, (void*)(FL_ALIGN_RIGHT_TOP), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"left bottom", 0,  0, (void*)(FL_ALIGN_LEFT_BOTTOM), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"right bottom", 0,  0, (void*)(FL_ALIGN_RIGHT_BOTTOM), 0, FL_NORMAL_LABEL, 0, 11, 0},
+ {"   Inside && Outside   ", 0,  0, (void*)(0xFFFFFFFF), 1, (uchar)FL_NORMAL_LABEL, 2, 11, 0},
+ {"top left", 0,  0, (void*)(FL_ALIGN_TOP_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"top", 0,  0, (void*)(FL_ALIGN_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"top right", 0,  0, (void*)(FL_ALIGN_TOP_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"left", 0,  0, (void*)(FL_ALIGN_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"center", 0,  0, (void*)(FL_ALIGN_CENTER), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"right", 0,  0, (void*)(FL_ALIGN_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"bottom left", 0,  0, (void*)(FL_ALIGN_BOTTOM_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"bottom", 0,  0, (void*)(FL_ALIGN_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"bottom right", 0,  0, (void*)(FL_ALIGN_BOTTOM_RIGHT), 128, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"   Outside Alignment   ", 0,  0, (void*)(0xFFFFFFFF), 1, (uchar)FL_NORMAL_LABEL, 2, 11, 0},
+ {"left top", 0,  0, (void*)(FL_ALIGN_LEFT_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"right top", 0,  0, (void*)(FL_ALIGN_RIGHT_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"left bottom", 0,  0, (void*)(FL_ALIGN_LEFT_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"right bottom", 0,  0, (void*)(FL_ALIGN_RIGHT_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -63,15 +63,15 @@ Fl_Value_Input *widget_w_input=(Fl_Value_Input *)0;
 Fl_Value_Input *widget_h_input=(Fl_Value_Input *)0;
 
 Fl_Menu_Item menu_2[] = {
- {"private", 0,  0, (void*)(0), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"public", 0,  0, (void*)(1), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"protected", 0,  0, (void*)(2), 0, FL_NORMAL_LABEL, 0, 11, 0},
+ {"private", 0,  0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"public", 0,  0, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"protected", 0,  0, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
 Fl_Menu_Item menu_3[] = {
- {"local", 0,  0, (void*)(0), 0, FL_NORMAL_LABEL, 0, 11, 0},
- {"global", 0,  0, (void*)(1), 0, FL_NORMAL_LABEL, 0, 11, 0},
+ {"local", 0,  0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"global", 0,  0, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -95,7 +95,7 @@ Fl_Double_Window* make_widget_panel() {
   Fl_Double_Window* w;
   { // Use a Double Window to avoid flickering.
     Fl_Double_Window* o = new Fl_Double_Window(420, 400);
-    w = o;
+    w = o; if (w) {/* empty */}
     o->labelsize(11);
     o->align(Fl_Align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE));
     o->hotspot(o);
diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index 9623b8a7e..d24bab755 100644
--- a/fluid/widget_panel.fl
+++ b/fluid/widget_panel.fl
@@ -1,6 +1,6 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0304 
-header_name {.h} 
+version 1.0304
+header_name {.h}
 code_name {.cxx}
 comment {//
 // "$Id$"
@@ -20,18 +20,18 @@ comment {//
 //     http://www.fltk.org/str.php
 //
 } {in_source in_header
-} 
+}
 
 decl {extern void comment_cb(Fl_Text_Editor*, void*);} {private global
-} 
+}
 
 Function {make_widget_panel()} {
   comment {Create a panel that can be used with all known widgets} open
 } {
   Fl_Window {} {
     comment {Use a Double Window to avoid flickering.} open
-    xywh {468 187 420 400} type Double labelsize 11 align 80 resizable hotspot
-    code0 {o->size_range(o->w(), o->h());} size_range {420 400 0 0} visible
+    xywh {468 187 420 400} type Double labelsize 11 align 80 hide resizable hotspot
+    code0 {o->size_range(o->w(), o->h());} size_range {420 400 0 0}
   } {
     Fl_Tabs {} {
       callback {propagate_load((Fl_Group *)o,v);} open
@@ -698,10 +698,10 @@ wCallback->do_callback(wCallback, v);} open
       }
     }
   }
-} 
+}
 
 comment {
 //
 // End of "$Id$".
 //} {in_source in_header
-} 
+}