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()

1 files changed, 45 insertions, 45 deletions

diff --git a/src/drivers/SVG/Fl_SVG_File_Surface.cxx b/src/drivers/SVG/Fl_SVG_File_Surface.cxx
index ba8099d7f..e8ecd75a8 100644
--- a/src/drivers/SVG/Fl_SVG_File_Surface.cxx
+++ b/src/drivers/SVG/Fl_SVG_File_Surface.cxx
@@ -71,54 +71,54 @@ public:
   ~Fl_SVG_Graphics_Driver();
   FILE* file() {return out_;}
 protected:
-  void rect(int x, int y, int w, int h);
-  void rectf(int x, int y, int w, int h);
-  void compute_dasharray(float s, char *dashes=0);
-  void line_style(int style, int width, char *dashes=0);
-  void line(int x1, int y1, int x2, int y2);
-  void line(int x1, int y1, int x2, int y2, int x3, int y3);
+  void rect(int x, int y, int w, int h) FL_OVERRIDE;
+  void rectf(int x, int y, int w, int h) FL_OVERRIDE;
+  virtual void compute_dasharray(float s, char *dashes=0);
+  void line_style(int style, int width, char *dashes=0) FL_OVERRIDE;
+  void line(int x1, int y1, int x2, int y2) FL_OVERRIDE;
+  void line(int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE;
   void font_(int f, int s);
-  void font(int f, int s);
-  Fl_Font font();
-  void draw(const char *str, int n, int x, int y);
-  void draw(const char*, int, float, float) ;
-  void draw(int, const char*, int, int, int) ;
-  void rtl_draw(const char *str, int n, int x, int y);
-  void color(uchar r, uchar g, uchar b);
-  void color(Fl_Color c);
-  Fl_Color color();
-  double width(const char*, int);
-  double width(unsigned int c);
-  void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h);
-  int height() ;
-  int descent() ;
-  void draw_rgb(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy);
+  void font(int f, int s) FL_OVERRIDE;
+  Fl_Font font() FL_OVERRIDE;
+  void draw(const char *str, int n, int x, int y) FL_OVERRIDE;
+  void draw(const char*, int, float, float) FL_OVERRIDE;
+  void draw(int, const char*, int, int, int) FL_OVERRIDE;
+  void rtl_draw(const char *str, int n, int x, int y) FL_OVERRIDE;
+  void color(uchar r, uchar g, uchar b) FL_OVERRIDE;
+  void color(Fl_Color c) FL_OVERRIDE;
+  Fl_Color color() FL_OVERRIDE;
+  double width(const char*, int) FL_OVERRIDE;
+  double width(unsigned int c) FL_OVERRIDE;
+  void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h) FL_OVERRIDE;
+  int height() FL_OVERRIDE;
+  int descent() FL_OVERRIDE;
+  void draw_rgb(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE;
   void define_rgb_png(Fl_RGB_Image *rgb, const char *name, int x, int y);
   void define_rgb_jpeg(Fl_RGB_Image *rgb, const char *name, int x, int y);
-  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_image(const uchar* buf, int x, int y, int w, int h, int d, int l);
-  void draw_image(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h, int d);
-  void draw_image_mono(const uchar* buf, int x, int y, int w, int h, int d, int l);
-  void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h, int d);
-  void push_clip(int x, int y, int w, int h);
-  void push_no_clip();
-  void pop_clip();
-  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 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);
-  void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
-  void loop(int x0, int y0, int x1, int y1, int x2, int y2);
-  void point(int x, int y);
-  void end_points();
-  void end_line();
-  void end_polygon();
-  void end_complex_polygon();
-  void circle(double x, double y,double r);
-  void arc(int x,int y,int w,int h,double a1,double a2);
-  void arc(double x, double y, double r, double start, double end);
-  void pie(int x,int y,int w,int h,double a1,double a2);
+  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_image(const uchar* buf, int x, int y, int w, int h, int d, int l) FL_OVERRIDE;
+  void draw_image(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h, int d) FL_OVERRIDE;
+  void draw_image_mono(const uchar* buf, int x, int y, int w, int h, int d, int l) FL_OVERRIDE;
+  void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h, int d) FL_OVERRIDE;
+  void push_clip(int x, int y, int w, int h) FL_OVERRIDE;
+  void push_no_clip() FL_OVERRIDE;
+  void pop_clip() 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 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 loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE;
+  void loop(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE;
+  void point(int x, int y) FL_OVERRIDE;
+  void end_points() FL_OVERRIDE;
+  void end_line() FL_OVERRIDE;
+  void end_polygon() FL_OVERRIDE;
+  void end_complex_polygon() FL_OVERRIDE;
+  void circle(double x, double y,double r) FL_OVERRIDE;
+  void arc(int x,int y,int w,int h,double a1,double a2) FL_OVERRIDE;
+  void arc(double x, double y, double r, double start, double end) FL_OVERRIDE;
+  void pie(int x,int y,int w,int h,double a1,double a2) FL_OVERRIDE;
   void arc_pie(char AorP, int x, int y, int w, int h, double a1, double a2);
 };