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() --- src/Fl_Menu.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Fl_Menu.cxx') diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 39f3cba34..d726a692b 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -116,7 +116,7 @@ public: // tiny window for title of menu: class menutitle : public window_with_items { - void draw(); + void draw() FL_OVERRIDE; public: menutitle(int X, int Y, int W, int H, const Fl_Menu_Item*); }; @@ -125,14 +125,14 @@ public: class menuwindow : public window_with_items { friend class Fl_Window_Driver; friend struct Fl_Menu_Item; - void draw(); + void draw() FL_OVERRIDE; void drawentry(const Fl_Menu_Item*, int i, int erase); int handle_part1(int); int handle_part2(int e, int ret); static Fl_Window *parent_; public: menutitle* title; - int handle(int); + int handle(int) FL_OVERRIDE; int itemheight; // zero == menubar int numitems; int selected; -- cgit v1.2.3