summaryrefslogtreecommitdiff
path: root/FL/Fl_Shared_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_Shared_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_Shared_Image.H')
-rw-r--r--FL/Fl_Shared_Image.H16
1 files changed, 8 insertions, 8 deletions
diff --git a/FL/Fl_Shared_Image.H b/FL/Fl_Shared_Image.H
index 9307b9e58..c95db55e0 100644
--- a/FL/Fl_Shared_Image.H
+++ b/FL/Fl_Shared_Image.H
@@ -139,22 +139,22 @@ public:
*/
int original() { return original_; }
- void release();
- void reload();
+ void release() FL_OVERRIDE;
+ virtual void reload();
- virtual Fl_Shared_Image *as_shared_image() {
+ Fl_Shared_Image *as_shared_image() FL_OVERRIDE {
return this;
}
- 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();
}
- 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 uncache();
+ void uncache() FL_OVERRIDE;
static Fl_Shared_Image *find(const char *name, int W = 0, int H = 0);
static Fl_Shared_Image *get(const char *name, int W = 0, int H = 0);