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_Scroll.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_Scroll.H')
| -rw-r--r-- | FL/Fl_Scroll.H | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/FL/Fl_Scroll.H b/FL/Fl_Scroll.H index 1917c96fd..0331c8330 100644 --- a/FL/Fl_Scroll.H +++ b/FL/Fl_Scroll.H @@ -146,19 +146,19 @@ protected: // (STR#1895) protected: - int on_insert(Fl_Widget*, int); // override - int on_move(int, int); // override + int on_insert(Fl_Widget*, int) FL_OVERRIDE; + int on_move(int, int) FL_OVERRIDE; void fix_scrollbar_order(); void bbox(int&,int&,int&,int&) const; - void draw(); + void draw() FL_OVERRIDE; public: Fl_Scrollbar scrollbar; Fl_Scrollbar hscrollbar; - void resize(int X, int Y, int W, int H); - int handle(int); + void resize(int X, int Y, int W, int H) FL_OVERRIDE; + int handle(int) FL_OVERRIDE; Fl_Scroll(int X, int Y, int W, int H, const char *L = 0); virtual ~Fl_Scroll(); @@ -181,7 +181,7 @@ public: void clear(); /* delete child n (by index) */ - virtual int delete_child(int n); + int delete_child(int n) FL_OVERRIDE; /** Gets the current size of the scrollbars' troughs, in pixels. |