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

6 files changed, 115 insertions, 115 deletions

diff --git a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H
index a54b185e6..79b93e6df 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H
+++ b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H
@@ -30,28 +30,28 @@ class Fl_Cocoa_Gl_Window_Driver : public Fl_Gl_Window_Driver {
   NSOpenGLContext *gl1ctxt; // GL1 context in addition to GL3 context
   friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *);
   Fl_Cocoa_Gl_Window_Driver(Fl_Gl_Window *win);
-  virtual float pixels_per_unit();
-  virtual void before_show(int& need_after);
-  virtual void after_show();
-  virtual int mode_(int m, const int *a);
-  virtual void make_current_before();
-  virtual void swap_buffers();
-  virtual void resize(int is_a_resize, int w, int h);
-  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 gl_start();
-  virtual char *alpha_mask_for_string(const char *str, int n, int w, int h, Fl_Fontsize fs);
-  virtual Fl_RGB_Image* capture_gl_rectangle(int x, int y, int w, int h);
-  virtual bool need_scissor() { return true; }
-  virtual void* GetProcAddress(const char *procName);
+  float pixels_per_unit() FL_OVERRIDE;
+  void before_show(int& need_after) FL_OVERRIDE;
+  void after_show() FL_OVERRIDE;
+  int mode_(int m, const int *a) FL_OVERRIDE;
+  void make_current_before() FL_OVERRIDE;
+  void swap_buffers() FL_OVERRIDE;
+  void resize(int is_a_resize, int w, int h) 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 gl_start() FL_OVERRIDE;
+  char *alpha_mask_for_string(const char *str, int n, int w, int h, Fl_Fontsize fs) FL_OVERRIDE;
+  Fl_RGB_Image* capture_gl_rectangle(int x, int y, int w, int h) FL_OVERRIDE;
+  bool need_scissor() FL_OVERRIDE { return true; }
+  void* GetProcAddress(const char *procName) FL_OVERRIDE;
   void apply_scissor();
-  virtual void switch_to_GL1();
-  virtual void switch_back();
+  void switch_to_GL1() FL_OVERRIDE;
+  void switch_back() FL_OVERRIDE;
 };
 
 
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm
index f54871df8..9f1227f0e 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm
+++ b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm
@@ -491,8 +491,8 @@ void Fl_Cocoa_Gl_Window_Driver::switch_back() {
 class Fl_Gl_Cocoa_Plugin : public Fl_Cocoa_Plugin {
 public:
   Fl_Gl_Cocoa_Plugin() : Fl_Cocoa_Plugin(name()) { }
-  virtual const char *name() { return "gl.cocoa.fltk.org"; }
-  virtual void resize(Fl_Gl_Window *glw, int x, int y, int w, int h) {
+  const char *name() FL_OVERRIDE { return "gl.cocoa.fltk.org"; }
+  void resize(Fl_Gl_Window *glw, int x, int y, int w, int h) FL_OVERRIDE {
     glw->Fl_Gl_Window::resize(x, y, w, h);
   }
 };
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
index c587caf37..c144ab243 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
+++ b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
@@ -56,18 +56,18 @@ private:
   PMPageFormat    pageFormat;
   PMPrintSettings printSettings;
   Fl_Cocoa_Printer_Driver(void);
-  int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message = NULL);
-  int begin_page (void);
-  int printable_rect(int *w, int *h);
-  void margins(int *left, int *top, int *right, int *bottom);
-  void origin(int *x, int *y);
-  void origin(int x, int y);
-  void scale (float scale_x, float scale_y = 0.);
-  void rotate(float angle);
-  void translate(int x, int y);
-  void untranslate(void);
-  int end_page (void);
-  void end_job (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;
   ~Fl_Cocoa_Printer_Driver(void);
 };
 
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
index fbd76b68e..9e3d2386a 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
+++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
@@ -63,49 +63,49 @@ public:
   static void breakMacEventLoop();
   // --- display management
   // --- screen configuration
-  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);
+  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;
   // implemented in Fl_cocoa.mm because uses Objective-c
-  virtual void screen_work_area(int &X, int &Y, int &W, int &H, int n);
+  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 grab(Fl_Window* win);
+  void grab(Fl_Window* win) FL_OVERRIDE;
   // --- global colors
-  virtual void get_system_colors();
-  virtual int has_marked_text() const;
+  void get_system_colors() FL_OVERRIDE;
+  int has_marked_text() const FL_OVERRIDE;
   static void reset_marked_text();
   static void insertion_point_location(int x, int y, int height);
   static int insertion_point_location(int *px, int *py, int *pheight);
-  virtual int dnd(int use_selection);
-  virtual int compose(int &del);
-  virtual int input_widget_handle_key(int key, unsigned mods, unsigned shift, Fl_Input *input);
-  virtual int get_mouse(int &x, int &y);
-  virtual void enable_im();
-  virtual void disable_im();
-  virtual void open_display_platform();
+  int dnd(int use_selection) FL_OVERRIDE;
+  int compose(int &del) FL_OVERRIDE;
+  int input_widget_handle_key(int key, unsigned mods, unsigned shift, Fl_Input *input) FL_OVERRIDE;
+  int get_mouse(int &x, int &y) FL_OVERRIDE;
+  void enable_im() FL_OVERRIDE;
+  void disable_im() FL_OVERRIDE;
+  void open_display_platform() FL_OVERRIDE;
   // --- compute dimensions of an Fl_Offscreen
-  virtual void offscreen_size(Fl_Offscreen o, int &width, int &height);
+  void offscreen_size(Fl_Offscreen o, int &width, int &height) FL_OVERRIDE;
 
-  virtual APP_SCALING_CAPABILITY rescalable() { return SYSTEMWIDE_APP_SCALING; }
-  virtual float scale(int /*nscreen*/) {return scale_;}
-  virtual void scale(int /*nscreen*/, float f) { scale_ = f;}
-  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 void default_icons(const Fl_RGB_Image *icons[], int count);
-  virtual void copy(const char *stuff, int len, int clipboard, const char *type);
-  virtual void paste(Fl_Widget &receiver, int clipboard, const char *type);
-  virtual int clipboard_contains(const char *type);
-  virtual void set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win);
-  virtual void reset_spot();
-  virtual int need_menu_handle_part2() {return 1;}
+  APP_SCALING_CAPABILITY rescalable() FL_OVERRIDE { return SYSTEMWIDE_APP_SCALING; }
+  float scale(int /*nscreen*/) FL_OVERRIDE {return scale_;}
+  void scale(int /*nscreen*/, float f) FL_OVERRIDE { scale_ = f;}
+  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;
+  void default_icons(const Fl_RGB_Image *icons[], int count) FL_OVERRIDE;
+  void copy(const char *stuff, int len, int clipboard, const char *type) FL_OVERRIDE;
+  void paste(Fl_Widget &receiver, int clipboard, const char *type) FL_OVERRIDE;
+  int clipboard_contains(const char *type) 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;
+  int need_menu_handle_part2() FL_OVERRIDE {return 1;}
   // these 2 are in Fl_get_key_mac.cxx
-  virtual int event_key(int);
-  virtual int get_key(int);
+  int event_key(int) FL_OVERRIDE;
+  int get_key(int) FL_OVERRIDE;
 private:
   float scale_;
 };
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
index 520c4c239..4c86696e0 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
@@ -82,7 +82,7 @@ private:
     CGImageRef mask;
   } *shape_data_;
   void shape_bitmap_(Fl_Image* b);
-  void shape_alpha_(Fl_Image* img, int offset);
+  void shape_alpha_(Fl_Image* img, int offset) FL_OVERRIDE;
   CGRect* subRect_;           // makes sure subwindow remains inside its parent window
   // stores 3 binary flags: whether window is mapped to retina display; whether resolution just changed;
   // whether window's view received the [FLView view_did_resize] message
@@ -110,47 +110,47 @@ public:
   CGImageRef CGImage_from_window_rect(int x, int y, int w, int h, bool capture_subwins = true);
 
   // --- 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();
-  virtual void flush_overlay();
-  virtual void draw_begin();
-  virtual void draw_end();
-  virtual void make_current();
-  virtual void label(const char *name, const char *mininame);
-  virtual void destroy_double_buffer();
-  virtual void show();
-  virtual void resize(int X,int Y,int W,int H);
-  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);
+  Fl_X *makeWindow() FL_OVERRIDE;
+  void take_focus() FL_OVERRIDE;
+  void flush() FL_OVERRIDE;
+  void flush_overlay() FL_OVERRIDE;
+  void draw_begin() FL_OVERRIDE;
+  void draw_end() FL_OVERRIDE;
+  void make_current() FL_OVERRIDE;
+  void label(const char *name, const char *mininame) FL_OVERRIDE;
+  void destroy_double_buffer() FL_OVERRIDE;
+  void show() FL_OVERRIDE;
+  void resize(int X,int Y,int W,int H) 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;
   // --- window cursor stuff
-  virtual int set_cursor(Fl_Cursor);
-  virtual int set_cursor(const Fl_RGB_Image*, int, int);
+  int set_cursor(Fl_Cursor) FL_OVERRIDE;
+  int set_cursor(const Fl_RGB_Image*, int, int) FL_OVERRIDE;
 
-  virtual void shape(const Fl_Image* img);
+  void shape(const Fl_Image* img) FL_OVERRIDE;
   // next 4 are in Fl_cocoa.mm because they use Objective-c
-  virtual void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right);
-  virtual void wait_for_expose();
+  void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right) FL_OVERRIDE;
+  void wait_for_expose() FL_OVERRIDE;
   void draw_titlebar_to_context(CGContextRef gc, int w, int h);
-  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);
+  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;
 
   //icons
-  virtual void icons(const Fl_RGB_Image *icons[], int count);
+  void icons(const Fl_RGB_Image *icons[], int count) FL_OVERRIDE;
   NSImage *icon_image;
 
-  virtual fl_uintptr_t os_id();
+  fl_uintptr_t os_id() FL_OVERRIDE;
 };
 
 class Fl_Cocoa_Plugin : public Fl_Plugin {
diff --git a/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H b/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H
index 27f34e226..94d890f3d 100644
--- a/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H
+++ b/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H
@@ -23,21 +23,21 @@ class Fl_MacOS_Sys_Menu_Bar_Driver : public Fl_Sys_Menu_Bar_Driver {
 public:
   Fl_MacOS_Sys_Menu_Bar_Driver();
   virtual ~Fl_MacOS_Sys_Menu_Bar_Driver();
-  virtual void update();
-  virtual void draw();
-  virtual void about(Fl_Callback *cb, void *data);
-  virtual int add(const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags);
-  virtual int add(const char* str);
-  virtual int insert(int index, const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags);
-  virtual void menu(const Fl_Menu_Item *m);
-  virtual void shortcut (int i, int s);
-  virtual void setonly (Fl_Menu_Item *item);
-  virtual void clear();
-  virtual int clear_submenu(int index);
-  virtual void remove(int index);
-  virtual void replace(int index, const char *name);
-  virtual void mode(int i, int fl);
-  virtual void create_window_menu();
+  void update() FL_OVERRIDE;
+  void draw() FL_OVERRIDE;
+  void about(Fl_Callback *cb, void *data) FL_OVERRIDE;
+  int add(const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags) FL_OVERRIDE;
+  int add(const char* str) FL_OVERRIDE;
+  int insert(int index, const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags) FL_OVERRIDE;
+  void menu(const Fl_Menu_Item *m) FL_OVERRIDE;
+  void shortcut (int i, int s) FL_OVERRIDE;
+  void setonly (Fl_Menu_Item *item) FL_OVERRIDE;
+  void clear() FL_OVERRIDE;
+  int clear_submenu(int index) FL_OVERRIDE;
+  void remove(int index) FL_OVERRIDE;
+  void replace(int index, const char *name) FL_OVERRIDE;
+  void mode(int i, int fl) FL_OVERRIDE;
+  void create_window_menu() FL_OVERRIDE;
   int find_first_window();
   void new_window(Fl_Window *win);
   void remove_window(Fl_Window *win);