Fix dependencies, typos, trailing whitespace, and formatting

No code changes.

4 files changed, 15 insertions, 14 deletions

diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
index 941ac4db1..13ac8f750 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
@@ -2,7 +2,7 @@
 // Definition of classes  Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device
 // for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 2010-2022 by Bill Spitzak and others.
+// Copyright 2010-2023 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
@@ -182,16 +182,16 @@ private:
   Gdiplus::Color gdiplus_color_;
   Gdiplus::Pen *pen_;
   Gdiplus::SolidBrush *brush_;
-  // The code below ensures the a connection to GDIplus is only made once, and that the
+  // The code below ensures that a connection to GDIplus is only made once, and that the
   // matching connection shutdown is also done exactly once.
   enum {
-	  STATE_CLOSED = 0,					// no connection, token is invalid
-	  STATE_STARTUP,					// attempt to start up, avoid recursions for whatever reason
-	  STATE_OPEN,						// connection was successful and the token is valid
-	  STATE_SHUTDOWN					// shutting down the gdi connection, avoid possible recursion
+        STATE_CLOSED = 0,           // no connection, token is invalid
+        STATE_STARTUP,              // attempt to start up, avoid recursions for whatever reason
+        STATE_OPEN,                 // connection was successful and the token is valid
+        STATE_SHUTDOWN              // shutting down the gdi connection, avoid possible recursion
   };
-  static int gdiplus_state_;			// reflect the state of the GDIplus driver connection
-  static ULONG_PTR gdiplus_token_;		// the token that GDIplus gives to us
+  static int gdiplus_state_;        // reflect the state of the GDIplus driver connection
+  static ULONG_PTR gdiplus_token_;  // the token that GDIplus gives to us
 public:
   Fl_GDIplus_Graphics_Driver();
   virtual ~Fl_GDIplus_Graphics_Driver();
diff --git a/src/drivers/PostScript/Fl_PostScript_image.cxx b/src/drivers/PostScript/Fl_PostScript_image.cxx
index f2a41a2d4..64f9972bf 100644
--- a/src/drivers/PostScript/Fl_PostScript_image.cxx
+++ b/src/drivers/PostScript/Fl_PostScript_image.cxx
@@ -421,7 +421,7 @@ int Fl_PostScript_Graphics_Driver::alpha_mask(const uchar * data, int w, int h,
       swap = next;
       next = current;
       current = swap;
-      *(next+1) = 0;          // must clean the first cell, next are overriden by *1
+      *(next+1) = 0;          // must clean the first cell, next are overridden by *1
       for (i=0; i<w; i++){
         for (k=0; k<4; k++){   // generating 4 x-pixels for 1 RGB
           short error, o1, o2, o3;
@@ -454,7 +454,7 @@ int Fl_PostScript_Graphics_Driver::alpha_mask(const uchar * data, int w, int h,
       swap = next;
       next = current;
       current = swap;
-      *(next+1) = 0;          // must clean the first cell, next are overriden by *1
+      *(next+1) = 0;          // must clean the first cell, next are overridden by *1
 
       for (i = w-1; i >= 0; i--){
 
diff --git a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H
index a7d551d24..637cd02b7 100644
--- a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H
+++ b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H
@@ -77,7 +77,7 @@ public:
     float gui_scale; // FLTK scale factor
     struct wl_list link;
   };
-  
+
 // static member variables
   static FL_EXPORT struct wl_display *wl_display;
   static const struct wl_data_device_listener *p_data_device_listener;
@@ -90,7 +90,7 @@ public:
   static bool insertion_point_location(int *px, int *py, int *pwidth, int *pheight);
   static Fl_Window *surface_to_window(struct wl_surface *);
   static bool own_output(struct wl_output *output);
-  
+
 // member variables
   struct wl_cursor *xc_arrow;
   struct wl_cursor *xc_ns;
@@ -120,11 +120,11 @@ public:
   struct libdecor *libdecor_context;
   struct xdg_wm_base *xdg_wm_base;
   struct zwp_text_input_manager_v3 *text_input_base;
-  
+
 // constructor
   Fl_Wayland_Screen_Driver();
 
-// overriden functions from parent class Fl_Screen_Driver
+// overridden functions from parent class Fl_Screen_Driver
   APP_SCALING_CAPABILITY rescalable() FL_OVERRIDE { return PER_SCREEN_APP_SCALING; }
   float scale(int n) FL_OVERRIDE;
   void scale(int n, float f) FL_OVERRIDE;
diff --git a/src/makedepend b/src/makedepend
index bd259df7b..b8188eee9 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -1073,6 +1073,7 @@ Fl_Anim_GIF_Image.o: ../FL/Fl_Plugin.H
 Fl_Anim_GIF_Image.o: ../FL/Fl_Preferences.H
 Fl_Anim_GIF_Image.o: ../FL/Fl_RGB_Image.H
 Fl_Anim_GIF_Image.o: ../FL/Fl_Shared_Image.H
+Fl_Anim_GIF_Image.o: ../FL/fl_string_functions.h
 Fl_Anim_GIF_Image.o: ../FL/fl_types.h
 Fl_Anim_GIF_Image.o: ../FL/fl_utf8.h
 Fl_Anim_GIF_Image.o: ../FL/Fl_Widget.H