From 3cf5a302fd2225b8d2622eb40e91262f4e7557c1 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Tue, 8 Jul 2025 14:59:37 +0200 Subject: Replace 'FL_OVERRIDE' with 'override' in public headers ... except FL/fl_attr.h where FL_OVERRIDE is #define'd --- FL/Fl_Pixmap.H | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'FL/Fl_Pixmap.H') diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index 0efdb84c7..13809063f 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -63,15 +63,15 @@ public: /** The constructors create a new pixmap from the specified XPM data. */ explicit Fl_Pixmap(const uchar* const * D) : Fl_Image(-1,0,1), alloc_data(0), id_(0), mask_(0) {set_data((const char*const*)D); measure();} virtual ~Fl_Pixmap(); - Fl_Image *copy(int W, int H) const FL_OVERRIDE; + Fl_Image *copy(int W, int H) const override; Fl_Image *copy() const { return Fl_Image::copy(); } - 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 color_average(Fl_Color c, float i) override; + void desaturate() override; + void draw(int X, int Y, int W, int H, int cx=0, int cy=0) override; void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);} - void label(Fl_Widget*w) FL_OVERRIDE; - void label(Fl_Menu_Item*m) FL_OVERRIDE; - void uncache() FL_OVERRIDE; + void label(Fl_Widget*w) override; + void label(Fl_Menu_Item*m) override; + void uncache() override; int cache_w() {return cache_w_;} int cache_h() {return cache_h_;} }; -- cgit v1.2.3