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 /test/fonts.cxx | |
| 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 'test/fonts.cxx')
| -rw-r--r-- | test/fonts.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/fonts.cxx b/test/fonts.cxx index ef161eae3..04e11ad75 100644 --- a/test/fonts.cxx +++ b/test/fonts.cxx @@ -32,7 +32,7 @@ Fl_Tile *tile; Fl_Window *vector_font_editor = 0; class FontDisplay : public Fl_Widget { - void draw(); + void draw() FL_OVERRIDE; public: int font, size; FontDisplay(Fl_Boxtype B, int X, int Y, int W, int H, const char* L = 0) : @@ -109,7 +109,7 @@ class LetterBox : public Fl_Group public: LetterBox(int x, int y, int w, int h, const char *l) : Fl_Group(x, y, w, h, l) { } - void draw() { + void draw() FL_OVERRIDE { draw_box(); fl_push_clip(x(), y(), w(), h()); draw_label(x(), y()-5, w(), h()-16, FL_ALIGN_CENTER); @@ -270,7 +270,7 @@ class Ut_Main_Window : public Fl_Double_Window public: Ut_Main_Window(int w, int h, const char *l=0) : Fl_Double_Window(w, h, l) { } - int handle(int event) { + int handle(int event) FL_OVERRIDE { if (event==FL_KEYBOARD && Fl::event_key()==FL_F+1) { if (!vector_font_editor) vector_font_editor = create_editor(); vector_font_editor->show(); |
