Fix dependencies and whitespace issues

18 files changed, 68 insertions, 108 deletions

diff --git a/fluid/Fl_Grid_Type.cxx b/fluid/Fl_Grid_Type.cxx
index 1565f19da..d0910619b 100644
--- a/fluid/Fl_Grid_Type.cxx
+++ b/fluid/Fl_Grid_Type.cxx
@@ -262,7 +262,7 @@ Fl_Grid::Cell *Fl_Grid_Proxy::widget(Fl_Widget *wi, int row, int col, Fl_Grid_Al
   return widget(wi, row, col, 1, 1, align);
 }
 
-/** 
+/**
  Just like the Fl_Grid original, but removes potential transient cell.
  \param[in] wi generate a cell for this widget
  \param[in] row, col, rowspan, colspan, align cell parameters
@@ -671,7 +671,7 @@ void Fl_Grid_Type::insert_child_at(Fl_Widget *child, int x, int y) {
   grid->move_cell(child, row, col, 2);
 }
 
-/** 
+/**
  Insert a child widget into the first new cell we can find .
 
  There are many other possible strategies. How about inserting to the right
@@ -795,7 +795,7 @@ void grid_child_cb(Fluid_Coord_Input* i, void* v, int what) {
           if (v2 == -1 && v >= 0) v2 = 0;
           g->move_cell(current_widget->o, v, v2, 2); i->value(v);
           break;
-        case 9: 
+        case 9:
           if (v2 == -1 && v >= 0) v2 = 0;
           g->move_cell(current_widget->o, v2, v, 2); i->value(v);
           break;
diff --git a/fluid/Fl_Group_Type.cxx b/fluid/Fl_Group_Type.cxx
index 5651aac86..6c098252f 100644
--- a/fluid/Fl_Group_Type.cxx
+++ b/fluid/Fl_Group_Type.cxx
@@ -43,7 +43,7 @@
 
 Fl_Group_Type Fl_Group_type;    // the "factory"
 
-/** 
+/**
  Override group's resize behavior to do nothing to children by default.
  \param[in] X, Y, W, H new size
  */
diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h
index ea6d083d9..7d65f6018 100644
--- a/fluid/Fl_Type.h
+++ b/fluid/Fl_Type.h
@@ -190,7 +190,7 @@ public:
   void comment(const char *);
 
   virtual Fl_Type* click_test(int,int) { return NULL; }
-  
+
   virtual void add_child(Fl_Type*, Fl_Type* beforethis) { }
   virtual void move_child(Fl_Type*, Fl_Type* beforethis) { }
   virtual void remove_child(Fl_Type*) { }
diff --git a/fluid/Fl_Window_Type.cxx b/fluid/Fl_Window_Type.cxx
index 8a5d4962e..71ea0d9b6 100644
--- a/fluid/Fl_Window_Type.cxx
+++ b/fluid/Fl_Window_Type.cxx
@@ -841,7 +841,7 @@ extern void fix_group_size(Fl_Type *t);
 extern Fl_Menu_Item Main_Menu[];
 extern Fl_Menu_Item New_Menu[];
 
-/** 
+/**
  Move the selected children according to current dx, dy, drag state.
 
  This is somewhat of a do-all function that received many additions when new
diff --git a/fluid/code.h b/fluid/code.h
index 65f6170b4..bac7bc756 100644
--- a/fluid/code.h
+++ b/fluid/code.h
@@ -102,7 +102,7 @@ public:
   Fl_Type* write_code(Fl_Type* p);
   int write_code(const char *cfile, const char *hfile, bool to_sourceview=false);
   void write_public(int state); // writes pubic:/private: as needed
-  
+
   void tag(int type, unsigned short uid);
 
   static unsigned long block_crc(const void *data, int n=-1, unsigned long in_crc=0, bool *inout_line_start=NULL);
diff --git a/fluid/documentation/src-dev/index.dox b/fluid/documentation/src-dev/index.dox
index 6bfbd3a42..157bb0c03 100644
--- a/fluid/documentation/src-dev/index.dox
+++ b/fluid/documentation/src-dev/index.dox
@@ -9,7 +9,7 @@
  <TD><CENTER>
  \image html fluid-128.png
  \image latex fluid-128.png  "" width=3cm
- 
+
  <B>FLUID 1.4.0 Developer Documentation</B>
 
  By F.&nbsp;Costantini, D.&nbsp;Gibson, M.&nbsp;Melcher,
diff --git a/fluid/documentation/src-dev/page_introduction.dox b/fluid/documentation/src-dev/page_introduction.dox
index 5684eeeda..2fbfdb433 100644
--- a/fluid/documentation/src-dev/page_introduction.dox
+++ b/fluid/documentation/src-dev/page_introduction.dox
@@ -30,7 +30,7 @@
 
  ## Future ##
 
- As we approach the imminent release of FLTK 1.4.0, FLUID will no longer undergo 
+ As we approach the imminent release of FLTK 1.4.0, FLUID will no longer undergo
  significant feature enhancements. Instead, the focus will shift towards
  documentation improvements, addressing bugs, and enhancing usability for
  recent FLTK additions such as Fl_Grid and Fl_Flex. Following the release of
diff --git a/fluid/documentation/src/index.dox b/fluid/documentation/src/index.dox
index 8f05fb2b0..e2d9360b6 100644
--- a/fluid/documentation/src/index.dox
+++ b/fluid/documentation/src/index.dox
@@ -9,7 +9,7 @@
  <TD><CENTER>
  \image html fluid-128.png
  \image latex fluid-128.png  "" width=3cm
- 
+
  <B>FLUID 1.4.0 User Manual</B>
 
  By F.&nbsp;Costantini, D.&nbsp;Gibson, M.&nbsp;Melcher,
diff --git a/fluid/file.cxx b/fluid/file.cxx
index 7c8e9e9cb..b20191291 100644
--- a/fluid/file.cxx
+++ b/fluid/file.cxx
@@ -231,7 +231,7 @@ Fl_Type *Fd_Project_Reader::read_children(Fl_Type *p, int merge, Strategy strate
     const char *c = read_word();
   REUSE_C:
     if (!c) {
-      if (p && !merge) 
+      if (p && !merge)
         read_error("Missing '}'");
       break;
     }
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index b395b6277..067bd16c5 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1022,11 +1022,11 @@ Fl_String open_project_filechooser(const Fl_String &title) {
 
 /**
  Load a project from the give file name and path.
- 
+
  The project file is inserted at the currently selected type.
- 
+
  If no filename is given, FLUID will open a file chooser dialog.
- 
+
  \param[in] filename_arg path and name of the new project file
  \return false if the operation failed
  */
diff --git a/fluid/makedepend b/fluid/makedepend
index 01f72ae12..6eedbd947 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -151,72 +151,36 @@ code.o: ../FL/Fl.H
 code.o: ../FL/fl_ask.H
 code.o: ../FL/fl_attr.h
 code.o: ../FL/Fl_Bitmap.H
-code.o: ../FL/Fl_Box.H
-code.o: ../FL/Fl_Browser.H
-code.o: ../FL/Fl_Browser_.H
-code.o: ../FL/Fl_Button.H
 code.o: ../FL/Fl_Cairo.H
 code.o: ../FL/fl_casts.H
-code.o: ../FL/Fl_Check_Button.H
-code.o: ../FL/Fl_Choice.H
 code.o: ../FL/fl_config.h
 code.o: ../FL/Fl_Device.H
-code.o: ../FL/Fl_Double_Window.H
 code.o: ../FL/fl_draw.H
 code.o: ../FL/Fl_Export.H
-code.o: ../FL/Fl_File_Browser.H
-code.o: ../FL/Fl_File_Chooser.H
-code.o: ../FL/Fl_File_Icon.H
-code.o: ../FL/Fl_File_Input.H
 code.o: ../FL/Fl_Flex.H
 code.o: ../FL/Fl_Graphics_Driver.H
 code.o: ../FL/Fl_Group.H
 code.o: ../FL/Fl_Image.H
-code.o: ../FL/Fl_Input.H
-code.o: ../FL/Fl_Input_.H
-code.o: ../FL/Fl_Int_Input.H
-code.o: ../FL/Fl_Light_Button.H
 code.o: ../FL/Fl_Menu.H
-code.o: ../FL/Fl_Menu_.H
-code.o: ../FL/Fl_Menu_Button.H
 code.o: ../FL/Fl_Menu_Item.H
-code.o: ../FL/Fl_Native_File_Chooser.H
 code.o: ../FL/Fl_Pack.H
 code.o: ../FL/Fl_Pixmap.H
 code.o: ../FL/Fl_Plugin.H
 code.o: ../FL/Fl_Preferences.H
 code.o: ../FL/Fl_Rect.H
-code.o: ../FL/Fl_Repeat_Button.H
-code.o: ../FL/Fl_Return_Button.H
 code.o: ../FL/Fl_RGB_Image.H
-code.o: ../FL/Fl_Scheme.H
-code.o: ../FL/Fl_Scheme_Choice.H
-code.o: ../FL/Fl_Scrollbar.H
 code.o: ../FL/Fl_Shared_Image.H
-code.o: ../FL/Fl_Shortcut_Button.H
-code.o: ../FL/Fl_Simple_Terminal.H
-code.o: ../FL/Fl_Slider.H
-code.o: ../FL/Fl_Spinner.H
 code.o: ../FL/fl_string_functions.h
 code.o: ../FL/Fl_Tabs.H
-code.o: ../FL/Fl_Text_Buffer.H
-code.o: ../FL/Fl_Text_Display.H
-code.o: ../FL/Fl_Text_Editor.H
-code.o: ../FL/Fl_Tile.H
 code.o: ../FL/fl_types.h
 code.o: ../FL/fl_utf8.h
-code.o: ../FL/Fl_Valuator.H
-code.o: ../FL/Fl_Value_Input.H
 code.o: ../FL/Fl_Widget.H
-code.o: ../FL/Fl_Window.H
 code.o: ../FL/Fl_Wizard.H
 code.o: ../FL/platform_types.h
 code.o: ../src/flstring.h
 code.o: ../src/Fl_String.H
-code.o: alignment_panel.h
 code.o: code.h
 code.o: ExternalCodeEditor_UNIX.h
-code.o: Fd_Snap_Action.h
 code.o: file.h
 code.o: fluid.h
 code.o: fluid_filename.h
@@ -226,8 +190,7 @@ code.o: Fl_Group_Type.h
 code.o: Fl_Type.h
 code.o: Fl_Widget_Type.h
 code.o: Fl_Window_Type.h
-code.o: shell_command.h
-code.o: widget_browser.h
+code.o: undo.h
 CodeEditor.o: ../FL/Enumerations.H
 CodeEditor.o: ../FL/Fl.H
 CodeEditor.o: ../FL/fl_attr.h
@@ -377,6 +340,7 @@ factory.o: ../FL/Fl_File_Icon.H
 factory.o: ../FL/Fl_File_Input.H
 factory.o: ../FL/Fl_Flex.H
 factory.o: ../FL/Fl_Graphics_Driver.H
+factory.o: ../FL/Fl_Grid.H
 factory.o: ../FL/Fl_Group.H
 factory.o: ../FL/Fl_Help_View.H
 factory.o: ../FL/Fl_Image.H
@@ -428,6 +392,7 @@ factory.o: Fd_Snap_Action.h
 factory.o: fluid.h
 factory.o: fluid_filename.h
 factory.o: Fl_Button_Type.h
+factory.o: Fl_Grid_Type.h
 factory.o: Fl_Group_Type.h
 factory.o: Fl_Menu_Type.h
 factory.o: Fl_Type.h
@@ -539,6 +504,7 @@ file.o: ../FL/Fl_File_Icon.H
 file.o: ../FL/Fl_File_Input.H
 file.o: ../FL/Fl_Flex.H
 file.o: ../FL/Fl_Graphics_Driver.H
+file.o: ../FL/Fl_Grid.H
 file.o: ../FL/Fl_Group.H
 file.o: ../FL/Fl_Image.H
 file.o: ../FL/Fl_Input.H
@@ -593,6 +559,7 @@ file.o: fluid.h
 file.o: fluid_filename.h
 file.o: Fluid_Image.h
 file.o: Fl_Function_Type.h
+file.o: Fl_Grid_Type.h
 file.o: Fl_Group_Type.h
 file.o: Fl_Type.h
 file.o: Fl_Widget_Type.h
@@ -693,6 +660,7 @@ fluid.o: Fl_Type.h
 fluid.o: Fl_Widget_Type.h
 fluid.o: Fl_Window_Type.h
 fluid.o: function_panel.h
+fluid.o: mergeback.h
 fluid.o: pixmaps.h
 fluid.o: shell_command.h
 fluid.o: sourceview_panel.h
@@ -899,6 +867,7 @@ Fl_Function_Type.o: Fl_Type.h
 Fl_Function_Type.o: Fl_Widget_Type.h
 Fl_Function_Type.o: Fl_Window_Type.h
 Fl_Function_Type.o: function_panel.h
+Fl_Function_Type.o: mergeback.h
 Fl_Function_Type.o: StyleParse.h
 Fl_Function_Type.o: widget_browser.h
 Fl_Grid_Type.o: ../config.h
@@ -1013,23 +982,14 @@ Fl_Menu_Type.o: ../FL/Fl.H
 Fl_Menu_Type.o: ../FL/fl_ask.H
 Fl_Menu_Type.o: ../FL/fl_attr.h
 Fl_Menu_Type.o: ../FL/Fl_Bitmap.H
-Fl_Menu_Type.o: ../FL/Fl_Box.H
-Fl_Menu_Type.o: ../FL/Fl_Browser.H
-Fl_Menu_Type.o: ../FL/Fl_Browser_.H
 Fl_Menu_Type.o: ../FL/Fl_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Cairo.H
 Fl_Menu_Type.o: ../FL/fl_casts.H
-Fl_Menu_Type.o: ../FL/Fl_Check_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Choice.H
 Fl_Menu_Type.o: ../FL/fl_config.h
 Fl_Menu_Type.o: ../FL/Fl_Device.H
-Fl_Menu_Type.o: ../FL/Fl_Double_Window.H
 Fl_Menu_Type.o: ../FL/fl_draw.H
 Fl_Menu_Type.o: ../FL/Fl_Export.H
-Fl_Menu_Type.o: ../FL/Fl_File_Browser.H
-Fl_Menu_Type.o: ../FL/Fl_File_Chooser.H
-Fl_Menu_Type.o: ../FL/Fl_File_Icon.H
-Fl_Menu_Type.o: ../FL/Fl_File_Input.H
 Fl_Menu_Type.o: ../FL/Fl_Flex.H
 Fl_Menu_Type.o: ../FL/Fl_Graphics_Driver.H
 Fl_Menu_Type.o: ../FL/Fl_Group.H
@@ -1037,38 +997,26 @@ Fl_Menu_Type.o: ../FL/Fl_Image.H
 Fl_Menu_Type.o: ../FL/Fl_Input.H
 Fl_Menu_Type.o: ../FL/Fl_Input_.H
 Fl_Menu_Type.o: ../FL/Fl_Input_Choice.H
-Fl_Menu_Type.o: ../FL/Fl_Int_Input.H
-Fl_Menu_Type.o: ../FL/Fl_Light_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Menu_.H
 Fl_Menu_Type.o: ../FL/Fl_Menu_Bar.H
 Fl_Menu_Type.o: ../FL/Fl_Menu_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Menu_Item.H
 Fl_Menu_Type.o: ../FL/fl_message.H
 Fl_Menu_Type.o: ../FL/Fl_Multi_Label.H
-Fl_Menu_Type.o: ../FL/Fl_Native_File_Chooser.H
 Fl_Menu_Type.o: ../FL/Fl_Output.H
 Fl_Menu_Type.o: ../FL/Fl_Pack.H
 Fl_Menu_Type.o: ../FL/Fl_Pixmap.H
 Fl_Menu_Type.o: ../FL/Fl_Plugin.H
 Fl_Menu_Type.o: ../FL/Fl_Preferences.H
 Fl_Menu_Type.o: ../FL/Fl_Rect.H
-Fl_Menu_Type.o: ../FL/Fl_Repeat_Button.H
-Fl_Menu_Type.o: ../FL/Fl_Return_Button.H
 Fl_Menu_Type.o: ../FL/Fl_RGB_Image.H
-Fl_Menu_Type.o: ../FL/Fl_Scheme.H
-Fl_Menu_Type.o: ../FL/Fl_Scheme_Choice.H
 Fl_Menu_Type.o: ../FL/Fl_Scrollbar.H
 Fl_Menu_Type.o: ../FL/Fl_Shared_Image.H
 Fl_Menu_Type.o: ../FL/Fl_Shortcut_Button.H
-Fl_Menu_Type.o: ../FL/Fl_Simple_Terminal.H
 Fl_Menu_Type.o: ../FL/Fl_Slider.H
-Fl_Menu_Type.o: ../FL/Fl_Spinner.H
-Fl_Menu_Type.o: ../FL/fl_string_functions.h
 Fl_Menu_Type.o: ../FL/Fl_Tabs.H
 Fl_Menu_Type.o: ../FL/Fl_Text_Buffer.H
 Fl_Menu_Type.o: ../FL/Fl_Text_Display.H
-Fl_Menu_Type.o: ../FL/Fl_Text_Editor.H
-Fl_Menu_Type.o: ../FL/Fl_Tile.H
 Fl_Menu_Type.o: ../FL/fl_types.h
 Fl_Menu_Type.o: ../FL/fl_utf8.h
 Fl_Menu_Type.o: ../FL/Fl_Valuator.H
@@ -1079,7 +1027,6 @@ Fl_Menu_Type.o: ../FL/Fl_Wizard.H
 Fl_Menu_Type.o: ../FL/platform_types.h
 Fl_Menu_Type.o: ../src/flstring.h
 Fl_Menu_Type.o: ../src/Fl_String.H
-Fl_Menu_Type.o: alignment_panel.h
 Fl_Menu_Type.o: code.h
 Fl_Menu_Type.o: custom_widgets.h
 Fl_Menu_Type.o: Fd_Snap_Action.h
@@ -1093,8 +1040,7 @@ Fl_Menu_Type.o: Fl_Menu_Type.h
 Fl_Menu_Type.o: Fl_Type.h
 Fl_Menu_Type.o: Fl_Widget_Type.h
 Fl_Menu_Type.o: Fl_Window_Type.h
-Fl_Menu_Type.o: shell_command.h
-Fl_Menu_Type.o: widget_browser.h
+Fl_Menu_Type.o: mergeback.h
 Fl_Type.o: ../config.h
 Fl_Type.o: ../FL/Enumerations.H
 Fl_Type.o: ../FL/filename.H
@@ -1240,6 +1186,7 @@ Fl_Widget_Type.o: Fl_Menu_Type.h
 Fl_Widget_Type.o: Fl_Type.h
 Fl_Widget_Type.o: Fl_Widget_Type.h
 Fl_Widget_Type.o: Fl_Window_Type.h
+Fl_Widget_Type.o: mergeback.h
 Fl_Widget_Type.o: pixmaps.h
 Fl_Widget_Type.o: shell_command.h
 Fl_Widget_Type.o: StyleParse.h
@@ -1272,6 +1219,7 @@ Fl_Window_Type.o: ../FL/Fl_File_Icon.H
 Fl_Window_Type.o: ../FL/Fl_File_Input.H
 Fl_Window_Type.o: ../FL/Fl_Flex.H
 Fl_Window_Type.o: ../FL/Fl_Graphics_Driver.H
+Fl_Window_Type.o: ../FL/Fl_Grid.H
 Fl_Window_Type.o: ../FL/Fl_Group.H
 Fl_Window_Type.o: ../FL/Fl_Image.H
 Fl_Window_Type.o: ../FL/Fl_Input.H
@@ -1308,6 +1256,7 @@ Fl_Window_Type.o: ../FL/Fl_Text_Buffer.H
 Fl_Window_Type.o: ../FL/Fl_Text_Display.H
 Fl_Window_Type.o: ../FL/Fl_Text_Editor.H
 Fl_Window_Type.o: ../FL/Fl_Tile.H
+Fl_Window_Type.o: ../FL/Fl_Tooltip.H
 Fl_Window_Type.o: ../FL/fl_types.h
 Fl_Window_Type.o: ../FL/fl_utf8.h
 Fl_Window_Type.o: ../FL/Fl_Valuator.H
@@ -1569,6 +1518,7 @@ sourceview_panel.o: ../FL/Fl_Box.H
 sourceview_panel.o: ../FL/Fl_Button.H
 sourceview_panel.o: ../FL/Fl_Cairo.H
 sourceview_panel.o: ../FL/fl_casts.H
+sourceview_panel.o: ../FL/Fl_Choice.H
 sourceview_panel.o: ../FL/fl_config.h
 sourceview_panel.o: ../FL/Fl_Device.H
 sourceview_panel.o: ../FL/Fl_Double_Window.H
@@ -1577,7 +1527,10 @@ sourceview_panel.o: ../FL/Fl_Export.H
 sourceview_panel.o: ../FL/Fl_Graphics_Driver.H
 sourceview_panel.o: ../FL/Fl_Group.H
 sourceview_panel.o: ../FL/Fl_Image.H
+sourceview_panel.o: ../FL/Fl_Input.H
+sourceview_panel.o: ../FL/Fl_Input_.H
 sourceview_panel.o: ../FL/Fl_Light_Button.H
+sourceview_panel.o: ../FL/Fl_Menu_.H
 sourceview_panel.o: ../FL/Fl_Menu_Item.H
 sourceview_panel.o: ../FL/Fl_Pixmap.H
 sourceview_panel.o: ../FL/Fl_Plugin.H
@@ -1645,6 +1598,7 @@ undo.o: ../config.h
 undo.o: ../FL/Enumerations.H
 undo.o: ../FL/filename.H
 undo.o: ../FL/Fl.H
+undo.o: ../FL/fl_ask.H
 undo.o: ../FL/fl_attr.h
 undo.o: ../FL/Fl_Bitmap.H
 undo.o: ../FL/Fl_Browser_.H
@@ -1732,6 +1686,7 @@ widget_panel.o: ../FL/Fl_Device.H
 widget_panel.o: ../FL/Fl_Double_Window.H
 widget_panel.o: ../FL/fl_draw.H
 widget_panel.o: ../FL/Fl_Export.H
+widget_panel.o: ../FL/Fl_Flex.H
 widget_panel.o: ../FL/Fl_Graphics_Driver.H
 widget_panel.o: ../FL/Fl_Grid.H
 widget_panel.o: ../FL/Fl_Group.H
@@ -1743,6 +1698,7 @@ widget_panel.o: ../FL/Fl_Light_Button.H
 widget_panel.o: ../FL/Fl_Menu_.H
 widget_panel.o: ../FL/Fl_Menu_Button.H
 widget_panel.o: ../FL/Fl_Menu_Item.H
+widget_panel.o: ../FL/Fl_Pack.H
 widget_panel.o: ../FL/Fl_Pixmap.H
 widget_panel.o: ../FL/Fl_Plugin.H
 widget_panel.o: ../FL/Fl_Preferences.H
@@ -1763,13 +1719,17 @@ widget_panel.o: ../FL/Fl_Valuator.H
 widget_panel.o: ../FL/Fl_Value_Input.H
 widget_panel.o: ../FL/Fl_Widget.H
 widget_panel.o: ../FL/Fl_Window.H
+widget_panel.o: ../FL/Fl_Wizard.H
 widget_panel.o: ../FL/platform_types.h
 widget_panel.o: ../src/Fl_String.H
 widget_panel.o: code.h
 widget_panel.o: CodeEditor.h
 widget_panel.o: custom_widgets.h
+widget_panel.o: Fl_Grid_Type.h
+widget_panel.o: Fl_Group_Type.h
 widget_panel.o: Fl_Type.h
 widget_panel.o: Fl_Widget_Type.h
 widget_panel.o: pixmaps.h
 widget_panel.o: StyleParse.h
+widget_panel.o: undo.h
 widget_panel.o: widget_panel.h
diff --git a/fluid/mergeback.cxx b/fluid/mergeback.cxx
index 9e830e152..35e611ecf 100644
--- a/fluid/mergeback.cxx
+++ b/fluid/mergeback.cxx
@@ -194,7 +194,7 @@ int Fd_Mergeback::ask_user_to_merge(const Fl_String &code_filename, const Fl_Str
                "MergeBack found %3$d modifications in the project structure\n"
                "of the source code. These kind of changes can no be\n"
                "merged back and will be lost when the source code is\n"
-               "generated again from the open project.", 
+               "generated again from the open project.",
                code_filename.c_str(), proj_filename.c_str(), num_changed_structure);
     return -1;
   }
@@ -294,7 +294,7 @@ void Fd_Mergeback::analyse_code(unsigned long code_crc, unsigned long tag_crc, i
    type or widget can not be found in the project
  * num_possible_override number of blocks that were changed in the code file,
    but also were changed in the project.
- 
+
  \return -1 if reading a tag failed, otherwise 0
  */
 int Fd_Mergeback::analyse() {
@@ -330,7 +330,7 @@ int Fd_Mergeback::analyse() {
       if (n!=3 || tag_type<0 || tag_type>FD_TAG_LAST ) { tag_error = 1; return -1; }
       if (code_crc != tag_crc) {
         switch (tag_type) {
-          case FD_TAG_GENERIC: 
+          case FD_TAG_GENERIC:
             num_changed_structure++;
             break;
           case FD_TAG_MENU_CALLBACK:
diff --git a/fluid/sourceview_panel.cxx b/fluid/sourceview_panel.cxx
index 78a69e100..3eb3f9669 100644
--- a/fluid/sourceview_panel.cxx
+++ b/fluid/sourceview_panel.cxx
@@ -32,7 +32,7 @@ extern void reveal_in_browser(Fl_Type *t);
 /**
  Update the header and source code highlighting depending on the
  currently selected object
- 
+
  The Source View system offers an immediate preview of the code
  files that will be generated by FLUID. It also marks the code
  generated for the last selected item in the header and the source
@@ -343,11 +343,11 @@ static void cb_1(Fl_Button*, void*) {
 static void cb_Reveal(Fl_Button*, void*) {
   if (sourceview_panel && sourceview_panel->visible()) {
     Fl_Type *node = NULL;
-    if (sv_source->visible_r()) 
+    if (sv_source->visible_r())
       node = Fl_Type::find_in_text(0, sv_source->insert_position());
-    else if (sv_header->visible_r()) 
+    else if (sv_header->visible_r())
       node = Fl_Type::find_in_text(1, sv_header->insert_position());
-    else if (sv_project->visible_r()) 
+    else if (sv_project->visible_r())
       node = Fl_Type::find_in_text(2, sv_project->insert_position());
     if (node) {
       select_only(node);
diff --git a/fluid/sourceview_panel.fl b/fluid/sourceview_panel.fl
index 0cb665ff1..a1e939370 100644
--- a/fluid/sourceview_panel.fl
+++ b/fluid/sourceview_panel.fl
@@ -419,11 +419,11 @@ if (e) {
         label Reveal
         callback {if (sourceview_panel && sourceview_panel->visible()) {
   Fl_Type *node = NULL;
-  if (sv_source->visible_r()) 
+  if (sv_source->visible_r())
     node = Fl_Type::find_in_text(0, sv_source->insert_position());
-  else if (sv_header->visible_r()) 
+  else if (sv_header->visible_r())
     node = Fl_Type::find_in_text(1, sv_header->insert_position());
-  else if (sv_project->visible_r()) 
+  else if (sv_project->visible_r())
     node = Fl_Type::find_in_text(2, sv_project->insert_position());
   if (node) {
     select_only(node);
diff --git a/fluid/template_panel.cxx b/fluid/template_panel.cxx
index debd92a7b..d109acdba 100644
--- a/fluid/template_panel.cxx
+++ b/fluid/template_panel.cxx
@@ -252,7 +252,7 @@ void template_load() {
   "}\nFl_Button {} {\nlabel Count\ncallback {int i = counter_widget->ivalue();\ni++;\n"
   "counter_widget->value(i);}\nxywh {99 15 80 22}\n}\n}\n}\n", f);
       fclose(f);
-    }  
+    }
     sample_templates_generated = 2;
     fluid_prefs.set("sample_templates_generated", sample_templates_generated);
     fluid_prefs.flush();
diff --git a/fluid/template_panel.fl b/fluid/template_panel.fl
index 8f063ec75..e64f95739 100644
--- a/fluid/template_panel.fl
+++ b/fluid/template_panel.fl
@@ -249,7 +249,7 @@ if (sample_templates_generated < 2) {
 "}\\nFl_Button {} {\\nlabel Count\\ncallback {int i = counter_widget->ivalue();\\ni++;\\n"
 "counter_widget->value(i);}\\nxywh {99 15 80 22}\\n}\\n}\\n}\\n", f);
     fclose(f);
-  }  
+  }
   sample_templates_generated = 2;
   fluid_prefs.set("sample_templates_generated", sample_templates_generated);
   fluid_prefs.flush();
diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx
index 0ea114ef6..be75f3098 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -254,14 +254,14 @@ static void cb_Left(Fl_Value_Input* o, void* v) {
   if (!grid) return;
   int m = 0;
   if (v == LOAD) {
-    grid->margin(&m, NULL, NULL, NULL); 
+    grid->margin(&m, NULL, NULL, NULL);
     o->value(m);
   } else {
     int m = (int)o->value(), old_m;
-    grid->margin(&old_m, NULL, NULL, NULL); 
+    grid->margin(&old_m, NULL, NULL, NULL);
     if (m != old_m) {
       undo_checkpoint();
-      grid->margin(m, -1, -1, -1); 
+      grid->margin(m, -1, -1, -1);
       grid->need_layout(true);
       set_modflag(1);
     }
@@ -273,14 +273,14 @@ static void cb_Top(Fl_Value_Input* o, void* v) {
   if (!grid) return;
   int m = 0;
   if (v == LOAD) {
-    grid->margin(NULL, &m, NULL, NULL); 
+    grid->margin(NULL, &m, NULL, NULL);
     o->value(m);
   } else {
     int m = (int)o->value(), old_m;
-    grid->margin(NULL, &old_m, NULL, NULL); 
+    grid->margin(NULL, &old_m, NULL, NULL);
     if (m != old_m) {
       undo_checkpoint();
-      grid->margin(-1, m, -1, -1); 
+      grid->margin(-1, m, -1, -1);
       grid->need_layout(true);
       set_modflag(1);
     }
@@ -292,14 +292,14 @@ static void cb_Right(Fl_Value_Input* o, void* v) {
   if (!grid) return;
   int m = 0;
   if (v == LOAD) {
-    grid->margin(NULL, NULL, &m, NULL); 
+    grid->margin(NULL, NULL, &m, NULL);
     o->value(m);
   } else {
     int m = (int)o->value(), old_m;
-    grid->margin(NULL, NULL, &old_m, NULL); 
+    grid->margin(NULL, NULL, &old_m, NULL);
     if (m != old_m) {
       undo_checkpoint();
-      grid->margin(-1, -1, m, -1); 
+      grid->margin(-1, -1, m, -1);
       grid->need_layout(true);
       set_modflag(1);
     }
@@ -437,7 +437,7 @@ static void cb_Weight(Fluid_Coord_Input* o, void* v) {
       undo_checkpoint();
       grid->row_weight(r, h);
       grid->need_layout(true);
-      set_modflag(1); 
+      set_modflag(1);
     }
   }
 }
diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index fe74ad327..84ed806cb 100644
--- a/fluid/widget_panel.fl
+++ b/fluid/widget_panel.fl
@@ -1175,14 +1175,14 @@ if (v == LOAD) {
 if (!grid) return;
 int m = 0;
 if (v == LOAD) {
-  grid->margin(&m, NULL, NULL, NULL); 
+  grid->margin(&m, NULL, NULL, NULL);
   o->value(m);
 } else {
   int m = (int)o->value(), old_m;
-  grid->margin(&old_m, NULL, NULL, NULL); 
+  grid->margin(&old_m, NULL, NULL, NULL);
   if (m != old_m) {
     undo_checkpoint();
-    grid->margin(m, -1, -1, -1); 
+    grid->margin(m, -1, -1, -1);
     grid->need_layout(true);
     set_modflag(1);
   }
@@ -1195,14 +1195,14 @@ if (v == LOAD) {
 if (!grid) return;
 int m = 0;
 if (v == LOAD) {
-  grid->margin(NULL, &m, NULL, NULL); 
+  grid->margin(NULL, &m, NULL, NULL);
   o->value(m);
 } else {
   int m = (int)o->value(), old_m;
-  grid->margin(NULL, &old_m, NULL, NULL); 
+  grid->margin(NULL, &old_m, NULL, NULL);
   if (m != old_m) {
     undo_checkpoint();
-    grid->margin(-1, m, -1, -1); 
+    grid->margin(-1, m, -1, -1);
     grid->need_layout(true);
     set_modflag(1);
   }
@@ -1215,14 +1215,14 @@ if (v == LOAD) {
 if (!grid) return;
 int m = 0;
 if (v == LOAD) {
-  grid->margin(NULL, NULL, &m, NULL); 
+  grid->margin(NULL, NULL, &m, NULL);
   o->value(m);
 } else {
   int m = (int)o->value(), old_m;
-  grid->margin(NULL, NULL, &old_m, NULL); 
+  grid->margin(NULL, NULL, &old_m, NULL);
   if (m != old_m) {
     undo_checkpoint();
-    grid->margin(-1, -1, m, -1); 
+    grid->margin(-1, -1, m, -1);
     grid->need_layout(true);
     set_modflag(1);
   }
@@ -1395,7 +1395,7 @@ if (v == LOAD) {
     undo_checkpoint();
     grid->row_weight(r, h);
     grid->need_layout(true);
-    set_modflag(1); 
+    set_modflag(1);
   }
 }}
               xywh {240 175 55 20} labelsize 11 align 5 textsize 11