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

5 files changed, 167 insertions, 167 deletions

diff --git a/src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H
index 6934fec15..62aab946a 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H
@@ -34,32 +34,32 @@ Consequently, FL_DOUBLE is enforced in all Fl_Gl_Window::mode_ values under Wayl
 class Fl_WinAPI_Gl_Window_Driver : public Fl_Gl_Window_Driver {
   friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *);
   Fl_WinAPI_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {}
-  virtual float pixels_per_unit();
-  virtual int mode_(int m, const int *a);
-  virtual void make_current_after();
-  virtual void swap_buffers();
-  virtual void invalidate() {}
-  virtual int flush_begin(char& valid_f);
-  virtual Fl_Gl_Choice *find(int m, const int *alistp);
-  virtual GLContext create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g);
+  float pixels_per_unit() FL_OVERRIDE;
+  int mode_(int m, const int *a) FL_OVERRIDE;
+  void make_current_after() FL_OVERRIDE;
+  void swap_buffers() FL_OVERRIDE;
+  void invalidate() FL_OVERRIDE {}
+  int flush_begin(char& valid_f) 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;
   GLContext do_create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g,
                                  int layer);
-  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* GetProcAddress(const char *procName);
-  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();
-  virtual void switch_to_GL1();
-  virtual void switch_back();
+  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* GetProcAddress(const char *procName) 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;
+  void switch_to_GL1() FL_OVERRIDE;
+  void switch_back() FL_OVERRIDE;
 #if HAVE_GL_OVERLAY
-  virtual void gl_hide_before(void *& overlay);
-  virtual int can_do_overlay();
-  virtual int overlay_color(Fl_Color i);
-  void make_overlay(void*&overlay);
+  void gl_hide_before(void *& overlay) FL_OVERRIDE;
+  int can_do_overlay() FL_OVERRIDE;
+  int overlay_color(Fl_Color i) FL_OVERRIDE;
+  void make_overlay(void*&overlay) FL_OVERRIDE;
 #endif
 };
 
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx
index 56b3c6d4b..2e59f124c 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx
@@ -36,18 +36,18 @@ private:
   int top_margin;
   void absolute_printable_rect(int *x, int *y, int *w, int *h);
   Fl_WinAPI_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_WinAPI_Printer_Driver(void);
 };
 
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
index 899b2cf3f..3bb5e11a6 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
@@ -45,58 +45,58 @@ public:
     for (int i = 0; i < MAX_SCREENS; i++) scale_of_screen[i] = 1;
   }
   // --- display management
-  virtual int visual(int flags);
+  int visual(int flags) FL_OVERRIDE;
   // --- 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);
+  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_xywh_unscaled(int &X, int &Y, int &W, int &H, int n);
-  virtual void screen_dpi(float &h, float &v, int n=0);
+  void screen_dpi(float &h, float &v, int n=0) FL_OVERRIDE;
   int screen_num_unscaled(int x, int y);
-  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 flush();
-  virtual void grab(Fl_Window* win);
+  void flush() FL_OVERRIDE;
+  void grab(Fl_Window* win) FL_OVERRIDE;
   // --- global colors
-  virtual void get_system_colors();
-  virtual int dnd(int unused);
-  virtual int compose(int &del);
-  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);
+  void get_system_colors() FL_OVERRIDE;
+  int dnd(int unused) FL_OVERRIDE;
+  int compose(int &del) 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;
   Fl_RGB_Image *read_win_rectangle_unscaled(int X, int Y, int w, int h, Fl_Window *win);
-  virtual int get_mouse(int &x, int &y);
-  virtual void enable_im();
-  virtual void disable_im();
-  virtual void open_display_platform();
-  virtual void offscreen_size(Fl_Offscreen off, int &width, int &height);
-  virtual APP_SCALING_CAPABILITY rescalable() {
+  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;
+  void offscreen_size(Fl_Offscreen off, int &width, int &height) FL_OVERRIDE;
+  APP_SCALING_CAPABILITY rescalable() FL_OVERRIDE {
     return PER_SCREEN_APP_SCALING;
   }
-  virtual float scale(int n) {
+  float scale(int n) FL_OVERRIDE {
     return scale_of_screen[n];
   }
-  virtual void scale(int n, float f) {
+  void scale(int n, float f) FL_OVERRIDE {
     scale_of_screen[n] = f;
   }
-  virtual void desktop_scale_factor();
-  virtual void default_icons(const Fl_RGB_Image *icons[], int count);
+  void desktop_scale_factor() FL_OVERRIDE;
+  void default_icons(const Fl_RGB_Image *icons[], int count) FL_OVERRIDE;
   // this one is implemented in Fl_win32.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 implemented in Fl_win32.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 implemented in Fl_win32.cxx
-  virtual int clipboard_contains(const char *type);
+  int clipboard_contains(const char *type) FL_OVERRIDE;
   // this one is implemented in Fl_win32.cxx
-  virtual void clipboard_notify_change();
+  void clipboard_notify_change() FL_OVERRIDE;
   // this one is implemented in Fl_win32.cxx
-  void set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win);
+  void set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win) FL_OVERRIDE;
   // these two are implemented in Fl_get_key_win32.cxx
-  virtual int event_key(int);
-  virtual int get_key(int);
+  int event_key(int) FL_OVERRIDE;
+  int get_key(int) FL_OVERRIDE;
 };
 
 
diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
index e6e7f5cf9..10047b632 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
@@ -41,80 +41,80 @@
 class Fl_WinAPI_System_Driver : public Fl_System_Driver
 {
 public:
-  virtual void warning(const char *format, va_list args);
-  virtual void error(const char *format, va_list args);
-  virtual void fatal(const char *format, va_list args);
-  virtual char *utf2mbcs(const char *s);
-  virtual char *getenv(const char *var);
-  virtual int putenv(const char *var);
-  virtual int open(const char *fnam, int oflags, int pmode);
-  virtual int open_ext(const char *fnam, int binary, int oflags, int pmode);
-  virtual FILE *fopen(const char *fnam, const char *mode);
-  virtual int system(const char *cmd);
-  virtual int execvp(const char *file, char *const *argv);
-  virtual int chmod(const char *fnam, int mode);
-  virtual int access(const char *fnam, int mode);
-  virtual int flstat(const char *fnam, struct stat *b);
-  virtual char *getcwd(char *b, int l);
-  virtual int chdir(const char *path);
-  virtual int unlink(const char *fnam);
-  virtual int mkdir(const char *fnam, int mode);
-  virtual int rmdir(const char *fnam);
-  virtual int rename(const char *fnam, const char *newnam);
-  virtual unsigned utf8towc(const char *src, unsigned srclen, wchar_t* dst, unsigned dstlen);
-  virtual unsigned utf8fromwc(char *dst, unsigned dstlen, const wchar_t* src, unsigned srclen);
-  virtual int utf8locale();
-  virtual unsigned utf8to_mb(const char *src, unsigned srclen, char *dst, unsigned dstlen);
-  virtual unsigned utf8from_mb(char *dst, unsigned dstlen, const char *src, unsigned srclen);
-  virtual int clocale_vprintf(FILE *output, const char *format, va_list args);
-  virtual int clocale_vsnprintf(char *output, size_t output_size, const char *format, va_list args);
-  virtual int clocale_vsscanf(const char *input, const char *format, va_list args);
-  virtual int filename_list(const char *d, dirent ***list,
+  void warning(const char *format, va_list args) FL_OVERRIDE;
+  void error(const char *format, va_list args) FL_OVERRIDE;
+  void fatal(const char *format, va_list args) FL_OVERRIDE;
+  char *utf2mbcs(const char *s) FL_OVERRIDE;
+  char *getenv(const char *var) FL_OVERRIDE;
+  int putenv(const char *var) FL_OVERRIDE;
+  int open(const char *fnam, int oflags, int pmode) FL_OVERRIDE;
+  int open_ext(const char *fnam, int binary, int oflags, int pmode) FL_OVERRIDE;
+  FILE *fopen(const char *fnam, const char *mode) FL_OVERRIDE;
+  int system(const char *cmd) FL_OVERRIDE;
+  int execvp(const char *file, char *const *argv) FL_OVERRIDE;
+  int chmod(const char *fnam, int mode) FL_OVERRIDE;
+  int access(const char *fnam, int mode) FL_OVERRIDE;
+  int flstat(const char *fnam, struct stat *b) FL_OVERRIDE;
+  char *getcwd(char *b, int l) FL_OVERRIDE;
+  int chdir(const char *path) FL_OVERRIDE;
+  int unlink(const char *fnam) FL_OVERRIDE;
+  int mkdir(const char *fnam, int mode) FL_OVERRIDE;
+  int rmdir(const char *fnam) FL_OVERRIDE;
+  int rename(const char *fnam, const char *newnam) FL_OVERRIDE;
+  unsigned utf8towc(const char *src, unsigned srclen, wchar_t* dst, unsigned dstlen) FL_OVERRIDE;
+  unsigned utf8fromwc(char *dst, unsigned dstlen, const wchar_t* src, unsigned srclen) FL_OVERRIDE;
+  int utf8locale() FL_OVERRIDE;
+  unsigned utf8to_mb(const char *src, unsigned srclen, char *dst, unsigned dstlen) FL_OVERRIDE;
+  unsigned utf8from_mb(char *dst, unsigned dstlen, const char *src, unsigned srclen) FL_OVERRIDE;
+  int clocale_vprintf(FILE *output, const char *format, va_list args) FL_OVERRIDE;
+  int clocale_vsnprintf(char *output, size_t output_size, const char *format, va_list args) FL_OVERRIDE;
+  int clocale_vsscanf(const char *input, const char *format, va_list args) FL_OVERRIDE;
+  int filename_list(const char *d, dirent ***list,
                             int (*sort)(struct dirent **, struct dirent **),
-                            char *errmsg=NULL, int errmsg_sz=0);
-  virtual int filename_expand(char *to,int tolen, const char *from);
-  virtual int filename_relative(char *to, int tolen, const char *from, const char *base);
-  virtual int filename_absolute(char *to, int tolen, const char *from);
-  virtual int filename_isdir(const char *n);
-  virtual int filename_isdir_quick(const char *n);
-  virtual const char *filename_ext(const char *buf);
-  virtual int open_uri(const char *uri, char *msg, int msglen);
-  virtual int use_recent_tooltip_fix() {return 1;}
-  virtual int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, int lname, Fl_File_Icon *icon);
-  virtual int file_browser_load_directory(const char *directory, char *filename, size_t name_size,
+                            char *errmsg=NULL, int errmsg_sz=0) FL_OVERRIDE;
+  int filename_expand(char *to,int tolen, const char *from) FL_OVERRIDE;
+  int filename_relative(char *to, int tolen, const char *from, const char *base) FL_OVERRIDE;
+  int filename_absolute(char *to, int tolen, const char *from) FL_OVERRIDE;
+  int filename_isdir(const char *n) FL_OVERRIDE;
+  int filename_isdir_quick(const char *n) FL_OVERRIDE;
+  const char *filename_ext(const char *buf) FL_OVERRIDE;
+  int open_uri(const char *uri, char *msg, int msglen) FL_OVERRIDE;
+  int use_recent_tooltip_fix() FL_OVERRIDE {return 1;}
+  int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, int lname, Fl_File_Icon *icon) FL_OVERRIDE;
+  int file_browser_load_directory(const char *directory, char *filename, size_t name_size,
                                           dirent ***pfiles, Fl_File_Sort_F *sort,
-                                          char *errmsg=NULL, int errmsg_sz=0);
-  virtual void newUUID(char *uuidBuffer);
-  virtual char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor,
-                                    const char *application);
-  virtual void *load(const char *filename);
-  virtual void png_extra_rgba_processing(unsigned char *array, int w, int h);
-  virtual const char *next_dir_sep(const char *start);
+                                          char *errmsg=NULL, int errmsg_sz=0) FL_OVERRIDE;
+  void newUUID(char *uuidBuffer) FL_OVERRIDE;
+  char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor,
+                                    const char *application) FL_OVERRIDE;
+  void *load(const char *filename) FL_OVERRIDE;
+  void png_extra_rgba_processing(unsigned char *array, int w, int h) FL_OVERRIDE;
+  const char *next_dir_sep(const char *start) FL_OVERRIDE;
   // these 3 are implemented in Fl_lock.cxx
-  virtual void awake(void*);
-  virtual int lock();
-  virtual void unlock();
+  void awake(void*) FL_OVERRIDE;
+  int lock() FL_OVERRIDE;
+  void unlock() FL_OVERRIDE;
   // this one is implemented in Fl_win32.cxx
-  virtual void* thread_message();
-  virtual int file_type(const char *filename);
-  virtual const char *home_directory_name();
-  virtual const char *filesystems_label() { return "My Computer"; }
-  virtual int backslash_as_slash() {return 1;}
-  virtual int colon_is_drive() {return 1;}
-  virtual int case_insensitive_filenames() {return 1;}
+  void* thread_message() FL_OVERRIDE;
+  int file_type(const char *filename) FL_OVERRIDE;
+  const char *home_directory_name() FL_OVERRIDE;
+  const char *filesystems_label() FL_OVERRIDE { return "My Computer"; }
+  int backslash_as_slash() FL_OVERRIDE {return 1;}
+  int colon_is_drive() FL_OVERRIDE {return 1;}
+  int case_insensitive_filenames() FL_OVERRIDE {return 1;}
   // this one is implemented in Fl_win32.cxx
-  virtual const char *filename_name(const char *buf);
-  virtual void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0);
-  virtual void add_fd(int fd, Fl_FD_Handler cb, void* = 0);
-  virtual void remove_fd(int, int when);
-  virtual void remove_fd(int);
-  virtual void gettime(time_t *sec, int *usec);
-  virtual char* strdup(const char *s) { return ::_strdup(s); }
-  virtual void lock_ring();
-  virtual void unlock_ring();
-  virtual double wait(double time_to_wait);
-  virtual int ready();
-  virtual int close_fd(int fd);
+  const char *filename_name(const char *buf) FL_OVERRIDE;
+  void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0) FL_OVERRIDE;
+  void add_fd(int fd, Fl_FD_Handler cb, void* = 0) FL_OVERRIDE;
+  void remove_fd(int, int when) FL_OVERRIDE;
+  void remove_fd(int) FL_OVERRIDE;
+  void gettime(time_t *sec, int *usec) FL_OVERRIDE;
+  char* strdup(const char *s) FL_OVERRIDE { return ::_strdup(s); }
+  void lock_ring() FL_OVERRIDE;
+  void unlock_ring() FL_OVERRIDE;
+  double wait(double time_to_wait) FL_OVERRIDE;
+  int ready() FL_OVERRIDE;
+  int close_fd(int fd) FL_OVERRIDE;
 };
 
 #endif // FL_WINAPI_SYSTEM_DRIVER_H
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
index afc8cc39b..bc834b48c 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
@@ -60,7 +60,7 @@ class Fl_WinAPI_Window_Driver : public Fl_Window_Driver
   } *shape_data_;
 private:
   void shape_bitmap_(Fl_Image* b);
-  void shape_alpha_(Fl_Image* img, int offset);
+  void shape_alpha_(Fl_Image* img, int offset) FL_OVERRIDE;
 public:
   Fl_WinAPI_Window_Driver(Fl_Window*);
   ~Fl_WinAPI_Window_Driver();
@@ -80,43 +80,43 @@ public:
   int fake_X_wm(int &X, int &Y, int &bt, int &bx, int &by, DWORD style = 0, DWORD styleEx = 0);
   void make_fullscreen(int X, int Y, int W, int H);
   // --- 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 size_range() {
+  Fl_X *makeWindow() FL_OVERRIDE;
+  void size_range() FL_OVERRIDE {
     // currently nothing to do
   }
-  virtual void flush_double();
-  virtual void flush_overlay();
-  virtual void draw_begin();
-  virtual void make_current();
-  virtual void show();
-  virtual void label(const char *name,const char *iname);
-  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 iconize();
-  virtual void decoration_sizes(int *top, int *left,  int *right, int *bottom);
+  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 label(const char *name,const char *iname) 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 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);
-  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();
+  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
   // this one is implemented in Fl_win32.cxx
-  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);
+  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;
   static void resize_after_screen_change(void *data);
 };