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, 117 insertions, 117 deletions

diff --git a/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.H b/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.H
index 6d8923c99..7eae4c2bc 100644
--- a/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.H
+++ b/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.H
@@ -27,9 +27,9 @@ protected:
   HDC gc;
   Fl_GDI_Copy_Surface_Driver(int w, int h);
   ~Fl_GDI_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;
 };
 
 #endif // FL_GDI_COPY_SURFACE_DRIVER_H
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
index 39af1e68e..6fa6840c8 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
@@ -47,112 +47,112 @@ private:
   BOOL alpha_blend_(int x, int y, int w, int h, HDC src_gc, int srcx, int srcy, int srcw, int srch);
   int depth; // to support translation
   POINT *origins; // to support translation
-  void set_current_();
-  void draw_fixed(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy);
-  void draw_fixed(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy);
-  virtual void make_unused_color_(unsigned char &r, unsigned char &g, unsigned char &b, int color_count, void **data);
+  void set_current_() FL_OVERRIDE;
+  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 make_unused_color_(unsigned char &r, unsigned char &g, unsigned char &b, int color_count, void **data) FL_OVERRIDE;
 protected:
-  void draw_fixed(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy);
-  void cache(Fl_RGB_Image *rgb);
+  void draw_fixed(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE;
+  void cache(Fl_RGB_Image *rgb) FL_OVERRIDE;
   HDC gc_;
   int numcount;
   int counts[20];
   uchar *mask_bitmap_;
-  uchar **mask_bitmap() {return &mask_bitmap_;}
+  uchar **mask_bitmap() FL_OVERRIDE {return &mask_bitmap_;}
   POINT *long_point;
 public:
   Fl_GDI_Graphics_Driver();
-  virtual ~Fl_GDI_Graphics_Driver();
-  virtual int has_feature(driver_feature mask) { return mask & NATIVE; }
-  char can_do_alpha_blending();
-  virtual void gc(void *ctxt) { gc_ = (HDC)ctxt; global_gc(); }
-  virtual void *gc() {return gc_;}
+  ~Fl_GDI_Graphics_Driver() FL_OVERRIDE;
+  int has_feature(driver_feature mask) FL_OVERRIDE { return mask & NATIVE; }
+  char can_do_alpha_blending() FL_OVERRIDE;
+  void gc(void *ctxt) FL_OVERRIDE { gc_ = (HDC)ctxt; global_gc(); }
+  void *gc() FL_OVERRIDE {return gc_;}
 
   // --- bitmap stuff
   static HBITMAP create_bitmask(int w, int h, const uchar *array); // NOT virtual
-  virtual void delete_bitmask(fl_uintptr_t bm);
+  void delete_bitmask(fl_uintptr_t bm) FL_OVERRIDE;
   HBITMAP create_alphamask(int w, int h, int d, int ld, const uchar *array);
-  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);
-  virtual void draw_rgb(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy);
-  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 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);
-  void text_extents_unscaled(const char*, int n, int& dx, int& dy, int& w, int& h);
-  int height_unscaled();
-  int descent_unscaled();
-  Fl_Fontsize size_unscaled();
+  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 draw_rgb(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE;
+  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;
+  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;
+  int height_unscaled() FL_OVERRIDE;
+  int descent_unscaled() FL_OVERRIDE;
+  Fl_Fontsize size_unscaled() FL_OVERRIDE;
 #if ! defined(FL_DOXYGEN)
   void copy_offscreen_with_alpha(int x,int y,int w,int h,HBITMAP bitmap,int srcx,int srcy);
 #endif
-  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 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;
   void translate_all(int x, int y);
   void untranslate_all(void);
   static HRGN scale_region(HRGN r, float f, Fl_GDI_Graphics_Driver *dr);
-  virtual void scale(float f);
+  void scale(float f) FL_OVERRIDE;
   float scale() {return Fl_Graphics_Driver::scale();}
 protected:
-  void transformed_vertex0(float x, float y);
-  void fixloop();
-  virtual void point(int x, int y);
-  void focus_rect(int x, int y, int w, int h);
-  virtual void rectf_unscaled(int x, int y, int w, int h);
+  void transformed_vertex0(float x, float y) FL_OVERRIDE;
+  void fixloop() FL_OVERRIDE;
+  void point(int x, int y) 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;
 #if USE_COLORMAP
-  virtual void colored_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b);
+  void colored_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) FL_OVERRIDE;
 #endif
-  virtual void line_unscaled(int x, int y, int x1, int y1);
-  virtual void line_unscaled(int x, int y, int x1, int y1, int x2, int y2);
-  virtual void xyline_unscaled(int x, int y, int x1);
-  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 line_unscaled(int x, int y, int x1, int y1) FL_OVERRIDE;
+  void line_unscaled(int x, int y, int x1, int y1, int x2, int y2) FL_OVERRIDE;
+  void xyline_unscaled(int x, int y, int x1) 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;
   // --- 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();
-  virtual Fl_Region scale_clip(float f);
+  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;
+  Fl_Region scale_clip(float f) FL_OVERRIDE;
   // --- implementation is in src/fl_vertex.cxx which includes src/cfg_gfx/xxx_rect.cxx
-  void begin_complex_polygon();
-  void end_points();
-  void end_line();
-  void end_loop();
-  void end_polygon();
-  void end_complex_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);
-  Fl_Color color() { return color_; }
-  void color(uchar r, uchar g, uchar b);
-  void set_color(Fl_Color i, unsigned int c);
-  void free_color(Fl_Color i, int overlay);
-  virtual Fl_Font set_fonts(const char *name);
-  virtual int get_font_sizes(Fl_Font fnum, int*& sizep);
-  virtual const char* get_font_name(Fl_Font fnum, int* ap);
-  virtual const char *font_name(int num);
-  virtual void font_name(int num, const char *name);
-  void global_gc();
-  virtual void overlay_rect(int x, int y, int w , int h);
-  virtual void cache_size(Fl_Image *img, int &width, int &height);
-  virtual void* change_pen_width(int width);
-  virtual void reset_pen_width(void *data);
+  void begin_complex_polygon() 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;
+  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;
+  Fl_Color color() FL_OVERRIDE { return color_; }
+  void color(uchar r, uchar g, uchar b) FL_OVERRIDE;
+  void set_color(Fl_Color i, unsigned int c) FL_OVERRIDE;
+  void free_color(Fl_Color i, int overlay) FL_OVERRIDE;
+  Fl_Font set_fonts(const char *name) FL_OVERRIDE;
+  int get_font_sizes(Fl_Font fnum, int*& sizep) FL_OVERRIDE;
+  const char* get_font_name(Fl_Font fnum, int* ap) FL_OVERRIDE;
+  const char *font_name(int num) FL_OVERRIDE;
+  void font_name(int num, const char *name) FL_OVERRIDE;
+  void global_gc() FL_OVERRIDE;
+  void overlay_rect(int x, int y, int w , int h) FL_OVERRIDE;
+  void cache_size(Fl_Image *img, int &width, int &height) FL_OVERRIDE;
+  void* change_pen_width(int width) FL_OVERRIDE;
+  void reset_pen_width(void *data) FL_OVERRIDE;
 };
 
 
@@ -167,11 +167,11 @@ private:
   typedef BOOL (WINAPI* transparent_f_type) (HDC,int,int,int,int,HDC,int,int,int,int,UINT);
   transparent_f_type TransparentBlt();
 public:
-  virtual int has_feature(driver_feature mask) { return mask & (NATIVE | PRINTER); }
-  void draw_pixmap(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy);
-  void draw_bitmap(Fl_Bitmap *bm, 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);
-  void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen bitmap, int srcx, int srcy);
+  int has_feature(driver_feature mask) FL_OVERRIDE { return mask & (NATIVE | PRINTER); }
+  void draw_pixmap(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE;
+  void draw_bitmap(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE;
+  void draw_rgb(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE;
+  void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen bitmap, int srcx, int srcy) FL_OVERRIDE;
 };
 
 #if USE_GDIPLUS
@@ -188,28 +188,28 @@ public:
   virtual ~Fl_GDIplus_Graphics_Driver();
   bool active;
   static void shutdown(void);
-virtual void color(Fl_Color c);
-virtual Fl_Color color() { return color_; }
-virtual void color(uchar r, uchar g, uchar b);
-  virtual void line(int x, int y, int x1, int y1);
-  virtual void line(int x, int y, int x1, int y1, int x2, int y2);
-  void loop(int x0, int y0, int x1, int y1, int x2, int y2);
-  void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
-  void polygon(int x0, int y0, int x1, int y1, int x2, int y2);
-  void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
-  virtual void line_style(int style, int width, char* dashes);
-  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 transformed_vertex(double xf, double yf);
-  virtual void vertex(double x,double y);
-  virtual void end_points();
-  virtual void end_line();
-  virtual void end_loop();
-  virtual void end_polygon();
-  virtual void end_complex_polygon();
-  virtual void circle(double x, double y, double r);
-  virtual void antialias(int state);
-  virtual int antialias();
+  void color(Fl_Color c) FL_OVERRIDE;
+  Fl_Color color() FL_OVERRIDE { return color_; }
+  void color(uchar r, uchar g, uchar b) FL_OVERRIDE;
+  void line(int x, int y, int x1, int y1) FL_OVERRIDE;
+  void line(int x, int y, int x1, int y1, int x2, int y2) FL_OVERRIDE;
+  void loop(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE;
+  void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE;
+  void polygon(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE;
+  void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE;
+  void line_style(int style, int width, char* dashes) 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 transformed_vertex(double xf, double yf) FL_OVERRIDE;
+  void vertex(double x,double y) 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;
+  void circle(double x, double y, double r) FL_OVERRIDE;
+  void antialias(int state) FL_OVERRIDE;
+  int antialias() FL_OVERRIDE;
 };
 
 #endif // USE_GDIPLUS
diff --git a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.H b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.H
index a3d8ac6c6..d44d57cd6 100644
--- a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.H
+++ b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.H
@@ -22,16 +22,16 @@
 #include <FL/platform.H>
 
 class Fl_GDI_Image_Surface_Driver : public Fl_Image_Surface_Driver {
-  virtual void end_current();
+  void end_current() FL_OVERRIDE;
 public:
   HWND pre_window;
   int _savedc;
   Fl_GDI_Image_Surface_Driver(int w, int h, int high_res, Fl_Offscreen off);
   ~Fl_GDI_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;
   POINT origin;
 };