Fix a typo, trailing whitespace, and dependencies

5 files changed, 23 insertions, 18 deletions

diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index 50793499e..90efd0216 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -32,8 +32,8 @@ static void cb_Comments(Fl_Choice* o, void* v) {
     o->value(*font);
   } else {
     *font = (int)o->value();
-    widget_browser->redraw(); 
-    widget_browser->save_prefs(); 
+    widget_browser->redraw();
+    widget_browser->save_prefs();
   }
 }
 
@@ -47,7 +47,7 @@ static void cb_Color_Chip(Fl_Button* o, void* v) {
     *color = d;
     o->color(d);
     widget_browser->redraw();
-    widget_browser->save_prefs(); 
+    widget_browser->save_prefs();
   }
 }
 
@@ -58,7 +58,7 @@ static void cb_Color_Choice(Fl_Menu_Button* o, void* v) {
     *color = d;
     o->parent()->do_callback(o->parent(), LOAD);
     widget_browser->redraw();
-    widget_browser->save_prefs(); 
+    widget_browser->save_prefs();
   }
 }
 
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index d8edbeb0a..b8de00efb 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -117,8 +117,8 @@ if (v == LOAD) {
   o->value(*font);
 } else {
   *font = (int)o->value();
-  widget_browser->redraw(); 
-  widget_browser->save_prefs(); 
+  widget_browser->redraw();
+  widget_browser->save_prefs();
 }} {}
 }
 
@@ -133,7 +133,7 @@ if (v == LOAD) {
   *color = d;
   o->color(d);
   widget_browser->redraw();
-  widget_browser->save_prefs(); 
+  widget_browser->save_prefs();
 }} {}
 }
 
@@ -145,7 +145,7 @@ Function {cb_Color_Choice(Fl_Menu_Button* o, void* v)} {open private return_type
   *color = d;
   o->parent()->do_callback(o->parent(), LOAD);
   widget_browser->redraw();
-  widget_browser->save_prefs(); 
+  widget_browser->save_prefs();
 }} {}
 }
 
diff --git a/fluid/makedepend b/fluid/makedepend
index 88d7b722b..831a6ef91 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -74,6 +74,7 @@ alignment_panel.o: ../FL/Fl_Scheme.H
 alignment_panel.o: ../FL/Fl_Scheme_Choice.H
 alignment_panel.o: ../FL/Fl_Scrollbar.H
 alignment_panel.o: ../FL/Fl_Shortcut_Button.H
+alignment_panel.o: ../FL/fl_show_colormap.H
 alignment_panel.o: ../FL/Fl_Slider.H
 alignment_panel.o: ../FL/Fl_Spinner.H
 alignment_panel.o: ../FL/fl_string_functions.h
@@ -258,6 +259,7 @@ custom_widgets.o: ../FL/Fl_Rect.H
 custom_widgets.o: ../FL/Fl_Return_Button.H
 custom_widgets.o: ../FL/Fl_RGB_Image.H
 custom_widgets.o: ../FL/Fl_Scrollbar.H
+custom_widgets.o: ../FL/Fl_Shared_Image.H
 custom_widgets.o: ../FL/Fl_Shortcut_Button.H
 custom_widgets.o: ../FL/Fl_Slider.H
 custom_widgets.o: ../FL/fl_string_functions.h
@@ -288,7 +290,6 @@ custom_widgets.o: Fl_Group_Type.h
 custom_widgets.o: Fl_Type.h
 custom_widgets.o: Fl_Widget_Type.h
 custom_widgets.o: Fl_Window_Type.h
-custom_widgets.o: pixmaps.h
 custom_widgets.o: StyleParse.h
 custom_widgets.o: widget_browser.h
 custom_widgets.o: widget_panel.h
@@ -448,6 +449,7 @@ Fd_Snap_Action.o: ../FL/Fl_Scheme.H
 Fd_Snap_Action.o: ../FL/Fl_Scheme_Choice.H
 Fd_Snap_Action.o: ../FL/Fl_Scrollbar.H
 Fd_Snap_Action.o: ../FL/Fl_Shortcut_Button.H
+Fd_Snap_Action.o: ../FL/fl_show_colormap.H
 Fd_Snap_Action.o: ../FL/Fl_Slider.H
 Fd_Snap_Action.o: ../FL/Fl_Spinner.H
 Fd_Snap_Action.o: ../FL/fl_string_functions.h
@@ -530,6 +532,7 @@ file.o: ../FL/Fl_Scheme_Choice.H
 file.o: ../FL/Fl_Scrollbar.H
 file.o: ../FL/Fl_Shared_Image.H
 file.o: ../FL/Fl_Shortcut_Button.H
+file.o: ../FL/fl_show_colormap.H
 file.o: ../FL/Fl_Slider.H
 file.o: ../FL/Fl_Spinner.H
 file.o: ../FL/fl_string_functions.h
@@ -623,6 +626,7 @@ fluid.o: ../FL/Fl_Scheme_Choice.H
 fluid.o: ../FL/Fl_Scrollbar.H
 fluid.o: ../FL/Fl_Shared_Image.H
 fluid.o: ../FL/Fl_Shortcut_Button.H
+fluid.o: ../FL/fl_show_colormap.H
 fluid.o: ../FL/Fl_Slider.H
 fluid.o: ../FL/Fl_Spinner.H
 fluid.o: ../FL/fl_string_functions.h
@@ -1188,7 +1192,6 @@ 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
 Fl_Widget_Type.o: undo.h
@@ -1248,6 +1251,7 @@ Fl_Window_Type.o: ../FL/Fl_Scheme_Choice.H
 Fl_Window_Type.o: ../FL/Fl_Scrollbar.H
 Fl_Window_Type.o: ../FL/Fl_Shared_Image.H
 Fl_Window_Type.o: ../FL/Fl_Shortcut_Button.H
+Fl_Window_Type.o: ../FL/fl_show_colormap.H
 Fl_Window_Type.o: ../FL/Fl_Slider.H
 Fl_Window_Type.o: ../FL/Fl_Spinner.H
 Fl_Window_Type.o: ../FL/fl_string_functions.h
@@ -1284,7 +1288,6 @@ Fl_Window_Type.o: Fl_Group_Type.h
 Fl_Window_Type.o: Fl_Type.h
 Fl_Window_Type.o: Fl_Widget_Type.h
 Fl_Window_Type.o: Fl_Window_Type.h
-Fl_Window_Type.o: pixmaps.h
 Fl_Window_Type.o: shell_command.h
 Fl_Window_Type.o: StyleParse.h
 Fl_Window_Type.o: undo.h
@@ -1326,6 +1329,7 @@ function_panel.o: ../FL/Fl_Slider.H
 function_panel.o: ../FL/Fl_Text_Buffer.H
 function_panel.o: ../FL/Fl_Text_Display.H
 function_panel.o: ../FL/Fl_Text_Editor.H
+function_panel.o: ../FL/Fl_Tile.H
 function_panel.o: ../FL/fl_types.h
 function_panel.o: ../FL/fl_utf8.h
 function_panel.o: ../FL/Fl_Valuator.H
@@ -1478,6 +1482,7 @@ shell_command.o: ../FL/Fl_Scheme.H
 shell_command.o: ../FL/Fl_Scheme_Choice.H
 shell_command.o: ../FL/Fl_Scrollbar.H
 shell_command.o: ../FL/Fl_Shortcut_Button.H
+shell_command.o: ../FL/fl_show_colormap.H
 shell_command.o: ../FL/Fl_Slider.H
 shell_command.o: ../FL/Fl_Spinner.H
 shell_command.o: ../FL/fl_string_functions.h
@@ -1706,6 +1711,7 @@ widget_panel.o: ../FL/Fl_Rect.H
 widget_panel.o: ../FL/Fl_Return_Button.H
 widget_panel.o: ../FL/Fl_RGB_Image.H
 widget_panel.o: ../FL/Fl_Scrollbar.H
+widget_panel.o: ../FL/Fl_Shared_Image.H
 widget_panel.o: ../FL/Fl_Shortcut_Button.H
 widget_panel.o: ../FL/Fl_Slider.H
 widget_panel.o: ../FL/Fl_Tabs.H
@@ -1729,7 +1735,6 @@ 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/widget_panel.cxx b/fluid/widget_panel.cxx
index 967e6b13f..758ad96b1 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -390,8 +390,8 @@ void run_image_panel() {
     make_image_panel();
 
   image_panel_window->do_callback(image_panel_window, LOAD);
-    
-  Fl::pushed(0);  
+
+  Fl::pushed(0);
   Fl_Window *g = Fl::grab();
   if (g) Fl::grab(0);
   image_panel_window->show();
@@ -399,7 +399,7 @@ void run_image_panel() {
     Fl::wait();
   if (g)
     Fl::grab(g);
-    
+
   Fl_Shared_Image *img = (Fl_Shared_Image*)image_panel_data->user_data();
   if (img) {
     img->release();
diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index e9733e4b6..894cf025f 100644
--- a/fluid/widget_panel.fl
+++ b/fluid/widget_panel.fl
@@ -313,8 +313,8 @@ Function {run_image_panel()} {open return_type void
   make_image_panel();
 
 image_panel_window->do_callback(image_panel_window, LOAD);
-  
-Fl::pushed(0);  
+
+Fl::pushed(0);
 Fl_Window *g = Fl::grab();
 if (g) Fl::grab(0);
 image_panel_window->show();
@@ -322,7 +322,7 @@ while (image_panel_window->shown())
   Fl::wait();
 if (g)
   Fl::grab(g);
-  
+
 Fl_Shared_Image *img = (Fl_Shared_Image*)image_panel_data->user_data();
 if (img) {
   img->release();