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/WinAPI/Fl_WinAPI_Gl_Window_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/WinAPI/Fl_WinAPI_Gl_Window_Driver.H')
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H index 6934fec15..62aab946a 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H @@ -34,32 +34,32 @@ Consequently, FL_DOUBLE is enforced in all Fl_Gl_Window::mode_ values under Wayl class Fl_WinAPI_Gl_Window_Driver : public Fl_Gl_Window_Driver { friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *); Fl_WinAPI_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {} - virtual float pixels_per_unit(); - virtual int mode_(int m, const int *a); - virtual void make_current_after(); - virtual void swap_buffers(); - virtual void invalidate() {} - virtual int flush_begin(char& valid_f); - virtual Fl_Gl_Choice *find(int m, const int *alistp); - virtual GLContext create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g); + float pixels_per_unit() FL_OVERRIDE; + int mode_(int m, const int *a) FL_OVERRIDE; + void make_current_after() FL_OVERRIDE; + void swap_buffers() FL_OVERRIDE; + void invalidate() FL_OVERRIDE {} + int flush_begin(char& valid_f) FL_OVERRIDE; + Fl_Gl_Choice *find(int m, const int *alistp) FL_OVERRIDE; + GLContext create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g) FL_OVERRIDE; GLContext do_create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g, int layer); - virtual void set_gl_context(Fl_Window* w, GLContext context); - virtual void delete_gl_context(GLContext); - virtual void make_overlay_current(); - virtual void redraw_overlay(); - virtual void* GetProcAddress(const char *procName); - virtual void draw_string_legacy(const char* str, int n); - virtual void gl_bitmap_font(Fl_Font_Descriptor *fl_fontsize); - virtual void get_list(Fl_Font_Descriptor *fd, int r); - virtual int genlistsize(); - virtual void switch_to_GL1(); - virtual void switch_back(); + void set_gl_context(Fl_Window* w, GLContext context) FL_OVERRIDE; + void delete_gl_context(GLContext) FL_OVERRIDE; + void make_overlay_current() FL_OVERRIDE; + void redraw_overlay() FL_OVERRIDE; + void* GetProcAddress(const char *procName) FL_OVERRIDE; + void draw_string_legacy(const char* str, int n) FL_OVERRIDE; + void gl_bitmap_font(Fl_Font_Descriptor *fl_fontsize) FL_OVERRIDE; + void get_list(Fl_Font_Descriptor *fd, int r) FL_OVERRIDE; + int genlistsize() FL_OVERRIDE; + void switch_to_GL1() FL_OVERRIDE; + void switch_back() FL_OVERRIDE; #if HAVE_GL_OVERLAY - virtual void gl_hide_before(void *& overlay); - virtual int can_do_overlay(); - virtual int overlay_color(Fl_Color i); - void make_overlay(void*&overlay); + void gl_hide_before(void *& overlay) FL_OVERRIDE; + int can_do_overlay() FL_OVERRIDE; + int overlay_color(Fl_Color i) FL_OVERRIDE; + void make_overlay(void*&overlay) FL_OVERRIDE; #endif }; |
