Replace 'FL_OVERRIDE' with 'override' in public headers

... except FL/fl_attr.h where FL_OVERRIDE is #define'd

75 files changed, 319 insertions, 319 deletions

diff --git a/FL/Fl_Adjuster.H b/FL/Fl_Adjuster.H
index be7a10766..e8d7161b8 100644
--- a/FL/Fl_Adjuster.H
+++ b/FL/Fl_Adjuster.H
@@ -43,9 +43,9 @@ class FL_EXPORT Fl_Adjuster : public Fl_Valuator {
   int ix;
   int soft_;
 protected:
-  void draw() FL_OVERRIDE;
-  int handle(int) FL_OVERRIDE;
-  void value_damage() FL_OVERRIDE;
+  void draw() override;
+  int handle(int) override;
+  void value_damage() override;
 public:
   Fl_Adjuster(int X,int Y,int W,int H,const char *l=0);
   /**
diff --git a/FL/Fl_Anim_GIF_Image.H b/FL/Fl_Anim_GIF_Image.H
index ca1c445ce..08f8d62c4 100644
--- a/FL/Fl_Anim_GIF_Image.H
+++ b/FL/Fl_Anim_GIF_Image.H
@@ -83,7 +83,7 @@ public:
                     const size_t length, Fl_Widget *canvas = 0,
                     unsigned short flags = 0);
   Fl_Anim_GIF_Image();
-  ~Fl_Anim_GIF_Image() FL_OVERRIDE;
+  ~Fl_Anim_GIF_Image() override;
 
   // -- file handling
   bool load(const char *name, const unsigned char *imgdata=NULL, size_t imglength=0);
@@ -127,12 +127,12 @@ public:
   int frame_h(int frame) const;
 
   // -- overridden methods
-  void color_average(Fl_Color c, float i) FL_OVERRIDE;
-  Fl_Image *copy(int W, int H) const FL_OVERRIDE;
+  void color_average(Fl_Color c, float i) override;
+  Fl_Image *copy(int W, int H) const override;
   Fl_Image *copy() const { return Fl_Pixmap::copy(); }
-  void desaturate() FL_OVERRIDE;
-  void draw(int x, int y, int w, int h, int cx = 0, int cy = 0) FL_OVERRIDE;
-  void uncache() FL_OVERRIDE;
+  void desaturate() override;
+  void draw(int x, int y, int w, int h, int cx = 0, int cy = 0) override;
+  void uncache() override;
 
   // -- debugging and logging
   int debug() const;
@@ -167,8 +167,8 @@ protected:
   static void cb_animate(void *d);
   void scale_frame();
   void set_frame();
-  void on_frame_data(Fl_GIF_Image::GIF_FRAME &f) FL_OVERRIDE;
-  void on_extension_data(Fl_GIF_Image::GIF_FRAME &f) FL_OVERRIDE;
+  void on_frame_data(Fl_GIF_Image::GIF_FRAME &f) override;
+  void on_extension_data(Fl_GIF_Image::GIF_FRAME &f) override;
 
 private:
 
diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H
index 677af7db4..5baedd4e9 100644
--- a/FL/Fl_Bitmap.H
+++ b/FL/Fl_Bitmap.H
@@ -54,13 +54,13 @@ public:
   Fl_Bitmap(const uchar *bits, int bits_length, int W, int H);
   Fl_Bitmap(const char *bits, int bits_length, int W, int H);
   virtual ~Fl_Bitmap();
-  Fl_Image *copy(int W, int H) const FL_OVERRIDE;
+  Fl_Image *copy(int W, int H) const override;
   Fl_Image *copy() const { return Fl_Image::copy(); }
-  void draw(int X, int Y, int W, int H, int cx=0, int cy=0) FL_OVERRIDE;
+  void draw(int X, int Y, int W, int H, int cx=0, int cy=0) override;
   void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);}
-  void label(Fl_Widget*w) FL_OVERRIDE;
-  void label(Fl_Menu_Item*m) FL_OVERRIDE;
-  void uncache() FL_OVERRIDE;
+  void label(Fl_Widget*w) override;
+  void label(Fl_Menu_Item*m) override;
+  void uncache() override;
   int cache_w() {return cache_w_;}
   int cache_h() {return cache_h_;}
 };
diff --git a/FL/Fl_Box.H b/FL/Fl_Box.H
index 37bef87ca..1023e7d77 100644
--- a/FL/Fl_Box.H
+++ b/FL/Fl_Box.H
@@ -33,7 +33,7 @@
 */
 class FL_EXPORT Fl_Box : public Fl_Widget {
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
 public:
   /**
     Creates a new Fl_Box widget with the given coordinates, size, and label.
@@ -72,7 +72,7 @@ public:
   */
   Fl_Box(Fl_Boxtype B, int X, int Y, int W, int H, const char *L);
 
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
 };
 
 #endif
diff --git a/FL/Fl_Browser.H b/FL/Fl_Browser.H
index f1e1009a9..182adb871 100644
--- a/FL/Fl_Browser.H
+++ b/FL/Fl_Browser.H
@@ -98,30 +98,30 @@ class FL_EXPORT Fl_Browser : public Fl_Browser_ {
 protected:
 
   // required routines for Fl_Browser_ subclass:
-  void* item_first() const FL_OVERRIDE;
-  void* item_next(void* item) const FL_OVERRIDE;
-  void* item_prev(void* item) const FL_OVERRIDE;
-  void* item_last()const FL_OVERRIDE;
-  int item_selected(void* item) const FL_OVERRIDE;
-  void item_select(void* item, int val) FL_OVERRIDE;
-  int item_height(void* item) const FL_OVERRIDE;
-  int item_width(void* item) const FL_OVERRIDE;
-  void item_draw(void* item, int X, int Y, int W, int H) const FL_OVERRIDE;
-  int full_height() const FL_OVERRIDE;
-  int incr_height() const FL_OVERRIDE;
-  const char *item_text(void *item) const FL_OVERRIDE;
+  void* item_first() const override;
+  void* item_next(void* item) const override;
+  void* item_prev(void* item) const override;
+  void* item_last()const override;
+  int item_selected(void* item) const override;
+  void item_select(void* item, int val) override;
+  int item_height(void* item) const override;
+  int item_width(void* item) const override;
+  void item_draw(void* item, int X, int Y, int W, int H) const override;
+  int full_height() const override;
+  int incr_height() const override;
+  const char *item_text(void *item) const override;
   /** Swap the items \p a and \p b.
       You must call redraw() to make any changes visible.
       \param[in] a,b the items to be swapped.
       \see swap(int,int), item_swap()
    */
-  void item_swap(void *a, void *b) FL_OVERRIDE { swap((FL_BLINE*)a, (FL_BLINE*)b); }
+  void item_swap(void *a, void *b) override { swap((FL_BLINE*)a, (FL_BLINE*)b); }
   /** Return the item at specified \p line.
       \param[in] line The line of the item to return. (1 based)
       \returns The item, or NULL if line out of range.
       \see item_at(), find_line(), lineno()
    */
-  void *item_at(int line) const FL_OVERRIDE { return (void*)find_line(line); }
+  void *item_at(int line) const override { return (void*)find_line(line); }
 
   FL_BLINE* find_line(int line) const ;
   FL_BLINE* _remove(int line) ;
@@ -188,10 +188,10 @@ public:
   int selected(int line) const ;
   void show(int line);
   /** Shows the entire Fl_Browser widget -- opposite of hide(). */
-  void show() FL_OVERRIDE { Fl_Widget::show(); }
+  void show() override { Fl_Widget::show(); }
   void hide(int line);
   /** Hides the entire Fl_Browser widget -- opposite of show(). */
-  void hide() FL_OVERRIDE { Fl_Widget::hide(); }
+  void hide() override { Fl_Widget::hide(); }
   int visible(int line) const ;
 
   int value() const ;
diff --git a/FL/Fl_Browser_.H b/FL/Fl_Browser_.H
index 5db510ffd..75760c579 100644
--- a/FL/Fl_Browser_.H
+++ b/FL/Fl_Browser_.H
@@ -206,7 +206,7 @@ protected:
   int leftedge() const; // x position after scrollbar & border
   void *find_item(int ypos); // item under mouse
 
-  void draw() FL_OVERRIDE;
+  void draw() override;
   Fl_Browser_(int X,int Y,int W,int H,const char *L=0);
 
 public:
@@ -232,8 +232,8 @@ public:
    */
   Fl_Scrollbar hscrollbar;
 
-  int handle(int event) FL_OVERRIDE;
-  void resize(int X,int Y,int W,int H) FL_OVERRIDE;
+  int handle(int event) override;
+  void resize(int X,int Y,int W,int H) override;
 
   int select(void *item,int val=1,int docallbacks=0);
   int select_only(void *item,int docallbacks=0);
diff --git a/FL/Fl_Button.H b/FL/Fl_Button.H
index 31b71a416..995338545 100644
--- a/FL/Fl_Button.H
+++ b/FL/Fl_Button.H
@@ -87,11 +87,11 @@ protected:
   static void key_release_timeout(void*);
   void simulate_key_action();
 
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
 
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
 
   Fl_Button(int X, int Y, int W, int H, const char *L = 0);
 
diff --git a/FL/Fl_Cairo_Window.H b/FL/Fl_Cairo_Window.H
index 658819175..d61d05026 100644
--- a/FL/Fl_Cairo_Window.H
+++ b/FL/Fl_Cairo_Window.H
@@ -96,7 +96,7 @@ public:
 
 protected:
   /** Overloaded to provide Cairo callback support. */
-  void draw() FL_OVERRIDE {
+  void draw() override {
     Fl_Double_Window::draw();
     if (draw_cb_) { // call the Cairo draw callback
       // manual method ? if yes explicitly get a cairo_context here
diff --git a/FL/Fl_Chart.H b/FL/Fl_Chart.H
index 0a0f7ffc6..3bb601f39 100644
--- a/FL/Fl_Chart.H
+++ b/FL/Fl_Chart.H
@@ -80,7 +80,7 @@ class FL_EXPORT Fl_Chart : public Fl_Widget {
   Fl_Color textcolor_;
 
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
   // (static) protected draw methods (STR 2022)
   // these methods are documented in src/Fl_Chart.cxx
diff --git a/FL/Fl_Check_Browser.H b/FL/Fl_Check_Browser.H
index 50a719f7a..63eb55dc1 100644
--- a/FL/Fl_Check_Browser.H
+++ b/FL/Fl_Check_Browser.H
@@ -31,20 +31,20 @@ class FL_EXPORT Fl_Check_Browser : public Fl_Browser_ {
 
 protected:
   /* required routines for Fl_Browser_ subclass: */
-  void *item_first() const FL_OVERRIDE;
-  void *item_next(void *) const FL_OVERRIDE;
-  void *item_prev(void *) const FL_OVERRIDE;
-  int item_height(void *) const FL_OVERRIDE;
-  int item_width(void *) const FL_OVERRIDE;
-  void item_draw(void *, int, int, int, int) const FL_OVERRIDE;
-  void item_select(void *, int) FL_OVERRIDE;
-  int item_selected(void *) const FL_OVERRIDE;
-  const char *item_text(void *item) const FL_OVERRIDE;
+  void *item_first() const override;
+  void *item_next(void *) const override;
+  void *item_prev(void *) const override;
+  int item_height(void *) const override;
+  int item_width(void *) const override;
+  void item_draw(void *, int, int, int, int) const override;
+  void item_select(void *, int) override;
+  int item_selected(void *) const override;
+  const char *item_text(void *item) const override;
 
 public:
-  void *item_at(int index) const FL_OVERRIDE;
+  void *item_at(int index) const override;
   void item_swap(int ia, int ib);
-  void item_swap(void *a, void *b) FL_OVERRIDE;
+  void item_swap(void *a, void *b) override;
 
   /* private data */
 
@@ -104,7 +104,7 @@ public:
   char *text(int item) const;     // returns pointer to internal buffer
 
 protected:
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
 };
 
 #endif // Fl_Check_Browser_H
diff --git a/FL/Fl_Choice.H b/FL/Fl_Choice.H
index 2434a9ac3..522f0ea25 100644
--- a/FL/Fl_Choice.H
+++ b/FL/Fl_Choice.H
@@ -107,9 +107,9 @@
  */
 class FL_EXPORT Fl_Choice : public Fl_Menu_ {
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
 public:
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
 
   Fl_Choice(int X, int Y, int W, int H, const char *L = 0);
 
diff --git a/FL/Fl_Clock.H b/FL/Fl_Clock.H
index 0a5eac4bc..a0024ca83 100644
--- a/FL/Fl_Clock.H
+++ b/FL/Fl_Clock.H
@@ -68,7 +68,7 @@ class FL_EXPORT Fl_Clock_Output : public Fl_Widget {
   int shadow_; // draw shadows of hands
   void drawhands(Fl_Color,Fl_Color); // part of draw
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
   void draw(int X, int Y, int W, int H);
 public:
 
@@ -151,7 +151,7 @@ public:
  */
 class FL_EXPORT Fl_Clock : public Fl_Clock_Output {
 public:
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
 
   Fl_Clock(int X, int Y, int W, int H,  const char *L = 0);
 
diff --git a/FL/Fl_Color_Chooser.H b/FL/Fl_Color_Chooser.H
index 29baecec7..e1f085b91 100644
--- a/FL/Fl_Color_Chooser.H
+++ b/FL/Fl_Color_Chooser.H
@@ -36,10 +36,10 @@
 class FL_EXPORT Flcc_HueBox : public Fl_Widget {
   int px, py;
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
   int handle_key(int);
 public:
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   Flcc_HueBox(int X, int Y, int W, int H) : Fl_Widget(X,Y,W,H) {
   px = py = 0;}
 };
@@ -48,10 +48,10 @@ public:
 class FL_EXPORT Flcc_ValueBox : public Fl_Widget {
   int py;
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
   int handle_key(int);
 public:
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   Flcc_ValueBox(int X, int Y, int W, int H) : Fl_Widget(X,Y,W,H) {
   py = 0;}
 };
@@ -59,7 +59,7 @@ public:
 /** For internal use only */
 class FL_EXPORT Flcc_Value_Input : public Fl_Value_Input {
 public:
-  int format(char*) FL_OVERRIDE;
+  int format(char*) override;
   Flcc_Value_Input(int X, int Y, int W, int H) : Fl_Value_Input(X,Y,W,H) {}
 };
 
@@ -124,7 +124,7 @@ class FL_EXPORT Fl_Color_Chooser : public Fl_Group {
   static void mode_cb(Fl_Widget*, void*);
 public:
 
-  int handle(int e) FL_OVERRIDE;
+  int handle(int e) override;
 
   /**
    Returns which Fl_Color_Chooser variant is currently active
diff --git a/FL/Fl_Copy_Surface.H b/FL/Fl_Copy_Surface.H
index c9e74e259..905daaad8 100644
--- a/FL/Fl_Copy_Surface.H
+++ b/FL/Fl_Copy_Surface.H
@@ -50,20 +50,20 @@ class FL_EXPORT Fl_Copy_Surface : public Fl_Widget_Surface {
 private:
   class Fl_Copy_Surface_Driver *platform_surface;
 protected:
-  void translate(int x, int y) FL_OVERRIDE;
-  void untranslate() FL_OVERRIDE;
+  void translate(int x, int y) override;
+  void untranslate() override;
 public:
   Fl_Copy_Surface(int w, int h);
   ~Fl_Copy_Surface();
-  void set_current() FL_OVERRIDE;
-  bool is_current() FL_OVERRIDE;
+  void set_current() override;
+  bool is_current() override;
   /** Returns the pixel width of the copy surface */
   int w();
   /** Returns the pixel height of the copy surface */
   int h();
-  void origin(int *x, int *y) FL_OVERRIDE;
-  void origin(int x, int y) FL_OVERRIDE;
-  int printable_rect(int *w, int *h) FL_OVERRIDE;
+  void origin(int *x, int *y) override;
+  void origin(int x, int y) override;
+  int printable_rect(int *w, int *h) override;
 };
 
 
@@ -88,10 +88,10 @@ protected:
   int height;
   Fl_Copy_Surface_Driver(int w, int h) : Fl_Widget_Surface(NULL), width(w), height(h) {}
   virtual ~Fl_Copy_Surface_Driver() {}
-  void set_current() FL_OVERRIDE = 0;
-  void translate(int x, int y) FL_OVERRIDE = 0;
-  void untranslate() FL_OVERRIDE = 0;
-  int printable_rect(int *w, int *h) FL_OVERRIDE;
+  void set_current() override = 0;
+  void translate(int x, int y) override = 0;
+  void untranslate() override = 0;
+  int printable_rect(int *w, int *h) override;
   /** Each platform implements this function its own way.
    It returns an object implementing all virtual functions
    of class Fl_Copy_Surface_Driver for the platform.
diff --git a/FL/Fl_Counter.H b/FL/Fl_Counter.H
index dddcfa4dc..c28bdcb9a 100644
--- a/FL/Fl_Counter.H
+++ b/FL/Fl_Counter.H
@@ -54,13 +54,13 @@ class FL_EXPORT Fl_Counter : public Fl_Valuator {
 
 protected:
 
-  void draw() FL_OVERRIDE;
+  void draw() override;
   // compute widths of arrow boxes
   void arrow_widths(int &w1, int &w2);
 
 public:
 
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
 
   Fl_Counter(int X, int Y, int W, int H, const char* L = 0);
   ~Fl_Counter();
diff --git a/FL/Fl_Dial.H b/FL/Fl_Dial.H
index 2440b5cfd..a6614d736 100644
--- a/FL/Fl_Dial.H
+++ b/FL/Fl_Dial.H
@@ -51,11 +51,11 @@ protected:
   // these allow subclasses to put the dial in a smaller area:
   void draw(int X, int Y, int W, int H);
   int handle(int event, int X, int Y, int W, int H);
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
 
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   /**
     Creates a new Fl_Dial widget using the given position, size,
     and label string. The default type is FL_NORMAL_DIAL.
diff --git a/FL/Fl_Double_Window.H b/FL/Fl_Double_Window.H
index 0cf127a98..05aae6551 100644
--- a/FL/Fl_Double_Window.H
+++ b/FL/Fl_Double_Window.H
@@ -30,13 +30,13 @@
 class FL_EXPORT Fl_Double_Window : public Fl_Window
 {
 public:
-  Fl_Double_Window *as_double_window() FL_OVERRIDE {return this; }
-  void show() FL_OVERRIDE;
+  Fl_Double_Window *as_double_window() override {return this; }
+  void show() override;
   /** Same as Fl_Window::show(int a, char **b) */
   void show(int a, char **b) {Fl_Window::show(a,b);}
-  void resize(int,int,int,int) FL_OVERRIDE;
-  void hide() FL_OVERRIDE;
-  void flush() FL_OVERRIDE;
+  void resize(int,int,int,int) override;
+  void hide() override;
+  void flush() override;
   ~Fl_Double_Window();
 
   /**
diff --git a/FL/Fl_File_Browser.H b/FL/Fl_File_Browser.H
index 620315c17..d516be7a4 100644
--- a/FL/Fl_File_Browser.H
+++ b/FL/Fl_File_Browser.H
@@ -42,11 +42,11 @@ class FL_EXPORT Fl_File_Browser : public Fl_Browser {
   const char    *pattern_;
   const char    *errmsg_;
 
-  int   full_height() const FL_OVERRIDE;
-  int   item_height(void *) const FL_OVERRIDE;
-  int   item_width(void *) const FL_OVERRIDE;
-  void  item_draw(void *, int, int, int, int) const FL_OVERRIDE;
-  int   incr_height() const FL_OVERRIDE { return (item_height(0) + linespacing()); }
+  int   full_height() const override;
+  int   item_height(void *) const override;
+  int   item_width(void *) const override;
+  void  item_draw(void *, int, int, int, int) const override;
+  int   incr_height() const override { return (item_height(0) + linespacing()); }
 
 public:
   enum { FILES, DIRECTORIES };
diff --git a/FL/Fl_File_Input.H b/FL/Fl_File_Input.H
index 832db013e..126046a06 100644
--- a/FL/Fl_File_Input.H
+++ b/FL/Fl_File_Input.H
@@ -57,10 +57,10 @@ public:
 
   Fl_File_Input(int X, int Y, int W, int H, const char *L=0);
 
-  int handle(int event) FL_OVERRIDE;
+  int handle(int event) override;
 
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
   /** Gets the box type used for the navigation bar. */
diff --git a/FL/Fl_Flex.H b/FL/Fl_Flex.H
index ef46daca3..adb798ea9 100644
--- a/FL/Fl_Flex.H
+++ b/FL/Fl_Flex.H
@@ -145,7 +145,7 @@ public:
   virtual ~Fl_Flex();
 
   virtual void end();
-  void resize(int x, int y, int w, int h) FL_OVERRIDE;
+  void resize(int x, int y, int w, int h) override;
 
   /**
     Set the horizontal or vertical size of a child widget.
@@ -168,8 +168,8 @@ protected:
 
   virtual int alloc_size(int size) const;
 
-  void on_remove(int) FL_OVERRIDE;
-  void draw() FL_OVERRIDE;
+  void on_remove(int) override;
+  void draw() override;
 
 public:
 
diff --git a/FL/Fl_FormsBitmap.H b/FL/Fl_FormsBitmap.H
index edde9a11b..5ab5ad951 100644
--- a/FL/Fl_FormsBitmap.H
+++ b/FL/Fl_FormsBitmap.H
@@ -28,7 +28,7 @@
 class FL_EXPORT Fl_FormsBitmap : public Fl_Widget {
     Fl_Bitmap *b;
 protected:
-    void draw() FL_OVERRIDE;
+    void draw() override;
 public:
     Fl_FormsBitmap(Fl_Boxtype, int, int, int, int, const char * = 0);
     void set(int W, int H, const uchar *bits);
diff --git a/FL/Fl_FormsPixmap.H b/FL/Fl_FormsPixmap.H
index 3cbe7c01c..83ff6bde3 100644
--- a/FL/Fl_FormsPixmap.H
+++ b/FL/Fl_FormsPixmap.H
@@ -29,7 +29,7 @@
 class FL_EXPORT Fl_FormsPixmap : public Fl_Widget {
     Fl_Pixmap *b;
 protected:
-    void draw() FL_OVERRIDE;
+    void draw() override;
 public:
     Fl_FormsPixmap(Fl_Boxtype t, int X, int Y, int W, int H, const char *L= 0);
 
diff --git a/FL/Fl_Free.H b/FL/Fl_Free.H
index 138a21370..bee95d7ac 100644
--- a/FL/Fl_Free.H
+++ b/FL/Fl_Free.H
@@ -56,9 +56,9 @@ class FL_EXPORT Fl_Free : public Fl_Widget {
     FL_HANDLEPTR hfunc;
     static void step(void *);
 protected:
-    void draw() FL_OVERRIDE;
+    void draw() override;
 public:
-    int handle(int e) FL_OVERRIDE;
+    int handle(int e) override;
   Fl_Free(uchar t,int X,int Y,int W,int H,const char *L,FL_HANDLEPTR hdl);
   ~Fl_Free();
 };
diff --git a/FL/Fl_Gl_Window.H b/FL/Fl_Gl_Window.H
index 8506359a2..65ae1b12c 100644
--- a/FL/Fl_Gl_Window.H
+++ b/FL/Fl_Gl_Window.H
@@ -73,17 +73,17 @@ class FL_EXPORT Fl_Gl_Window : public Fl_Window {
   static int gl_plugin_linkage();
 protected:
   void draw_begin();
-  void draw() FL_OVERRIDE;
+  void draw() override;
   void draw_end();
 
 public:
-  void show() FL_OVERRIDE;
+  void show() override;
   /** Same as Fl_Window::show(int a, char **b) */
   void show(int a, char **b) {Fl_Window::show(a,b);}
-  void flush() FL_OVERRIDE;
-  void hide() FL_OVERRIDE;
-  void resize(int,int,int,int) FL_OVERRIDE;
-  int handle(int) FL_OVERRIDE;
+  void flush() override;
+  void hide() override;
+  void resize(int,int,int,int) override;
+  int handle(int) override;
 
   /**
     Is turned off when FLTK creates a new context for this window or
@@ -213,8 +213,8 @@ public:
   void make_overlay_current();
 
   // Note: Doxygen docs in Fl_Widget.H to avoid redundancy.
-  Fl_Gl_Window* as_gl_window() FL_OVERRIDE { return this; }
-  Fl_Gl_Window const* as_gl_window() const FL_OVERRIDE { return this; }
+  Fl_Gl_Window* as_gl_window() override { return this; }
+  Fl_Gl_Window const* as_gl_window() const override { return this; }
 
   float pixels_per_unit();
   /** Gives the window width in OpenGL pixels.
diff --git a/FL/Fl_Grid.H b/FL/Fl_Grid.H
index a557fb12a..5e6c278cd 100644
--- a/FL/Fl_Grid.H
+++ b/FL/Fl_Grid.H
@@ -270,7 +270,7 @@ public:
   virtual void layout(int rows, int cols, int margin = -1, int gap = -1);
   virtual void layout();
   virtual void clear_layout();
-  virtual void resize(int X, int Y, int W, int H) FL_OVERRIDE;
+  virtual void resize(int X, int Y, int W, int H) override;
 
   short rows() const { return rows_; }
   short cols() const { return cols_; }
@@ -303,8 +303,8 @@ public:
   }
 
 protected:
-  virtual void draw() FL_OVERRIDE;
-  void on_remove(int) FL_OVERRIDE;
+  virtual void draw() override;
+  void on_remove(int) override;
   virtual void draw_grid();           // draw grid lines for debugging
 
 public:
diff --git a/FL/Fl_Group.H b/FL/Fl_Group.H
index 381ebb00b..fe17684b9 100644
--- a/FL/Fl_Group.H
+++ b/FL/Fl_Group.H
@@ -72,7 +72,7 @@ class FL_EXPORT Fl_Group : public Fl_Widget {
   Fl_Group& operator=(const Fl_Group&);
 
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
   void draw_child(Fl_Widget& widget) const;
   void draw_children();
   void draw_outside_label(const Fl_Widget& widget) const ;
@@ -85,7 +85,7 @@ protected:
 
 public:
 
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   void begin();
   void end();
   static Fl_Group *current();
@@ -119,7 +119,7 @@ public:
 
   Fl_Widget* const* array() const;
 
-  void resize(int,int,int,int) FL_OVERRIDE;
+  void resize(int,int,int,int) override;
   /**
     Creates a new Fl_Group widget using the given position, size,
     and label string. The default boxtype is FL_NO_BOX.
@@ -239,8 +239,8 @@ public:
   unsigned int clip_children() { return (flags() & CLIP_CHILDREN) != 0; }
 
   // Note: Doxygen docs in Fl_Widget.H to avoid redundancy.
-  Fl_Group* as_group() FL_OVERRIDE { return this; }
-  Fl_Group const* as_group() const FL_OVERRIDE { return this; }
+  Fl_Group* as_group() override { return this; }
+  Fl_Group const* as_group() const override { return this; }
 
   // back compatibility functions:
 
diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H
index 6cf1e1267..d8fac1883 100644
--- a/FL/Fl_Image.H
+++ b/FL/Fl_Image.H
@@ -365,16 +365,16 @@ public:
   Fl_RGB_Image(const uchar *bits, int W, int H, int D=3, int LD=0);
   Fl_RGB_Image(const uchar *bits, int bits_length, int W, int H, int D, int LD);
   Fl_RGB_Image(const Fl_Pixmap *pxm, Fl_Color bg=FL_GRAY);
-  ~Fl_RGB_Image() FL_OVERRIDE;
-  Fl_Image *copy(int W, int H) const FL_OVERRIDE;
+  ~Fl_RGB_Image() override;
+  Fl_Image *copy(int W, int H) const override;
   Fl_Image *copy() const { return Fl_Image::copy(); }
-  void color_average(Fl_Color c, float i) FL_OVERRIDE;
-  void desaturate() FL_OVERRIDE;
-  void draw(int X, int Y, int W, int H, int cx=0, int cy=0) FL_OVERRIDE;
+  void color_average(Fl_Color c, float i) override;
+  void desaturate() override;
+  void draw(int X, int Y, int W, int H, int cx=0, int cy=0) override;
   void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);}
-  void label(Fl_Widget*w) FL_OVERRIDE;
-  void label(Fl_Menu_Item*m) FL_OVERRIDE;
-  void uncache() FL_OVERRIDE;
+  void label(Fl_Widget*w) override;
+  void label(Fl_Menu_Item*m) override;
+  void uncache() override;
   int cache_w() {return cache_w_;}
   int cache_h() {return cache_h_;}
   /** Sets the maximum allowed image size in bytes when creating an Fl_RGB_Image object.
diff --git a/FL/Fl_Image_Surface.H b/FL/Fl_Image_Surface.H
index c9f0b2226..13aa2d40b 100644
--- a/FL/Fl_Image_Surface.H
+++ b/FL/Fl_Image_Surface.H
@@ -68,18 +68,18 @@ private:
   class Fl_Image_Surface_Driver *platform_surface;
   Fl_Offscreen get_offscreen_before_delete_();
 protected:
-  void translate(int x, int y) FL_OVERRIDE;
-  void untranslate() FL_OVERRIDE;
+  void translate(int x, int y) override;
+  void untranslate() override;
 public:
   Fl_Image_Surface(int w, int h, int high_res = 0, Fl_Offscreen off = 0);
   ~Fl_Image_Surface();
-  void set_current() FL_OVERRIDE;
-  bool is_current() FL_OVERRIDE;
+  void set_current() override;
+  bool is_current() override;
   Fl_RGB_Image *image();
   Fl_Shared_Image *highres_image();
-  void origin(int *x, int *y) FL_OVERRIDE;
-  void origin(int x, int y) FL_OVERRIDE;
-  int printable_rect(int *w, int *h) FL_OVERRIDE;
+  void origin(int *x, int *y) override;
+  void origin(int x, int y) override;
+  int printable_rect(int *w, int *h) override;
   Fl_Offscreen offscreen();
   void rescale();
   void mask(const Fl_RGB_Image *);
@@ -111,10 +111,10 @@ protected:
   static void copy_with_mask(Fl_RGB_Image* mask, uchar *dib_dst, uchar *dib_src,
                              int line_size, bool bottom_to_top);
   static Fl_RGB_Image *RGB3_to_RGB1(const Fl_RGB_Image *rgb3, int W, int H);
-  void set_current() FL_OVERRIDE = 0;
-  void translate(int x, int y) FL_OVERRIDE = 0;
-  void untranslate() FL_OVERRIDE = 0;
-  int printable_rect(int *w, int *h) FL_OVERRIDE;
+  void set_current() override = 0;
+  void translate(int x, int y) override = 0;
+  void untranslate() override = 0;
+  int printable_rect(int *w, int *h) override;
   virtual Fl_RGB_Image *image() = 0;
   virtual void mask(const Fl_RGB_Image *) {}
   /** Each platform implements this function its own way.
diff --git a/FL/Fl_Input.H b/FL/Fl_Input.H
index 970a41481..4aebeebc5 100644
--- a/FL/Fl_Input.H
+++ b/FL/Fl_Input.H
@@ -255,12 +255,12 @@ class FL_EXPORT Fl_Input : public Fl_Input_ {
   int kf_copy_cut();
 
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
   int handle_key();
   int handle_rmb();
 
 public:
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   Fl_Input(int,int,int,int,const char * = 0);
   static const char *cut_menu_text;
   static const char *copy_menu_text;
diff --git a/FL/Fl_Input_.H b/FL/Fl_Input_.H
index 2e87b115d..80d3869dc 100644
--- a/FL/Fl_Input_.H
+++ b/FL/Fl_Input_.H
@@ -224,7 +224,7 @@ protected:
 public:
 
   /* Change the size of the widget. */
-  void resize(int, int, int, int) FL_OVERRIDE;
+  void resize(int, int, int, int) override;
 
   /* Constructor */
   Fl_Input_(int, int, int, int, const char* = 0);
diff --git a/FL/Fl_Input_Choice.H b/FL/Fl_Input_Choice.H
index 4c840b670..0339add1f 100644
--- a/FL/Fl_Input_Choice.H
+++ b/FL/Fl_Input_Choice.H
@@ -44,11 +44,11 @@ class FL_EXPORT Fl_Input_Choice : public Fl_Group {
 
   // Private class to handle slightly 'special' behavior of menu button
   class InputMenuButton : public Fl_Menu_Button {
-    void draw() FL_OVERRIDE;
+    void draw() override;
     const Fl_Menu_Item* popup();
   public:
     InputMenuButton(int X, int Y, int W, int H, const char *L=0);
-    int handle(int e) FL_OVERRIDE;
+    int handle(int e) override;
   };
 
   Fl_Input *inp_;
@@ -89,13 +89,13 @@ protected:
   /** See menu_x() for info. */
   virtual int menu_h() const { return h() - Fl::box_dh(box()); }
 
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
 
   Fl_Input_Choice(int X, int Y, int W, int H, const char *L=0);
 
-  void resize(int X, int Y, int W, int H) FL_OVERRIDE;
+  void resize(int X, int Y, int W, int H) override;
 
   /** Adds an item to the menu.
     When any item is selected, the Fl_Input_Choice callback() is invoked,
diff --git a/FL/Fl_Light_Button.H b/FL/Fl_Light_Button.H
index a03ec2e69..fb914b9ce 100644
--- a/FL/Fl_Light_Button.H
+++ b/FL/Fl_Light_Button.H
@@ -35,9 +35,9 @@
 */
 class FL_EXPORT Fl_Light_Button : public Fl_Button {
 protected:
-    void draw() FL_OVERRIDE;
+    void draw() override;
 public:
-    int handle(int) FL_OVERRIDE;
+    int handle(int) override;
     Fl_Light_Button(int x,int y,int w,int h,const char *l = 0);
 };
 
diff --git a/FL/Fl_Menu_Bar.H b/FL/Fl_Menu_Bar.H
index 4e7af0d6e..9def6a536 100644
--- a/FL/Fl_Menu_Bar.H
+++ b/FL/Fl_Menu_Bar.H
@@ -69,9 +69,9 @@
 class FL_EXPORT Fl_Menu_Bar : public Fl_Menu_ {
   friend class Fl_Sys_Menu_Bar_Driver;
 protected:
-    void draw() FL_OVERRIDE;
+    void draw() override;
 public:
-    int handle(int) FL_OVERRIDE;
+    int handle(int) override;
   /**
     Creates a new Fl_Menu_Bar widget using the given position,
     size, and label string. The default boxtype is FL_UP_BOX.
diff --git a/FL/Fl_Menu_Button.H b/FL/Fl_Menu_Button.H
index 3f52593b4..115f6f0a0 100644
--- a/FL/Fl_Menu_Button.H
+++ b/FL/Fl_Menu_Button.H
@@ -59,7 +59,7 @@
 */
 class FL_EXPORT Fl_Menu_Button : public Fl_Menu_ {
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
   static Fl_Menu_Button* pressed_menu_button_;
 public:
   /**
@@ -76,7 +76,7 @@ public:
     POPUP23,  /**< pops up with the mouse 2nd or 3rd buttons. */
     POPUP123 /**< pops up with any mouse button. */
   };
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   const Fl_Menu_Item* popup();
   Fl_Menu_Button(int,int,int,int,const char * =0);
 };
diff --git a/FL/Fl_Native_File_Chooser.H b/FL/Fl_Native_File_Chooser.H
index 726a34636..f2055f925 100644
--- a/FL/Fl_Native_File_Chooser.H
+++ b/FL/Fl_Native_File_Chooser.H
@@ -252,26 +252,26 @@ protected:
 public:
   Fl_Native_File_Chooser_FLTK_Driver(int val);
   virtual ~Fl_Native_File_Chooser_FLTK_Driver();
-  void type(int t) FL_OVERRIDE;
-  int type() const FL_OVERRIDE;
-  void options(int o) FL_OVERRIDE;
-  int options() const FL_OVERRIDE;
-  int count() const FL_OVERRIDE;
-  const char *filename() const FL_OVERRIDE;
-  const char *filename(int i) const FL_OVERRIDE;
-  void directory(const char *val) FL_OVERRIDE;
-  const char *directory() const FL_OVERRIDE;
-  void title(const char *t) FL_OVERRIDE;
-  const char* title() const FL_OVERRIDE;
-  const char *filter() const FL_OVERRIDE;
-  void filter(const char *f) FL_OVERRIDE;
-  int filters() const FL_OVERRIDE;
-  void filter_value(int i) FL_OVERRIDE;
-  int filter_value() const FL_OVERRIDE;
-  void preset_file(const char*f) FL_OVERRIDE;
-  const char* preset_file() const FL_OVERRIDE;
-  const char *errmsg() const FL_OVERRIDE;
-  int show() FL_OVERRIDE;
+  void type(int t) override;
+  int type() const override;
+  void options(int o) override;
+  int options() const override;
+  int count() const override;
+  const char *filename() const override;
+  const char *filename(int i) const override;
+  void directory(const char *val) override;
+  const char *directory() const override;
+  void title(const char *t) override;
+  const char* title() const override;
+  const char *filter() const override;
+  void filter(const char *f) override;
+  int filters() const override;
+  void filter_value(int i) override;
+  int filter_value() const override;
+  void preset_file(const char*f) override;
+  const char* preset_file() const override;
+  const char *errmsg() const override;
+  int show() override;
 };
 
 /**
diff --git a/FL/Fl_Overlay_Window.H b/FL/Fl_Overlay_Window.H
index b03037586..064ddd734 100644
--- a/FL/Fl_Overlay_Window.H
+++ b/FL/Fl_Overlay_Window.H
@@ -49,10 +49,10 @@ public:
 private:
   Fl_Window *overlay_;
 public:
-  void show() FL_OVERRIDE;
-  void hide() FL_OVERRIDE;
-  void flush() FL_OVERRIDE;
-  void resize(int,int,int,int) FL_OVERRIDE;
+  void show() override;
+  void hide() override;
+  void flush() override;
+  void resize(int,int,int,int) override;
   ~Fl_Overlay_Window();
   /** Returns non-zero if there's hardware overlay support */
   int can_do_overlay();
@@ -72,7 +72,7 @@ protected:
 public:
   /** Same as Fl_Window::show(int a, char **b) */
   void show(int a, char **b) {Fl_Double_Window::show(a,b);}
-  Fl_Overlay_Window *as_overlay_window() FL_OVERRIDE {return this; }
+  Fl_Overlay_Window *as_overlay_window() override {return this; }
 };
 
 #endif
diff --git a/FL/Fl_Pack.H b/FL/Fl_Pack.H
index 3da236b19..3990a1907 100644
--- a/FL/Fl_Pack.H
+++ b/FL/Fl_Pack.H
@@ -61,7 +61,7 @@ public:
   };
 
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
   Fl_Pack(int X, int Y, int W, int H, const char *L = 0);
@@ -92,7 +92,7 @@ public:
   */
   uchar horizontal() const {return type();}
 
-  void resize(int X, int Y, int W, int H) FL_OVERRIDE;
+  void resize(int X, int Y, int W, int H) override;
   /** Deletes all child widgets with Fl_Group::clear().
   And  sets to NULL the resizable() widget. */
   void clear() { Fl_Group::clear(); resizable(NULL); }
diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H
index 0efdb84c7..13809063f 100644
--- a/FL/Fl_Pixmap.H
+++ b/FL/Fl_Pixmap.H
@@ -63,15 +63,15 @@ public:
   /**    The constructors create a new pixmap from the specified XPM data.  */
   explicit Fl_Pixmap(const uchar* const * D) : Fl_Image(-1,0,1), alloc_data(0), id_(0), mask_(0) {set_data((const char*const*)D); measure();}
   virtual ~Fl_Pixmap();
-  Fl_Image *copy(int W, int H) const FL_OVERRIDE;
+  Fl_Image *copy(int W, int H) const override;
   Fl_Image *copy() const { return Fl_Image::copy(); }
-  void color_average(Fl_Color c, float i) FL_OVERRIDE;
-  void desaturate() FL_OVERRIDE;
-  void draw(int X, int Y, int W, int H, int cx=0, int cy=0) FL_OVERRIDE;
+  void color_average(Fl_Color c, float i) override;
+  void desaturate() override;
+  void draw(int X, int Y, int W, int H, int cx=0, int cy=0) override;
   void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);}
-  void label(Fl_Widget*w) FL_OVERRIDE;
-  void label(Fl_Menu_Item*m) FL_OVERRIDE;
-  void uncache() FL_OVERRIDE;
+  void label(Fl_Widget*w) override;
+  void label(Fl_Menu_Item*m) override;
+  void uncache() override;
   int cache_w() {return cache_w_;}
   int cache_h() {return cache_h_;}
 };
diff --git a/FL/Fl_Positioner.H b/FL/Fl_Positioner.H
index ce1a7980b..57d16a073 100644
--- a/FL/Fl_Positioner.H
+++ b/FL/Fl_Positioner.H
@@ -44,11 +44,11 @@ protected:
   // these allow subclasses to put the dial in a smaller area:
   void draw(int, int, int, int);
   int handle(int, int, int, int, int);
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
 
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   /**
     Creates a new Fl_Positioner widget using the given position,
     size, and label string. The default boxtype is FL_NO_BOX.
diff --git a/FL/Fl_PostScript.H b/FL/Fl_PostScript.H
index b03a0a0dc..8de3f60c1 100644
--- a/FL/Fl_PostScript.H
+++ b/FL/Fl_PostScript.H
@@ -91,7 +91,7 @@ public:
   /** The destructor. */
   ~Fl_PostScript_File_Device();
   /** Don't use with this class. */
-  int begin_job(int pagecount, int* from, int* to, char **perr_message) FL_OVERRIDE;
+  int begin_job(int pagecount, int* from, int* to, char **perr_message) override;
   /** Begins the session where all graphics requests will go to a local PostScript file.
    Opens a file dialog to select an output PostScript file.
    This member function makes end_job() close the resulting PostScript file and display an
@@ -128,28 +128,28 @@ public:
     return begin_job(ps_output, pagecount, format, layout);
   }
 
-  int begin_page (void) FL_OVERRIDE;
-  int printable_rect(int *w, int *h) FL_OVERRIDE;
-  void margins(int *left, int *top, int *right, int *bottom) FL_OVERRIDE;
-  void origin(int *x, int *y) FL_OVERRIDE;
-  void origin(int x, int y) FL_OVERRIDE;
-  void scale (float scale_x, float scale_y = 0.) FL_OVERRIDE;
-  void rotate(float angle) FL_OVERRIDE;
-  void translate(int x, int y) FL_OVERRIDE;
-  void untranslate(void) FL_OVERRIDE;
-  int end_page (void) FL_OVERRIDE;
+  int begin_page (void) override;
+  int printable_rect(int *w, int *h) override;
+  void margins(int *left, int *top, int *right, int *bottom) override;
+  void origin(int *x, int *y) override;
+  void origin(int x, int y) override;
+  void scale (float scale_x, float scale_y = 0.) override;
+  void rotate(float angle) override;
+  void translate(int x, int y) override;
+  void untranslate(void) override;
+  int end_page (void) override;
   /** Completes all PostScript output.
    This also closes with \p fclose() the underlying file() unless close_command() was used to set another function.
    */
-  void end_job(void) FL_OVERRIDE;
+  void end_job(void) override;
   /** Label of the PostScript file chooser window */
   static const char *file_chooser_title;
   /** Returns the underlying FILE* receiving all PostScript data */
   FILE *file();
   /** Sets the function end_job() calls to close the file() */
   void close_command(Fl_PostScript_Close_Command cmd);
-  void set_current() FL_OVERRIDE;
-  void end_current() FL_OVERRIDE;
+  void set_current() override;
+  void end_current() override;
 };
 
 /** Encapsulated PostScript drawing surface.
@@ -198,13 +198,13 @@ public:
    with fl_alert().
    */
   ~Fl_EPS_File_Surface();
-  int printable_rect(int *w, int *h) FL_OVERRIDE;
+  int printable_rect(int *w, int *h) override;
   /** Returns the underlying FILE pointer */
   FILE *file();
-  void origin(int x, int y) FL_OVERRIDE;
-  void origin(int *px, int *py) FL_OVERRIDE;
-  void translate(int x, int y) FL_OVERRIDE;
-  void untranslate() FL_OVERRIDE;
+  void origin(int x, int y) override;
+  void origin(int *px, int *py) override;
+  void translate(int x, int y) override;
+  void untranslate() override;
   /** Completes all EPS output.
    The only operation possible with the Fl_EPS_File_Surface object after calling close() is its destruction.
    \return The status code of output operations to the FILE object. 0 indicates success. */
diff --git a/FL/Fl_Printer.H b/FL/Fl_Printer.H
index 3efa5f74c..31926eff3 100644
--- a/FL/Fl_Printer.H
+++ b/FL/Fl_Printer.H
@@ -106,20 +106,20 @@ private:
 public:
   /** The constructor */
   Fl_Printer(void);
-  int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message = NULL) FL_OVERRIDE;
-  int begin_page(void) FL_OVERRIDE;
-  int printable_rect(int *w, int *h) FL_OVERRIDE;
-  void margins(int *left, int *top, int *right, int *bottom) FL_OVERRIDE;
-  void origin(int *x, int *y) FL_OVERRIDE;
-  void origin(int x, int y) FL_OVERRIDE;
-  void scale(float scale_x, float scale_y = 0.) FL_OVERRIDE;
-  void rotate(float angle) FL_OVERRIDE;
-  void translate(int x, int y) FL_OVERRIDE;
-  void untranslate(void) FL_OVERRIDE;
-  int end_page (void) FL_OVERRIDE;
-  void end_job (void) FL_OVERRIDE;
-  void set_current(void) FL_OVERRIDE;
-  bool is_current() FL_OVERRIDE;
+  int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message = NULL) override;
+  int begin_page(void) override;
+  int printable_rect(int *w, int *h) override;
+  void margins(int *left, int *top, int *right, int *bottom) override;
+  void origin(int *x, int *y) override;
+  void origin(int x, int y) override;
+  void scale(float scale_x, float scale_y = 0.) override;
+  void rotate(float angle) override;
+  void translate(int x, int y) override;
+  void untranslate(void) override;
+  int end_page (void) override;
+  void end_job (void) override;
+  void set_current(void) override;
+  bool is_current() override;
 
   /** \name These attributes are useful for the Linux/Unix platform only.
    \{
diff --git a/FL/Fl_Progress.H b/FL/Fl_Progress.H
index 81c4f8241..9fa7b72a8 100644
--- a/FL/Fl_Progress.H
+++ b/FL/Fl_Progress.H
@@ -41,7 +41,7 @@ class FL_EXPORT Fl_Progress : public Fl_Widget {
 
   protected:
 
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
   public:
 
diff --git a/FL/Fl_Repeat_Button.H b/FL/Fl_Repeat_Button.H
index f80008e00..7e85b0bfb 100644
--- a/FL/Fl_Repeat_Button.H
+++ b/FL/Fl_Repeat_Button.H
@@ -31,7 +31,7 @@
 class FL_EXPORT Fl_Repeat_Button : public Fl_Button {
   static void repeat_callback(void *);
 public:
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   /**
     Creates a new Fl_Repeat_Button widget using the given
     position, size, and label string. The default boxtype is FL_UP_BOX.
diff --git a/FL/Fl_Return_Button.H b/FL/Fl_Return_Button.H
index 81ce47873..2f344aeeb 100644
--- a/FL/Fl_Return_Button.H
+++ b/FL/Fl_Return_Button.H
@@ -30,9 +30,9 @@
 */
 class FL_EXPORT Fl_Return_Button : public Fl_Button {
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
 public:
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   /**
     Creates a new Fl_Return_Button widget using the given
     position, size, and label string. The default boxtype is FL_UP_BOX.
diff --git a/FL/Fl_Roller.H b/FL/Fl_Roller.H
index dc9aa4381..03ec835ac 100644
--- a/FL/Fl_Roller.H
+++ b/FL/Fl_Roller.H
@@ -37,9 +37,9 @@
 */
 class FL_EXPORT Fl_Roller : public Fl_Valuator {
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
 public:
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   Fl_Roller(int X,int Y,int W,int H,const char* L=0);
 };
 
diff --git a/FL/Fl_SVG_File_Surface.H b/FL/Fl_SVG_File_Surface.H
index 2a8061e16..0fe06daa6 100644
--- a/FL/Fl_SVG_File_Surface.H
+++ b/FL/Fl_SVG_File_Surface.H
@@ -65,11 +65,11 @@ public:
   ~Fl_SVG_File_Surface();
   /** Returns the underlying FILE pointer */
   FILE *file();
-  void origin(int x, int y) FL_OVERRIDE;
-  void origin(int *x, int *y) FL_OVERRIDE;
-  void translate(int x, int y) FL_OVERRIDE;
-  void untranslate() FL_OVERRIDE;
-  int printable_rect(int *w, int *h) FL_OVERRIDE;
+  void origin(int x, int y) override;
+  void origin(int *x, int *y) override;
+  void translate(int x, int y) override;
+  void untranslate() override;
+  int printable_rect(int *w, int *h) override;
   /** Closes the FILE pointer where SVG data is output.
   The underlying FILE is closed by function fclose() unless another function was set at object's construction time.
   The only operation possible after this on the Fl_SVG_File_Surface object is its destruction.
diff --git a/FL/Fl_SVG_Image.H b/FL/Fl_SVG_Image.H
index 6d9f77777..a8a505928 100644
--- a/FL/Fl_SVG_Image.H
+++ b/FL/Fl_SVG_Image.H
@@ -146,7 +146,7 @@ private:
   float average_weight_;
   float svg_scaling_(int W, int H);
   void rasterize_(int W, int H);
-  void cache_size_(int &width, int &height) FL_OVERRIDE;
+  void cache_size_(int &width, int &height) override;
   void init_(const char *name, const unsigned char *filedata, size_t length);
   Fl_SVG_Image(const Fl_SVG_Image *source);
 public:
@@ -157,17 +157,17 @@ public:
   Fl_SVG_Image(const char *sharedname, const char *svg_data);
   Fl_SVG_Image(const char *sharedname, const unsigned char *svg_data, size_t length);
   virtual ~Fl_SVG_Image();
-  Fl_Image *copy(int W, int H) const FL_OVERRIDE;
+  Fl_Image *copy(int W, int H) const override;
   Fl_Image *copy() const {
     return Fl_Image::copy();
   }
   void resize(int width, int height);
-  void desaturate() FL_OVERRIDE;
-  void color_average(Fl_Color c, float i) FL_OVERRIDE;
-  void draw(int X, int Y, int W, int H, int cx = 0, int cy = 0) FL_OVERRIDE;
+  void desaturate() override;
+  void color_average(Fl_Color c, float i) override;
+  void draw(int X, int Y, int W, int H, int cx = 0, int cy = 0) override;
   void draw(int X, int Y) { draw(X, Y, w(), h(), 0, 0); }
-  Fl_SVG_Image *as_svg_image() FL_OVERRIDE { return this; }
-  void normalize() FL_OVERRIDE;
+  Fl_SVG_Image *as_svg_image() override { return this; }
+  void normalize() override;
 };
 
 #endif // FL_SVG_IMAGE_H
diff --git a/FL/Fl_Scheme_Choice.H b/FL/Fl_Scheme_Choice.H
index 336d43fb3..7bcdd05bb 100644
--- a/FL/Fl_Scheme_Choice.H
+++ b/FL/Fl_Scheme_Choice.H
@@ -28,7 +28,7 @@ protected:
 
 public:
   Fl_Scheme_Choice(int X, int Y, int W, int H, const char *L = 0);
-  int handle(int event) FL_OVERRIDE;
+  int handle(int event) override;
 
   // set the current value according to the active scheme
   virtual void init_value();
diff --git a/FL/Fl_Scroll.H b/FL/Fl_Scroll.H
index 0331c8330..fbcd02946 100644
--- a/FL/Fl_Scroll.H
+++ b/FL/Fl_Scroll.H
@@ -146,19 +146,19 @@ protected:      //  (STR#1895)
 
 protected:
 
-  int on_insert(Fl_Widget*, int) FL_OVERRIDE;
-  int on_move(int, int) FL_OVERRIDE;
+  int on_insert(Fl_Widget*, int) override;
+  int on_move(int, int) override;
   void fix_scrollbar_order();
   void bbox(int&,int&,int&,int&) const;
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
 
   Fl_Scrollbar scrollbar;
   Fl_Scrollbar hscrollbar;
 
-  void resize(int X, int Y, int W, int H) FL_OVERRIDE;
-  int handle(int) FL_OVERRIDE;
+  void resize(int X, int Y, int W, int H) override;
+  int handle(int) override;
 
   Fl_Scroll(int X, int Y, int W, int H, const char *L = 0);
   virtual ~Fl_Scroll();
@@ -181,7 +181,7 @@ public:
   void clear();
 
   /* delete child n (by index) */
-  int delete_child(int n) FL_OVERRIDE;
+  int delete_child(int n) override;
 
   /**
     Gets the current size of the scrollbars' troughs, in pixels.
diff --git a/FL/Fl_Scrollbar.H b/FL/Fl_Scrollbar.H
index 8e7a45ee9..23cc21d9c 100644
--- a/FL/Fl_Scrollbar.H
+++ b/FL/Fl_Scrollbar.H
@@ -45,13 +45,13 @@ class FL_EXPORT Fl_Scrollbar : public Fl_Slider {
   static void timeout_cb(void*);
   void increment_cb();
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
 
   Fl_Scrollbar(int X,int Y,int W,int H, const char *L = 0);
   ~Fl_Scrollbar();
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
 
   /**
     Gets the integer value (position) of the slider in the scrollbar.
diff --git a/FL/Fl_Secret_Input.H b/FL/Fl_Secret_Input.H
index bd4ca30f9..0d66d70a4 100644
--- a/FL/Fl_Secret_Input.H
+++ b/FL/Fl_Secret_Input.H
@@ -39,7 +39,7 @@ public:
     Inherited destructor destroys the widget and any value associated with it.
   */
   Fl_Secret_Input(int X,int Y,int W,int H,const char *l = 0);
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
 };
 
 #endif
diff --git a/FL/Fl_Shared_Image.H b/FL/Fl_Shared_Image.H
index fec770041..c8dee6239 100644
--- a/FL/Fl_Shared_Image.H
+++ b/FL/Fl_Shared_Image.H
@@ -145,22 +145,22 @@ public:
   */
   int original() { return original_; }
 
-  void  release() FL_OVERRIDE;
+  void  release() override;
   virtual void  reload();
 
-  Fl_Shared_Image *as_shared_image() FL_OVERRIDE {
+  Fl_Shared_Image *as_shared_image() override {
     return this;
   }
 
-  Fl_Image *copy(int W, int H) const FL_OVERRIDE;
+  Fl_Image *copy(int W, int H) const override;
   Fl_Image *copy() const;
   Fl_Image *copy();
 
-  void color_average(Fl_Color c, float i) FL_OVERRIDE;
-  void desaturate() FL_OVERRIDE;
-  void draw(int X, int Y, int W, int H, int cx = 0, int cy = 0) FL_OVERRIDE;
+  void color_average(Fl_Color c, float i) override;
+  void desaturate() override;
+  void draw(int X, int Y, int W, int H, int cx = 0, int cy = 0) override;
   void draw(int X, int Y) { draw(X, Y, w(), h(), 0, 0); }
-  void uncache() FL_OVERRIDE;
+  void uncache() override;
 
   static Fl_Shared_Image *find(const char *name, int W = 0, int H = 0);
   static Fl_Shared_Image *get(const char *name, int W = 0, int H = 0);
diff --git a/FL/Fl_Shortcut_Button.H b/FL/Fl_Shortcut_Button.H
index 8e9511246..2baa55f3a 100644
--- a/FL/Fl_Shortcut_Button.H
+++ b/FL/Fl_Shortcut_Button.H
@@ -27,8 +27,8 @@ private:
 protected:
   Fl_Shortcut shortcut_value;
   void do_end_hot_callback();
-  int handle(int) FL_OVERRIDE;
-  void draw() FL_OVERRIDE;
+  int handle(int) override;
+  void draw() override;
 public:
   Fl_Shortcut_Button(int X,int Y,int W,int H, const char* l = 0);
   void value(Fl_Shortcut shortcut);
diff --git a/FL/Fl_Single_Window.H b/FL/Fl_Single_Window.H
index 7cbb38722..6c8a669ea 100644
--- a/FL/Fl_Single_Window.H
+++ b/FL/Fl_Single_Window.H
@@ -31,7 +31,7 @@
 */
 class FL_EXPORT Fl_Single_Window : public Fl_Window {
 public:
-  void show() FL_OVERRIDE;
+  void show() override;
   /** Same as Fl_Window::show(int argc, char **argv) */
   void show(int argc, char **argv) { Fl_Window::show(argc, argv);}
 
@@ -55,7 +55,7 @@ public:
   /**
     Same as Fl_Window::flush()
   */
-  void flush() FL_OVERRIDE { Fl_Window::flush(); }
+  void flush() override { Fl_Window::flush(); }
 };
 
 #endif
diff --git a/FL/Fl_Slider.H b/FL/Fl_Slider.H
index 071423864..030085c22 100644
--- a/FL/Fl_Slider.H
+++ b/FL/Fl_Slider.H
@@ -68,11 +68,11 @@ protected:
   // these allow subclasses to put the slider in a smaller area:
   void draw(int, int, int, int);
   int handle(int, int, int, int, int);
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
 
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   Fl_Slider(int X,int Y,int W,int H, const char *L = 0);
   Fl_Slider(uchar t,int X,int Y,int W,int H, const char *L);
 
diff --git a/FL/Fl_Spinner.H b/FL/Fl_Spinner.H
index cad68a3a0..93b3431bc 100644
--- a/FL/Fl_Spinner.H
+++ b/FL/Fl_Spinner.H
@@ -58,7 +58,7 @@ protected:
   public:
     Fl_Spinner_Input(int X, int Y, int W, int H)
     : Fl_Input(X, Y, W, H) {}
-    int handle(int event) FL_OVERRIDE; // implemented in src/Fl_Spinner.cxx
+    int handle(int event) override; // implemented in src/Fl_Spinner.cxx
   };
 
   Fl_Spinner_Input input_;              // Input field for the value
@@ -66,16 +66,16 @@ protected:
                 up_button_,             // Up button
                 down_button_;           // Down button
 
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
 
   // Constructor
   Fl_Spinner(int X, int Y, int W, int H, const char *L = 0);
   // Event handling
-  int handle(int event) FL_OVERRIDE;
+  int handle(int event) override;
   // Resize group and subwidgets
-  void resize(int X, int Y, int W, int H) FL_OVERRIDE;
+  void resize(int X, int Y, int W, int H) override;
 
   /** Returns the format string for the value. */
   const char *format() const { return (format_); }
diff --git a/FL/Fl_Sys_Menu_Bar.H b/FL/Fl_Sys_Menu_Bar.H
index aff118c7a..fbc145219 100644
--- a/FL/Fl_Sys_Menu_Bar.H
+++ b/FL/Fl_Sys_Menu_Bar.H
@@ -95,7 +95,7 @@ class Fl_Sys_Menu_Bar_Driver;
 class FL_EXPORT Fl_Sys_Menu_Bar : public Fl_Menu_Bar {
   static Fl_Sys_Menu_Bar_Driver *driver();
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
 public:
   /** Possible styles of the Window menu in the system menu bar */
   typedef enum {
@@ -110,8 +110,8 @@ public:
    */
   const Fl_Menu_Item *menu() const {return Fl_Menu_::menu();}
   void menu(const Fl_Menu_Item *m);
-  void update() FL_OVERRIDE;
-  void play_menu(const Fl_Menu_Item *) FL_OVERRIDE;
+  void update() override;
+  void play_menu(const Fl_Menu_Item *) override;
   int add(const char* label, int shortcut, Fl_Callback*, void *user_data=0, int flags=0);
   /** Adds a new menu item.
    \see Fl_Menu_::add(const char* label, int shortcut, Fl_Callback*, void *user_data=0, int flags=0)
diff --git a/FL/Fl_Table.H b/FL/Fl_Table.H
index d4a149da5..fa3428ef2 100644
--- a/FL/Fl_Table.H
+++ b/FL/Fl_Table.H
@@ -237,7 +237,7 @@ protected:
   Fl_Scrollbar *hscrollbar;                     ///< child horizontal scrollbar widget
 
   // Fltk
-  int handle(int e) FL_OVERRIDE;        // fltk handle() FL_OVERRIDE
+  int handle(int e) override;        // fltk handle() override
 
   // Class maintenance
   void recalc_dimensions();
@@ -403,7 +403,7 @@ protected:
   }
 
   // draw() has to be protected per FLTK convention (was public in 1.3.x)
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
   Fl_Table(int X, int Y, int W, int H, const char *l=0);
@@ -730,7 +730,7 @@ public:
   void set_selection(int row_top, int col_left, int row_bot, int col_right);
   int move_cursor(int R, int C, int shiftselect);
   int move_cursor(int R, int C);
-  void resize(int X, int Y, int W, int H) FL_OVERRIDE; // fltk resize() FL_OVERRIDE
+  void resize(int X, int Y, int W, int H) override; // fltk resize() override
 
   // This crashes sortapp() during init.
   //  void box(Fl_Boxtype val) {
diff --git a/FL/Fl_Table_Row.H b/FL/Fl_Table_Row.H
index 28b1d05b4..5e561104d 100644
--- a/FL/Fl_Table_Row.H
+++ b/FL/Fl_Table_Row.H
@@ -67,7 +67,7 @@ private:
   TableRowSelectMode _selectmode;
 
 protected:
-  int handle(int event) FL_OVERRIDE;
+  int handle(int event) override;
   int find_cell(TableContext context,           // find cell's x/y/w/h given r/c
                 int R, int C, int &X, int &Y, int &W, int &H) {
     return(Fl_Table::find_cell(context, R, C, X, Y, W, H));
@@ -94,7 +94,7 @@ public:
    */
   ~Fl_Table_Row() { }
 
-  void rows(int val) FL_OVERRIDE; // set number of rows
+  void rows(int val) override; // set number of rows
   int rows() {                          // get number of rows
     return(Fl_Table::rows());
   }
@@ -124,7 +124,7 @@ public:
    */
   void select_all_rows(int flag=1);     // all rows to a known state
 
-  void clear() FL_OVERRIDE {
+  void clear() override {
     rows(0);            // implies clearing selection
     cols(0);
     Fl_Table::clear();  // clear the table
diff --git a/FL/Fl_Tabs.H b/FL/Fl_Tabs.H
index b1824142f..3ac76e3b5 100644
--- a/FL/Fl_Tabs.H
+++ b/FL/Fl_Tabs.H
@@ -266,9 +266,9 @@ protected:
   void handle_overflow_menu();
   void draw_overflow_menu_button();
 
-  int on_insert(Fl_Widget*, int) FL_OVERRIDE;
-  int on_move(int, int) FL_OVERRIDE;
-  void on_remove(int) FL_OVERRIDE;
+  int on_insert(Fl_Widget*, int) override;
+  int on_move(int, int) override;
+  void on_remove(int) override;
 
   virtual void redraw_tabs();
   virtual int tab_positions();  // allocate and calculate tab positions
@@ -279,17 +279,17 @@ protected:
   virtual int hit_overflow_menu(int event_x, int event_y);
   virtual int hit_tabs_area(int event_x, int event_y);
 
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
 
   Fl_Tabs(int X, int Y, int W, int H, const char *L = 0);
-  ~Fl_Tabs() FL_OVERRIDE;
+  ~Fl_Tabs() override;
 
-  void resize(int, int, int, int) FL_OVERRIDE;
-  void show() FL_OVERRIDE;
+  void resize(int, int, int, int) override;
+  void show() override;
 
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   Fl_Widget *value();
   int value(Fl_Widget *);
 
diff --git a/FL/Fl_Terminal.H b/FL/Fl_Terminal.H
index 7752ece28..dcf038bb6 100644
--- a/FL/Fl_Terminal.H
+++ b/FL/Fl_Terminal.H
@@ -1041,9 +1041,9 @@ private:
   int  handle_selection(int e);
 public:
   // FLTK: draw(), resize(), handle()
-  void draw(void) FL_OVERRIDE;
-  void resize(int X,int Y,int W,int H) FL_OVERRIDE;
-  int  handle(int e) FL_OVERRIDE;
+  void draw(void) override;
+  void resize(int X,int Y,int W,int H) override;
+  int  handle(int e) override;
   const char* text(bool lines_below_cursor=false) const;
 
 protected:
diff --git a/FL/Fl_Text_Display.H b/FL/Fl_Text_Display.H
index 0cf218383..c997f9ce2 100644
--- a/FL/Fl_Text_Display.H
+++ b/FL/Fl_Text_Display.H
@@ -167,7 +167,7 @@ public:
   Fl_Text_Display(int X, int Y, int W, int H, const char *l = 0);
   ~Fl_Text_Display();
 
-  int handle(int e) FL_OVERRIDE;
+  int handle(int e) override;
 
   void buffer(Fl_Text_Buffer* buf);
 
@@ -434,7 +434,7 @@ public:
 
   virtual void recalc_display();
   virtual void display_needs_recalc();
-  void resize(int X, int Y, int W, int H) FL_OVERRIDE;
+  void resize(int X, int Y, int W, int H) override;
 
   /**
    Convert an x pixel position into a column number.
@@ -472,7 +472,7 @@ protected:
   // Anything with "vline" indicates thats it deals with currently
   // visible lines.
 
-  void draw() FL_OVERRIDE;
+  void draw() override;
   void draw_text(int X, int Y, int W, int H);
   void draw_range(int start, int end);
   void draw_cursor(int, int);
diff --git a/FL/Fl_Text_Editor.H b/FL/Fl_Text_Editor.H
index 16af25451..fbe38ddb8 100644
--- a/FL/Fl_Text_Editor.H
+++ b/FL/Fl_Text_Editor.H
@@ -50,7 +50,7 @@ class FL_EXPORT Fl_Text_Editor : public Fl_Text_Display {
 
     Fl_Text_Editor(int X, int Y, int W, int H, const char* l = 0);
     ~Fl_Text_Editor() { remove_all_key_bindings(); }
-    int handle(int e) FL_OVERRIDE;
+    int handle(int e) override;
     /**
         Sets the current insert mode; if non-zero, new text
         is inserted before the current cursor position. Otherwise, new
diff --git a/FL/Fl_Tile.H b/FL/Fl_Tile.H
index 189e0f6da..aecb382ba 100644
--- a/FL/Fl_Tile.H
+++ b/FL/Fl_Tile.H
@@ -26,10 +26,10 @@
 
 class FL_EXPORT Fl_Tile : public Fl_Group {
 public:
-  int handle(int event) FL_OVERRIDE;
+  int handle(int event) override;
   Fl_Tile(int X, int Y, int W, int H, const char *L=0);
-  ~Fl_Tile() FL_OVERRIDE;
-  void resize(int X, int Y, int W, int H) FL_OVERRIDE;
+  ~Fl_Tile() override;
+  void resize(int X, int Y, int W, int H) override;
   virtual void move_intersection(int oldx, int oldy, int newx, int newy);
   virtual void drag_intersection(int oldx, int oldy, int newx, int newy);
   FL_DEPRECATED("since 1.4.0 - use move_intersection(p) instead",
@@ -67,9 +67,9 @@ protected:
   void request_grow_t(int old_t, int &new_t, Fl_Rect *final_size);
   void request_grow_b(int old_b, int &new_b, Fl_Rect *final_size);
 
-  int on_insert(Fl_Widget*, int) FL_OVERRIDE;
-  int on_move(int, int) FL_OVERRIDE;
-  void on_remove(int) FL_OVERRIDE;
+  int on_insert(Fl_Widget*, int) override;
+  int on_move(int, int) override;
+  void on_remove(int) override;
 };
 
 #endif
diff --git a/FL/Fl_Tiled_Image.H b/FL/Fl_Tiled_Image.H
index 10015aa32..bfc748ddb 100644
--- a/FL/Fl_Tiled_Image.H
+++ b/FL/Fl_Tiled_Image.H
@@ -39,13 +39,13 @@ public:
   Fl_Tiled_Image(Fl_Image *i, int W = 0, int H = 0);
   virtual ~Fl_Tiled_Image();
 
-  Fl_Image *copy(int W, int H) const FL_OVERRIDE;
+  Fl_Image *copy(int W, int H) const override;
   Fl_Image *copy() const {
     return Fl_Image::copy();
   }
-  void color_average(Fl_Color c, float i) FL_OVERRIDE;
-  void desaturate() FL_OVERRIDE;
-  void draw(int X, int Y, int W, int H, int cx = 0, int cy = 0) FL_OVERRIDE;
+  void color_average(Fl_Color c, float i) override;
+  void desaturate() override;
+  void draw(int X, int Y, int W, int H, int cx = 0, int cy = 0) override;
   void draw(int X, int Y) { draw(X, Y, w(), h(), 0, 0); }
   /** Gets The image that is tiled */
   Fl_Image *image() { return image_; }
diff --git a/FL/Fl_Timer.H b/FL/Fl_Timer.H
index b79bbebfa..89f1a5d26 100644
--- a/FL/Fl_Timer.H
+++ b/FL/Fl_Timer.H
@@ -43,9 +43,9 @@ class FL_EXPORT Fl_Timer : public Fl_Widget {
   double delay, total;
   long lastsec,lastusec;
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
 public:
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   Fl_Timer(uchar t,int x,int y,int w,int h, const char *l);
   ~Fl_Timer();
   void value(double);
diff --git a/FL/Fl_Tree.H b/FL/Fl_Tree.H
index 6c2b7bf3c..d9b2a47aa 100644
--- a/FL/Fl_Tree.H
+++ b/FL/Fl_Tree.H
@@ -312,14 +312,14 @@ protected:
   // undocmented draw_tree() dropped -- draw() does all the work now
 
   // draw() has to be protected per FLTK convention (was public in 1.3.x)
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
   Fl_Tree(int X, int Y, int W, int H, const char *L=0);
   ~Fl_Tree();
-  int handle(int e) FL_OVERRIDE;
+  int handle(int e) override;
   void show_self();
-  void resize(int,int,int,int) FL_OVERRIDE;
+  void resize(int,int,int,int) override;
 
   ///////////////////////
   // root methods
diff --git a/FL/Fl_Valuator.H b/FL/Fl_Valuator.H
index 7562b0f17..7587bb298 100644
--- a/FL/Fl_Valuator.H
+++ b/FL/Fl_Valuator.H
@@ -70,7 +70,7 @@ protected:
 public:
 
   /** Destructor is accessible despite protected constructor. */
-  ~Fl_Valuator() FL_OVERRIDE { }
+  ~Fl_Valuator() override { }
     /**    Sets the minimum (a) and maximum (b) values for the valuator widget. */
     void bounds(double a, double b) {min=a; max=b;}
     /**    Gets the minimum value for the valuator.  */
diff --git a/FL/Fl_Value_Input.H b/FL/Fl_Value_Input.H
index 7aca4e9ba..f46818146 100644
--- a/FL/Fl_Value_Input.H
+++ b/FL/Fl_Value_Input.H
@@ -61,13 +61,13 @@ public:
 private:
   char soft_;
   static void input_cb(Fl_Widget*,void*);
-  void value_damage() FL_OVERRIDE; // cause damage() due to value() changing
+  void value_damage() override; // cause damage() due to value() changing
 public:
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
 public:
-  void resize(int,int,int,int) FL_OVERRIDE;
+  void resize(int,int,int,int) override;
   Fl_Value_Input(int x,int y,int w,int h,const char *l=0);
   ~Fl_Value_Input();
 
diff --git a/FL/Fl_Value_Output.H b/FL/Fl_Value_Output.H
index 4e380ea2a..1d1984da0 100644
--- a/FL/Fl_Value_Output.H
+++ b/FL/Fl_Value_Output.H
@@ -43,10 +43,10 @@ class FL_EXPORT Fl_Value_Output : public Fl_Valuator {
   Fl_Color textcolor_;
 
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   Fl_Value_Output(int x,int y,int w,int h,const char *l=0);
 
   /**
diff --git a/FL/Fl_Value_Slider.H b/FL/Fl_Value_Slider.H
index 3d7e42cba..9293c6831 100644
--- a/FL/Fl_Value_Slider.H
+++ b/FL/Fl_Value_Slider.H
@@ -36,10 +36,10 @@ class FL_EXPORT Fl_Value_Slider : public Fl_Slider {
   short value_height_;
 
 protected:
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
   Fl_Value_Slider(int x, int y, int w, int h, const char *l = 0);
 
   /** Gets the typeface of the text in the value box. */
diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H
index c5b13faba..4bd548bdf 100644
--- a/FL/Fl_Window.H
+++ b/FL/Fl_Window.H
@@ -97,7 +97,7 @@ protected:
 
   /** Stores the last window that was made current. See current() const */
   static Fl_Window *current_;
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
 
@@ -198,7 +198,7 @@ public:
   */
     virtual ~Fl_Window();
 
-  int handle(int) FL_OVERRIDE;
+  int handle(int) override;
 
   /**
     Changes the size and position of the window.  If shown() is true,
@@ -216,7 +216,7 @@ public:
     dimensions. It is up to the application developer to verify window
     parameters after the resize request.
   */
-  void resize(int X,int Y,int W,int H) FL_OVERRIDE;
+  void resize(int X,int Y,int W,int H) override;
   /** Sets whether or not the window manager border is around the window.
   The default value is true. The macOS platform ignores requests to change the
   border state of a fullscreen or maximized window.
@@ -458,12 +458,12 @@ public:
 
     \see Fl_Window::show(int argc, char **argv)
   */
-  void show() FL_OVERRIDE;
+  void show() override;
   /**
     Removes the window from the screen.  If the window is already hidden or
     has not been shown then this does nothing and is harmless.
   */
-  void hide() FL_OVERRIDE;
+  void hide() override;
   /**
     Puts the window on the screen with show() and parses command-line arguments.
 
@@ -596,8 +596,8 @@ public:
   int decorated_h() const;
 
   // Note: Doxygen docs in Fl_Widget.H to avoid redundancy.
-  Fl_Window* as_window() FL_OVERRIDE { return this; }
-  Fl_Window const* as_window() const FL_OVERRIDE { return this; }
+  Fl_Window* as_window() override { return this; }
+  Fl_Window const* as_window() const override { return this; }
 
   /**
    Return non-null if this is an Fl_Overlay_Window object.
diff --git a/FL/Fl_Wizard.H b/FL/Fl_Wizard.H
index b45d21892..37b781d3a 100644
--- a/FL/Fl_Wizard.H
+++ b/FL/Fl_Wizard.H
@@ -43,7 +43,7 @@ class FL_EXPORT Fl_Wizard : public Fl_Group {
 
 protected:
 
-  void draw() FL_OVERRIDE;
+  void draw() override;
 
 public:
 
diff --git a/FL/forms.H b/FL/forms.H
index 076c54d6f..c76025989 100644
--- a/FL/forms.H
+++ b/FL/forms.H
@@ -803,7 +803,7 @@ inline void fl_set_slider_precision(Fl_Widget* o, int i) {
 // meaning of FL_ALIGN_INSIDE.  Implementation in forms.cxx
 class FL_EXPORT Fl_FormsText : public Fl_Widget {
 protected:
-    void draw() FL_OVERRIDE;
+    void draw() override;
 public:
     Fl_FormsText(Fl_Boxtype b, int X, int Y, int W, int H, const char* l=0)
         : Fl_Widget(X,Y,W,H,l) {box(b); align(FL_ALIGN_LEFT);}
diff --git a/FL/glut.H b/FL/glut.H
index 6ddf27016..435059510 100644
--- a/FL/glut.H
+++ b/FL/glut.H
@@ -54,9 +54,9 @@ class FL_EXPORT Fl_Glut_Window : public Fl_Gl_Window {
   void _init();
   int mouse_down;
 protected:
-  void draw() FL_OVERRIDE;
-  void draw_overlay() FL_OVERRIDE;
-  int handle(int) FL_OVERRIDE;
+  void draw() override;
+  void draw_overlay() override;
+  int handle(int) override;
 public: // so the inline functions work
   int number;
   int menu[3];