diff options
| author | Matthias Melcher <github@matthiasm.com> | 2022-12-30 19:14:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-30 19:14:36 +0100 |
| commit | 44c874b731f9f58c2f50c3c6076371058cbe26e3 (patch) | |
| tree | 2386dfcc700c41a1109fc78b96875c11056abcc9 /FL/Fl_Image.H | |
| parent | f58a93a159105336136ce6e54ab7fc161e4fa15a (diff) | |
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()
Diffstat (limited to 'FL/Fl_Image.H')
| -rw-r--r-- | FL/Fl_Image.H | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H index d571d9e88..fb1ddf734 100644 --- a/FL/Fl_Image.H +++ b/FL/Fl_Image.H @@ -356,16 +356,16 @@ public: Fl_RGB_Image(const uchar *bits, int W, int H, int D=3, int LD=0); Fl_RGB_Image(const uchar *bits, int bits_length, int W, int H, int D, int LD); Fl_RGB_Image(const Fl_Pixmap *pxm, Fl_Color bg=FL_GRAY); - virtual ~Fl_RGB_Image(); - virtual Fl_Image *copy(int W, int H) const; + ~Fl_RGB_Image() FL_OVERRIDE; + Fl_Image *copy(int W, int H) const FL_OVERRIDE; Fl_Image *copy() const { return Fl_Image::copy(); } - virtual void color_average(Fl_Color c, float i); - virtual void desaturate(); - virtual void draw(int X, int Y, int W, int H, int cx=0, int cy=0); + void color_average(Fl_Color c, float i) FL_OVERRIDE; + void desaturate() FL_OVERRIDE; + void draw(int X, int Y, int W, int H, int cx=0, int cy=0) FL_OVERRIDE; void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);} - virtual void label(Fl_Widget*w); - virtual void label(Fl_Menu_Item*m); - virtual void uncache(); + void label(Fl_Widget*w) FL_OVERRIDE; + void label(Fl_Menu_Item*m) FL_OVERRIDE; + void uncache() FL_OVERRIDE; /** Sets the maximum allowed image size in bytes when creating an Fl_RGB_Image object. The image size in bytes of an Fl_RGB_Image object is the value of the product w() * h() * d(). |