Use `FL_OVERRIDE` for all overridden virtual methods (#611)

FL_OVERRIDE is defined as `override` for C++11 and higher
FL_OVERRIDE is defined as `override` for VisualC 2015 and newer
Don't interfere with Fl_Widget::override()

3 files changed, 88 insertions, 88 deletions

diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.H b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.H
index e67447b4d..2932a3f1c 100644
--- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.H
+++ b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.H
@@ -25,15 +25,15 @@
 
 class Fl_Xlib_Copy_Surface_Driver : public Fl_Copy_Surface_Driver {
   friend class Fl_Copy_Surface_Driver;
-  virtual void end_current();
+  void end_current() FL_OVERRIDE;
 protected:
   Fl_Offscreen xid;
   Window oldwindow;
   Fl_Xlib_Copy_Surface_Driver(int w, int h);
   ~Fl_Xlib_Copy_Surface_Driver();
-  void set_current();
-  void translate(int x, int y);
-  void untranslate();
+  void set_current() FL_OVERRIDE;
+  void translate(int x, int y) FL_OVERRIDE;
+  void untranslate() FL_OVERRIDE;
 #if FLTK_USE_CAIRO
   cairo_t *cairo_;
 #endif
diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
index 016ace499..6142217d5 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
@@ -57,26 +57,26 @@ private:
   unsigned depth_; // depth of translation stack
   int stack_x_[FL_XLIB_GRAPHICS_TRANSLATION_STACK_SIZE]; // translation stack allowing cumulative translations
   int stack_y_[FL_XLIB_GRAPHICS_TRANSLATION_STACK_SIZE];
-  virtual void set_current_();
+  void set_current_() FL_OVERRIDE;
   int clip_max_; // +/- x/y coordinate limit (16-bit coordinate space)
-  virtual void draw_fixed(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy);
-  virtual void draw_fixed(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy);
-  virtual void draw_fixed(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy);
+  void draw_fixed(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE;
+  void draw_fixed(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE;
+  void draw_fixed(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE;
 #if USE_PANGO
   double do_width_unscaled_(const char *str, int n);
 #endif
 protected:
-  virtual void draw_image_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0);
-  virtual void draw_image_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3);
-  virtual void draw_image_mono_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0);
-  virtual void draw_image_mono_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1);
+  void draw_image_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0) FL_OVERRIDE;
+  void draw_image_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3) FL_OVERRIDE;
+  void draw_image_mono_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0) FL_OVERRIDE;
+  void draw_image_mono_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1) FL_OVERRIDE;
 #if HAVE_XRENDER
-  virtual void draw_rgb(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy);
+  void draw_rgb(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE;
   int scale_and_render_pixmap(Fl_Offscreen pixmap, int depth, double scale_x, double scale_y, int XP, int YP, int WP, int HP);
 #endif
-  virtual int height_unscaled();
-  virtual int descent_unscaled();
-  virtual Fl_Region scale_clip(float f);
+  int height_unscaled() FL_OVERRIDE;
+  int descent_unscaled() FL_OVERRIDE;
+  Fl_Region scale_clip(float f) FL_OVERRIDE;
 #if USE_XFT
   void drawUCS4(const void *str, int n, int x, int y);
 #endif
@@ -95,24 +95,24 @@ private:
 #endif
   static GC gc_;
   uchar *mask_bitmap_;
-  uchar **mask_bitmap() {return &mask_bitmap_;}
+  uchar **mask_bitmap() FL_OVERRIDE {return &mask_bitmap_;}
   XPoint *short_point;
 #if USE_XFT
   static Window draw_window;
   static struct _XftDraw* draw_;
 #endif
-  void cache(Fl_RGB_Image *img);
+  void cache(Fl_RGB_Image *img) FL_OVERRIDE;
 public:
   Fl_Xlib_Graphics_Driver(void);
-  virtual ~Fl_Xlib_Graphics_Driver();
+  ~Fl_Xlib_Graphics_Driver() FL_OVERRIDE;
   void translate_all(int dx, int dy);
   void untranslate_all();
-  virtual void scale(float f);
+  void scale(float f) FL_OVERRIDE;
   float scale() {return Fl_Graphics_Driver::scale();}
-  virtual int has_feature(driver_feature mask) { return mask & NATIVE; }
-  virtual void *gc() { return gc_; }
-  virtual void gc(void *value);
-  char can_do_alpha_blending();
+  int has_feature(driver_feature mask) FL_OVERRIDE { return mask & NATIVE; }
+  void *gc() FL_OVERRIDE { return gc_; }
+  void gc(void *value) FL_OVERRIDE;
+  char can_do_alpha_blending() FL_OVERRIDE;
 #if USE_XFT
   static void destroy_xft_draw(Window id);
 #endif
@@ -120,38 +120,38 @@ public:
 
   // --- bitmap stuff
   static unsigned long create_bitmask(int w, int h, const uchar *array); // NOT virtual
-  virtual void delete_bitmask(fl_uintptr_t bm);
-  virtual void draw_unscaled(const char* str, int n, int x, int y);
-  virtual void draw_unscaled(int angle, const char *str, int n, int x, int y);
-  virtual void rtl_draw_unscaled(const char* str, int n, int x, int y);
-  virtual void font_unscaled(Fl_Font face, Fl_Fontsize size);
-  void cache(Fl_Pixmap *img);
-  virtual void uncache_pixmap(fl_uintptr_t p);
-  void cache(Fl_Bitmap *img);
-  void uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_uintptr_t &mask_);
-  virtual double width_unscaled(const char *str, int n);
-  virtual double width_unscaled(unsigned int c);
-  virtual void text_extents_unscaled(const char*, int n, int& dx, int& dy, int& w, int& h);
-  virtual Fl_Fontsize size_unscaled();
-  virtual void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy);
-  void add_rectangle_to_region(Fl_Region r, int x, int y, int w, int h);
-  Fl_Region XRectangleRegion(int x, int y, int w, int h);
-  void XDestroyRegion(Fl_Region r);
+  void delete_bitmask(fl_uintptr_t bm) FL_OVERRIDE;
+  void draw_unscaled(const char* str, int n, int x, int y) FL_OVERRIDE;
+  void draw_unscaled(int angle, const char *str, int n, int x, int y) FL_OVERRIDE;
+  void rtl_draw_unscaled(const char* str, int n, int x, int y) FL_OVERRIDE;
+  void font_unscaled(Fl_Font face, Fl_Fontsize size) FL_OVERRIDE;
+  void cache(Fl_Pixmap *img) FL_OVERRIDE;
+  void uncache_pixmap(fl_uintptr_t p) FL_OVERRIDE;
+  void cache(Fl_Bitmap *img) FL_OVERRIDE;
+  void uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_uintptr_t &mask_) FL_OVERRIDE;
+  double width_unscaled(const char *str, int n) FL_OVERRIDE;
+  double width_unscaled(unsigned int c) FL_OVERRIDE;
+  void text_extents_unscaled(const char*, int n, int& dx, int& dy, int& w, int& h) FL_OVERRIDE;
+  Fl_Fontsize size_unscaled() FL_OVERRIDE;
+  void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) FL_OVERRIDE;
+  void add_rectangle_to_region(Fl_Region r, int x, int y, int w, int h) FL_OVERRIDE;
+  Fl_Region XRectangleRegion(int x, int y, int w, int h) FL_OVERRIDE;
+  void XDestroyRegion(Fl_Region r) FL_OVERRIDE;
 protected:
-  virtual void transformed_vertex0(float x, float y);
-  void fixloop();
-  virtual void focus_rect(int x, int y, int w, int h);
-  virtual void rectf_unscaled(int x, int y, int w, int h);
-  virtual void colored_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b);
-  virtual void line_unscaled(int x, int y, int x1, int y1);
-  virtual void xyline_unscaled(int x, int y, int x1);
-  virtual void *change_pen_width(int lwidth);
-  virtual void reset_pen_width(void *data);
-  virtual void yxline_unscaled(int x, int y, int y1);
-  virtual void loop_unscaled(int x0, int y0, int x1, int y1, int x2, int y2);
-  virtual void loop_unscaled(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
-  virtual void polygon_unscaled(int x0, int y0, int x1, int y1, int x2, int y2);
-  virtual void polygon_unscaled(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
+  void transformed_vertex0(float x, float y) FL_OVERRIDE;
+  void fixloop() FL_OVERRIDE;
+  void focus_rect(int x, int y, int w, int h) FL_OVERRIDE;
+  void rectf_unscaled(int x, int y, int w, int h) FL_OVERRIDE;
+  void colored_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) FL_OVERRIDE;
+  void line_unscaled(int x, int y, int x1, int y1) FL_OVERRIDE;
+  void xyline_unscaled(int x, int y, int x1) FL_OVERRIDE;
+  void *change_pen_width(int lwidth) FL_OVERRIDE;
+  void reset_pen_width(void *data) FL_OVERRIDE;
+  void yxline_unscaled(int x, int y, int y1) FL_OVERRIDE;
+  void loop_unscaled(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE;
+  void loop_unscaled(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE;
+  void polygon_unscaled(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE;
+  void polygon_unscaled(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE;
 
   // Scaling and clipping stuff for internal usage.
   // Currently specific to Fl_Xlib_Graphics_Driver (16-bit coordinate clipping)
@@ -184,36 +184,36 @@ protected:
   void draw_clipped_line(int x1, int y1, int x2, int y2);
 
   // --- clipping
-  void push_clip(int x, int y, int w, int h);
-  int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H);
-  int not_clipped(int x, int y, int w, int h);
-  void restore_clip();
-  void end_points();
-  void end_line();
-  void end_loop();
-  void end_polygon();
-  void end_complex_polygon();
-  bool can_fill_non_convex_polygon();
-  void gap();
-  virtual void ellipse_unscaled(double xt, double yt, double rx, double ry);
-  virtual void arc_unscaled(int x, int y, int w, int h, double a1, double a2);
-  virtual void pie_unscaled(int x, int y, int w, int h, double a1, double a2);
-  virtual void line_style_unscaled(int style, int width, char* dashes);
-  void color(Fl_Color c);
-  void set_color(Fl_Color i, unsigned int c);
-  void free_color(Fl_Color i, int overlay);
-  Fl_Color color() { return color_; }
-  void color(uchar r, uchar g, uchar b);
-  virtual float scale_font_for_PostScript(Fl_Font_Descriptor *desc, int s);
-  virtual const char* get_font_name(Fl_Font fnum, int* ap);
-  virtual int get_font_sizes(Fl_Font fnum, int*& sizep);
+  void push_clip(int x, int y, int w, int h) FL_OVERRIDE;
+  int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H) FL_OVERRIDE;
+  int not_clipped(int x, int y, int w, int h) FL_OVERRIDE;
+  void restore_clip() FL_OVERRIDE;
+  void end_points() FL_OVERRIDE;
+  void end_line() FL_OVERRIDE;
+  void end_loop() FL_OVERRIDE;
+  void end_polygon() FL_OVERRIDE;
+  void end_complex_polygon() FL_OVERRIDE;
+  bool can_fill_non_convex_polygon() FL_OVERRIDE;
+  void gap() FL_OVERRIDE;
+  void ellipse_unscaled(double xt, double yt, double rx, double ry) FL_OVERRIDE;
+  void arc_unscaled(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE;
+  void pie_unscaled(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE;
+  void line_style_unscaled(int style, int width, char* dashes) FL_OVERRIDE;
+  void color(Fl_Color c) FL_OVERRIDE;
+  void set_color(Fl_Color i, unsigned int c) FL_OVERRIDE;
+  void free_color(Fl_Color i, int overlay) FL_OVERRIDE;
+  Fl_Color color() FL_OVERRIDE { return color_; }
+  void color(uchar r, uchar g, uchar b) FL_OVERRIDE;
+  float scale_font_for_PostScript(Fl_Font_Descriptor *desc, int s) FL_OVERRIDE;
+  const char* get_font_name(Fl_Font fnum, int* ap) FL_OVERRIDE;
+  int get_font_sizes(Fl_Font fnum, int*& sizep) FL_OVERRIDE;
 #if !USE_XFT
-  virtual unsigned font_desc_size();
-  virtual float scale_bitmap_for_PostScript();
+  unsigned font_desc_size() FL_OVERRIDE;
+  float scale_bitmap_for_PostScript() FL_OVERRIDE;
 #endif
-  virtual const char *font_name(int num);
-  virtual void font_name(int num, const char *name);
-  virtual Fl_Font set_fonts(const char* xstarname);
+  const char *font_name(int num) FL_OVERRIDE;
+  void font_name(int num, const char *name) FL_OVERRIDE;
+  Fl_Font set_fonts(const char* xstarname) FL_OVERRIDE;
 };
 
 #endif // FL_XLIB_GRAPHICS_DRIVER_H
diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.H b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.H
index 3f8ecda7f..ab702840d 100644
--- a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.H
+++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.H
@@ -23,15 +23,15 @@
 #endif // FLTK_USE_CAIRO
 
 class Fl_Xlib_Image_Surface_Driver : public Fl_Image_Surface_Driver {
-  virtual void end_current();
+  void end_current() FL_OVERRIDE;
 public:
   Window pre_window;
   Fl_Xlib_Image_Surface_Driver(int w, int h, int high_res, Fl_Offscreen off);
   ~Fl_Xlib_Image_Surface_Driver();
-  void set_current();
-  void translate(int x, int y);
-  void untranslate();
-  Fl_RGB_Image *image();
+  void set_current() FL_OVERRIDE;
+  void translate(int x, int y) FL_OVERRIDE;
+  void untranslate() FL_OVERRIDE;
+  Fl_RGB_Image *image() FL_OVERRIDE;
 #if FLTK_USE_CAIRO
   cairo_t *cairo_;
 #endif