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 /src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.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 'src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H')
| -rw-r--r-- | src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H b/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H index 27f34e226..94d890f3d 100644 --- a/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H +++ b/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H @@ -23,21 +23,21 @@ class Fl_MacOS_Sys_Menu_Bar_Driver : public Fl_Sys_Menu_Bar_Driver { public: Fl_MacOS_Sys_Menu_Bar_Driver(); virtual ~Fl_MacOS_Sys_Menu_Bar_Driver(); - virtual void update(); - virtual void draw(); - virtual void about(Fl_Callback *cb, void *data); - virtual int add(const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags); - virtual int add(const char* str); - virtual int insert(int index, const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags); - virtual void menu(const Fl_Menu_Item *m); - virtual void shortcut (int i, int s); - virtual void setonly (Fl_Menu_Item *item); - virtual void clear(); - virtual int clear_submenu(int index); - virtual void remove(int index); - virtual void replace(int index, const char *name); - virtual void mode(int i, int fl); - virtual void create_window_menu(); + void update() FL_OVERRIDE; + void draw() FL_OVERRIDE; + void about(Fl_Callback *cb, void *data) FL_OVERRIDE; + int add(const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags) FL_OVERRIDE; + int add(const char* str) FL_OVERRIDE; + int insert(int index, const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags) FL_OVERRIDE; + void menu(const Fl_Menu_Item *m) FL_OVERRIDE; + void shortcut (int i, int s) FL_OVERRIDE; + void setonly (Fl_Menu_Item *item) FL_OVERRIDE; + void clear() FL_OVERRIDE; + int clear_submenu(int index) FL_OVERRIDE; + void remove(int index) FL_OVERRIDE; + void replace(int index, const char *name) FL_OVERRIDE; + void mode(int i, int fl) FL_OVERRIDE; + void create_window_menu() FL_OVERRIDE; int find_first_window(); void new_window(Fl_Window *win); void remove_window(Fl_Window *win); |
