From 44c874b731f9f58c2f50c3c6076371058cbe26e3 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Fri, 30 Dec 2022 19:14:36 +0100 Subject: 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() --- FL/Fl_Check_Browser.H | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'FL/Fl_Check_Browser.H') diff --git a/FL/Fl_Check_Browser.H b/FL/Fl_Check_Browser.H index da2cd579c..50a719f7a 100644 --- a/FL/Fl_Check_Browser.H +++ b/FL/Fl_Check_Browser.H @@ -31,20 +31,20 @@ class FL_EXPORT Fl_Check_Browser : public Fl_Browser_ { protected: /* required routines for Fl_Browser_ subclass: */ - void *item_first() const; - void *item_next(void *) const; - void *item_prev(void *) const; - int item_height(void *) const; - int item_width(void *) const; - void item_draw(void *, int, int, int, int) const; - void item_select(void *, int); - int item_selected(void *) const; - const char *item_text(void *item) const; // override + void *item_first() const FL_OVERRIDE; + void *item_next(void *) const FL_OVERRIDE; + void *item_prev(void *) const FL_OVERRIDE; + int item_height(void *) const FL_OVERRIDE; + int item_width(void *) const FL_OVERRIDE; + void item_draw(void *, int, int, int, int) const FL_OVERRIDE; + void item_select(void *, int) FL_OVERRIDE; + int item_selected(void *) const FL_OVERRIDE; + const char *item_text(void *item) const FL_OVERRIDE; public: - void *item_at(int index) const; // override - void item_swap(int ia, int ib); // override - void item_swap(void *a, void *b); // override + void *item_at(int index) const FL_OVERRIDE; + void item_swap(int ia, int ib); + void item_swap(void *a, void *b) FL_OVERRIDE; /* private data */ @@ -104,7 +104,7 @@ public: char *text(int item) const; // returns pointer to internal buffer protected: - int handle(int); + int handle(int) FL_OVERRIDE; }; #endif // Fl_Check_Browser_H -- cgit v1.2.3