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

4 files changed, 105 insertions, 105 deletions

diff --git a/src/drivers/X11/Fl_X11_Gl_Window_Driver.H b/src/drivers/X11/Fl_X11_Gl_Window_Driver.H
index 72c4af1e5..026f3ec4a 100644
--- a/src/drivers/X11/Fl_X11_Gl_Window_Driver.H
+++ b/src/drivers/X11/Fl_X11_Gl_Window_Driver.H
@@ -27,26 +27,26 @@ class Fl_Gl_Choice;
 class Fl_X11_Gl_Window_Driver : public Fl_Gl_Window_Driver {
   friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *);
   Fl_X11_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {}
-  virtual float pixels_per_unit();
-  virtual void before_show(int& need_after);
-  virtual int mode_(int m, const int *a);
-  virtual void swap_buffers();
-  virtual char swap_type();
-  virtual Fl_Gl_Choice *find(int m, const int *alistp);
-  virtual GLContext create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g);
-  virtual void set_gl_context(Fl_Window* w, GLContext context);
-  virtual void delete_gl_context(GLContext);
-  virtual void make_overlay_current();
-  virtual void redraw_overlay();
-  virtual void waitGL();
-  virtual void gl_visual(Fl_Gl_Choice*); // support for Fl::gl_visual()
-  virtual void gl_start();
-  virtual void draw_string_legacy(const char* str, int n);
-  virtual void gl_bitmap_font(Fl_Font_Descriptor *fl_fontsize);
-  virtual void get_list(Fl_Font_Descriptor *fd, int r);
-  virtual int genlistsize();
+  float pixels_per_unit() FL_OVERRIDE;
+  void before_show(int& need_after) FL_OVERRIDE;
+  int mode_(int m, const int *a) FL_OVERRIDE;
+  void swap_buffers() FL_OVERRIDE;
+  char swap_type() FL_OVERRIDE;
+  Fl_Gl_Choice *find(int m, const int *alistp) FL_OVERRIDE;
+  GLContext create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g) FL_OVERRIDE;
+  void set_gl_context(Fl_Window* w, GLContext context) FL_OVERRIDE;
+  void delete_gl_context(GLContext) FL_OVERRIDE;
+  void make_overlay_current() FL_OVERRIDE;
+  void redraw_overlay() FL_OVERRIDE;
+  void waitGL() FL_OVERRIDE;
+  void gl_visual(Fl_Gl_Choice*) FL_OVERRIDE; // support for Fl::gl_visual()
+  void gl_start() FL_OVERRIDE;
+  void draw_string_legacy(const char* str, int n) FL_OVERRIDE;
+  void gl_bitmap_font(Fl_Font_Descriptor *fl_fontsize) FL_OVERRIDE;
+  void get_list(Fl_Font_Descriptor *fd, int r) FL_OVERRIDE;
+  int genlistsize() FL_OVERRIDE;
 #if !USE_XFT
-  virtual Fl_Font_Descriptor** fontnum_to_fontdescriptor(int fnum);
+  virtual Fl_Font_Descriptor** fontnum_to_fontdescriptor(int fnum) FL_OVERRIDE;
 #endif
   //static GLContext create_gl_context(XVisualInfo* vis);
 };
diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.H b/src/drivers/X11/Fl_X11_Screen_Driver.H
index 5ff64ccad..17826a94d 100644
--- a/src/drivers/X11/Fl_X11_Screen_Driver.H
+++ b/src/drivers/X11/Fl_X11_Screen_Driver.H
@@ -51,10 +51,10 @@ protected:
 public:
 #if USE_XFT // scaling does not work without Xft
   float current_xft_dpi; // current value of the Xft.dpi X resource
-  virtual APP_SCALING_CAPABILITY rescalable() { return PER_SCREEN_APP_SCALING; }
-  virtual float scale(int n) {return screens[n].scale;}
-  virtual void scale(int n, float f) { screens[n].scale = f;}
-  virtual void desktop_scale_factor();
+  APP_SCALING_CAPABILITY rescalable() FL_OVERRIDE { return PER_SCREEN_APP_SCALING; }
+  float scale(int n) FL_OVERRIDE {return screens[n].scale;}
+  void scale(int n, float f) FL_OVERRIDE { screens[n].scale = f;}
+  void desktop_scale_factor() FL_OVERRIDE;
   int screen_num_unscaled(int x, int y);
 #endif
 
@@ -62,57 +62,57 @@ public:
   static int ewmh_supported();
   static void copy_image(const unsigned char* data, int W, int H, int destination);
   // --- display management
-  virtual void display(const char *disp);
-  virtual int XParseGeometry(const char*, int*, int*, unsigned int*, unsigned int*);
-  virtual int poll_or_select_with_delay(double time_to_wait);
-  virtual int poll_or_select();
-  virtual void own_colormap();
-  virtual const char *shortcut_add_key_name(unsigned key, char *p, char *buf, const char **);
-  virtual int need_menu_handle_part1_extra() {return 1;}
-  virtual int need_menu_handle_part2() {return 1;}
+  void display(const char *disp) FL_OVERRIDE;
+  int XParseGeometry(const char*, int*, int*, unsigned int*, unsigned int*) FL_OVERRIDE;
+  int poll_or_select_with_delay(double time_to_wait) FL_OVERRIDE;
+  int poll_or_select() FL_OVERRIDE;
+  void own_colormap() FL_OVERRIDE;
+  const char *shortcut_add_key_name(unsigned key, char *p, char *buf, const char **) FL_OVERRIDE;
+  int need_menu_handle_part1_extra() FL_OVERRIDE {return 1;}
+  int need_menu_handle_part2() FL_OVERRIDE {return 1;}
   // these 2 are in Fl_get_key.cxx
-  virtual int event_key(int);
-  virtual int get_key(int);
-  virtual int visual(int flags);
+  int event_key(int) FL_OVERRIDE;
+  int get_key(int) FL_OVERRIDE;
+  int visual(int flags) FL_OVERRIDE;
   // --- screen configuration
   void init_workarea();
-  virtual void init();
-  virtual int x();
-  virtual int y();
-  virtual int w();
-  virtual int h();
-  virtual void screen_xywh(int &X, int &Y, int &W, int &H, int n);
-  virtual void screen_dpi(float &h, float &v, int n=0);
-  virtual void screen_work_area(int &X, int &Y, int &W, int &H, int n);
+  void init() FL_OVERRIDE;
+  int x() FL_OVERRIDE;
+  int y() FL_OVERRIDE;
+  int w() FL_OVERRIDE;
+  int h() FL_OVERRIDE;
+  void screen_xywh(int &X, int &Y, int &W, int &H, int n) FL_OVERRIDE;
+  void screen_dpi(float &h, float &v, int n=0) FL_OVERRIDE;
+  void screen_work_area(int &X, int &Y, int &W, int &H, int n) FL_OVERRIDE;
   // --- audible output
-  virtual void beep(int type);
+  void beep(int type) FL_OVERRIDE;
   // --- global events
-  virtual void flush();
-  virtual void grab(Fl_Window* win);
+  void flush() FL_OVERRIDE;
+  void grab(Fl_Window* win) FL_OVERRIDE;
   // --- global colors
-  virtual int parse_color(const char* p, uchar& r, uchar& g, uchar& b);
-  virtual void get_system_colors();
-  virtual const char *get_system_scheme();
-  virtual int dnd(int unused);
-  virtual int compose(int &del);
-  virtual void compose_reset();
-  virtual int text_display_can_leak() const;
-  virtual Fl_RGB_Image *read_win_rectangle(int X, int Y, int w, int h, Fl_Window *win, bool may_capture_subwins, bool *did_capture_subwins);
-  virtual int get_mouse(int &x, int &y);
+  int parse_color(const char* p, uchar& r, uchar& g, uchar& b) FL_OVERRIDE;
+  void get_system_colors() FL_OVERRIDE;
+  const char *get_system_scheme() FL_OVERRIDE;
+  int dnd(int unused) FL_OVERRIDE;
+  int compose(int &del) FL_OVERRIDE;
+  void compose_reset() FL_OVERRIDE;
+  int text_display_can_leak() const FL_OVERRIDE;
+  Fl_RGB_Image *read_win_rectangle(int X, int Y, int w, int h, Fl_Window *win, bool may_capture_subwins, bool *did_capture_subwins) FL_OVERRIDE;
+  int get_mouse(int &x, int &y) FL_OVERRIDE;
 
-  virtual void open_display_platform();
-  virtual void close_display();
+  void open_display_platform() FL_OVERRIDE;
+  void close_display() FL_OVERRIDE;
   // --- compute dimensions of an Fl_Offscreen
-  virtual void offscreen_size(Fl_Offscreen o, int &width, int &height);
-  virtual void default_icons(const Fl_RGB_Image *icons[], int count);
+  void offscreen_size(Fl_Offscreen o, int &width, int &height) FL_OVERRIDE;
+  void default_icons(const Fl_RGB_Image *icons[], int count) FL_OVERRIDE;
   // this one is in Fl_x.cxx
-  virtual void copy(const char *stuff, int len, int clipboard, const char *type);
+  void copy(const char *stuff, int len, int clipboard, const char *type) FL_OVERRIDE;
   // this one is in Fl_x.cxx
-  virtual void paste(Fl_Widget &receiver, int clipboard, const char *type);
+  void paste(Fl_Widget &receiver, int clipboard, const char *type) FL_OVERRIDE;
   // this one is in Fl_x.cxx
-  virtual int clipboard_contains(const char *type);
+  int clipboard_contains(const char *type) FL_OVERRIDE;
   // this one is in Fl_x.cxx
-  virtual void clipboard_notify_change();
+  void clipboard_notify_change() FL_OVERRIDE;
   // for support of input methods
   static char fl_is_over_the_spot;
   static XRectangle fl_spot;
@@ -125,11 +125,11 @@ public:
   static void xim_activate(Window xid);
   static void xim_deactivate(void);
   static void init_xim();
-  virtual void enable_im();
-  virtual void disable_im();
-  virtual void set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win);
-  virtual void reset_spot();
-  virtual void set_status(int X, int Y, int W, int H);
+  void enable_im() FL_OVERRIDE;
+  void disable_im() FL_OVERRIDE;
+  void set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win) FL_OVERRIDE;
+  void reset_spot() FL_OVERRIDE;
+  void set_status(int X, int Y, int W, int H) FL_OVERRIDE;
 };
 
 
diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
index 2a5239eae..9e3465f13 100644
--- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
@@ -48,7 +48,7 @@
 
 extern Atom fl_NET_WORKAREA;
 
-// these are set by Fl::args() and override any system colors: from Fl_get_system_colors.cxx
+// these are set by Fl::args() and FL_OVERRIDE any system colors: from Fl_get_system_colors.cxx
 extern const char *fl_fg;
 extern const char *fl_bg;
 extern const char *fl_bg2;
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H
index a2a19d12c..6cb54dd95 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.H
+++ b/src/drivers/X11/Fl_X11_Window_Driver.H
@@ -80,59 +80,59 @@ private:
   void decorated_win_size(int &w, int &h);
   void combine_mask();
   void shape_bitmap_(Fl_Image* b);
-  void shape_alpha_(Fl_Image* img, int offset);
+  void shape_alpha_(Fl_Image* img, int offset) FL_OVERRIDE;
   void flush_double(int erase_overlay);
   void sendxjunk();
   void activate_window();
 
 public:
   Fl_X11_Window_Driver(Fl_Window*);
-  virtual ~Fl_X11_Window_Driver();
+  ~Fl_X11_Window_Driver() FL_OVERRIDE;
   static inline Fl_X11_Window_Driver* driver(const Fl_Window *w) {return (Fl_X11_Window_Driver*)Fl_Window_Driver::driver(w);}
 #if  USE_XFT
   static void resize_after_screen_change(void *data);
 #endif // USE_XFT
 
   // --- window data
-  virtual int decorated_w();
-  virtual int decorated_h();
-  virtual const Fl_Image* shape();
+  int decorated_w() FL_OVERRIDE;
+  int decorated_h() FL_OVERRIDE;
+  const Fl_Image* shape() FL_OVERRIDE;
 
   // --- window management
-  virtual Fl_X *makeWindow();
-  virtual void take_focus();
-  virtual void flush_double();
-  virtual void flush_overlay();
-  virtual void draw_begin();
-  virtual void make_current();
-  virtual void show();
-  virtual void resize(int X,int Y,int W,int H);
-  virtual void label(const char *name, const char *mininame);
-  virtual void destroy_double_buffer();
-  virtual void hide();
-  virtual void map();
-  virtual void unmap();
-  virtual void fullscreen_on();
-  virtual void fullscreen_off(int X, int Y, int W, int H);
-  virtual void use_border();
-  virtual void size_range();
-  virtual void iconize();
-  virtual void decoration_sizes(int *top, int *left,  int *right, int *bottom);
-  virtual void show_with_args_begin();
-  virtual void show_with_args_end(int argc, char **argv);
+  Fl_X *makeWindow() FL_OVERRIDE;
+  void take_focus() FL_OVERRIDE;
+  void flush_double() FL_OVERRIDE;
+  void flush_overlay() FL_OVERRIDE;
+  void draw_begin() FL_OVERRIDE;
+  void make_current() FL_OVERRIDE;
+  void show() FL_OVERRIDE;
+  void resize(int X,int Y,int W,int H) FL_OVERRIDE;
+  void label(const char *name, const char *mininame) FL_OVERRIDE;
+  void destroy_double_buffer() FL_OVERRIDE;
+  void hide() FL_OVERRIDE;
+  void map() FL_OVERRIDE;
+  void unmap() FL_OVERRIDE;
+  void fullscreen_on() FL_OVERRIDE;
+  void fullscreen_off(int X, int Y, int W, int H) FL_OVERRIDE;
+  void use_border() FL_OVERRIDE;
+  void size_range() FL_OVERRIDE;
+  void iconize() FL_OVERRIDE;
+  void decoration_sizes(int *top, int *left,  int *right, int *bottom) FL_OVERRIDE;
+  void show_with_args_begin() FL_OVERRIDE;
+  void show_with_args_end(int argc, char **argv) FL_OVERRIDE;
   // --- window cursor stuff
-  virtual int set_cursor(Fl_Cursor);
-  virtual int set_cursor(const Fl_RGB_Image*, int, int);
-
-  virtual void shape(const Fl_Image* img);
-  virtual void icons(const Fl_RGB_Image *icons[], int count);
-  virtual const void *icon() const;
-  virtual void icon(const void * ic);
-  virtual void free_icons();
+  int set_cursor(Fl_Cursor) FL_OVERRIDE;
+  int set_cursor(const Fl_RGB_Image*, int, int) FL_OVERRIDE;
+
+  void shape(const Fl_Image* img) FL_OVERRIDE;
+  void icons(const Fl_RGB_Image *icons[], int count) FL_OVERRIDE;
+  const void *icon() const FL_OVERRIDE;
+  void icon(const void * ic) FL_OVERRIDE;
+  void free_icons() FL_OVERRIDE;
   void set_icons(); // driver-internal support function
-  virtual void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right);
-  virtual int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data);
-  virtual fl_uintptr_t os_id();
+  void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right) FL_OVERRIDE;
+  int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data) FL_OVERRIDE;
+  fl_uintptr_t os_id() FL_OVERRIDE;
 };