summaryrefslogtreecommitdiff
path: root/FL/Fl_SVG_Image.H
diff options
context:
space:
mode:
authorMatthias Melcher <github@matthiasm.com>2022-12-30 19:14:36 +0100
committerGitHub <noreply@github.com>2022-12-30 19:14:36 +0100
commit44c874b731f9f58c2f50c3c6076371058cbe26e3 (patch)
tree2386dfcc700c41a1109fc78b96875c11056abcc9 /FL/Fl_SVG_Image.H
parentf58a93a159105336136ce6e54ab7fc161e4fa15a (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_SVG_Image.H')
-rw-r--r--FL/Fl_SVG_Image.H14
1 files changed, 7 insertions, 7 deletions
diff --git a/FL/Fl_SVG_Image.H b/FL/Fl_SVG_Image.H
index 2171c2a75..6d9f77777 100644
--- a/FL/Fl_SVG_Image.H
+++ b/FL/Fl_SVG_Image.H
@@ -146,7 +146,7 @@ private:
float average_weight_;
float svg_scaling_(int W, int H);
void rasterize_(int W, int H);
- virtual void cache_size_(int &width, int &height);
+ void cache_size_(int &width, int &height) FL_OVERRIDE;
void init_(const char *name, const unsigned char *filedata, size_t length);
Fl_SVG_Image(const Fl_SVG_Image *source);
public:
@@ -157,17 +157,17 @@ public:
Fl_SVG_Image(const char *sharedname, const char *svg_data);
Fl_SVG_Image(const char *sharedname, const unsigned char *svg_data, size_t length);
virtual ~Fl_SVG_Image();
- virtual Fl_Image *copy(int W, int H) const;
+ Fl_Image *copy(int W, int H) const FL_OVERRIDE;
Fl_Image *copy() const {
return Fl_Image::copy();
}
void resize(int width, int height);
- virtual void desaturate();
- virtual void color_average(Fl_Color c, float i);
- virtual void draw(int X, int Y, int W, int H, int cx = 0, int cy = 0);
+ void desaturate() FL_OVERRIDE;
+ void color_average(Fl_Color c, float i) 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 Fl_SVG_Image *as_svg_image() { return this; }
- virtual void normalize();
+ Fl_SVG_Image *as_svg_image() FL_OVERRIDE { return this; }
+ void normalize() FL_OVERRIDE;
};
#endif // FL_SVG_IMAGE_H