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

diff --git a/fluid/Fl_Widget_Type.h b/fluid/Fl_Widget_Type.h
index 9a8555c3f..a9e9942e1 100644
--- a/fluid/Fl_Widget_Type.h
+++ b/fluid/Fl_Widget_Type.h
@@ -40,7 +40,7 @@ void comment_cb(class Fl_Text_Editor* i, void *v);
 class Fl_Widget_Type : public Fl_Type {
   virtual Fl_Widget *widget(int,int,int,int) = 0;
   virtual Fl_Widget_Type *_make() = 0; // virtual constructor
-  virtual void setlabel(const char *);
+  void setlabel(const char *) FL_OVERRIDE;
 
   const char *extra_code_[NUM_EXTRA_CODE];
   const char *subclass_;
@@ -51,12 +51,12 @@ class Fl_Widget_Type : public Fl_Type {
 
 protected:
 
-  void write_static();
-  void write_code1();
+  void write_static() FL_OVERRIDE;
+  void write_code1() FL_OVERRIDE;
   void write_widget_code();
   void write_extra_code();
   void write_block_close();
-  void write_code2();
+  void write_code2() FL_OVERRIDE;
   void write_color(const char*, Fl_Color);
   Fl_Widget *live_widget;
 
@@ -75,8 +75,8 @@ public:
   void setinactive(Fluid_Image *);
 
   Fl_Widget_Type();
-  Fl_Type *make(Strategy strategy);
-  void open();
+  Fl_Type *make(Strategy strategy) FL_OVERRIDE;
+  void open() FL_OVERRIDE;
 
   const char *extra_code(int n) const {return extra_code_[n];}
   void extra_code(int n,const char *);
@@ -96,16 +96,16 @@ public:
   virtual int textstuff(int what, Fl_Font &, int &, Fl_Color &);
   virtual Fl_Menu_Item *subtypes();
 
-  virtual int is_widget() const;
-  virtual int is_public() const;
+  int is_widget() const FL_OVERRIDE;
+  int is_public() const FL_OVERRIDE;
 
-  virtual void write_properties();
-  virtual void read_property(const char *);
-  virtual int read_fdesign(const char*, const char*);
+  void write_properties() FL_OVERRIDE;
+  void read_property(const char *) FL_OVERRIDE;
+  int read_fdesign(const char*, const char*) FL_OVERRIDE;
 
-  virtual Fl_Widget *enter_live_mode(int top=0);
-  virtual void leave_live_mode();
-  virtual void copy_properties();
+  Fl_Widget *enter_live_mode(int top=0) FL_OVERRIDE;
+  void leave_live_mode() FL_OVERRIDE;
+  void copy_properties() FL_OVERRIDE;
 
   virtual void ideal_size(int &w, int &h);
   virtual void ideal_spacing(int &x, int &y);