Fix tabs, trailing spaces, and update dependencies

10 files changed, 56 insertions, 18 deletions

diff --git a/FL/Fl_Gl_Window.H b/FL/Fl_Gl_Window.H
index fe2b17ac3..8506359a2 100644
--- a/FL/Fl_Gl_Window.H
+++ b/FL/Fl_Gl_Window.H
@@ -178,7 +178,7 @@ public:
    and at least one of these conditions applies:
    - the program runs on the macOS platform;
    - the Fl_Gl_Window has child widgets.
-   
+
    See more details in \ref opengl3.
 
    \version the <tt>FL_OPENGL3</tt> flag appeared in version 1.3.4
diff --git a/FL/Fl_Help_View.H b/FL/Fl_Help_View.H
index b6b21cc97..2c73926c0 100644
--- a/FL/Fl_Help_View.H
+++ b/FL/Fl_Help_View.H
@@ -388,7 +388,7 @@ public:
 
   // Check if the user selected text in this view.
   int text_selected();
-  
+
   // If text is selected in this view, copy it to a clipboard.
   int copy(int clipboard=1);
 };
diff --git a/README.CMake.txt b/README.CMake.txt
index cb8337248..fd31db049 100644
--- a/README.CMake.txt
+++ b/README.CMake.txt
@@ -517,16 +517,16 @@ installed CMake you may need to adjust the path's in the alias commands.
  2.6  Building under Windows WSL with Clang and Makefiles
 ----------------------------------------------------------
 
-WSL, the Windows Subsystem for Linux allows developers to run a Linux 
+WSL, the Windows Subsystem for Linux allows developers to run a Linux
 environment without the need for a separate virtual machine or dual booting.
-WSL 2 runs inside a managed virtual machine that implements the full 
+WSL 2 runs inside a managed virtual machine that implements the full
 Linux kernel. WSL requires Windows 11.
 
 FLTK apps generated using WSL are Linux compatible binaries. To run those
-binaries on Windows, WSL comes with a limited built-in X11 server. Third 
+binaries on Windows, WSL comes with a limited built-in X11 server. Third
 party X11 servers can be installed that better support all features of FLTK.
 
-1) Install WSL from PowerShell with admin privileges: 
+1) Install WSL from PowerShell with admin privileges:
      > wsl --install
 
 2) Reboot and open the Linux terminal. You will need to install the following
diff --git a/configure.ac b/configure.ac
index 901c59a87..5c38a5de0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -769,15 +769,15 @@ syspnginc_ok=no
 AS_IF([test x$enable_localpng != xyes -a x$PKGCONFIG != x], [
     AC_MSG_CHECKING([for libpng-1.6.x])
     AS_IF([$PKGCONFIG --exists libpng16], [
-	AC_MSG_RESULT([yes])
-	AC_DEFINE([HAVE_PNG_H], 1, [Have PNG library?])
-	syspnginc_ok=yes
-	syspnglib_ok=yes
-	PNGINC="$($PKGCONFIG --cflags libpng16)"
-	IMAGELIBS="$($PKGCONFIG --libs libpng16) $IMAGELIBS"
-	STATICIMAGELIBS="$($PKGCONFIG --libs libpng16) $STATICIMAGELIBS"
+        AC_MSG_RESULT([yes])
+        AC_DEFINE([HAVE_PNG_H], 1, [Have PNG library?])
+        syspnginc_ok=yes
+        syspnglib_ok=yes
+        PNGINC="$($PKGCONFIG --cflags libpng16)"
+        IMAGELIBS="$($PKGCONFIG --libs libpng16) $IMAGELIBS"
+        STATICIMAGELIBS="$($PKGCONFIG --libs libpng16) $STATICIMAGELIBS"
     ], [
-	AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
     ])
 ])
 
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index 160234aa4..eb2d04e90 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -2996,7 +2996,7 @@ void Fl_Widget_Type::write_code1(Fd_Code_Writer& f) {
       f.write_c("new %s(0, 0, %d, %d", t, o->w(), o->h());
     else
       f.write_c("new %s(%d, %d", t, o->w(), o->h());
-  } else if (is_a(ID_Menu_Bar) 
+  } else if (is_a(ID_Menu_Bar)
              && ((Fl_Menu_Bar_Type*)this)->is_sys_menu_bar()
              && is_in_class()) {
     f.write_c("(%s*)new %s(%d, %d, %d, %d",
diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
index 318fc61f4..33615c3c6 100644
--- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
+++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
@@ -1832,7 +1832,7 @@ void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) {
   // When moving or resizing a non-GL subwindow independently from its parent, this condition
   // delays application of X,Y,W,H values until the compositor signals
   // it's ready for a new frame using the frame callback mechanism.
-  if ((parent && parent->damage()) || depth > 1 || pWindow->as_gl_window() || !parent_xid || 
+  if ((parent && parent->damage()) || depth > 1 || pWindow->as_gl_window() || !parent_xid ||
       wait_for_expose_value || (parent_xid->frame_cb && !xid_rect)) {
     if (is_a_resize) {
       if (pWindow->parent()) {
diff --git a/src/makedepend b/src/makedepend
index 77bf85f6c..ad5891342 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -2359,6 +2359,8 @@ Fl_Help_View.o: ../FL/Fl_Graphics_Driver.H
 Fl_Help_View.o: ../FL/Fl_Group.H
 Fl_Help_View.o: ../FL/Fl_Help_View.H
 Fl_Help_View.o: ../FL/Fl_Image.H
+Fl_Help_View.o: ../FL/Fl_Menu_Item.H
+Fl_Help_View.o: ../FL/Fl_Multi_Label.H
 Fl_Help_View.o: ../FL/Fl_Pixmap.H
 Fl_Help_View.o: ../FL/Fl_Plugin.H
 Fl_Help_View.o: ../FL/Fl_Preferences.H
@@ -4154,6 +4156,7 @@ Fl_Tree.o: ../FL/Fl_Valuator.H
 Fl_Tree.o: ../FL/Fl_Widget.H
 Fl_Tree.o: ../FL/platform_types.h
 Fl_Tree_Item.o: ../FL/Enumerations.H
+Fl_Tree_Item.o: ../FL/filename.H
 Fl_Tree_Item.o: ../FL/Fl.H
 Fl_Tree_Item.o: ../FL/fl_attr.h
 Fl_Tree_Item.o: ../FL/Fl_Cairo.H
@@ -4163,6 +4166,7 @@ Fl_Tree_Item.o: ../FL/fl_draw.H
 Fl_Tree_Item.o: ../FL/Fl_Export.H
 Fl_Tree_Item.o: ../FL/Fl_Group.H
 Fl_Tree_Item.o: ../FL/Fl_Image.H
+Fl_Tree_Item.o: ../FL/Fl_Preferences.H
 Fl_Tree_Item.o: ../FL/Fl_Scrollbar.H
 Fl_Tree_Item.o: ../FL/Fl_Slider.H
 Fl_Tree_Item.o: ../FL/fl_string_functions.h
@@ -4175,6 +4179,7 @@ Fl_Tree_Item.o: ../FL/fl_utf8.h
 Fl_Tree_Item.o: ../FL/Fl_Valuator.H
 Fl_Tree_Item.o: ../FL/Fl_Widget.H
 Fl_Tree_Item.o: ../FL/platform_types.h
+Fl_Tree_Item.o: Fl_System_Driver.H
 Fl_Tree_Item_Array.o: ../FL/Enumerations.H
 Fl_Tree_Item_Array.o: ../FL/Fl.H
 Fl_Tree_Item_Array.o: ../FL/fl_attr.h
@@ -4199,13 +4204,14 @@ Fl_Tree_Prefs.o: ../FL/fl_attr.h
 Fl_Tree_Prefs.o: ../FL/Fl_Cairo.H
 Fl_Tree_Prefs.o: ../FL/fl_casts.H
 Fl_Tree_Prefs.o: ../FL/fl_config.h
+Fl_Tree_Prefs.o: ../FL/fl_draw.H
 Fl_Tree_Prefs.o: ../FL/Fl_Export.H
 Fl_Tree_Prefs.o: ../FL/Fl_Image.H
-Fl_Tree_Prefs.o: ../FL/Fl_Pixmap.H
 Fl_Tree_Prefs.o: ../FL/Fl_Preferences.H
 Fl_Tree_Prefs.o: ../FL/Fl_Tree_Prefs.H
 Fl_Tree_Prefs.o: ../FL/fl_types.h
 Fl_Tree_Prefs.o: ../FL/fl_utf8.h
+Fl_Tree_Prefs.o: ../FL/Fl_Widget.H
 Fl_Tree_Prefs.o: ../FL/platform_types.h
 Fl_Tree_Prefs.o: Fl_System_Driver.H
 fl_utf8.o: ../FL/Enumerations.H
diff --git a/test/.gitignore b/test/.gitignore
index 0c1ef9d61..ea265dd43 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -68,6 +68,7 @@ input_choice
 keyboard
 label
 line_style
+line_style_docs
 list_visuals
 mandelbrot
 menubar
diff --git a/test/makedepend b/test/makedepend
index b808751db..67a3d5618 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -1391,6 +1391,8 @@ input_choice.o: ../FL/Fl_Bitmap.H
 input_choice.o: ../FL/Fl_Button.H
 input_choice.o: ../FL/Fl_Cairo.H
 input_choice.o: ../FL/fl_casts.H
+input_choice.o: ../FL/Fl_Check_Button.H
+input_choice.o: ../FL/Fl_Choice.H
 input_choice.o: ../FL/fl_config.h
 input_choice.o: ../FL/Fl_Double_Window.H
 input_choice.o: ../FL/Fl_Export.H
@@ -1399,11 +1401,14 @@ input_choice.o: ../FL/Fl_Image.H
 input_choice.o: ../FL/Fl_Input.H
 input_choice.o: ../FL/Fl_Input_.H
 input_choice.o: ../FL/Fl_Input_Choice.H
+input_choice.o: ../FL/Fl_Light_Button.H
 input_choice.o: ../FL/Fl_Menu_.H
 input_choice.o: ../FL/Fl_Menu_Button.H
 input_choice.o: ../FL/Fl_Menu_Item.H
 input_choice.o: ../FL/Fl_Multi_Label.H
 input_choice.o: ../FL/Fl_Rect.H
+input_choice.o: ../FL/Fl_Scheme.H
+input_choice.o: ../FL/Fl_Scheme_Choice.H
 input_choice.o: ../FL/Fl_Scrollbar.H
 input_choice.o: ../FL/Fl_Terminal.H
 input_choice.o: ../FL/fl_types.h
@@ -1503,6 +1508,32 @@ line_style.o: ../FL/Fl_Value_Slider.H
 line_style.o: ../FL/Fl_Widget.H
 line_style.o: ../FL/Fl_Window.H
 line_style.o: ../FL/platform_types.h
+line_style_docs.o: ../FL/Enumerations.H
+line_style_docs.o: ../FL/Fl.H
+line_style_docs.o: ../FL/fl_attr.h
+line_style_docs.o: ../FL/Fl_Bitmap.H
+line_style_docs.o: ../FL/Fl_Box.H
+line_style_docs.o: ../FL/Fl_Cairo.H
+line_style_docs.o: ../FL/fl_casts.H
+line_style_docs.o: ../FL/fl_config.h
+line_style_docs.o: ../FL/Fl_Device.H
+line_style_docs.o: ../FL/Fl_Double_Window.H
+line_style_docs.o: ../FL/fl_draw.H
+line_style_docs.o: ../FL/Fl_Export.H
+line_style_docs.o: ../FL/Fl_Graphics_Driver.H
+line_style_docs.o: ../FL/Fl_Grid.H
+line_style_docs.o: ../FL/Fl_Group.H
+line_style_docs.o: ../FL/Fl_Image.H
+line_style_docs.o: ../FL/Fl_Pixmap.H
+line_style_docs.o: ../FL/Fl_Plugin.H
+line_style_docs.o: ../FL/Fl_Preferences.H
+line_style_docs.o: ../FL/Fl_Rect.H
+line_style_docs.o: ../FL/Fl_RGB_Image.H
+line_style_docs.o: ../FL/fl_types.h
+line_style_docs.o: ../FL/fl_utf8.h
+line_style_docs.o: ../FL/Fl_Widget.H
+line_style_docs.o: ../FL/Fl_Window.H
+line_style_docs.o: ../FL/platform_types.h
 list_visuals.o: ../config.h
 list_visuals.o: ../FL/Enumerations.H
 list_visuals.o: ../FL/fl_config.h
diff --git a/test/sudoku.cxx b/test/sudoku.cxx
index 6d7b85eb1..c0d6bfd43 100644
--- a/test/sudoku.cxx
+++ b/test/sudoku.cxx
@@ -1288,7 +1288,7 @@ Sudoku::restart_cb(Fl_Widget *widget, void *) {
       }
     }
 
-  if (solved) 
+  if (solved)
     sudoku->new_game(sudoku->seed_);
   else
     sudoku->clear_undo();