diff options
Diffstat (limited to 'src')
55 files changed, 1264 insertions, 1264 deletions
diff --git a/src/Fl_Color_Chooser.cxx b/src/Fl_Color_Chooser.cxx index 08307a8da..665c72dc6 100644 --- a/src/Fl_Color_Chooser.cxx +++ b/src/Fl_Color_Chooser.cxx @@ -580,7 +580,7 @@ Fl_Color_Chooser::Fl_Color_Chooser(int X, int Y, int W, int H, const char* L) #include <FL/Fl_Return_Button.H> class ColorChip : public Fl_Widget { - void draw(); + void draw() FL_OVERRIDE; public: uchar r,g,b; ColorChip(int X, int Y, int W, int H) : Fl_Widget(X,Y,W,H) { diff --git a/src/Fl_Gl_Device_Plugin.cxx b/src/Fl_Gl_Device_Plugin.cxx index 6abdbb514..12fe05bfc 100644 --- a/src/Fl_Gl_Device_Plugin.cxx +++ b/src/Fl_Gl_Device_Plugin.cxx @@ -28,8 +28,8 @@ class Fl_Gl_Device_Plugin : public Fl_Device_Plugin { public: Fl_Gl_Device_Plugin() : Fl_Device_Plugin(name()) { } - virtual const char *name() { return "opengl.device.fltk.org"; } - virtual int print(Fl_Widget *w) { + const char *name() FL_OVERRIDE { return "opengl.device.fltk.org"; } + int print(Fl_Widget *w) FL_OVERRIDE { Fl_Gl_Window *glw = w->as_gl_window(); if (!glw) return 0; Fl_RGB_Image *img = Fl_Gl_Window_Driver::driver(glw)->capture_gl_rectangle(0, 0, glw->w(), glw->h()); @@ -38,7 +38,7 @@ public: delete img; return 1; } - virtual Fl_RGB_Image* rectangle_capture(Fl_Widget *widget, int x, int y, int w, int h) { + Fl_RGB_Image* rectangle_capture(Fl_Widget *widget, int x, int y, int w, int h) FL_OVERRIDE { Fl_Gl_Window *glw = widget->as_gl_window(); if (!glw) return NULL; return Fl_Gl_Window_Driver::driver(glw)->capture_gl_rectangle(x, y, w, h); 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; diff --git a/src/Fl_Message.h b/src/Fl_Message.h index 7450d23a1..2f33df1d1 100644 --- a/src/Fl_Message.h +++ b/src/Fl_Message.h @@ -45,7 +45,7 @@ class Fl_Message_Box : public Fl_Box { public: Fl_Message_Box(int X, int Y, int W, int H) : Fl_Box(X, Y, W, H) {} - int handle(int e); + int handle(int e) FL_OVERRIDE; }; // class Fl_Message_Box /** diff --git a/src/Fl_Native_File_Chooser_GTK.cxx b/src/Fl_Native_File_Chooser_GTK.cxx index cbfe50440..6a4e3fad0 100644 --- a/src/Fl_Native_File_Chooser_GTK.cxx +++ b/src/Fl_Native_File_Chooser_GTK.cxx @@ -130,16 +130,16 @@ private: int fl_gtk_chooser_wrapper(); // method that wraps the GTK widget Fl_GTK_Native_File_Chooser_Driver(int val); - virtual ~Fl_GTK_Native_File_Chooser_Driver(); + ~Fl_GTK_Native_File_Chooser_Driver() FL_OVERRIDE; static int did_find_GTK_libs; static void probe_for_GTK_libs(void); - virtual void type(int); - virtual int count() const; - virtual const char *filename() const; - virtual const char *filename(int i) const; - virtual void title(const char *); - virtual const char* title() const; - virtual int show(); + void type(int) FL_OVERRIDE; + int count() const FL_OVERRIDE; + const char *filename() const FL_OVERRIDE; + const char *filename(int i) const FL_OVERRIDE; + void title(const char *) FL_OVERRIDE; + const char* title() const FL_OVERRIDE; + int show() FL_OVERRIDE; void changed_output_type(const char *filter); static int custom_gtk_filter_function(const GtkFileFilterInfo*, Fl_GTK_Native_File_Chooser_Driver::pair*); diff --git a/src/Fl_Native_File_Chooser_Kdialog.H b/src/Fl_Native_File_Chooser_Kdialog.H index c4f824b76..fd423a8c6 100644 --- a/src/Fl_Native_File_Chooser_Kdialog.H +++ b/src/Fl_Native_File_Chooser_Kdialog.H @@ -36,21 +36,21 @@ class Fl_Kdialog_Native_File_Chooser_Driver : public Fl_Native_File_Chooser_FLTK static bool have_looked_for_kdialog; Fl_Kdialog_Native_File_Chooser_Driver(int val); ~Fl_Kdialog_Native_File_Chooser_Driver(); - int count() const; - const char *filename() const; - const char *filename(int i) const; + int count() const FL_OVERRIDE; + const char *filename() const FL_OVERRIDE; + const char *filename(int i) const FL_OVERRIDE; virtual char *build_command(); - int show(); + int show() FL_OVERRIDE; char *parse_filter(const char *f); - const char *filter() const; - virtual void filter(const char *f); - int filters() const; - void preset_file(const char *val); - const char *preset_file() const; - void directory(const char *val); - const char *directory() const; - void title(const char *val); - const char *title() const; + const char *filter() const FL_OVERRIDE; + void filter(const char *f) FL_OVERRIDE; + int filters() const FL_OVERRIDE; + void preset_file(const char *val) FL_OVERRIDE; + const char *preset_file() const FL_OVERRIDE; + void directory(const char *val) FL_OVERRIDE; + const char *directory() const FL_OVERRIDE; + void title(const char *val) FL_OVERRIDE; + const char *title() const FL_OVERRIDE; }; #endif // FL_KDIALOG_NATIVE_FILE_CHOOSER_H diff --git a/src/Fl_Native_File_Chooser_MAC.mm b/src/Fl_Native_File_Chooser_MAC.mm index a0ef1ac74..df4808cb2 100644 --- a/src/Fl_Native_File_Chooser_MAC.mm +++ b/src/Fl_Native_File_Chooser_MAC.mm @@ -67,26 +67,26 @@ private: public: Fl_Quartz_Native_File_Chooser_Driver(int val); ~Fl_Quartz_Native_File_Chooser_Driver(); - virtual void type(int t); - virtual int type() const ; - virtual void options(int o); - virtual int options() const; - virtual int count() const; - virtual const char *filename() const ; - virtual const char *filename(int i) const ; - virtual void directory(const char *val) ; - virtual const char *directory() const; - virtual void title(const char *t); - virtual const char* title() const; - virtual const char *filter() const ; - virtual void filter(const char *f); - virtual int filters() const ; - virtual void filter_value(int i) ; - virtual int filter_value() const ; - virtual void preset_file(const char*f) ; - virtual const char* preset_file() const; - virtual const char *errmsg() const ; - virtual int show() ; + void type(int t) FL_OVERRIDE; + int type() const FL_OVERRIDE; + void options(int o) FL_OVERRIDE; + int options() const FL_OVERRIDE; + int count() const FL_OVERRIDE; + const char *filename() const FL_OVERRIDE; + const char *filename(int i) const FL_OVERRIDE; + void directory(const char *val) FL_OVERRIDE; + const char *directory() const FL_OVERRIDE; + void title(const char *t) FL_OVERRIDE; + const char* title() const FL_OVERRIDE; + const char *filter() const FL_OVERRIDE; + void filter(const char *f) FL_OVERRIDE; + int filters() const FL_OVERRIDE; + void filter_value(int i) FL_OVERRIDE; + int filter_value() const FL_OVERRIDE; + void preset_file(const char*f) FL_OVERRIDE; + const char* preset_file() const FL_OVERRIDE; + const char *errmsg() const FL_OVERRIDE; + int show() FL_OVERRIDE; }; Fl_Native_File_Chooser::Fl_Native_File_Chooser(int val) { diff --git a/src/Fl_Native_File_Chooser_WIN32.cxx b/src/Fl_Native_File_Chooser_WIN32.cxx index 066923942..901c8fbf6 100644 --- a/src/Fl_Native_File_Chooser_WIN32.cxx +++ b/src/Fl_Native_File_Chooser_WIN32.cxx @@ -77,26 +77,26 @@ private: public: Fl_WinAPI_Native_File_Chooser_Driver(int val); ~Fl_WinAPI_Native_File_Chooser_Driver(); - virtual void type(int t); - virtual int type() const ; - virtual void options(int o); - virtual int options() const; - virtual int count() const; - virtual const char *filename() const ; - virtual const char *filename(int i) const ; - virtual void directory(const char *val) ; - virtual const char *directory() const; - virtual void title(const char *t); - virtual const char* title() const; - virtual const char *filter() const ; - virtual void filter(const char *f); - virtual int filters() const ; - virtual void filter_value(int i) ; - virtual int filter_value() const ; - virtual void preset_file(const char*f) ; - virtual const char* preset_file() const; - virtual const char *errmsg() const ; - virtual int show() ; + void type(int t) FL_OVERRIDE; + int type() const FL_OVERRIDE; + void options(int o) FL_OVERRIDE; + int options() const FL_OVERRIDE; + int count() const FL_OVERRIDE; + const char *filename() const FL_OVERRIDE; + const char *filename(int i) const FL_OVERRIDE; + void directory(const char *val) FL_OVERRIDE; + const char *directory() const FL_OVERRIDE; + void title(const char *t) FL_OVERRIDE; + const char* title() const FL_OVERRIDE; + const char *filter() const FL_OVERRIDE; + void filter(const char *f) FL_OVERRIDE; + int filters() const FL_OVERRIDE; + void filter_value(int i) FL_OVERRIDE; + int filter_value() const FL_OVERRIDE; + void preset_file(const char*f) FL_OVERRIDE; + const char* preset_file() const FL_OVERRIDE; + const char *errmsg() const FL_OVERRIDE; + int show() FL_OVERRIDE; }; diff --git a/src/Fl_Native_File_Chooser_Zenity.H b/src/Fl_Native_File_Chooser_Zenity.H index bdaa5ba20..269d2f9cd 100644 --- a/src/Fl_Native_File_Chooser_Zenity.H +++ b/src/Fl_Native_File_Chooser_Zenity.H @@ -24,7 +24,7 @@ class Fl_Zenity_Native_File_Chooser_Driver : public Fl_Kdialog_Native_File_Choos static bool did_find_zenity; static bool have_looked_for_zenity; Fl_Zenity_Native_File_Chooser_Driver(int val); - virtual char *build_command(); + char *build_command() FL_OVERRIDE; }; #endif // FL_ZENITY_NATIVE_FILE_CHOOSER_H diff --git a/src/Fl_Screen_Driver.H b/src/Fl_Screen_Driver.H index 7ccbc67e9..38070df5a 100644 --- a/src/Fl_Screen_Driver.H +++ b/src/Fl_Screen_Driver.H @@ -109,8 +109,8 @@ public: virtual void init() {} virtual int x() { return 0; } virtual int y() { return 0; } - virtual int w() { return 800; } // default, override in driver! - virtual int h() { return 600; } // default, override in driver! + virtual int w() { return 800; } // default, FL_OVERRIDE in driver! + virtual int h() { return 600; } // default, FL_OVERRIDE in driver! virtual int screen_count(); void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my); virtual void screen_xywh(int &X, int &Y, int &W, int &H, int /*n*/) { @@ -122,7 +122,7 @@ public: void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my, int mw, int mh); virtual int screen_num(int x, int y); virtual int screen_num(int x, int y, int w, int h); - virtual void screen_dpi(float &h, float &v, int n = 0) { // override in driver! + virtual void screen_dpi(float &h, float &v, int n = 0) { // FL_OVERRIDE in driver! h = 72; v = 72; (void)n; @@ -134,7 +134,7 @@ public: // --- audible output virtual void beep(int) {} // --- global events - virtual void flush() {} // must override + virtual void flush() {} // must FL_OVERRIDE virtual void grab(Fl_Window *) {} // --- global colors /* the default implementation of parse_color() may be enough */ diff --git a/src/Fl_System_Driver.H b/src/Fl_System_Driver.H index 89a555fdb..89110b201 100644 --- a/src/Fl_System_Driver.H +++ b/src/Fl_System_Driver.H @@ -220,8 +220,8 @@ public: virtual Fl_Sys_Menu_Bar_Driver *sys_menu_bar_driver() { return NULL; } virtual void lock_ring() {} virtual void unlock_ring() {} - virtual double wait(double); // must override - virtual int ready() { return 0; } // must override + virtual double wait(double); // must FL_OVERRIDE + virtual int ready() { return 0; } // must FL_OVERRIDE virtual int close_fd(int) {return -1;} // to close a file descriptor }; diff --git a/src/Fl_Tooltip.cxx b/src/Fl_Tooltip.cxx index 35898dc05..f77b668e9 100644 --- a/src/Fl_Tooltip.cxx +++ b/src/Fl_Tooltip.cxx @@ -52,16 +52,16 @@ public: set_tooltip_window(); end(); } - void draw(); + void draw() FL_OVERRIDE; void layout(); /** Shows the tooltip windows only if a tooltip text is available. */ - void show() { + void show() FL_OVERRIDE { if (!tip) return; Fl_Menu_Window::show(); } - int handle(int e) { + int handle(int e) FL_OVERRIDE { if (e == FL_PUSH || e == FL_KEYDOWN) { hide(); Fl::remove_timeout(tooltip_hide_timeout); diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 2c2720033..2cc04913c 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -2412,7 +2412,7 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap) attr.colormap = colormap; attr.border_pixel = 0; attr.bit_gravity = 0; // StaticGravity; - if (win->override()) { + if (win->FL_OVERRIDE()) { attr.override_redirect = 1; attr.save_under = 1; mask |= CWOverrideRedirect | CWSaveUnder; @@ -2613,7 +2613,7 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap) void Fl_X11_Window_Driver::sendxjunk() { Fl_Window *w = pWindow; - if (w->parent() || w->override()) return; // it's not a window manager window! + if (w->parent() || w->FL_OVERRIDE()) return; // it's not a window manager window! XSizeHints *hints = XAllocSizeHints(); // memset(&hints, 0, sizeof(hints)); jreiser suggestion to fix purify? diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H index 3343345a1..0b5eee198 100644 --- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H +++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H @@ -38,7 +38,7 @@ typedef struct _PangoFontDescription PangoFontDescription; class Fl_Cairo_Font_Descriptor : public Fl_Font_Descriptor { public: Fl_Cairo_Font_Descriptor(const char* fontname, Fl_Fontsize size, PangoContext *context); - virtual FL_EXPORT ~Fl_Cairo_Font_Descriptor(); + FL_EXPORT ~Fl_Cairo_Font_Descriptor() FL_OVERRIDE; PangoFontDescription *fontref; int **width; // array of arrays of character widths int line_height; @@ -57,7 +57,7 @@ protected: PangoLayout *pango_layout_; public: Fl_Cairo_Graphics_Driver(); - virtual ~Fl_Cairo_Graphics_Driver(); + ~Fl_Cairo_Graphics_Driver() FL_OVERRIDE; class Clip { public: @@ -93,110 +93,110 @@ public: void needs_commit_tag(bool *tag) { needs_commit_tag_ = tag; } // implementation of drawing methods - void color(Fl_Color c); - void color(uchar r, uchar g, uchar b); - Fl_Color color(); - - void push_clip(int x, int y, int w, int h); - void push_no_clip(); - void pop_clip(); - - void line_style(int style, int width=0, char* dashes=0); - - void rect(int x, int y, int w, int h); - void rectf(int x, int y, int w, int h); - - void xyline(int x, int y, int x1); - void xyline(int x, int y, int x1, int y2); - void xyline(int x, int y, int x1, int y2, int x3); - - void yxline(int x, int y, int y1); - void yxline(int x, int y, int y1, int x2); - void yxline(int x, int y, int y1, int x2, int y3); - - void line(int x1, int y1, int x2, int y2); - void line(int x1, int y1, int x2, int y2, int x3, int y3); - - void loop(int x0, int y0, int x1, int y1, int x2, int y2); - void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); - void polygon(int x0, int y0, int x1, int y1, int x2, int y2); - void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); - void point(int x, int y); - void overlay_rect(int x, int y, int w , int h); - int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H); - void restore_clip(); - int not_clipped(int x, int y, int w, int h); - - void begin_points(); - void begin_line(); - void begin_loop(); - void begin_polygon(); - void vertex(double x, double y); - void curve(double x, double y, double x1, double y1, double x2, double y2, double x3, double y3); - void circle(double x, double y, double r); - void arc(double x, double y, double r, double start, double a); - void arc(int x, int y, int w, int h, double a1, double a2); - void pie(int x, int y, int w, int h, double a1, double a2); - void end_points(); - void end_line(); - void end_loop(); - void end_polygon(); - void begin_complex_polygon() { begin_polygon(); } - void gap() { gap_ = 1; } - void end_complex_polygon() { end_polygon(); } - void transformed_vertex(double x, double y); - - void draw_image_mono(const uchar* d, int x,int y,int w,int h, int delta=1, int ld=0); - void draw_image(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=3); - void draw_image_mono(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=1); + void color(Fl_Color c) FL_OVERRIDE; + void color(uchar r, uchar g, uchar b) FL_OVERRIDE; + Fl_Color color() FL_OVERRIDE; + + void push_clip(int x, int y, int w, int h) FL_OVERRIDE; + void push_no_clip() FL_OVERRIDE; + void pop_clip() FL_OVERRIDE; + + void line_style(int style, int width=0, char* dashes=0) FL_OVERRIDE; + + void rect(int x, int y, int w, int h) FL_OVERRIDE; + void rectf(int x, int y, int w, int h) FL_OVERRIDE; + + void xyline(int x, int y, int x1) FL_OVERRIDE; + void xyline(int x, int y, int x1, int y2) FL_OVERRIDE; + void xyline(int x, int y, int x1, int y2, int x3) FL_OVERRIDE; + + void yxline(int x, int y, int y1) FL_OVERRIDE; + void yxline(int x, int y, int y1, int x2) FL_OVERRIDE; + void yxline(int x, int y, int y1, int x2, int y3) FL_OVERRIDE; + + void line(int x1, int y1, int x2, int y2) FL_OVERRIDE; + void line(int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + + void loop(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + void polygon(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + void point(int x, int y) FL_OVERRIDE; + void overlay_rect(int x, int y, int w , int h) FL_OVERRIDE; + int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H) FL_OVERRIDE; + void restore_clip() FL_OVERRIDE; + int not_clipped(int x, int y, int w, int h) FL_OVERRIDE; + + void begin_points() FL_OVERRIDE; + void begin_line() FL_OVERRIDE; + void begin_loop() FL_OVERRIDE; + void begin_polygon() FL_OVERRIDE; + void vertex(double x, double y) FL_OVERRIDE; + void curve(double x, double y, double x1, double y1, double x2, double y2, double x3, double y3) FL_OVERRIDE; + void circle(double x, double y, double r) FL_OVERRIDE; + void arc(double x, double y, double r, double start, double a) FL_OVERRIDE; + void arc(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void pie(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void end_points() FL_OVERRIDE; + void end_line() FL_OVERRIDE; + void end_loop() FL_OVERRIDE; + void end_polygon() FL_OVERRIDE; + void begin_complex_polygon() FL_OVERRIDE { begin_polygon(); } + void gap() FL_OVERRIDE { gap_ = 1; } + void end_complex_polygon() FL_OVERRIDE { end_polygon(); } + void transformed_vertex(double x, double y) FL_OVERRIDE; + + void draw_image_mono(const uchar* d, int x,int y,int w,int h, int delta=1, int ld=0) FL_OVERRIDE; + void draw_image(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=3) FL_OVERRIDE; + void draw_image_mono(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=1) FL_OVERRIDE; void ps_origin(int x, int y); void ps_translate(int, int); void ps_untranslate(); void draw_cached_pattern_(Fl_Image *img, cairo_pattern_t *pat, int X, int Y, int W, int H, int cx, int cy); - void draw_image(const uchar *data, int ix, int iy, int iw, int ih, int D, int LD); - void draw_rgb(Fl_RGB_Image *rgb,int XP, int YP, int WP, int HP, int cx, int cy); - void cache(Fl_RGB_Image *rgb); - void uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_uintptr_t &mask_); - void draw_bitmap(Fl_Bitmap *bm,int XP, int YP, int WP, int HP, int cx, int cy); + void draw_image(const uchar *data, int ix, int iy, int iw, int ih, int D, int LD) FL_OVERRIDE; + void draw_rgb(Fl_RGB_Image *rgb,int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void cache(Fl_RGB_Image *rgb) FL_OVERRIDE; + void uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_uintptr_t &mask_) FL_OVERRIDE; + void draw_bitmap(Fl_Bitmap *bm,int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; static cairo_pattern_t *bitmap_to_pattern(Fl_Bitmap *bm, bool complement, cairo_surface_t **p_surface); - void cache(Fl_Bitmap *img); - virtual void delete_bitmask(fl_uintptr_t bm); - void cache(Fl_Pixmap *pxm); - void draw_pixmap(Fl_Pixmap *rgb,int XP, int YP, int WP, int HP, int cx, int cy); - void uncache_pixmap(fl_uintptr_t p); - - void font(Fl_Font fnum, Fl_Fontsize s); - Fl_Font font() { return Fl_Graphics_Driver::font(); } - void draw(const char* s, int nBytes, int x, int y) { draw(s, nBytes, float(x), float(y)); } - void draw(const char* s, int nBytes, float x, float y); - void draw(int angle, const char *str, int n, int x, int y); - void rtl_draw(const char* str, int n, int x, int y); - int height(); - int descent(); - double width(const char *str, int n); - double width(unsigned c); - void text_extents(const char* txt, int n, int& dx, int& dy, int& w, int& h); - virtual PangoFontDescription* pango_font_description() { + void cache(Fl_Bitmap *img) FL_OVERRIDE; + void delete_bitmask(fl_uintptr_t bm) FL_OVERRIDE; + void cache(Fl_Pixmap *pxm) FL_OVERRIDE; + void draw_pixmap(Fl_Pixmap *rgb,int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void uncache_pixmap(fl_uintptr_t p) FL_OVERRIDE; + + void font(Fl_Font fnum, Fl_Fontsize s) FL_OVERRIDE; + Fl_Font font() FL_OVERRIDE { return Fl_Graphics_Driver::font(); } + void draw(const char* s, int nBytes, int x, int y) FL_OVERRIDE { draw(s, nBytes, float(x), float(y)); } + void draw(const char* s, int nBytes, float x, float y) FL_OVERRIDE; + void draw(int angle, const char *str, int n, int x, int y) FL_OVERRIDE; + void rtl_draw(const char* str, int n, int x, int y) FL_OVERRIDE; + int height() FL_OVERRIDE; + int descent() FL_OVERRIDE; + double width(const char *str, int n) FL_OVERRIDE; + double width(unsigned c) FL_OVERRIDE; + void text_extents(const char* txt, int n, int& dx, int& dy, int& w, int& h) FL_OVERRIDE; + PangoFontDescription* pango_font_description() FL_OVERRIDE { return ((Fl_Cairo_Font_Descriptor*)font_descriptor())->fontref; } static void init_built_in_fonts(); - virtual Fl_Font set_fonts(const char* pattern_name); - virtual const char *font_name(int num); - virtual void font_name(int num, const char *name); - virtual const char* get_font_name(Fl_Font fnum, int* ap); - virtual int get_font_sizes(Fl_Font fnum, int*& sizep); - virtual Fl_Region XRectangleRegion(int x, int y, int w, int h); - virtual void XDestroyRegion(Fl_Region r); - virtual void add_rectangle_to_region(Fl_Region r, int X, int Y, int W, int H); - virtual void cache_size(Fl_Image *img, int &width, int &height); - virtual char can_do_alpha_blending(); - virtual float override_scale(); - virtual void restore_scale(float); - virtual void antialias(int state); - virtual int antialias(); + Fl_Font set_fonts(const char* pattern_name) FL_OVERRIDE; + const char *font_name(int num) FL_OVERRIDE; + void font_name(int num, const char *name) FL_OVERRIDE; + const char* get_font_name(Fl_Font fnum, int* ap) FL_OVERRIDE; + int get_font_sizes(Fl_Font fnum, int*& sizep) FL_OVERRIDE; + Fl_Region XRectangleRegion(int x, int y, int w, int h) FL_OVERRIDE; + void XDestroyRegion(Fl_Region r) FL_OVERRIDE; + void add_rectangle_to_region(Fl_Region r, int X, int Y, int W, int H) FL_OVERRIDE; + void cache_size(Fl_Image *img, int &width, int &height) FL_OVERRIDE; + char can_do_alpha_blending() FL_OVERRIDE; + float override_scale() FL_OVERRIDE; + void restore_scale(float) FL_OVERRIDE; + void antialias(int state) FL_OVERRIDE; + int antialias() FL_OVERRIDE; }; #endif // FL_CAIRO_GRAPHICS_DRIVER_H diff --git a/src/drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.H b/src/drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.H index 76986af9a..7c514b1cf 100644 --- a/src/drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.H +++ b/src/drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.H @@ -27,11 +27,11 @@ class Fl_Display_Cairo_Graphics_Driver : public Fl_Cairo_Graphics_Driver { private: static void *gc_; public: - virtual void scale(float f); - virtual float scale() {return Fl_Graphics_Driver::scale();} - virtual void gc(void *value); - virtual void* gc(); - virtual void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy); + void scale(float f) FL_OVERRIDE; + float scale() {return Fl_Graphics_Driver::scale();} + void gc(void *value) FL_OVERRIDE; + void* gc() FL_OVERRIDE; + void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) FL_OVERRIDE; }; #endif // FL_DISPLAY_CAIRO_GRAPHICS_DRIVER_H diff --git a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H index a54b185e6..79b93e6df 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H +++ b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H @@ -30,28 +30,28 @@ class Fl_Cocoa_Gl_Window_Driver : public Fl_Gl_Window_Driver { NSOpenGLContext *gl1ctxt; // GL1 context in addition to GL3 context friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *); Fl_Cocoa_Gl_Window_Driver(Fl_Gl_Window *win); - virtual float pixels_per_unit(); - virtual void before_show(int& need_after); - virtual void after_show(); - virtual int mode_(int m, const int *a); - virtual void make_current_before(); - virtual void swap_buffers(); - virtual void resize(int is_a_resize, int w, int h); - virtual char swap_type(); - virtual Fl_Gl_Choice *find(int m, const int *alistp); - virtual GLContext create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g); - 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 gl_start(); - virtual char *alpha_mask_for_string(const char *str, int n, int w, int h, Fl_Fontsize fs); - virtual Fl_RGB_Image* capture_gl_rectangle(int x, int y, int w, int h); - virtual bool need_scissor() { return true; } - virtual void* GetProcAddress(const char *procName); + float pixels_per_unit() FL_OVERRIDE; + void before_show(int& need_after) FL_OVERRIDE; + void after_show() FL_OVERRIDE; + int mode_(int m, const int *a) FL_OVERRIDE; + void make_current_before() FL_OVERRIDE; + void swap_buffers() FL_OVERRIDE; + void resize(int is_a_resize, int w, int h) FL_OVERRIDE; + char swap_type() 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; + 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 gl_start() FL_OVERRIDE; + char *alpha_mask_for_string(const char *str, int n, int w, int h, Fl_Fontsize fs) FL_OVERRIDE; + Fl_RGB_Image* capture_gl_rectangle(int x, int y, int w, int h) FL_OVERRIDE; + bool need_scissor() FL_OVERRIDE { return true; } + void* GetProcAddress(const char *procName) FL_OVERRIDE; void apply_scissor(); - virtual void switch_to_GL1(); - virtual void switch_back(); + void switch_to_GL1() FL_OVERRIDE; + void switch_back() FL_OVERRIDE; }; diff --git a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm index f54871df8..9f1227f0e 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm +++ b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm @@ -491,8 +491,8 @@ void Fl_Cocoa_Gl_Window_Driver::switch_back() { class Fl_Gl_Cocoa_Plugin : public Fl_Cocoa_Plugin { public: Fl_Gl_Cocoa_Plugin() : Fl_Cocoa_Plugin(name()) { } - virtual const char *name() { return "gl.cocoa.fltk.org"; } - virtual void resize(Fl_Gl_Window *glw, int x, int y, int w, int h) { + const char *name() FL_OVERRIDE { return "gl.cocoa.fltk.org"; } + void resize(Fl_Gl_Window *glw, int x, int y, int w, int h) FL_OVERRIDE { glw->Fl_Gl_Window::resize(x, y, w, h); } }; diff --git a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm index c587caf37..c144ab243 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm +++ b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm @@ -56,18 +56,18 @@ private: PMPageFormat pageFormat; PMPrintSettings printSettings; Fl_Cocoa_Printer_Driver(void); - int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message = NULL); - int begin_page (void); - int printable_rect(int *w, int *h); - void margins(int *left, int *top, int *right, int *bottom); - void origin(int *x, int *y); - void origin(int x, int y); - void scale (float scale_x, float scale_y = 0.); - void rotate(float angle); - void translate(int x, int y); - void untranslate(void); - int end_page (void); - void end_job (void); + int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message = NULL) FL_OVERRIDE; + int begin_page (void) FL_OVERRIDE; + int printable_rect(int *w, int *h) FL_OVERRIDE; + void margins(int *left, int *top, int *right, int *bottom) FL_OVERRIDE; + void origin(int *x, int *y) FL_OVERRIDE; + void origin(int x, int y) FL_OVERRIDE; + void scale (float scale_x, float scale_y = 0.) FL_OVERRIDE; + void rotate(float angle) FL_OVERRIDE; + void translate(int x, int y) FL_OVERRIDE; + void untranslate(void) FL_OVERRIDE; + int end_page (void) FL_OVERRIDE; + void end_job (void) FL_OVERRIDE; ~Fl_Cocoa_Printer_Driver(void); }; diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H index fbd76b68e..9e3d2386a 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H @@ -63,49 +63,49 @@ public: static void breakMacEventLoop(); // --- display management // --- screen configuration - virtual void init(); - virtual int x(); - virtual int y(); - virtual int w(); - virtual int h(); - virtual void screen_xywh(int &X, int &Y, int &W, int &H, int n); - virtual void screen_dpi(float &h, float &v, int n=0); + void init() FL_OVERRIDE; + int x() FL_OVERRIDE; + int y() FL_OVERRIDE; + int w() FL_OVERRIDE; + int h() FL_OVERRIDE; + void screen_xywh(int &X, int &Y, int &W, int &H, int n) FL_OVERRIDE; + void screen_dpi(float &h, float &v, int n=0) FL_OVERRIDE; // implemented in Fl_cocoa.mm because uses Objective-c - virtual void screen_work_area(int &X, int &Y, int &W, int &H, int n); + void screen_work_area(int &X, int &Y, int &W, int &H, int n) FL_OVERRIDE; // --- audible output - virtual void beep(int type); + void beep(int type) FL_OVERRIDE; // --- global events - virtual void grab(Fl_Window* win); + void grab(Fl_Window* win) FL_OVERRIDE; // --- global colors - virtual void get_system_colors(); - virtual int has_marked_text() const; + void get_system_colors() FL_OVERRIDE; + int has_marked_text() const FL_OVERRIDE; static void reset_marked_text(); static void insertion_point_location(int x, int y, int height); static int insertion_point_location(int *px, int *py, int *pheight); - virtual int dnd(int use_selection); - virtual int compose(int &del); - virtual int input_widget_handle_key(int key, unsigned mods, unsigned shift, Fl_Input *input); - virtual int get_mouse(int &x, int &y); - virtual void enable_im(); - virtual void disable_im(); - virtual void open_display_platform(); + int dnd(int use_selection) FL_OVERRIDE; + int compose(int &del) FL_OVERRIDE; + int input_widget_handle_key(int key, unsigned mods, unsigned shift, Fl_Input *input) FL_OVERRIDE; + int get_mouse(int &x, int &y) FL_OVERRIDE; + void enable_im() FL_OVERRIDE; + void disable_im() FL_OVERRIDE; + void open_display_platform() FL_OVERRIDE; // --- compute dimensions of an Fl_Offscreen - virtual void offscreen_size(Fl_Offscreen o, int &width, int &height); + void offscreen_size(Fl_Offscreen o, int &width, int &height) FL_OVERRIDE; - virtual APP_SCALING_CAPABILITY rescalable() { return SYSTEMWIDE_APP_SCALING; } - virtual float scale(int /*nscreen*/) {return scale_;} - virtual void scale(int /*nscreen*/, float f) { scale_ = f;} - virtual Fl_RGB_Image *read_win_rectangle(int X, int Y, int w, int h, Fl_Window *win, bool may_capture_subwins, bool *did_capture_subwins); - virtual void default_icons(const Fl_RGB_Image *icons[], int count); - virtual void copy(const char *stuff, int len, int clipboard, const char *type); - virtual void paste(Fl_Widget &receiver, int clipboard, const char *type); - virtual int clipboard_contains(const char *type); - virtual void set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win); - virtual void reset_spot(); - virtual int need_menu_handle_part2() {return 1;} + APP_SCALING_CAPABILITY rescalable() FL_OVERRIDE { return SYSTEMWIDE_APP_SCALING; } + float scale(int /*nscreen*/) FL_OVERRIDE {return scale_;} + void scale(int /*nscreen*/, float f) FL_OVERRIDE { scale_ = f;} + Fl_RGB_Image *read_win_rectangle(int X, int Y, int w, int h, Fl_Window *win, bool may_capture_subwins, bool *did_capture_subwins) FL_OVERRIDE; + void default_icons(const Fl_RGB_Image *icons[], int count) FL_OVERRIDE; + void copy(const char *stuff, int len, int clipboard, const char *type) FL_OVERRIDE; + void paste(Fl_Widget &receiver, int clipboard, const char *type) FL_OVERRIDE; + int clipboard_contains(const char *type) FL_OVERRIDE; + void set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win) FL_OVERRIDE; + void reset_spot() FL_OVERRIDE; + int need_menu_handle_part2() FL_OVERRIDE {return 1;} // these 2 are in Fl_get_key_mac.cxx - virtual int event_key(int); - virtual int get_key(int); + int event_key(int) FL_OVERRIDE; + int get_key(int) FL_OVERRIDE; private: float scale_; }; diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H index 520c4c239..4c86696e0 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H +++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H @@ -82,7 +82,7 @@ private: CGImageRef mask; } *shape_data_; void shape_bitmap_(Fl_Image* b); - void shape_alpha_(Fl_Image* img, int offset); + void shape_alpha_(Fl_Image* img, int offset) FL_OVERRIDE; CGRect* subRect_; // makes sure subwindow remains inside its parent window // stores 3 binary flags: whether window is mapped to retina display; whether resolution just changed; // whether window's view received the [FLView view_did_resize] message @@ -110,47 +110,47 @@ public: CGImageRef CGImage_from_window_rect(int x, int y, int w, int h, bool capture_subwins = true); // --- window data - virtual int decorated_w(); - virtual int decorated_h(); - virtual const Fl_Image* shape(); + int decorated_w() FL_OVERRIDE; + int decorated_h() FL_OVERRIDE; + const Fl_Image* shape() FL_OVERRIDE; // --- window management - virtual Fl_X *makeWindow(); - virtual void take_focus(); - virtual void flush(); - virtual void flush_overlay(); - virtual void draw_begin(); - virtual void draw_end(); - virtual void make_current(); - virtual void label(const char *name, const char *mininame); - virtual void destroy_double_buffer(); - virtual void show(); - virtual void resize(int X,int Y,int W,int H); - virtual void hide(); - virtual void map(); - virtual void unmap(); - virtual void fullscreen_on(); - virtual void fullscreen_off(int X, int Y, int W, int H); - virtual void use_border(); - virtual void size_range(); - virtual void iconize(); - virtual void decoration_sizes(int *top, int *left, int *right, int *bottom); + Fl_X *makeWindow() FL_OVERRIDE; + void take_focus() FL_OVERRIDE; + void flush() FL_OVERRIDE; + void flush_overlay() FL_OVERRIDE; + void draw_begin() FL_OVERRIDE; + void draw_end() FL_OVERRIDE; + void make_current() FL_OVERRIDE; + void label(const char *name, const char *mininame) FL_OVERRIDE; + void destroy_double_buffer() FL_OVERRIDE; + void show() FL_OVERRIDE; + void resize(int X,int Y,int W,int H) FL_OVERRIDE; + void hide() FL_OVERRIDE; + void map() FL_OVERRIDE; + void unmap() FL_OVERRIDE; + void fullscreen_on() FL_OVERRIDE; + void fullscreen_off(int X, int Y, int W, int H) FL_OVERRIDE; + void use_border() FL_OVERRIDE; + void size_range() FL_OVERRIDE; + void iconize() FL_OVERRIDE; + void decoration_sizes(int *top, int *left, int *right, int *bottom) FL_OVERRIDE; // --- window cursor stuff - virtual int set_cursor(Fl_Cursor); - virtual int set_cursor(const Fl_RGB_Image*, int, int); + int set_cursor(Fl_Cursor) FL_OVERRIDE; + int set_cursor(const Fl_RGB_Image*, int, int) FL_OVERRIDE; - virtual void shape(const Fl_Image* img); + void shape(const Fl_Image* img) FL_OVERRIDE; // next 4 are in Fl_cocoa.mm because they use Objective-c - virtual void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right); - virtual void wait_for_expose(); + void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right) FL_OVERRIDE; + void wait_for_expose() FL_OVERRIDE; void draw_titlebar_to_context(CGContextRef gc, int w, int h); - virtual int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data); + int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data) FL_OVERRIDE; //icons - virtual void icons(const Fl_RGB_Image *icons[], int count); + void icons(const Fl_RGB_Image *icons[], int count) FL_OVERRIDE; NSImage *icon_image; - virtual fl_uintptr_t os_id(); + fl_uintptr_t os_id() FL_OVERRIDE; }; class Fl_Cocoa_Plugin : public Fl_Plugin { 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); diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.H b/src/drivers/Darwin/Fl_Darwin_System_Driver.H index 4113424ca..776f68738 100644 --- a/src/drivers/Darwin/Fl_Darwin_System_Driver.H +++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.H @@ -42,46 +42,46 @@ class Fl_Darwin_System_Driver : public Fl_Posix_System_Driver { public: Fl_Darwin_System_Driver(); - virtual int single_arg(const char *arg); - virtual int arg_and_value(const char *name, const char *value); - virtual int clocale_vprintf(FILE *output, const char *format, va_list args); - virtual int clocale_vsnprintf(char *output, size_t output_size, const char *format, va_list args); - virtual int clocale_vsscanf(const char *input, const char *format, va_list args); + int single_arg(const char *arg) FL_OVERRIDE; + int arg_and_value(const char *name, const char *value) FL_OVERRIDE; + int clocale_vprintf(FILE *output, const char *format, va_list args) FL_OVERRIDE; + int clocale_vsnprintf(char *output, size_t output_size, const char *format, va_list args) FL_OVERRIDE; + int clocale_vsscanf(const char *input, const char *format, va_list args) FL_OVERRIDE; static void *get_carbon_function(const char *name); static int calc_mac_os_version(); // computes the fl_mac_os_version global variable static unsigned short *compute_macKeyLookUp(); - virtual int filename_list(const char *d, dirent ***list, + int filename_list(const char *d, dirent ***list, int (*sort)(struct dirent **, struct dirent **), - char *errmsg=NULL, int errmsg_sz=0); - virtual int open_uri(const char *uri, char *msg, int msglen); - virtual int need_test_shortcut_extra() {return 1;} - virtual int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, int lname, Fl_File_Icon *icon); - virtual void newUUID(char *uuidBuffer); - virtual char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor, - const char *application); - virtual const char *local_to_latin1(const char *t, int n); - virtual const char *latin1_to_local(const char *t, int n); - virtual const char *local_to_mac_roman(const char *t, int n); - virtual const char *mac_roman_to_local(const char *t, int n); - virtual Fl_Pixmap *tree_openpixmap(); + char *errmsg=NULL, int errmsg_sz=0) FL_OVERRIDE; + int open_uri(const char *uri, char *msg, int msglen) FL_OVERRIDE; + int need_test_shortcut_extra() FL_OVERRIDE {return 1;} + int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, int lname, Fl_File_Icon *icon) FL_OVERRIDE; + void newUUID(char *uuidBuffer) FL_OVERRIDE; + char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor, + const char *application) FL_OVERRIDE; + const char *local_to_latin1(const char *t, int n) FL_OVERRIDE; + const char *latin1_to_local(const char *t, int n) FL_OVERRIDE; + const char *local_to_mac_roman(const char *t, int n) FL_OVERRIDE; + const char *mac_roman_to_local(const char *t, int n) FL_OVERRIDE; + Fl_Pixmap *tree_openpixmap() FL_OVERRIDE; static const char * const tree_open_xpm_darwin[]; // used by tree_openpixmap() - virtual Fl_Pixmap *tree_closepixmap(); + Fl_Pixmap *tree_closepixmap() FL_OVERRIDE; static const char * const tree_close_xpm_darwin[]; // used by tree_closepixmap() - virtual int tree_connector_style(); - virtual const char *filename_name(const char *buf); - virtual void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0); - virtual void add_fd(int fd, Fl_FD_Handler cb, void* = 0); - virtual void remove_fd(int, int when); - virtual void remove_fd(int); - virtual void open_callback(void (*)(const char *)); - virtual const char *shift_name(); - virtual const char *meta_name(); - virtual const char *alt_name(); - virtual const char *control_name(); - virtual Fl_Sys_Menu_Bar_Driver *sys_menu_bar_driver(); - virtual double wait(double time_to_wait); - virtual int ready(); + int tree_connector_style() FL_OVERRIDE; + const char *filename_name(const char *buf) FL_OVERRIDE; + void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0) FL_OVERRIDE; + void add_fd(int fd, Fl_FD_Handler cb, void* = 0) FL_OVERRIDE; + void remove_fd(int, int when) FL_OVERRIDE; + void remove_fd(int) FL_OVERRIDE; + void open_callback(void (*)(const char *)) FL_OVERRIDE; + const char *shift_name() FL_OVERRIDE; + const char *meta_name() FL_OVERRIDE; + const char *alt_name() FL_OVERRIDE; + const char *control_name() FL_OVERRIDE; + Fl_Sys_Menu_Bar_Driver *sys_menu_bar_driver() FL_OVERRIDE; + double wait(double time_to_wait) FL_OVERRIDE; + int ready() FL_OVERRIDE; }; #endif // FL_DARWIN_SYSTEM_DRIVER_H diff --git a/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.H b/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.H index 6d8923c99..7eae4c2bc 100644 --- a/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.H +++ b/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.H @@ -27,9 +27,9 @@ protected: HDC gc; Fl_GDI_Copy_Surface_Driver(int w, int h); ~Fl_GDI_Copy_Surface_Driver(); - void set_current(); - void translate(int x, int y); - void untranslate(); + void set_current() FL_OVERRIDE; + void translate(int x, int y) FL_OVERRIDE; + void untranslate() FL_OVERRIDE; }; #endif // FL_GDI_COPY_SURFACE_DRIVER_H diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H index 39af1e68e..6fa6840c8 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H @@ -47,112 +47,112 @@ private: BOOL alpha_blend_(int x, int y, int w, int h, HDC src_gc, int srcx, int srcy, int srcw, int srch); int depth; // to support translation POINT *origins; // to support translation - void set_current_(); - void draw_fixed(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); - void draw_fixed(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); - virtual void make_unused_color_(unsigned char &r, unsigned char &g, unsigned char &b, int color_count, void **data); + void set_current_() FL_OVERRIDE; + void draw_fixed(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_fixed(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void make_unused_color_(unsigned char &r, unsigned char &g, unsigned char &b, int color_count, void **data) FL_OVERRIDE; protected: - void draw_fixed(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy); - void cache(Fl_RGB_Image *rgb); + void draw_fixed(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void cache(Fl_RGB_Image *rgb) FL_OVERRIDE; HDC gc_; int numcount; int counts[20]; uchar *mask_bitmap_; - uchar **mask_bitmap() {return &mask_bitmap_;} + uchar **mask_bitmap() FL_OVERRIDE {return &mask_bitmap_;} POINT *long_point; public: Fl_GDI_Graphics_Driver(); - virtual ~Fl_GDI_Graphics_Driver(); - virtual int has_feature(driver_feature mask) { return mask & NATIVE; } - char can_do_alpha_blending(); - virtual void gc(void *ctxt) { gc_ = (HDC)ctxt; global_gc(); } - virtual void *gc() {return gc_;} + ~Fl_GDI_Graphics_Driver() FL_OVERRIDE; + int has_feature(driver_feature mask) FL_OVERRIDE { return mask & NATIVE; } + char can_do_alpha_blending() FL_OVERRIDE; + void gc(void *ctxt) FL_OVERRIDE { gc_ = (HDC)ctxt; global_gc(); } + void *gc() FL_OVERRIDE {return gc_;} // --- bitmap stuff static HBITMAP create_bitmask(int w, int h, const uchar *array); // NOT virtual - virtual void delete_bitmask(fl_uintptr_t bm); + void delete_bitmask(fl_uintptr_t bm) FL_OVERRIDE; HBITMAP create_alphamask(int w, int h, int d, int ld, const uchar *array); - virtual void draw_unscaled(const char* str, int n, int x, int y); - virtual void draw_unscaled(int angle, const char *str, int n, int x, int y); - virtual void rtl_draw_unscaled(const char* str, int n, int x, int y); - virtual void font_unscaled(Fl_Font face, Fl_Fontsize size); - virtual void draw_rgb(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy); - virtual void draw_image_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0); - virtual void draw_image_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3); - virtual void draw_image_mono_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0); - virtual void draw_image_mono_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1); - void cache(Fl_Pixmap *img); - virtual void uncache_pixmap(fl_uintptr_t p); - void cache(Fl_Bitmap *img); - void uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_uintptr_t &mask_); - virtual double width_unscaled(const char *str, int n); - virtual double width_unscaled(unsigned int c); - void text_extents_unscaled(const char*, int n, int& dx, int& dy, int& w, int& h); - int height_unscaled(); - int descent_unscaled(); - Fl_Fontsize size_unscaled(); + void draw_unscaled(const char* str, int n, int x, int y) FL_OVERRIDE; + void draw_unscaled(int angle, const char *str, int n, int x, int y) FL_OVERRIDE; + void rtl_draw_unscaled(const char* str, int n, int x, int y) FL_OVERRIDE; + void font_unscaled(Fl_Font face, Fl_Fontsize size) FL_OVERRIDE; + void draw_rgb(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_image_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0) FL_OVERRIDE; + void draw_image_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3) FL_OVERRIDE; + void draw_image_mono_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0) FL_OVERRIDE; + void draw_image_mono_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1) FL_OVERRIDE; + void cache(Fl_Pixmap *img) FL_OVERRIDE; + void uncache_pixmap(fl_uintptr_t p) FL_OVERRIDE; + void cache(Fl_Bitmap *img) FL_OVERRIDE; + void uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_uintptr_t &mask_) FL_OVERRIDE; + double width_unscaled(const char *str, int n) FL_OVERRIDE; + double width_unscaled(unsigned int c) FL_OVERRIDE; + void text_extents_unscaled(const char*, int n, int& dx, int& dy, int& w, int& h) FL_OVERRIDE; + int height_unscaled() FL_OVERRIDE; + int descent_unscaled() FL_OVERRIDE; + Fl_Fontsize size_unscaled() FL_OVERRIDE; #if ! defined(FL_DOXYGEN) void copy_offscreen_with_alpha(int x,int y,int w,int h,HBITMAP bitmap,int srcx,int srcy); #endif - virtual void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy); - void add_rectangle_to_region(Fl_Region r, int x, int y, int w, int h); - Fl_Region XRectangleRegion(int x, int y, int w, int h); - void XDestroyRegion(Fl_Region r); + void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) FL_OVERRIDE; + void add_rectangle_to_region(Fl_Region r, int x, int y, int w, int h) FL_OVERRIDE; + Fl_Region XRectangleRegion(int x, int y, int w, int h) FL_OVERRIDE; + void XDestroyRegion(Fl_Region r) FL_OVERRIDE; void translate_all(int x, int y); void untranslate_all(void); static HRGN scale_region(HRGN r, float f, Fl_GDI_Graphics_Driver *dr); - virtual void scale(float f); + void scale(float f) FL_OVERRIDE; float scale() {return Fl_Graphics_Driver::scale();} protected: - void transformed_vertex0(float x, float y); - void fixloop(); - virtual void point(int x, int y); - void focus_rect(int x, int y, int w, int h); - virtual void rectf_unscaled(int x, int y, int w, int h); + void transformed_vertex0(float x, float y) FL_OVERRIDE; + void fixloop() FL_OVERRIDE; + void point(int x, int y) FL_OVERRIDE; + void focus_rect(int x, int y, int w, int h) FL_OVERRIDE; + void rectf_unscaled(int x, int y, int w, int h) FL_OVERRIDE; #if USE_COLORMAP - virtual void colored_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b); + void colored_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) FL_OVERRIDE; #endif - virtual void line_unscaled(int x, int y, int x1, int y1); - virtual void line_unscaled(int x, int y, int x1, int y1, int x2, int y2); - virtual void xyline_unscaled(int x, int y, int x1); - virtual void yxline_unscaled(int x, int y, int y1); - virtual void loop_unscaled(int x0, int y0, int x1, int y1, int x2, int y2); - virtual void loop_unscaled(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); - virtual void polygon_unscaled(int x0, int y0, int x1, int y1, int x2, int y2); - virtual void polygon_unscaled(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); + void line_unscaled(int x, int y, int x1, int y1) FL_OVERRIDE; + void line_unscaled(int x, int y, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void xyline_unscaled(int x, int y, int x1) FL_OVERRIDE; + void yxline_unscaled(int x, int y, int y1) FL_OVERRIDE; + void loop_unscaled(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void loop_unscaled(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + void polygon_unscaled(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void polygon_unscaled(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; // --- clipping - void push_clip(int x, int y, int w, int h); - int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H); - int not_clipped(int x, int y, int w, int h); - void restore_clip(); - virtual Fl_Region scale_clip(float f); + void push_clip(int x, int y, int w, int h) FL_OVERRIDE; + int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H) FL_OVERRIDE; + int not_clipped(int x, int y, int w, int h) FL_OVERRIDE; + void restore_clip() FL_OVERRIDE; + Fl_Region scale_clip(float f) FL_OVERRIDE; // --- implementation is in src/fl_vertex.cxx which includes src/cfg_gfx/xxx_rect.cxx - void begin_complex_polygon(); - void end_points(); - void end_line(); - void end_loop(); - void end_polygon(); - void end_complex_polygon(); - void gap(); - virtual void ellipse_unscaled(double xt, double yt, double rx, double ry); - virtual void arc_unscaled(int x, int y, int w, int h, double a1, double a2); - virtual void pie_unscaled(int x, int y, int w, int h, double a1, double a2); - virtual void line_style_unscaled(int style, int width, char* dashes); - void color(Fl_Color c); - Fl_Color color() { return color_; } - void color(uchar r, uchar g, uchar b); - void set_color(Fl_Color i, unsigned int c); - void free_color(Fl_Color i, int overlay); - virtual Fl_Font set_fonts(const char *name); - virtual int get_font_sizes(Fl_Font fnum, int*& sizep); - virtual const char* get_font_name(Fl_Font fnum, int* ap); - virtual const char *font_name(int num); - virtual void font_name(int num, const char *name); - void global_gc(); - virtual void overlay_rect(int x, int y, int w , int h); - virtual void cache_size(Fl_Image *img, int &width, int &height); - virtual void* change_pen_width(int width); - virtual void reset_pen_width(void *data); + void begin_complex_polygon() FL_OVERRIDE; + void end_points() FL_OVERRIDE; + void end_line() FL_OVERRIDE; + void end_loop() FL_OVERRIDE; + void end_polygon() FL_OVERRIDE; + void end_complex_polygon() FL_OVERRIDE; + void gap() FL_OVERRIDE; + void ellipse_unscaled(double xt, double yt, double rx, double ry) FL_OVERRIDE; + void arc_unscaled(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void pie_unscaled(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void line_style_unscaled(int style, int width, char* dashes) FL_OVERRIDE; + void color(Fl_Color c) FL_OVERRIDE; + Fl_Color color() FL_OVERRIDE { return color_; } + void color(uchar r, uchar g, uchar b) FL_OVERRIDE; + void set_color(Fl_Color i, unsigned int c) FL_OVERRIDE; + void free_color(Fl_Color i, int overlay) FL_OVERRIDE; + Fl_Font set_fonts(const char *name) FL_OVERRIDE; + int get_font_sizes(Fl_Font fnum, int*& sizep) FL_OVERRIDE; + const char* get_font_name(Fl_Font fnum, int* ap) FL_OVERRIDE; + const char *font_name(int num) FL_OVERRIDE; + void font_name(int num, const char *name) FL_OVERRIDE; + void global_gc() FL_OVERRIDE; + void overlay_rect(int x, int y, int w , int h) FL_OVERRIDE; + void cache_size(Fl_Image *img, int &width, int &height) FL_OVERRIDE; + void* change_pen_width(int width) FL_OVERRIDE; + void reset_pen_width(void *data) FL_OVERRIDE; }; @@ -167,11 +167,11 @@ private: typedef BOOL (WINAPI* transparent_f_type) (HDC,int,int,int,int,HDC,int,int,int,int,UINT); transparent_f_type TransparentBlt(); public: - virtual int has_feature(driver_feature mask) { return mask & (NATIVE | PRINTER); } - void draw_pixmap(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); - void draw_bitmap(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy); - void draw_rgb(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy); - void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen bitmap, int srcx, int srcy); + int has_feature(driver_feature mask) FL_OVERRIDE { return mask & (NATIVE | PRINTER); } + void draw_pixmap(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_bitmap(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_rgb(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen bitmap, int srcx, int srcy) FL_OVERRIDE; }; #if USE_GDIPLUS @@ -188,28 +188,28 @@ public: virtual ~Fl_GDIplus_Graphics_Driver(); bool active; static void shutdown(void); -virtual void color(Fl_Color c); -virtual Fl_Color color() { return color_; } -virtual void color(uchar r, uchar g, uchar b); - virtual void line(int x, int y, int x1, int y1); - virtual void line(int x, int y, int x1, int y1, int x2, int y2); - void loop(int x0, int y0, int x1, int y1, int x2, int y2); - void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); - void polygon(int x0, int y0, int x1, int y1, int x2, int y2); - void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); - virtual void line_style(int style, int width, char* dashes); - virtual void arc_unscaled(int x, int y, int w, int h, double a1, double a2); - virtual void pie_unscaled(int x, int y, int w, int h, double a1, double a2); - virtual void transformed_vertex(double xf, double yf); - virtual void vertex(double x,double y); - virtual void end_points(); - virtual void end_line(); - virtual void end_loop(); - virtual void end_polygon(); - virtual void end_complex_polygon(); - virtual void circle(double x, double y, double r); - virtual void antialias(int state); - virtual int antialias(); + void color(Fl_Color c) FL_OVERRIDE; + Fl_Color color() FL_OVERRIDE { return color_; } + void color(uchar r, uchar g, uchar b) FL_OVERRIDE; + void line(int x, int y, int x1, int y1) FL_OVERRIDE; + void line(int x, int y, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void loop(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + void polygon(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + void line_style(int style, int width, char* dashes) FL_OVERRIDE; + void arc_unscaled(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void pie_unscaled(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void transformed_vertex(double xf, double yf) FL_OVERRIDE; + void vertex(double x,double y) FL_OVERRIDE; + void end_points() FL_OVERRIDE; + void end_line() FL_OVERRIDE; + void end_loop() FL_OVERRIDE; + void end_polygon() FL_OVERRIDE; + void end_complex_polygon() FL_OVERRIDE; + void circle(double x, double y, double r) FL_OVERRIDE; + void antialias(int state) FL_OVERRIDE; + int antialias() FL_OVERRIDE; }; #endif // USE_GDIPLUS diff --git a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.H b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.H index a3d8ac6c6..d44d57cd6 100644 --- a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.H +++ b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.H @@ -22,16 +22,16 @@ #include <FL/platform.H> class Fl_GDI_Image_Surface_Driver : public Fl_Image_Surface_Driver { - virtual void end_current(); + void end_current() FL_OVERRIDE; public: HWND pre_window; int _savedc; Fl_GDI_Image_Surface_Driver(int w, int h, int high_res, Fl_Offscreen off); ~Fl_GDI_Image_Surface_Driver(); - void set_current(); - void translate(int x, int y); - void untranslate(); - Fl_RGB_Image *image(); + void set_current() FL_OVERRIDE; + void translate(int x, int y) FL_OVERRIDE; + void untranslate() FL_OVERRIDE; + Fl_RGB_Image *image() FL_OVERRIDE; POINT origin; }; diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H index a2dcf099b..bd3173aad 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H @@ -39,64 +39,64 @@ public: line_width_(1.0f), line_stipple_(FL_SOLID) { } // --- line and polygon drawing with integer coordinates - void point(int x, int y); - void rect(int x, int y, int w, int h); - void rectf(int x, int y, int w, int h); - void line(int x, int y, int x1, int y1); - void line(int x, int y, int x1, int y1, int x2, int y2); - void xyline(int x, int y, int x1); - void xyline(int x, int y, int x1, int y2); - void xyline(int x, int y, int x1, int y2, int x3); - void yxline(int x, int y, int y1); - void yxline(int x, int y, int y1, int x2); - void yxline(int x, int y, int y1, int x2, int y3); - void loop(int x0, int y0, int x1, int y1, int x2, int y2); - void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); - void polygon(int x0, int y0, int x1, int y1, int x2, int y2); - void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); - void focus_rect(int x, int y, int w, int h); + void point(int x, int y) FL_OVERRIDE; + void rect(int x, int y, int w, int h) FL_OVERRIDE; + void rectf(int x, int y, int w, int h) FL_OVERRIDE; + void line(int x, int y, int x1, int y1) FL_OVERRIDE; + void line(int x, int y, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void xyline(int x, int y, int x1) FL_OVERRIDE; + void xyline(int x, int y, int x1, int y2) FL_OVERRIDE; + void xyline(int x, int y, int x1, int y2, int x3) FL_OVERRIDE; + void yxline(int x, int y, int y1) FL_OVERRIDE; + void yxline(int x, int y, int y1, int x2) FL_OVERRIDE; + void yxline(int x, int y, int y1, int x2, int y3) FL_OVERRIDE; + void loop(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + void polygon(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + void focus_rect(int x, int y, int w, int h) FL_OVERRIDE; // ---- clipping - void push_clip(int x, int y, int w, int h); - void pop_clip(); - void push_no_clip(); - Fl_Region clip_region(); - void clip_region(Fl_Region r); - void restore_clip(); - int not_clipped(int x, int y, int w, int h); - int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H); + void push_clip(int x, int y, int w, int h) FL_OVERRIDE; + void pop_clip() FL_OVERRIDE; + void push_no_clip() FL_OVERRIDE; + Fl_Region clip_region() FL_OVERRIDE; + void clip_region(Fl_Region r) FL_OVERRIDE; + void restore_clip() FL_OVERRIDE; + int not_clipped(int x, int y, int w, int h) FL_OVERRIDE; + int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H) FL_OVERRIDE; // ---- matrix transformed drawing - void transformed_vertex(double xf, double yf); - void begin_points(); - void end_points(); - void begin_line(); - void end_line(); - void begin_loop(); - void end_loop(); - void begin_polygon(); - void end_polygon(); - void begin_complex_polygon(); - void gap(); - void end_complex_polygon(); - void fixloop(); - void circle(double x, double y, double r); - void arc(int x, int y, int w, int h, double a1, double a2); - void arc(double x, double y, double r, double start, double end); - void pie(int x, int y, int w, int h, double a1, double a2); - void line_style(int style, int width=0, char* dashes=0); - void color(Fl_Color c); - Fl_Color color() { return color_; } - void color(uchar r, uchar g, uchar b); + void transformed_vertex(double xf, double yf) FL_OVERRIDE; + void begin_points() FL_OVERRIDE; + void end_points() FL_OVERRIDE; + void begin_line() FL_OVERRIDE; + void end_line() FL_OVERRIDE; + void begin_loop() FL_OVERRIDE; + void end_loop() FL_OVERRIDE; + void begin_polygon() FL_OVERRIDE; + void end_polygon() FL_OVERRIDE; + void begin_complex_polygon() FL_OVERRIDE; + void gap() FL_OVERRIDE; + void end_complex_polygon() FL_OVERRIDE; + void fixloop() FL_OVERRIDE; + void circle(double x, double y, double r) FL_OVERRIDE; + void arc(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void arc(double x, double y, double r, double start, double end) FL_OVERRIDE; + void pie(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void line_style(int style, int width=0, char* dashes=0) FL_OVERRIDE; + void color(Fl_Color c) FL_OVERRIDE; + Fl_Color color() FL_OVERRIDE { return color_; } + void color(uchar r, uchar g, uchar b) FL_OVERRIDE; // --- implementation is in Fl_OpenGL_Graphics_Driver_font.cxx - void font(Fl_Font face, Fl_Fontsize fsize); - Fl_Font font(); - void draw(const char *str, int n, int x, int y); - void draw(const char *str, int n, float x, float y); - void draw(int angle, const char *str, int n, int x, int y); - double width(const char *str, int n); - double width(unsigned int c); - void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h); - int height(); - int descent(); + void font(Fl_Font face, Fl_Fontsize fsize) FL_OVERRIDE; + Fl_Font font() FL_OVERRIDE; + void draw(const char *str, int n, int x, int y) FL_OVERRIDE; + void draw(const char *str, int n, float x, float y) FL_OVERRIDE; + void draw(int angle, const char *str, int n, int x, int y) FL_OVERRIDE; + double width(const char *str, int n) FL_OVERRIDE; + double width(unsigned int c) FL_OVERRIDE; + void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h) FL_OVERRIDE; + int height() FL_OVERRIDE; + int descent() FL_OVERRIDE; }; #endif // FL_OPENGL_GRAPHICS_DRIVER_H diff --git a/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx b/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx index cdd77385c..a49941837 100644 --- a/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx +++ b/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx @@ -27,7 +27,7 @@ /** Support for printing on the Unix/Linux platform */ class Fl_Posix_Printer_Driver : public Fl_PostScript_File_Device { - virtual int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message=NULL); + int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message=NULL) FL_OVERRIDE; }; #if HAVE_DLSYM && HAVE_DLFCN_H @@ -56,8 +56,8 @@ public: GtkPrintJob *pjob; // data shared between begin_job() and end_job() char tmpfilename[50]; // name of temporary PostScript file containing to-be-printed data - virtual int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message=NULL); - virtual void end_job(); + int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message=NULL) FL_OVERRIDE; + void end_job() FL_OVERRIDE; static bool probe_for_GTK(); static void *ptr_gtk; // points to the GTK dynamic lib or NULL diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.H b/src/drivers/Posix/Fl_Posix_System_Driver.H index 0de91203b..a81fd6b7d 100644 --- a/src/drivers/Posix/Fl_Posix_System_Driver.H +++ b/src/drivers/Posix/Fl_Posix_System_Driver.H @@ -47,25 +47,25 @@ class Fl_Posix_System_Driver : public Fl_System_Driver protected: int run_program(const char *program, char **argv, char *msg, int msglen); public: - virtual int mkdir(const char* f, int mode) {return ::mkdir(f, mode);} - virtual int open(const char* f, int oflags, int pmode) { + int mkdir(const char* f, int mode) FL_OVERRIDE {return ::mkdir(f, mode);} + int open(const char* f, int oflags, int pmode) FL_OVERRIDE { return pmode == -1 ? ::open(f, oflags) : ::open(f, oflags, pmode); } - virtual char *getenv(const char *v) { return ::getenv(v); } - virtual int putenv(const char *var) {return ::putenv(strdup(var));} - virtual int system(const char* cmd) {return ::system(cmd);} - virtual int execvp(const char *file, char *const *argv) {return ::execvp(file, argv);} - virtual int chmod(const char* f, int mode) {return ::chmod(f, mode);} - virtual int access(const char* f, int mode) { return ::access(f, mode);} - virtual int flstat(const char* f, struct stat *b) { return ::stat(f, b);} - virtual char *getcwd(char* b, int l) {return ::getcwd(b, l);} - virtual int chdir(const char* path) {return ::chdir(path);} - virtual int unlink(const char* f) {return ::unlink(f);} - virtual int rmdir(const char* f) {return ::rmdir(f);} - virtual int rename(const char* f, const char *n) {return ::rename(f, n);} - virtual const char *getpwnam(const char *login); + char *getenv(const char *v) FL_OVERRIDE { return ::getenv(v); } + int putenv(const char *var) FL_OVERRIDE {return ::putenv(strdup(var));} + int system(const char* cmd) FL_OVERRIDE {return ::system(cmd);} + int execvp(const char *file, char *const *argv) FL_OVERRIDE {return ::execvp(file, argv);} + int chmod(const char* f, int mode) FL_OVERRIDE {return ::chmod(f, mode);} + int access(const char* f, int mode) FL_OVERRIDE { return ::access(f, mode);} + int flstat(const char* f, struct stat *b) FL_OVERRIDE { return ::stat(f, b);} + char *getcwd(char* b, int l) FL_OVERRIDE {return ::getcwd(b, l);} + int chdir(const char* path) FL_OVERRIDE {return ::chdir(path);} + int unlink(const char* f) FL_OVERRIDE {return ::unlink(f);} + int rmdir(const char* f) FL_OVERRIDE {return ::rmdir(f);} + int rename(const char* f, const char *n) FL_OVERRIDE {return ::rename(f, n);} + const char *getpwnam(const char *login) FL_OVERRIDE; #if HAVE_DLFCN_H - virtual void *load(const char *filename); + void *load(const char *filename) FL_OVERRIDE; #if HAVE_DLSYM static void *ptr_gtk; static bool probe_for_GTK(int major, int minor, void **ptr_gtk); @@ -73,19 +73,19 @@ public: #endif static void *dlopen_or_dlsym(const char *lib_name, const char *func_name = NULL); // these 4 are implemented in Fl_lock.cxx - virtual void awake(void*); - virtual int lock(); - virtual void unlock(); - virtual void* thread_message(); - virtual int file_type(const char *filename); - virtual const char *home_directory_name() { return ::getenv("HOME"); } - virtual int dot_file_hidden() {return 1;} - virtual void gettime(time_t *sec, int *usec); - virtual char* strdup(const char *s) {return ::strdup(s);} - virtual int close_fd(int fd); + void awake(void*) FL_OVERRIDE; + int lock() FL_OVERRIDE; + void unlock() FL_OVERRIDE; + void* thread_message() FL_OVERRIDE; + int file_type(const char *filename) FL_OVERRIDE; + const char *home_directory_name() FL_OVERRIDE { return ::getenv("HOME"); } + int dot_file_hidden() FL_OVERRIDE {return 1;} + void gettime(time_t *sec, int *usec) FL_OVERRIDE; + char* strdup(const char *s) FL_OVERRIDE {return ::strdup(s);} + int close_fd(int fd) FL_OVERRIDE; #if defined(HAVE_PTHREAD) - virtual void lock_ring(); - virtual void unlock_ring(); + void lock_ring() FL_OVERRIDE; + void unlock_ring() FL_OVERRIDE; #endif }; diff --git a/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H b/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H index 7f7a0acce..fef8ded71 100644 --- a/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H +++ b/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H @@ -59,32 +59,32 @@ public: void page(int format); int start_postscript (int pagecount, enum Fl_Paged_Device::Page_Format format, enum Fl_Paged_Device::Page_Layout layout); int start_eps(int width, int height); - void draw_image(const uchar *data, int ix, int iy, int iw, int ih, int D, int LD); - void draw_image(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=3) { + void draw_image(const uchar *data, int ix, int iy, int iw, int ih, int D, int LD) FL_OVERRIDE; + void draw_image(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=3) FL_OVERRIDE { Fl_Cairo_Graphics_Driver::draw_image(call, data, x,y,w,h,delta); } - void font(int f, int s); - Fl_Font font(); - double width(const char *s, int n); - double width(unsigned u); - int height(); - int descent(); - void text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h); + void font(int f, int s) FL_OVERRIDE; + Fl_Font font() FL_OVERRIDE; + double width(const char *s, int n) FL_OVERRIDE; + double width(unsigned u) FL_OVERRIDE; + int height() FL_OVERRIDE; + int descent() FL_OVERRIDE; + void text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h) FL_OVERRIDE; // draw text at width measured on display void transformed_draw(const char* s, int n, double x, double y); - void draw(const char* s, int nBytes, int x, int y) {transformed_draw(s,nBytes,x,y); } - void draw(const char* s, int nBytes, float x, float y) {transformed_draw(s,nBytes,x,y); } - void draw(int angle, const char *str, int n, int x, int y) {Fl_Cairo_Graphics_Driver::draw(angle, str, n, x, y);} - - void point(int x, int y); - int not_clipped(int x, int y, int w, int h); - int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H); - virtual int has_feature(driver_feature feature_mask) { return feature_mask & PRINTER; } + void draw(const char* s, int nBytes, int x, int y) FL_OVERRIDE {transformed_draw(s,nBytes,x,y); } + void draw(const char* s, int nBytes, float x, float y) FL_OVERRIDE {transformed_draw(s,nBytes,x,y); } + void draw(int angle, const char *str, int n, int x, int y) FL_OVERRIDE {Fl_Cairo_Graphics_Driver::draw(angle, str, n, x, y);} + + void point(int x, int y) FL_OVERRIDE; + int not_clipped(int x, int y, int w, int h) FL_OVERRIDE; + int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H) FL_OVERRIDE; + virtual int has_feature(driver_feature feature_mask) FL_OVERRIDE { return feature_mask & PRINTER; } // draw image classes without caching them void draw_rgb_bitmap_(Fl_Image *img,int XP, int YP, int WP, int HP, int cx, int cy); - void draw_pixmap(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy); - void draw_bitmap(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy); - void draw_rgb(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy); + void draw_pixmap(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_bitmap(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_rgb(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; }; #else // ! USE_PANGO @@ -100,7 +100,7 @@ private: void close85(void *data); int scale_for_image_(Fl_Image *img, int XP, int YP, int WP, int HP,int cx, int cy); protected: - uchar **mask_bitmap() {return &mask;} + uchar **mask_bitmap() FL_OVERRIDE {return &mask;} public: Fl_PostScript_Graphics_Driver(); @@ -172,78 +172,78 @@ public: void page(int format); // implementation of drawing methods - void color(Fl_Color c); - void color(uchar r, uchar g, uchar b); - Fl_Color color(); - - void push_clip(int x, int y, int w, int h); - int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H); - int not_clipped(int x, int y, int w, int h); - void push_no_clip(); - void pop_clip(); - - void line_style(int style, int width=0, char* dashes=0); - - void rect(int x, int y, int w, int h); - void rectf(int x, int y, int w, int h); - - void xyline(int x, int y, int x1); - void xyline(int x, int y, int x1, int y2); - void xyline(int x, int y, int x1, int y2, int x3); - - void yxline(int x, int y, int y1); - void yxline(int x, int y, int y1, int x2); - void yxline(int x, int y, int y1, int x2, int y3); - - void line(int x1, int y1, int x2, int y2); - void line(int x1, int y1, int x2, int y2, int x3, int y3); - - void loop(int x0, int y0, int x1, int y1, int x2, int y2); - void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); - void polygon(int x0, int y0, int x1, int y1, int x2, int y2); - void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); - void point(int x, int y); - - void begin_points(); - void begin_line(); - void begin_loop(); - void begin_polygon(); - void vertex(double x, double y); - void curve(double x, double y, double x1, double y1, double x2, double y2, double x3, double y3); - void circle(double x, double y, double r); - void arc(double x, double y, double r, double start, double a); - void arc(int x, int y, int w, int h, double a1, double a2); - void pie(int x, int y, int w, int h, double a1, double a2); - void end_points(); - void end_line(); - void end_loop(); - void end_polygon(); - void begin_complex_polygon(){begin_polygon();} - void gap(){gap_=1;} - void end_complex_polygon(){end_polygon();} - void transformed_vertex(double x, double y); - - void draw_image(const uchar* d, int x,int y,int w,int h, int delta=3, int ldelta=0); - void draw_image_mono(const uchar* d, int x,int y,int w,int h, int delta=1, int ld=0); - void draw_image(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=3); - void draw_image_mono(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=1); - - void draw(const char* s, int nBytes, int x, int y) {transformed_draw(s,nBytes,x,y); } - void draw(const char* s, int nBytes, float x, float y) {transformed_draw(s,nBytes,x,y); } - void draw(int angle, const char *str, int n, int x, int y); - void rtl_draw(const char* s, int n, int x, int y); - void font(int face, int size); - Fl_Font font(); - double width(const char *, int); - double width(unsigned int u); - void text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h); - int height(); - int descent(); - void draw_pixmap(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy); - void draw_bitmap(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy); - void draw_rgb(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy); + void color(Fl_Color c) FL_OVERRIDE; + void color(uchar r, uchar g, uchar b) FL_OVERRIDE; + Fl_Color color() FL_OVERRIDE; + + void push_clip(int x, int y, int w, int h) FL_OVERRIDE; + int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H) FL_OVERRIDE; + int not_clipped(int x, int y, int w, int h) FL_OVERRIDE; + void push_no_clip() FL_OVERRIDE; + void pop_clip() FL_OVERRIDE; + + void line_style(int style, int width=0, char* dashes=0) FL_OVERRIDE; + + void rect(int x, int y, int w, int h) FL_OVERRIDE; + void rectf(int x, int y, int w, int h) FL_OVERRIDE; + + void xyline(int x, int y, int x1) FL_OVERRIDE; + void xyline(int x, int y, int x1, int y2) FL_OVERRIDE; + void xyline(int x, int y, int x1, int y2, int x3) FL_OVERRIDE; + + void yxline(int x, int y, int y1) FL_OVERRIDE; + void yxline(int x, int y, int y1, int x2) FL_OVERRIDE; + void yxline(int x, int y, int y1, int x2, int y3) FL_OVERRIDE; + + void line(int x1, int y1, int x2, int y2) FL_OVERRIDE; + void line(int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + + void loop(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + void polygon(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + void point(int x, int y) FL_OVERRIDE; + + void begin_points() FL_OVERRIDE; + void begin_line() FL_OVERRIDE; + void begin_loop() FL_OVERRIDE; + void begin_polygon() FL_OVERRIDE; + void vertex(double x, double y) FL_OVERRIDE; + void curve(double x, double y, double x1, double y1, double x2, double y2, double x3, double y3) FL_OVERRIDE; + void circle(double x, double y, double r) FL_OVERRIDE; + void arc(double x, double y, double r, double start, double a) FL_OVERRIDE; + void arc(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void pie(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void end_points() FL_OVERRIDE; + void end_line() FL_OVERRIDE; + void end_loop() FL_OVERRIDE; + void end_polygon() FL_OVERRIDE; + void begin_complex_polygon() FL_OVERRIDE {begin_polygon();} + void gap() FL_OVERRIDE {gap_=1;} + void end_complex_polygon() FL_OVERRIDE {end_polygon();} + void transformed_vertex(double x, double y) FL_OVERRIDE; + + void draw_image(const uchar* d, int x,int y,int w,int h, int delta=3, int ldelta=0) FL_OVERRIDE; + void draw_image_mono(const uchar* d, int x,int y,int w,int h, int delta=1, int ld=0) FL_OVERRIDE; + void draw_image(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=3) FL_OVERRIDE; + void draw_image_mono(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=1) FL_OVERRIDE; + + void draw(const char* s, int nBytes, int x, int y) FL_OVERRIDE {transformed_draw(s,nBytes,x,y); } + void draw(const char* s, int nBytes, float x, float y) FL_OVERRIDE {transformed_draw(s,nBytes,x,y); } + void draw(int angle, const char *str, int n, int x, int y) FL_OVERRIDE; + void rtl_draw(const char* s, int n, int x, int y) FL_OVERRIDE; + void font(int face, int size) FL_OVERRIDE; + Fl_Font font() FL_OVERRIDE; + double width(const char *, int) FL_OVERRIDE; + double width(unsigned int u) FL_OVERRIDE; + void text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h) FL_OVERRIDE; + int height() FL_OVERRIDE; + int descent() FL_OVERRIDE; + void draw_pixmap(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_bitmap(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_rgb(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; ~Fl_PostScript_Graphics_Driver(); - virtual int has_feature(driver_feature feature_mask) { return feature_mask & PRINTER; } + int has_feature(driver_feature feature_mask) FL_OVERRIDE { return feature_mask & PRINTER; } void ps_origin(int x, int y); void ps_translate(int, int); diff --git a/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H b/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H index 14d469dbe..8ef586624 100644 --- a/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H +++ b/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H @@ -31,9 +31,9 @@ protected: Fl_Quartz_Copy_Surface_Driver(int w, int h); // implemented in Fl_cocoa.mm because uses Objective-c ~Fl_Quartz_Copy_Surface_Driver(); - void set_current(); - void translate(int x, int y); - void untranslate(); + void set_current() FL_OVERRIDE; + void translate(int x, int y) FL_OVERRIDE; + void untranslate() FL_OVERRIDE; }; #endif /* Fl_Quartz_Copy_Surface_Driver_H */ diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H index f5c9bd3a2..ca1ffce04 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H @@ -56,92 +56,92 @@ protected: CGLineJoin quartz_line_join_; CGFloat *quartz_line_pattern; int quartz_line_pattern_size; - virtual void cache_size(Fl_Image* img, int &width, int &height); + void cache_size(Fl_Image* img, int &width, int &height) FL_OVERRIDE; public: Fl_Quartz_Graphics_Driver(); - virtual int has_feature(driver_feature mask) { return mask & NATIVE; } - virtual void gc(void *ctxt) { gc_ = (CGContextRef)ctxt; global_gc(); } - virtual void *gc() {return gc_;} - char can_do_alpha_blending(); + int has_feature(driver_feature mask) FL_OVERRIDE { return mask & NATIVE; } + void gc(void *ctxt) FL_OVERRIDE { gc_ = (CGContextRef)ctxt; global_gc(); } + void *gc() FL_OVERRIDE {return gc_;} + char can_do_alpha_blending() FL_OVERRIDE; // --- bitmap stuff static CGImageRef create_bitmask(int w, int h, const uchar *array); // NOT virtual - virtual void delete_bitmask(fl_uintptr_t bm); - void draw_pixmap(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); - void draw_bitmap(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); - void draw_rgb(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy); - void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0); - void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3); - void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0); - void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1); - void cache(Fl_Pixmap *img); - void cache(Fl_Bitmap *img); - void cache(Fl_RGB_Image *img); - void uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_uintptr_t &mask_); - void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy); + void delete_bitmask(fl_uintptr_t bm) FL_OVERRIDE; + void draw_pixmap(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_bitmap(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_rgb(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0) FL_OVERRIDE; + void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3) FL_OVERRIDE; + void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0) FL_OVERRIDE; + void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1) FL_OVERRIDE; + void cache(Fl_Pixmap *img) FL_OVERRIDE; + void cache(Fl_Bitmap *img) FL_OVERRIDE; + void cache(Fl_RGB_Image *img) FL_OVERRIDE; + void uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_uintptr_t &mask_) FL_OVERRIDE; + void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) FL_OVERRIDE; void draw_CGImage(CGImageRef cgimg, int x, int y, int w, int h, int srcx, int srcy, int sw, int sh); static CGRect fl_cgrectmake_cocoa(int x, int y, int w, int h); - void add_rectangle_to_region(Fl_Region r, int x, int y, int w, int h); - Fl_Region XRectangleRegion(int x, int y, int w, int h); - void XDestroyRegion(Fl_Region r); + void add_rectangle_to_region(Fl_Region r, int x, int y, int w, int h) FL_OVERRIDE; + Fl_Region XRectangleRegion(int x, int y, int w, int h) FL_OVERRIDE; + void XDestroyRegion(Fl_Region r) FL_OVERRIDE; void high_resolution(bool b) { high_resolution_ = b; } protected: - void point(int x, int y); - void rect(int x, int y, int w, int h); - void focus_rect(int x, int y, int w, int h); - void rectf(int x, int y, int w, int h); - void line(int x, int y, int x1, int y1); - void line(int x, int y, int x1, int y1, int x2, int y2); - void xyline(int x, int y, int x1); - void xyline(int x, int y, int x1, int y2); - void xyline(int x, int y, int x1, int y2, int x3); - void yxline(int x, int y, int y1); - void yxline(int x, int y, int y1, int x2); - void yxline(int x, int y, int y1, int x2, int y3); - void loop(int x0, int y0, int x1, int y1, int x2, int y2); - void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); - void polygon(int x0, int y0, int x1, int y1, int x2, int y2); - void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); + void point(int x, int y) FL_OVERRIDE; + void rect(int x, int y, int w, int h) FL_OVERRIDE; + void focus_rect(int x, int y, int w, int h) FL_OVERRIDE; + void rectf(int x, int y, int w, int h) FL_OVERRIDE; + void line(int x, int y, int x1, int y1) FL_OVERRIDE; + void line(int x, int y, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void xyline(int x, int y, int x1) FL_OVERRIDE; + void xyline(int x, int y, int x1, int y2) FL_OVERRIDE; + void xyline(int x, int y, int x1, int y2, int x3) FL_OVERRIDE; + void yxline(int x, int y, int y1) FL_OVERRIDE; + void yxline(int x, int y, int y1, int x2) FL_OVERRIDE; + void yxline(int x, int y, int y1, int x2, int y3) FL_OVERRIDE; + void loop(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + void polygon(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; // --- clipping - void push_clip(int x, int y, int w, int h); - int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H); - int not_clipped(int x, int y, int w, int h); - void restore_clip(); - void end_points(); - void end_line(); - void end_polygon(); - void end_complex_polygon(); - void circle(double x, double y, double r); - void arc(int x, int y, int w, int h, double a1, double a2); - void pie(int x, int y, int w, int h, double a1, double a2); - void line_style(int style, int width=0, char* dashes=0); - void color(Fl_Color c); - Fl_Color color() { return color_; } - void color(uchar r, uchar g, uchar b); - void draw(const char *str, int n, int x, int y); - void draw(const char *str, int n, float x, float y); - void draw(int angle, const char *str, int n, int x, int y); + void push_clip(int x, int y, int w, int h) FL_OVERRIDE; + int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H) FL_OVERRIDE; + int not_clipped(int x, int y, int w, int h) FL_OVERRIDE; + void restore_clip() FL_OVERRIDE; + void end_points() FL_OVERRIDE; + void end_line() FL_OVERRIDE; + void end_polygon() FL_OVERRIDE; + void end_complex_polygon() FL_OVERRIDE; + void circle(double x, double y, double r) FL_OVERRIDE; + void arc(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void pie(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void line_style(int style, int width=0, char* dashes=0) FL_OVERRIDE; + void color(Fl_Color c) FL_OVERRIDE; + Fl_Color color() FL_OVERRIDE { return color_; } + void color(uchar r, uchar g, uchar b) FL_OVERRIDE; + void draw(const char *str, int n, int x, int y) FL_OVERRIDE; + void draw(const char *str, int n, float x, float y) FL_OVERRIDE; + void draw(int angle, const char *str, int n, int x, int y) FL_OVERRIDE; double width(const UniChar* txt, int n); - void rtl_draw(const char *str, int n, int x, int y); - void font(Fl_Font face, Fl_Fontsize fsize); - double width(const char *str, int n); - double width(unsigned int c); - int height(); - int descent(); + void rtl_draw(const char *str, int n, int x, int y) FL_OVERRIDE; + void font(Fl_Font face, Fl_Fontsize fsize) FL_OVERRIDE; + double width(const char *str, int n) FL_OVERRIDE; + double width(unsigned int c) FL_OVERRIDE; + int height() FL_OVERRIDE; + int descent() FL_OVERRIDE; virtual bool high_resolution() { return high_resolution_; } - virtual void global_gc(); + void global_gc() FL_OVERRIDE; void quartz_restore_line_style(); inline Fl_Quartz_Font_Descriptor *valid_font_descriptor(); - virtual const char* get_font_name(Fl_Font fnum, int* ap); - virtual int get_font_sizes(Fl_Font fnum, int*& sizep); - virtual const char *font_name(int num); - virtual void font_name(int num, const char *name); - Fl_Fontdesc* calc_fl_fonts(void); + const char* get_font_name(Fl_Font fnum, int* ap) FL_OVERRIDE; + int get_font_sizes(Fl_Font fnum, int*& sizep) FL_OVERRIDE; + const char *font_name(int num) FL_OVERRIDE; + void font_name(int num, const char *name) FL_OVERRIDE; + Fl_Fontdesc* calc_fl_fonts(void) FL_OVERRIDE; - virtual void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h); - virtual Fl_Font set_fonts(const char* xstarname); + void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h) FL_OVERRIDE; + Fl_Font set_fonts(const char* xstarname) FL_OVERRIDE; void set_fontname_in_fontdesc(Fl_Fontdesc *f); - virtual void uncache_pixmap(fl_uintptr_t p); + void uncache_pixmap(fl_uintptr_t p) FL_OVERRIDE; #if HAS_ATSU && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 enum {use_CoreText = 1, use_ATSU}; @@ -167,16 +167,16 @@ protected: #else void descriptor_init(const char* name, Fl_Fontsize Size, Fl_Quartz_Font_Descriptor *d); #endif - virtual void overlay_rect(int x, int y, int w , int h); - virtual float override_scale(); - virtual void restore_scale(float); - virtual void antialias(int state); - virtual int antialias(); + void overlay_rect(int x, int y, int w , int h) FL_OVERRIDE; + float override_scale() FL_OVERRIDE; + void restore_scale(float) FL_OVERRIDE; + void antialias(int state) FL_OVERRIDE; + int antialias() FL_OVERRIDE; }; class Fl_Quartz_Printer_Graphics_Driver : public Fl_Quartz_Graphics_Driver { public: - virtual int has_feature(driver_feature mask) { return mask & (NATIVE | PRINTER); } + int has_feature(driver_feature mask) FL_OVERRIDE { return mask & (NATIVE | PRINTER); } }; #endif // FL_QUARTZ_GRAPHICS_DRIVER_H diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.H b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.H index f70a43ed6..b6f58ec8f 100644 --- a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.H +++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.H @@ -21,15 +21,15 @@ #include <FL/platform.H> class Fl_Quartz_Image_Surface_Driver : public Fl_Image_Surface_Driver { - virtual void end_current(); + void end_current() FL_OVERRIDE; public: FLWindow *pre_window; Fl_Quartz_Image_Surface_Driver(int w, int h, int high_res, Fl_Offscreen off); ~Fl_Quartz_Image_Surface_Driver(); - void set_current(); - void translate(int x, int y); - void untranslate(); - Fl_RGB_Image *image(); + void set_current() FL_OVERRIDE; + void translate(int x, int y) FL_OVERRIDE; + void untranslate() FL_OVERRIDE; + Fl_RGB_Image *image() FL_OVERRIDE; }; #endif // FL_QUARTZ_IMAGE_SURFACE_DRIVER_H diff --git a/src/drivers/SVG/Fl_SVG_File_Surface.cxx b/src/drivers/SVG/Fl_SVG_File_Surface.cxx index ba8099d7f..e8ecd75a8 100644 --- a/src/drivers/SVG/Fl_SVG_File_Surface.cxx +++ b/src/drivers/SVG/Fl_SVG_File_Surface.cxx @@ -71,54 +71,54 @@ public: ~Fl_SVG_Graphics_Driver(); FILE* file() {return out_;} protected: - void rect(int x, int y, int w, int h); - void rectf(int x, int y, int w, int h); - void compute_dasharray(float s, char *dashes=0); - void line_style(int style, int width, char *dashes=0); - void line(int x1, int y1, int x2, int y2); - void line(int x1, int y1, int x2, int y2, int x3, int y3); + void rect(int x, int y, int w, int h) FL_OVERRIDE; + void rectf(int x, int y, int w, int h) FL_OVERRIDE; + virtual void compute_dasharray(float s, char *dashes=0); + void line_style(int style, int width, char *dashes=0) FL_OVERRIDE; + void line(int x1, int y1, int x2, int y2) FL_OVERRIDE; + void line(int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; void font_(int f, int s); - void font(int f, int s); - Fl_Font font(); - void draw(const char *str, int n, int x, int y); - void draw(const char*, int, float, float) ; - void draw(int, const char*, int, int, int) ; - void rtl_draw(const char *str, int n, int x, int y); - void color(uchar r, uchar g, uchar b); - void color(Fl_Color c); - Fl_Color color(); - double width(const char*, int); - double width(unsigned int c); - void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h); - int height() ; - int descent() ; - void draw_rgb(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy); + void font(int f, int s) FL_OVERRIDE; + Fl_Font font() FL_OVERRIDE; + void draw(const char *str, int n, int x, int y) FL_OVERRIDE; + void draw(const char*, int, float, float) FL_OVERRIDE; + void draw(int, const char*, int, int, int) FL_OVERRIDE; + void rtl_draw(const char *str, int n, int x, int y) FL_OVERRIDE; + void color(uchar r, uchar g, uchar b) FL_OVERRIDE; + void color(Fl_Color c) FL_OVERRIDE; + Fl_Color color() FL_OVERRIDE; + double width(const char*, int) FL_OVERRIDE; + double width(unsigned int c) FL_OVERRIDE; + void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h) FL_OVERRIDE; + int height() FL_OVERRIDE; + int descent() FL_OVERRIDE; + void draw_rgb(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; void define_rgb_png(Fl_RGB_Image *rgb, const char *name, int x, int y); void define_rgb_jpeg(Fl_RGB_Image *rgb, const char *name, int x, int y); - void draw_pixmap(Fl_Pixmap *pxm,int XP, int YP, int WP, int HP, int cx, int cy); - void draw_bitmap(Fl_Bitmap *bm,int XP, int YP, int WP, int HP, int cx, int cy); - void draw_image(const uchar* buf, int x, int y, int w, int h, int d, int l); - void draw_image(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h, int d); - void draw_image_mono(const uchar* buf, int x, int y, int w, int h, int d, int l); - void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h, int d); - void push_clip(int x, int y, int w, int h); - void push_no_clip(); - void pop_clip(); - int clip_box(int x, int y, int w, int h, int& X, int& Y, int& W, int& H); - int not_clipped(int x, int y, int w, int h); - void polygon(int x0, int y0, int x1, int y1, int x2, int y2); - void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); - void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); - void loop(int x0, int y0, int x1, int y1, int x2, int y2); - void point(int x, int y); - void end_points(); - void end_line(); - void end_polygon(); - void end_complex_polygon(); - void circle(double x, double y,double r); - void arc(int x,int y,int w,int h,double a1,double a2); - void arc(double x, double y, double r, double start, double end); - void pie(int x,int y,int w,int h,double a1,double a2); + void draw_pixmap(Fl_Pixmap *pxm,int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_bitmap(Fl_Bitmap *bm,int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_image(const uchar* buf, int x, int y, int w, int h, int d, int l) FL_OVERRIDE; + void draw_image(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h, int d) FL_OVERRIDE; + void draw_image_mono(const uchar* buf, int x, int y, int w, int h, int d, int l) FL_OVERRIDE; + void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h, int d) FL_OVERRIDE; + void push_clip(int x, int y, int w, int h) FL_OVERRIDE; + void push_no_clip() FL_OVERRIDE; + void pop_clip() FL_OVERRIDE; + int clip_box(int x, int y, int w, int h, int& X, int& Y, int& W, int& H) FL_OVERRIDE; + int not_clipped(int x, int y, int w, int h) FL_OVERRIDE; + void polygon(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + void loop(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void point(int x, int y) FL_OVERRIDE; + void end_points() FL_OVERRIDE; + void end_line() FL_OVERRIDE; + void end_polygon() FL_OVERRIDE; + void end_complex_polygon() FL_OVERRIDE; + void circle(double x, double y,double r) FL_OVERRIDE; + void arc(int x,int y,int w,int h,double a1,double a2) FL_OVERRIDE; + void arc(double x, double y, double r, double start, double end) FL_OVERRIDE; + void pie(int x,int y,int w,int h,double a1,double a2) FL_OVERRIDE; void arc_pie(char AorP, int x, int y, int w, int h, double a1, double a2); }; diff --git a/src/drivers/Unix/Fl_Unix_System_Driver.H b/src/drivers/Unix/Fl_Unix_System_Driver.H index 7234cc360..8bc365515 100644 --- a/src/drivers/Unix/Fl_Unix_System_Driver.H +++ b/src/drivers/Unix/Fl_Unix_System_Driver.H @@ -23,27 +23,27 @@ class Fl_RGB_Image; class Fl_Unix_System_Driver : public Fl_Posix_System_Driver { public: - virtual int clocale_vsnprintf(char *output, size_t output_size, const char *format, va_list args); - virtual int clocale_vsscanf(const char *input, const char *format, va_list args); - virtual int clocale_vprintf(FILE *output, const char *format, va_list args); - virtual int filename_list(const char *d, dirent ***list, + int clocale_vsnprintf(char *output, size_t output_size, const char *format, va_list args) FL_OVERRIDE; + int clocale_vsscanf(const char *input, const char *format, va_list args) FL_OVERRIDE; + int clocale_vprintf(FILE *output, const char *format, va_list args) FL_OVERRIDE; + int filename_list(const char *d, dirent ***list, int (*sort)(struct dirent **, struct dirent **), - char *errmsg=NULL, int errmsg_sz=0); - virtual int open_uri(const char *uri, char *msg, int msglen); - virtual int use_tooltip_timeout_condition() {return 1;} - virtual int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, int lname, Fl_File_Icon *icon); - virtual void newUUID(char *uuidBuffer); - virtual char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor, - const char *application); - virtual int preferences_need_protection_check() {return 1;} - virtual int utf8locale(); - virtual const char *filename_name(const char *buf); - virtual void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0); - virtual void add_fd(int fd, Fl_FD_Handler cb, void* = 0); - virtual void remove_fd(int, int when); - virtual void remove_fd(int); - double wait(double time_to_wait); - int ready(); + char *errmsg=NULL, int errmsg_sz=0) FL_OVERRIDE; + int open_uri(const char *uri, char *msg, int msglen) FL_OVERRIDE; + int use_tooltip_timeout_condition() FL_OVERRIDE {return 1;} + int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, int lname, Fl_File_Icon *icon) FL_OVERRIDE; + void newUUID(char *uuidBuffer) FL_OVERRIDE; + char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor, + const char *application) FL_OVERRIDE; + int preferences_need_protection_check() FL_OVERRIDE {return 1;} + int utf8locale() FL_OVERRIDE; + const char *filename_name(const char *buf) FL_OVERRIDE; + void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0) FL_OVERRIDE; + void add_fd(int fd, Fl_FD_Handler cb, void* = 0) FL_OVERRIDE; + void remove_fd(int, int when) FL_OVERRIDE; + void remove_fd(int) FL_OVERRIDE; + double wait(double time_to_wait) FL_OVERRIDE; + int ready() FL_OVERRIDE; static unsigned char *create_bmp(const unsigned char *data, int W, int H, int *return_size); static Fl_RGB_Image *own_bmp_to_RGB(char *bmp); static void read_int(uchar *c, int& i); diff --git a/src/drivers/Wayland/Fl_Wayland_Copy_Surface_Driver.H b/src/drivers/Wayland/Fl_Wayland_Copy_Surface_Driver.H index f5f6eee11..e10a801ce 100644 --- a/src/drivers/Wayland/Fl_Wayland_Copy_Surface_Driver.H +++ b/src/drivers/Wayland/Fl_Wayland_Copy_Surface_Driver.H @@ -26,9 +26,9 @@ class Fl_Wayland_Copy_Surface_Driver : public Fl_Copy_Surface_Driver { protected: Fl_Wayland_Copy_Surface_Driver(int w, int h); ~Fl_Wayland_Copy_Surface_Driver(); - void set_current(); - void translate(int x, int y); - void untranslate(); + void set_current() FL_OVERRIDE; + void translate(int x, int y) FL_OVERRIDE; + void untranslate() FL_OVERRIDE; }; #endif // FL_WAYLAND_COPY_SURFACE_DRIVER_H diff --git a/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.H b/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.H index e30143468..960f18c11 100644 --- a/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.H +++ b/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.H @@ -38,21 +38,21 @@ class Fl_Wayland_Gl_Window_Driver : public Fl_Gl_Window_Driver { friend class Fl_Wayland_Gl_Plugin; bool egl_swap_in_progress; Fl_Wayland_Gl_Window_Driver(Fl_Gl_Window *win); - virtual float pixels_per_unit(); - virtual void make_current_before(); - virtual int mode_(int m, const int *a); - virtual void swap_buffers(); - virtual void resize(int is_a_resize, int w, int h); - virtual char swap_type(); - virtual Fl_Gl_Choice *find(int m, const int *alistp); - virtual GLContext create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g); - 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 gl_start(); - virtual void gl_visual(Fl_Gl_Choice *c); - char *alpha_mask_for_string(const char *str, int n, int w, int h, Fl_Fontsize fs); + float pixels_per_unit() FL_OVERRIDE; + void make_current_before() FL_OVERRIDE; + int mode_(int m, const int *a) FL_OVERRIDE; + void swap_buffers() FL_OVERRIDE; + void resize(int is_a_resize, int w, int h) FL_OVERRIDE; + char swap_type() 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; + 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 gl_start() FL_OVERRIDE; + void gl_visual(Fl_Gl_Choice *c) FL_OVERRIDE; + char *alpha_mask_for_string(const char *str, int n, int w, int h, Fl_Fontsize fs) FL_OVERRIDE; static EGLDisplay egl_display; static EGLint configs_count; void init(); diff --git a/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx index 3624d63f9..45a26e046 100644 --- a/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx @@ -371,20 +371,20 @@ void Fl_Wayland_Gl_Window_Driver::swap_buffers() { class Fl_Wayland_Gl_Plugin : public Fl_Wayland_Plugin { public: Fl_Wayland_Gl_Plugin() : Fl_Wayland_Plugin(name()) { } - virtual const char *name() { return "gl.wayland.fltk.org"; } - virtual void do_swap(Fl_Window *w) { + const char *name() FL_OVERRIDE { return "gl.wayland.fltk.org"; } + void do_swap(Fl_Window *w) FL_OVERRIDE { Fl_Gl_Window_Driver *gldr = Fl_Gl_Window_Driver::driver(w->as_gl_window()); if (gldr->overlay() == w) gldr->swap_buffers(); } - virtual void invalidate(Fl_Window *w) { + void invalidate(Fl_Window *w) FL_OVERRIDE { w->as_gl_window()->valid(0); } - virtual void terminate() { + void terminate() FL_OVERRIDE { if (Fl_Wayland_Gl_Window_Driver::egl_display != EGL_NO_DISPLAY) { eglTerminate(Fl_Wayland_Gl_Window_Driver::egl_display); } } - virtual void destroy(struct gl_start_support *gl_start_support_) { + void destroy(struct gl_start_support *gl_start_support_) FL_OVERRIDE { eglDestroySurface(Fl_Wayland_Gl_Window_Driver::egl_display, gl_start_support_->egl_surface); wl_egl_window_destroy(gl_start_support_->egl_window); wl_subsurface_destroy(gl_start_support_->subsurface); diff --git a/src/drivers/Wayland/Fl_Wayland_Graphics_Driver.H b/src/drivers/Wayland/Fl_Wayland_Graphics_Driver.H index 01932fc50..d736df9de 100644 --- a/src/drivers/Wayland/Fl_Wayland_Graphics_Driver.H +++ b/src/drivers/Wayland/Fl_Wayland_Graphics_Driver.H @@ -75,13 +75,13 @@ public: Fl_Wayland_Graphics_Driver(); static const uint32_t wld_format; void set_buffer(struct fl_wld_buffer *buffer, float scale = 0); - virtual void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen osrc, int srcx, int srcy); + void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen osrc, int srcx, int srcy) FL_OVERRIDE; static struct fl_wld_buffer *create_shm_buffer(int width, int height); static void buffer_release(struct wld_window *window); static void buffer_commit(struct wld_window *window, bool need_damage = true); static void cairo_init(struct fl_wld_buffer *buffer, int width, int height, int stride, cairo_format_t format); - virtual void *gc(); - virtual void gc(void *gc); + void *gc() FL_OVERRIDE; + void gc(void *gc) FL_OVERRIDE; }; #endif // FL_WAYLAND_GRAPHICS_DRIVER_H diff --git a/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.H b/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.H index 7959267f8..8e7246c24 100644 --- a/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.H +++ b/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.H @@ -21,15 +21,15 @@ #include <FL/platform.H> class Fl_Wayland_Image_Surface_Driver : public Fl_Image_Surface_Driver { - virtual void end_current(); + void end_current() FL_OVERRIDE; struct wld_window *pre_window; public: Fl_Wayland_Image_Surface_Driver(int w, int h, int high_res, Fl_Offscreen off); ~Fl_Wayland_Image_Surface_Driver(); - virtual void set_current(); - virtual void translate(int x, int y); - virtual void untranslate(); - virtual Fl_RGB_Image *image(); + void set_current() FL_OVERRIDE; + void translate(int x, int y) FL_OVERRIDE; + void untranslate() FL_OVERRIDE; + Fl_RGB_Image *image() FL_OVERRIDE; }; #endif // FL_WAYLAND_IMAGE_SURFACE_DRIVER_H diff --git a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H index 8ef09fd68..afc895e01 100644 --- a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H +++ b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H @@ -117,49 +117,49 @@ public: struct zwp_text_input_manager_v3 *text_input_base; Fl_Wayland_Screen_Driver(); - virtual APP_SCALING_CAPABILITY rescalable() { return PER_SCREEN_APP_SCALING; } - virtual float scale(int n); - virtual void scale(int n, float f); + APP_SCALING_CAPABILITY rescalable() FL_OVERRIDE { return PER_SCREEN_APP_SCALING; } + float scale(int n) FL_OVERRIDE; + void scale(int n, float f) FL_OVERRIDE; int screen_num_unscaled(int x, int y); void copy_image(const unsigned char* data, int W, int H); // --- screen configuration void init_workarea(); - virtual void init(); - virtual int x(); - virtual int y(); - virtual int w(); - virtual int h(); - virtual void screen_xywh(int &X, int &Y, int &W, int &H, int n); - virtual void screen_dpi(float &h, float &v, int n=0); - virtual void screen_work_area(int &X, int &Y, int &W, int &H, int n); + void init() FL_OVERRIDE; + int x() FL_OVERRIDE; + int y() FL_OVERRIDE; + int w() FL_OVERRIDE; + int h() FL_OVERRIDE; + void screen_xywh(int &X, int &Y, int &W, int &H, int n) FL_OVERRIDE; + void screen_dpi(float &h, float &v, int n=0) FL_OVERRIDE; + void screen_work_area(int &X, int &Y, int &W, int &H, int n) FL_OVERRIDE; // --- audible output - virtual void beep(int type); + void beep(int type) FL_OVERRIDE; // --- global events - virtual void flush(); - virtual void grab(Fl_Window* win); + void flush() FL_OVERRIDE; + void grab(Fl_Window* win) FL_OVERRIDE; // --- global colors - virtual void get_system_colors(); - virtual const char *get_system_scheme(); - virtual int dnd(int unused); - virtual int compose(int &del); - virtual void compose_reset(); - virtual Fl_RGB_Image *read_win_rectangle(int X, int Y, int w, int h, Fl_Window *win, bool may_capture_subwins, bool *did_capture_subwins); - virtual int get_mouse(int &x, int &y); - virtual void open_display_platform(); - virtual void close_display(); - virtual void display(const char *d); + void get_system_colors() FL_OVERRIDE; + const char *get_system_scheme() FL_OVERRIDE; + int dnd(int unused) FL_OVERRIDE; + int compose(int &del) FL_OVERRIDE; + void compose_reset() FL_OVERRIDE; + Fl_RGB_Image *read_win_rectangle(int X, int Y, int w, int h, Fl_Window *win, bool may_capture_subwins, bool *did_capture_subwins) FL_OVERRIDE; + int get_mouse(int &x, int &y) FL_OVERRIDE; + void open_display_platform() FL_OVERRIDE; + void close_display() FL_OVERRIDE; + void display(const char *d) FL_OVERRIDE; // --- compute dimensions of an Fl_Offscreen - virtual void offscreen_size(Fl_Offscreen o, int &width, int &height); - virtual int has_marked_text() const; + void offscreen_size(Fl_Offscreen o, int &width, int &height) FL_OVERRIDE; + int has_marked_text() const FL_OVERRIDE; static int next_marked_length; // next length of marked text after current marked text will have been replaced // --- clipboard operations // this one is in fl_wayland_clipboard_dnd.cxx - virtual void copy(const char *stuff, int len, int clipboard, const char *type); + void copy(const char *stuff, int len, int clipboard, const char *type) FL_OVERRIDE; // this one is in fl_wayland_clipboard_dnd.cxx - virtual void paste(Fl_Widget &receiver, int clipboard, const char *type); + void paste(Fl_Widget &receiver, int clipboard, const char *type) FL_OVERRIDE; // this one is in fl_wayland_clipboard_dnd.cxx - virtual int clipboard_contains(const char *type); + int clipboard_contains(const char *type) FL_OVERRIDE; // --- Wayland-special void set_cursor(); struct wl_cursor *default_cursor(); @@ -173,11 +173,11 @@ public: static bool own_output(struct wl_output *output); typedef enum {unspecified, MUTTER, WESTON, KDE} compositor_name; static compositor_name compositor; // identifies the used Wayland compositor - void set_spot(int font, int height, int x, int y, int w, int h, Fl_Window *win); - void reset_spot(); - virtual void *control_maximize_button(void *data); - int event_key(int k); - int get_key(int k); + void set_spot(int font, int height, int x, int y, int w, int h, Fl_Window *win) FL_OVERRIDE; + void reset_spot() FL_OVERRIDE; + void *control_maximize_button(void *data) FL_OVERRIDE; + int event_key(int k) FL_OVERRIDE; + int get_key(int k) FL_OVERRIDE; }; diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.H b/src/drivers/Wayland/Fl_Wayland_Window_Driver.H index 2b12ededd..60e346915 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.H +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.H @@ -77,7 +77,7 @@ public: static type_for_resize_window_between_screens data_for_resize_window_between_screens_; void decorated_win_size(int &w, int &h); void shape_bitmap_(Fl_Image* b); - void shape_alpha_(Fl_Image* img, int offset); + void shape_alpha_(Fl_Image* img, int offset) FL_OVERRIDE; void update_scale(); cairo_rectangle_int_t *subRect() { return subRect_; } // getter void subRect(cairo_rectangle_int_t *r); // setter @@ -93,40 +93,40 @@ public: static void resize_after_screen_change(void *data); // --- window data - virtual int decorated_w(); - virtual int decorated_h(); - virtual const Fl_Image* shape(); + int decorated_w() FL_OVERRIDE; + int decorated_h() FL_OVERRIDE; + const Fl_Image* shape() FL_OVERRIDE; // --- window management - virtual Fl_X *makeWindow(); - virtual void take_focus(); - virtual void flush(); - virtual void flush_overlay(); - virtual void draw_end(); - virtual void make_current(); - virtual void show(); - virtual void resize(int X,int Y,int W,int H); - virtual void label(const char *name, const char *mininame); - virtual void destroy_double_buffer(); - virtual void hide(); - virtual void map(); - virtual void unmap(); - virtual void fullscreen_on(); - virtual void fullscreen_off(int X, int Y, int W, int H); - virtual void use_border(); - virtual void size_range(); - virtual void iconize(); - virtual void decoration_sizes(int *top, int *left, int *right, int *bottom); + Fl_X *makeWindow() FL_OVERRIDE; + void take_focus() FL_OVERRIDE; + void flush() FL_OVERRIDE; + void flush_overlay() FL_OVERRIDE; + void draw_end() FL_OVERRIDE; + void make_current() FL_OVERRIDE; + void show() FL_OVERRIDE; + void resize(int X,int Y,int W,int H) FL_OVERRIDE; + void label(const char *name, const char *mininame) FL_OVERRIDE; + void destroy_double_buffer() FL_OVERRIDE; + void hide() FL_OVERRIDE; + void map() FL_OVERRIDE; + void unmap() FL_OVERRIDE; + void fullscreen_on() FL_OVERRIDE; + void fullscreen_off(int X, int Y, int W, int H) FL_OVERRIDE; + void use_border() FL_OVERRIDE; + void size_range() FL_OVERRIDE; + void iconize() FL_OVERRIDE; + void decoration_sizes(int *top, int *left, int *right, int *bottom) FL_OVERRIDE; // --- window cursor stuff - virtual int set_cursor(Fl_Cursor); - virtual int set_cursor(const Fl_RGB_Image*, int, int); - - virtual void shape(const Fl_Image* img); - virtual void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right); - virtual int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data); - virtual void wait_for_expose(); - virtual void reposition_menu_window(int x, int y); - virtual void menu_window_area(int &X, int &Y, int &W, int &H, int nscreen = -1); + int set_cursor(Fl_Cursor) FL_OVERRIDE; + int set_cursor(const Fl_RGB_Image*, int, int) FL_OVERRIDE; + + void shape(const Fl_Image* img) FL_OVERRIDE; + void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right) FL_OVERRIDE; + int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data) FL_OVERRIDE; + void wait_for_expose() FL_OVERRIDE; + void reposition_menu_window(int x, int y) FL_OVERRIDE; + void menu_window_area(int &X, int &Y, int &W, int &H, int nscreen = -1) FL_OVERRIDE; }; 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 }; diff --git a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx index 56b3c6d4b..2e59f124c 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx @@ -36,18 +36,18 @@ private: int top_margin; void absolute_printable_rect(int *x, int *y, int *w, int *h); Fl_WinAPI_Printer_Driver(void); - int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message = NULL); - int begin_page (void); - int printable_rect(int *w, int *h); - void margins(int *left, int *top, int *right, int *bottom); - void origin(int *x, int *y); - void origin(int x, int y); - void scale (float scale_x, float scale_y = 0.); - void rotate(float angle); - void translate(int x, int y); - void untranslate(void); - int end_page (void); - void end_job (void); + int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message = NULL) FL_OVERRIDE; + int begin_page (void) FL_OVERRIDE; + int printable_rect(int *w, int *h) FL_OVERRIDE; + void margins(int *left, int *top, int *right, int *bottom) FL_OVERRIDE; + void origin(int *x, int *y) FL_OVERRIDE; + void origin(int x, int y) FL_OVERRIDE; + void scale (float scale_x, float scale_y = 0.) FL_OVERRIDE; + void rotate(float angle) FL_OVERRIDE; + void translate(int x, int y) FL_OVERRIDE; + void untranslate(void) FL_OVERRIDE; + int end_page (void) FL_OVERRIDE; + void end_job (void) FL_OVERRIDE; ~Fl_WinAPI_Printer_Driver(void); }; diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H index 899b2cf3f..3bb5e11a6 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H @@ -45,58 +45,58 @@ public: for (int i = 0; i < MAX_SCREENS; i++) scale_of_screen[i] = 1; } // --- display management - virtual int visual(int flags); + int visual(int flags) FL_OVERRIDE; // --- screen configuration - virtual void init(); - virtual int x(); - virtual int y(); - virtual int w(); - virtual int h(); - virtual void screen_xywh(int &X, int &Y, int &W, int &H, int n); + void init() FL_OVERRIDE; + int x() FL_OVERRIDE; + int y() FL_OVERRIDE; + int w() FL_OVERRIDE; + int h() FL_OVERRIDE; + void screen_xywh(int &X, int &Y, int &W, int &H, int n) FL_OVERRIDE; void screen_xywh_unscaled(int &X, int &Y, int &W, int &H, int n); - virtual void screen_dpi(float &h, float &v, int n=0); + void screen_dpi(float &h, float &v, int n=0) FL_OVERRIDE; int screen_num_unscaled(int x, int y); - virtual void screen_work_area(int &X, int &Y, int &W, int &H, int n); + void screen_work_area(int &X, int &Y, int &W, int &H, int n) FL_OVERRIDE; // --- audible output - virtual void beep(int type); + void beep(int type) FL_OVERRIDE; // --- global events - virtual void flush(); - virtual void grab(Fl_Window* win); + void flush() FL_OVERRIDE; + void grab(Fl_Window* win) FL_OVERRIDE; // --- global colors - virtual void get_system_colors(); - virtual int dnd(int unused); - virtual int compose(int &del); - virtual Fl_RGB_Image *read_win_rectangle(int X, int Y, int w, int h, Fl_Window *win, bool may_capture_subwins, bool *did_capture_subwins); + void get_system_colors() FL_OVERRIDE; + int dnd(int unused) FL_OVERRIDE; + int compose(int &del) FL_OVERRIDE; + Fl_RGB_Image *read_win_rectangle(int X, int Y, int w, int h, Fl_Window *win, bool may_capture_subwins, bool *did_capture_subwins) FL_OVERRIDE; Fl_RGB_Image *read_win_rectangle_unscaled(int X, int Y, int w, int h, Fl_Window *win); - virtual int get_mouse(int &x, int &y); - virtual void enable_im(); - virtual void disable_im(); - virtual void open_display_platform(); - virtual void offscreen_size(Fl_Offscreen off, int &width, int &height); - virtual APP_SCALING_CAPABILITY rescalable() { + int get_mouse(int &x, int &y) FL_OVERRIDE; + void enable_im() FL_OVERRIDE; + void disable_im() FL_OVERRIDE; + void open_display_platform() FL_OVERRIDE; + void offscreen_size(Fl_Offscreen off, int &width, int &height) FL_OVERRIDE; + APP_SCALING_CAPABILITY rescalable() FL_OVERRIDE { return PER_SCREEN_APP_SCALING; } - virtual float scale(int n) { + float scale(int n) FL_OVERRIDE { return scale_of_screen[n]; } - virtual void scale(int n, float f) { + void scale(int n, float f) FL_OVERRIDE { scale_of_screen[n] = f; } - virtual void desktop_scale_factor(); - virtual void default_icons(const Fl_RGB_Image *icons[], int count); + void desktop_scale_factor() FL_OVERRIDE; + void default_icons(const Fl_RGB_Image *icons[], int count) FL_OVERRIDE; // this one is implemented in Fl_win32.cxx - virtual void copy(const char *stuff, int len, int clipboard, const char *type); + void copy(const char *stuff, int len, int clipboard, const char *type) FL_OVERRIDE; // this one is implemented in Fl_win32.cxx - virtual void paste(Fl_Widget &receiver, int clipboard, const char *type); + void paste(Fl_Widget &receiver, int clipboard, const char *type) FL_OVERRIDE; // this one is implemented in Fl_win32.cxx - virtual int clipboard_contains(const char *type); + int clipboard_contains(const char *type) FL_OVERRIDE; // this one is implemented in Fl_win32.cxx - virtual void clipboard_notify_change(); + void clipboard_notify_change() FL_OVERRIDE; // this one is implemented in Fl_win32.cxx - void set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win); + void set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win) FL_OVERRIDE; // these two are implemented in Fl_get_key_win32.cxx - virtual int event_key(int); - virtual int get_key(int); + int event_key(int) FL_OVERRIDE; + int get_key(int) FL_OVERRIDE; }; diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H index e6e7f5cf9..10047b632 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H @@ -41,80 +41,80 @@ class Fl_WinAPI_System_Driver : public Fl_System_Driver { public: - virtual void warning(const char *format, va_list args); - virtual void error(const char *format, va_list args); - virtual void fatal(const char *format, va_list args); - virtual char *utf2mbcs(const char *s); - virtual char *getenv(const char *var); - virtual int putenv(const char *var); - virtual int open(const char *fnam, int oflags, int pmode); - virtual int open_ext(const char *fnam, int binary, int oflags, int pmode); - virtual FILE *fopen(const char *fnam, const char *mode); - virtual int system(const char *cmd); - virtual int execvp(const char *file, char *const *argv); - virtual int chmod(const char *fnam, int mode); - virtual int access(const char *fnam, int mode); - virtual int flstat(const char *fnam, struct stat *b); - virtual char *getcwd(char *b, int l); - virtual int chdir(const char *path); - virtual int unlink(const char *fnam); - virtual int mkdir(const char *fnam, int mode); - virtual int rmdir(const char *fnam); - virtual int rename(const char *fnam, const char *newnam); - virtual unsigned utf8towc(const char *src, unsigned srclen, wchar_t* dst, unsigned dstlen); - virtual unsigned utf8fromwc(char *dst, unsigned dstlen, const wchar_t* src, unsigned srclen); - virtual int utf8locale(); - virtual unsigned utf8to_mb(const char *src, unsigned srclen, char *dst, unsigned dstlen); - virtual unsigned utf8from_mb(char *dst, unsigned dstlen, const char *src, unsigned srclen); - virtual int clocale_vprintf(FILE *output, const char *format, va_list args); - virtual int clocale_vsnprintf(char *output, size_t output_size, const char *format, va_list args); - virtual int clocale_vsscanf(const char *input, const char *format, va_list args); - virtual int filename_list(const char *d, dirent ***list, + void warning(const char *format, va_list args) FL_OVERRIDE; + void error(const char *format, va_list args) FL_OVERRIDE; + void fatal(const char *format, va_list args) FL_OVERRIDE; + char *utf2mbcs(const char *s) FL_OVERRIDE; + char *getenv(const char *var) FL_OVERRIDE; + int putenv(const char *var) FL_OVERRIDE; + int open(const char *fnam, int oflags, int pmode) FL_OVERRIDE; + int open_ext(const char *fnam, int binary, int oflags, int pmode) FL_OVERRIDE; + FILE *fopen(const char *fnam, const char *mode) FL_OVERRIDE; + int system(const char *cmd) FL_OVERRIDE; + int execvp(const char *file, char *const *argv) FL_OVERRIDE; + int chmod(const char *fnam, int mode) FL_OVERRIDE; + int access(const char *fnam, int mode) FL_OVERRIDE; + int flstat(const char *fnam, struct stat *b) FL_OVERRIDE; + char *getcwd(char *b, int l) FL_OVERRIDE; + int chdir(const char *path) FL_OVERRIDE; + int unlink(const char *fnam) FL_OVERRIDE; + int mkdir(const char *fnam, int mode) FL_OVERRIDE; + int rmdir(const char *fnam) FL_OVERRIDE; + int rename(const char *fnam, const char *newnam) FL_OVERRIDE; + unsigned utf8towc(const char *src, unsigned srclen, wchar_t* dst, unsigned dstlen) FL_OVERRIDE; + unsigned utf8fromwc(char *dst, unsigned dstlen, const wchar_t* src, unsigned srclen) FL_OVERRIDE; + int utf8locale() FL_OVERRIDE; + unsigned utf8to_mb(const char *src, unsigned srclen, char *dst, unsigned dstlen) FL_OVERRIDE; + unsigned utf8from_mb(char *dst, unsigned dstlen, const char *src, unsigned srclen) FL_OVERRIDE; + int clocale_vprintf(FILE *output, const char *format, va_list args) FL_OVERRIDE; + int clocale_vsnprintf(char *output, size_t output_size, const char *format, va_list args) FL_OVERRIDE; + int clocale_vsscanf(const char *input, const char *format, va_list args) FL_OVERRIDE; + int filename_list(const char *d, dirent ***list, int (*sort)(struct dirent **, struct dirent **), - char *errmsg=NULL, int errmsg_sz=0); - virtual int filename_expand(char *to,int tolen, const char *from); - virtual int filename_relative(char *to, int tolen, const char *from, const char *base); - virtual int filename_absolute(char *to, int tolen, const char *from); - virtual int filename_isdir(const char *n); - virtual int filename_isdir_quick(const char *n); - virtual const char *filename_ext(const char *buf); - virtual int open_uri(const char *uri, char *msg, int msglen); - virtual int use_recent_tooltip_fix() {return 1;} - virtual int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, int lname, Fl_File_Icon *icon); - virtual int file_browser_load_directory(const char *directory, char *filename, size_t name_size, + char *errmsg=NULL, int errmsg_sz=0) FL_OVERRIDE; + int filename_expand(char *to,int tolen, const char *from) FL_OVERRIDE; + int filename_relative(char *to, int tolen, const char *from, const char *base) FL_OVERRIDE; + int filename_absolute(char *to, int tolen, const char *from) FL_OVERRIDE; + int filename_isdir(const char *n) FL_OVERRIDE; + int filename_isdir_quick(const char *n) FL_OVERRIDE; + const char *filename_ext(const char *buf) FL_OVERRIDE; + int open_uri(const char *uri, char *msg, int msglen) FL_OVERRIDE; + int use_recent_tooltip_fix() FL_OVERRIDE {return 1;} + int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, int lname, Fl_File_Icon *icon) FL_OVERRIDE; + int file_browser_load_directory(const char *directory, char *filename, size_t name_size, dirent ***pfiles, Fl_File_Sort_F *sort, - char *errmsg=NULL, int errmsg_sz=0); - virtual void newUUID(char *uuidBuffer); - virtual char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor, - const char *application); - virtual void *load(const char *filename); - virtual void png_extra_rgba_processing(unsigned char *array, int w, int h); - virtual const char *next_dir_sep(const char *start); + char *errmsg=NULL, int errmsg_sz=0) FL_OVERRIDE; + void newUUID(char *uuidBuffer) FL_OVERRIDE; + char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor, + const char *application) FL_OVERRIDE; + void *load(const char *filename) FL_OVERRIDE; + void png_extra_rgba_processing(unsigned char *array, int w, int h) FL_OVERRIDE; + const char *next_dir_sep(const char *start) FL_OVERRIDE; // these 3 are implemented in Fl_lock.cxx - virtual void awake(void*); - virtual int lock(); - virtual void unlock(); + void awake(void*) FL_OVERRIDE; + int lock() FL_OVERRIDE; + void unlock() FL_OVERRIDE; // this one is implemented in Fl_win32.cxx - virtual void* thread_message(); - virtual int file_type(const char *filename); - virtual const char *home_directory_name(); - virtual const char *filesystems_label() { return "My Computer"; } - virtual int backslash_as_slash() {return 1;} - virtual int colon_is_drive() {return 1;} - virtual int case_insensitive_filenames() {return 1;} + void* thread_message() FL_OVERRIDE; + int file_type(const char *filename) FL_OVERRIDE; + const char *home_directory_name() FL_OVERRIDE; + const char *filesystems_label() FL_OVERRIDE { return "My Computer"; } + int backslash_as_slash() FL_OVERRIDE {return 1;} + int colon_is_drive() FL_OVERRIDE {return 1;} + int case_insensitive_filenames() FL_OVERRIDE {return 1;} // this one is implemented in Fl_win32.cxx - virtual const char *filename_name(const char *buf); - virtual void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0); - virtual void add_fd(int fd, Fl_FD_Handler cb, void* = 0); - virtual void remove_fd(int, int when); - virtual void remove_fd(int); - virtual void gettime(time_t *sec, int *usec); - virtual char* strdup(const char *s) { return ::_strdup(s); } - virtual void lock_ring(); - virtual void unlock_ring(); - virtual double wait(double time_to_wait); - virtual int ready(); - virtual int close_fd(int fd); + const char *filename_name(const char *buf) FL_OVERRIDE; + void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0) FL_OVERRIDE; + void add_fd(int fd, Fl_FD_Handler cb, void* = 0) FL_OVERRIDE; + void remove_fd(int, int when) FL_OVERRIDE; + void remove_fd(int) FL_OVERRIDE; + void gettime(time_t *sec, int *usec) FL_OVERRIDE; + char* strdup(const char *s) FL_OVERRIDE { return ::_strdup(s); } + void lock_ring() FL_OVERRIDE; + void unlock_ring() FL_OVERRIDE; + double wait(double time_to_wait) FL_OVERRIDE; + int ready() FL_OVERRIDE; + int close_fd(int fd) FL_OVERRIDE; }; #endif // FL_WINAPI_SYSTEM_DRIVER_H diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H index afc8cc39b..bc834b48c 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H @@ -60,7 +60,7 @@ class Fl_WinAPI_Window_Driver : public Fl_Window_Driver } *shape_data_; private: void shape_bitmap_(Fl_Image* b); - void shape_alpha_(Fl_Image* img, int offset); + void shape_alpha_(Fl_Image* img, int offset) FL_OVERRIDE; public: Fl_WinAPI_Window_Driver(Fl_Window*); ~Fl_WinAPI_Window_Driver(); @@ -80,43 +80,43 @@ public: int fake_X_wm(int &X, int &Y, int &bt, int &bx, int &by, DWORD style = 0, DWORD styleEx = 0); void make_fullscreen(int X, int Y, int W, int H); // --- window data - virtual int decorated_w(); - virtual int decorated_h(); - virtual const Fl_Image* shape(); + int decorated_w() FL_OVERRIDE; + int decorated_h() FL_OVERRIDE; + const Fl_Image* shape() FL_OVERRIDE; // --- window management - virtual Fl_X *makeWindow(); - virtual void size_range() { + Fl_X *makeWindow() FL_OVERRIDE; + void size_range() FL_OVERRIDE { // currently nothing to do } - virtual void flush_double(); - virtual void flush_overlay(); - virtual void draw_begin(); - virtual void make_current(); - virtual void show(); - virtual void label(const char *name,const char *iname); - virtual void resize(int X,int Y,int W,int H); - virtual void hide(); - virtual void map(); - virtual void unmap(); - virtual void fullscreen_on(); - virtual void fullscreen_off(int X, int Y, int W, int H); - virtual void iconize(); - virtual void decoration_sizes(int *top, int *left, int *right, int *bottom); + void flush_double() FL_OVERRIDE; + void flush_overlay() FL_OVERRIDE; + void draw_begin() FL_OVERRIDE; + void make_current() FL_OVERRIDE; + void show() FL_OVERRIDE; + void label(const char *name,const char *iname) FL_OVERRIDE; + void resize(int X,int Y,int W,int H) FL_OVERRIDE; + void hide() FL_OVERRIDE; + void map() FL_OVERRIDE; + void unmap() FL_OVERRIDE; + void fullscreen_on() FL_OVERRIDE; + void fullscreen_off(int X, int Y, int W, int H) FL_OVERRIDE; + void iconize() FL_OVERRIDE; + void decoration_sizes(int *top, int *left, int *right, int *bottom) FL_OVERRIDE; // --- window cursor stuff - virtual int set_cursor(Fl_Cursor); - virtual int set_cursor(const Fl_RGB_Image*, int, int); + int set_cursor(Fl_Cursor) FL_OVERRIDE; + int set_cursor(const Fl_RGB_Image*, int, int) FL_OVERRIDE; - virtual void shape(const Fl_Image* img); - virtual void icons(const Fl_RGB_Image *icons[], int count); - virtual const void *icon() const; - virtual void icon(const void * ic); - virtual void free_icons(); + void shape(const Fl_Image* img) FL_OVERRIDE; + void icons(const Fl_RGB_Image *icons[], int count) FL_OVERRIDE; + const void *icon() const FL_OVERRIDE; + void icon(const void * ic) FL_OVERRIDE; + void free_icons() FL_OVERRIDE; void set_icons(); // driver-internal support function // this one is implemented in Fl_win32.cxx - virtual void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right); - virtual int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, - void (*draw_area)(void*, int,int,int,int), void* data); + void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right) FL_OVERRIDE; + int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, + void (*draw_area)(void*, int,int,int,int), void* data) FL_OVERRIDE; static void resize_after_screen_change(void *data); }; diff --git a/src/drivers/X11/Fl_X11_Gl_Window_Driver.H b/src/drivers/X11/Fl_X11_Gl_Window_Driver.H index 72c4af1e5..026f3ec4a 100644 --- a/src/drivers/X11/Fl_X11_Gl_Window_Driver.H +++ b/src/drivers/X11/Fl_X11_Gl_Window_Driver.H @@ -27,26 +27,26 @@ class Fl_Gl_Choice; class Fl_X11_Gl_Window_Driver : public Fl_Gl_Window_Driver { friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *); Fl_X11_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {} - virtual float pixels_per_unit(); - virtual void before_show(int& need_after); - virtual int mode_(int m, const int *a); - virtual void swap_buffers(); - virtual char swap_type(); - virtual Fl_Gl_Choice *find(int m, const int *alistp); - virtual GLContext create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g); - 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 waitGL(); - virtual void gl_visual(Fl_Gl_Choice*); // support for Fl::gl_visual() - virtual void gl_start(); - 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(); + float pixels_per_unit() FL_OVERRIDE; + void before_show(int& need_after) FL_OVERRIDE; + int mode_(int m, const int *a) FL_OVERRIDE; + void swap_buffers() FL_OVERRIDE; + char swap_type() 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; + 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 waitGL() FL_OVERRIDE; + void gl_visual(Fl_Gl_Choice*) FL_OVERRIDE; // support for Fl::gl_visual() + void gl_start() 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; #if !USE_XFT - virtual Fl_Font_Descriptor** fontnum_to_fontdescriptor(int fnum); + virtual Fl_Font_Descriptor** fontnum_to_fontdescriptor(int fnum) FL_OVERRIDE; #endif //static GLContext create_gl_context(XVisualInfo* vis); }; diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.H b/src/drivers/X11/Fl_X11_Screen_Driver.H index 5ff64ccad..17826a94d 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.H +++ b/src/drivers/X11/Fl_X11_Screen_Driver.H @@ -51,10 +51,10 @@ protected: public: #if USE_XFT // scaling does not work without Xft float current_xft_dpi; // current value of the Xft.dpi X resource - virtual APP_SCALING_CAPABILITY rescalable() { return PER_SCREEN_APP_SCALING; } - virtual float scale(int n) {return screens[n].scale;} - virtual void scale(int n, float f) { screens[n].scale = f;} - virtual void desktop_scale_factor(); + APP_SCALING_CAPABILITY rescalable() FL_OVERRIDE { return PER_SCREEN_APP_SCALING; } + float scale(int n) FL_OVERRIDE {return screens[n].scale;} + void scale(int n, float f) FL_OVERRIDE { screens[n].scale = f;} + void desktop_scale_factor() FL_OVERRIDE; int screen_num_unscaled(int x, int y); #endif @@ -62,57 +62,57 @@ public: static int ewmh_supported(); static void copy_image(const unsigned char* data, int W, int H, int destination); // --- display management - virtual void display(const char *disp); - virtual int XParseGeometry(const char*, int*, int*, unsigned int*, unsigned int*); - virtual int poll_or_select_with_delay(double time_to_wait); - virtual int poll_or_select(); - virtual void own_colormap(); - virtual const char *shortcut_add_key_name(unsigned key, char *p, char *buf, const char **); - virtual int need_menu_handle_part1_extra() {return 1;} - virtual int need_menu_handle_part2() {return 1;} + void display(const char *disp) FL_OVERRIDE; + int XParseGeometry(const char*, int*, int*, unsigned int*, unsigned int*) FL_OVERRIDE; + int poll_or_select_with_delay(double time_to_wait) FL_OVERRIDE; + int poll_or_select() FL_OVERRIDE; + void own_colormap() FL_OVERRIDE; + const char *shortcut_add_key_name(unsigned key, char *p, char *buf, const char **) FL_OVERRIDE; + int need_menu_handle_part1_extra() FL_OVERRIDE {return 1;} + int need_menu_handle_part2() FL_OVERRIDE {return 1;} // these 2 are in Fl_get_key.cxx - virtual int event_key(int); - virtual int get_key(int); - virtual int visual(int flags); + int event_key(int) FL_OVERRIDE; + int get_key(int) FL_OVERRIDE; + int visual(int flags) FL_OVERRIDE; // --- screen configuration void init_workarea(); - virtual void init(); - virtual int x(); - virtual int y(); - virtual int w(); - virtual int h(); - virtual void screen_xywh(int &X, int &Y, int &W, int &H, int n); - virtual void screen_dpi(float &h, float &v, int n=0); - virtual void screen_work_area(int &X, int &Y, int &W, int &H, int n); + void init() FL_OVERRIDE; + int x() FL_OVERRIDE; + int y() FL_OVERRIDE; + int w() FL_OVERRIDE; + int h() FL_OVERRIDE; + void screen_xywh(int &X, int &Y, int &W, int &H, int n) FL_OVERRIDE; + void screen_dpi(float &h, float &v, int n=0) FL_OVERRIDE; + void screen_work_area(int &X, int &Y, int &W, int &H, int n) FL_OVERRIDE; // --- audible output - virtual void beep(int type); + void beep(int type) FL_OVERRIDE; // --- global events - virtual void flush(); - virtual void grab(Fl_Window* win); + void flush() FL_OVERRIDE; + void grab(Fl_Window* win) FL_OVERRIDE; // --- global colors - virtual int parse_color(const char* p, uchar& r, uchar& g, uchar& b); - virtual void get_system_colors(); - virtual const char *get_system_scheme(); - virtual int dnd(int unused); - virtual int compose(int &del); - virtual void compose_reset(); - virtual int text_display_can_leak() const; - virtual Fl_RGB_Image *read_win_rectangle(int X, int Y, int w, int h, Fl_Window *win, bool may_capture_subwins, bool *did_capture_subwins); - virtual int get_mouse(int &x, int &y); + int parse_color(const char* p, uchar& r, uchar& g, uchar& b) FL_OVERRIDE; + void get_system_colors() FL_OVERRIDE; + const char *get_system_scheme() FL_OVERRIDE; + int dnd(int unused) FL_OVERRIDE; + int compose(int &del) FL_OVERRIDE; + void compose_reset() FL_OVERRIDE; + int text_display_can_leak() const FL_OVERRIDE; + Fl_RGB_Image *read_win_rectangle(int X, int Y, int w, int h, Fl_Window *win, bool may_capture_subwins, bool *did_capture_subwins) FL_OVERRIDE; + int get_mouse(int &x, int &y) FL_OVERRIDE; - virtual void open_display_platform(); - virtual void close_display(); + void open_display_platform() FL_OVERRIDE; + void close_display() FL_OVERRIDE; // --- compute dimensions of an Fl_Offscreen - virtual void offscreen_size(Fl_Offscreen o, int &width, int &height); - virtual void default_icons(const Fl_RGB_Image *icons[], int count); + void offscreen_size(Fl_Offscreen o, int &width, int &height) FL_OVERRIDE; + void default_icons(const Fl_RGB_Image *icons[], int count) FL_OVERRIDE; // this one is in Fl_x.cxx - virtual void copy(const char *stuff, int len, int clipboard, const char *type); + void copy(const char *stuff, int len, int clipboard, const char *type) FL_OVERRIDE; // this one is in Fl_x.cxx - virtual void paste(Fl_Widget &receiver, int clipboard, const char *type); + void paste(Fl_Widget &receiver, int clipboard, const char *type) FL_OVERRIDE; // this one is in Fl_x.cxx - virtual int clipboard_contains(const char *type); + int clipboard_contains(const char *type) FL_OVERRIDE; // this one is in Fl_x.cxx - virtual void clipboard_notify_change(); + void clipboard_notify_change() FL_OVERRIDE; // for support of input methods static char fl_is_over_the_spot; static XRectangle fl_spot; @@ -125,11 +125,11 @@ public: static void xim_activate(Window xid); static void xim_deactivate(void); static void init_xim(); - virtual void enable_im(); - virtual void disable_im(); - virtual void set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win); - virtual void reset_spot(); - virtual void set_status(int X, int Y, int W, int H); + void enable_im() FL_OVERRIDE; + void disable_im() FL_OVERRIDE; + void set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win) FL_OVERRIDE; + void reset_spot() FL_OVERRIDE; + void set_status(int X, int Y, int W, int H) FL_OVERRIDE; }; diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx index 2a5239eae..9e3465f13 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx @@ -48,7 +48,7 @@ extern Atom fl_NET_WORKAREA; -// these are set by Fl::args() and override any system colors: from Fl_get_system_colors.cxx +// these are set by Fl::args() and FL_OVERRIDE any system colors: from Fl_get_system_colors.cxx extern const char *fl_fg; extern const char *fl_bg; extern const char *fl_bg2; diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H index a2a19d12c..6cb54dd95 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.H +++ b/src/drivers/X11/Fl_X11_Window_Driver.H @@ -80,59 +80,59 @@ private: void decorated_win_size(int &w, int &h); void combine_mask(); void shape_bitmap_(Fl_Image* b); - void shape_alpha_(Fl_Image* img, int offset); + void shape_alpha_(Fl_Image* img, int offset) FL_OVERRIDE; void flush_double(int erase_overlay); void sendxjunk(); void activate_window(); public: Fl_X11_Window_Driver(Fl_Window*); - virtual ~Fl_X11_Window_Driver(); + ~Fl_X11_Window_Driver() FL_OVERRIDE; static inline Fl_X11_Window_Driver* driver(const Fl_Window *w) {return (Fl_X11_Window_Driver*)Fl_Window_Driver::driver(w);} #if USE_XFT static void resize_after_screen_change(void *data); #endif // USE_XFT // --- window data - virtual int decorated_w(); - virtual int decorated_h(); - virtual const Fl_Image* shape(); + int decorated_w() FL_OVERRIDE; + int decorated_h() FL_OVERRIDE; + const Fl_Image* shape() FL_OVERRIDE; // --- window management - virtual Fl_X *makeWindow(); - virtual void take_focus(); - virtual void flush_double(); - virtual void flush_overlay(); - virtual void draw_begin(); - virtual void make_current(); - virtual void show(); - virtual void resize(int X,int Y,int W,int H); - virtual void label(const char *name, const char *mininame); - virtual void destroy_double_buffer(); - virtual void hide(); - virtual void map(); - virtual void unmap(); - virtual void fullscreen_on(); - virtual void fullscreen_off(int X, int Y, int W, int H); - virtual void use_border(); - virtual void size_range(); - virtual void iconize(); - virtual void decoration_sizes(int *top, int *left, int *right, int *bottom); - virtual void show_with_args_begin(); - virtual void show_with_args_end(int argc, char **argv); + Fl_X *makeWindow() FL_OVERRIDE; + void take_focus() FL_OVERRIDE; + void flush_double() FL_OVERRIDE; + void flush_overlay() FL_OVERRIDE; + void draw_begin() FL_OVERRIDE; + void make_current() FL_OVERRIDE; + void show() FL_OVERRIDE; + void resize(int X,int Y,int W,int H) FL_OVERRIDE; + void label(const char *name, const char *mininame) FL_OVERRIDE; + void destroy_double_buffer() FL_OVERRIDE; + void hide() FL_OVERRIDE; + void map() FL_OVERRIDE; + void unmap() FL_OVERRIDE; + void fullscreen_on() FL_OVERRIDE; + void fullscreen_off(int X, int Y, int W, int H) FL_OVERRIDE; + void use_border() FL_OVERRIDE; + void size_range() FL_OVERRIDE; + void iconize() FL_OVERRIDE; + void decoration_sizes(int *top, int *left, int *right, int *bottom) FL_OVERRIDE; + void show_with_args_begin() FL_OVERRIDE; + void show_with_args_end(int argc, char **argv) FL_OVERRIDE; // --- window cursor stuff - virtual int set_cursor(Fl_Cursor); - virtual int set_cursor(const Fl_RGB_Image*, int, int); - - virtual void shape(const Fl_Image* img); - virtual void icons(const Fl_RGB_Image *icons[], int count); - virtual const void *icon() const; - virtual void icon(const void * ic); - virtual void free_icons(); + int set_cursor(Fl_Cursor) FL_OVERRIDE; + int set_cursor(const Fl_RGB_Image*, int, int) FL_OVERRIDE; + + void shape(const Fl_Image* img) FL_OVERRIDE; + void icons(const Fl_RGB_Image *icons[], int count) FL_OVERRIDE; + const void *icon() const FL_OVERRIDE; + void icon(const void * ic) FL_OVERRIDE; + void free_icons() FL_OVERRIDE; void set_icons(); // driver-internal support function - virtual void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right); - virtual int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data); - virtual fl_uintptr_t os_id(); + void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right) FL_OVERRIDE; + int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data) FL_OVERRIDE; + fl_uintptr_t os_id() FL_OVERRIDE; }; diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.H b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.H index e67447b4d..2932a3f1c 100644 --- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.H +++ b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.H @@ -25,15 +25,15 @@ class Fl_Xlib_Copy_Surface_Driver : public Fl_Copy_Surface_Driver { friend class Fl_Copy_Surface_Driver; - virtual void end_current(); + void end_current() FL_OVERRIDE; protected: Fl_Offscreen xid; Window oldwindow; Fl_Xlib_Copy_Surface_Driver(int w, int h); ~Fl_Xlib_Copy_Surface_Driver(); - void set_current(); - void translate(int x, int y); - void untranslate(); + void set_current() FL_OVERRIDE; + void translate(int x, int y) FL_OVERRIDE; + void untranslate() FL_OVERRIDE; #if FLTK_USE_CAIRO cairo_t *cairo_; #endif diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H index 016ace499..6142217d5 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H @@ -57,26 +57,26 @@ private: unsigned depth_; // depth of translation stack int stack_x_[FL_XLIB_GRAPHICS_TRANSLATION_STACK_SIZE]; // translation stack allowing cumulative translations int stack_y_[FL_XLIB_GRAPHICS_TRANSLATION_STACK_SIZE]; - virtual void set_current_(); + void set_current_() FL_OVERRIDE; int clip_max_; // +/- x/y coordinate limit (16-bit coordinate space) - virtual void draw_fixed(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); - virtual void draw_fixed(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); - virtual void draw_fixed(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy); + void draw_fixed(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_fixed(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; + void draw_fixed(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; #if USE_PANGO double do_width_unscaled_(const char *str, int n); #endif protected: - virtual void draw_image_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0); - virtual void draw_image_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3); - virtual void draw_image_mono_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0); - virtual void draw_image_mono_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1); + void draw_image_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0) FL_OVERRIDE; + void draw_image_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3) FL_OVERRIDE; + void draw_image_mono_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0) FL_OVERRIDE; + void draw_image_mono_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1) FL_OVERRIDE; #if HAVE_XRENDER - virtual void draw_rgb(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy); + void draw_rgb(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE; int scale_and_render_pixmap(Fl_Offscreen pixmap, int depth, double scale_x, double scale_y, int XP, int YP, int WP, int HP); #endif - virtual int height_unscaled(); - virtual int descent_unscaled(); - virtual Fl_Region scale_clip(float f); + int height_unscaled() FL_OVERRIDE; + int descent_unscaled() FL_OVERRIDE; + Fl_Region scale_clip(float f) FL_OVERRIDE; #if USE_XFT void drawUCS4(const void *str, int n, int x, int y); #endif @@ -95,24 +95,24 @@ private: #endif static GC gc_; uchar *mask_bitmap_; - uchar **mask_bitmap() {return &mask_bitmap_;} + uchar **mask_bitmap() FL_OVERRIDE {return &mask_bitmap_;} XPoint *short_point; #if USE_XFT static Window draw_window; static struct _XftDraw* draw_; #endif - void cache(Fl_RGB_Image *img); + void cache(Fl_RGB_Image *img) FL_OVERRIDE; public: Fl_Xlib_Graphics_Driver(void); - virtual ~Fl_Xlib_Graphics_Driver(); + ~Fl_Xlib_Graphics_Driver() FL_OVERRIDE; void translate_all(int dx, int dy); void untranslate_all(); - virtual void scale(float f); + void scale(float f) FL_OVERRIDE; float scale() {return Fl_Graphics_Driver::scale();} - virtual int has_feature(driver_feature mask) { return mask & NATIVE; } - virtual void *gc() { return gc_; } - virtual void gc(void *value); - char can_do_alpha_blending(); + int has_feature(driver_feature mask) FL_OVERRIDE { return mask & NATIVE; } + void *gc() FL_OVERRIDE { return gc_; } + void gc(void *value) FL_OVERRIDE; + char can_do_alpha_blending() FL_OVERRIDE; #if USE_XFT static void destroy_xft_draw(Window id); #endif @@ -120,38 +120,38 @@ public: // --- bitmap stuff static unsigned long create_bitmask(int w, int h, const uchar *array); // NOT virtual - virtual void delete_bitmask(fl_uintptr_t bm); - virtual void draw_unscaled(const char* str, int n, int x, int y); - virtual void draw_unscaled(int angle, const char *str, int n, int x, int y); - virtual void rtl_draw_unscaled(const char* str, int n, int x, int y); - virtual void font_unscaled(Fl_Font face, Fl_Fontsize size); - void cache(Fl_Pixmap *img); - virtual void uncache_pixmap(fl_uintptr_t p); - void cache(Fl_Bitmap *img); - void uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_uintptr_t &mask_); - virtual double width_unscaled(const char *str, int n); - virtual double width_unscaled(unsigned int c); - virtual void text_extents_unscaled(const char*, int n, int& dx, int& dy, int& w, int& h); - virtual Fl_Fontsize size_unscaled(); - virtual void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy); - void add_rectangle_to_region(Fl_Region r, int x, int y, int w, int h); - Fl_Region XRectangleRegion(int x, int y, int w, int h); - void XDestroyRegion(Fl_Region r); + void delete_bitmask(fl_uintptr_t bm) FL_OVERRIDE; + void draw_unscaled(const char* str, int n, int x, int y) FL_OVERRIDE; + void draw_unscaled(int angle, const char *str, int n, int x, int y) FL_OVERRIDE; + void rtl_draw_unscaled(const char* str, int n, int x, int y) FL_OVERRIDE; + void font_unscaled(Fl_Font face, Fl_Fontsize size) FL_OVERRIDE; + void cache(Fl_Pixmap *img) FL_OVERRIDE; + void uncache_pixmap(fl_uintptr_t p) FL_OVERRIDE; + void cache(Fl_Bitmap *img) FL_OVERRIDE; + void uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_uintptr_t &mask_) FL_OVERRIDE; + double width_unscaled(const char *str, int n) FL_OVERRIDE; + double width_unscaled(unsigned int c) FL_OVERRIDE; + void text_extents_unscaled(const char*, int n, int& dx, int& dy, int& w, int& h) FL_OVERRIDE; + Fl_Fontsize size_unscaled() FL_OVERRIDE; + void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) FL_OVERRIDE; + void add_rectangle_to_region(Fl_Region r, int x, int y, int w, int h) FL_OVERRIDE; + Fl_Region XRectangleRegion(int x, int y, int w, int h) FL_OVERRIDE; + void XDestroyRegion(Fl_Region r) FL_OVERRIDE; protected: - virtual void transformed_vertex0(float x, float y); - void fixloop(); - virtual void focus_rect(int x, int y, int w, int h); - virtual void rectf_unscaled(int x, int y, int w, int h); - virtual void colored_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b); - virtual void line_unscaled(int x, int y, int x1, int y1); - virtual void xyline_unscaled(int x, int y, int x1); - virtual void *change_pen_width(int lwidth); - virtual void reset_pen_width(void *data); - virtual void yxline_unscaled(int x, int y, int y1); - virtual void loop_unscaled(int x0, int y0, int x1, int y1, int x2, int y2); - virtual void loop_unscaled(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); - virtual void polygon_unscaled(int x0, int y0, int x1, int y1, int x2, int y2); - virtual void polygon_unscaled(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3); + void transformed_vertex0(float x, float y) FL_OVERRIDE; + void fixloop() FL_OVERRIDE; + void focus_rect(int x, int y, int w, int h) FL_OVERRIDE; + void rectf_unscaled(int x, int y, int w, int h) FL_OVERRIDE; + void colored_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) FL_OVERRIDE; + void line_unscaled(int x, int y, int x1, int y1) FL_OVERRIDE; + void xyline_unscaled(int x, int y, int x1) FL_OVERRIDE; + void *change_pen_width(int lwidth) FL_OVERRIDE; + void reset_pen_width(void *data) FL_OVERRIDE; + void yxline_unscaled(int x, int y, int y1) FL_OVERRIDE; + void loop_unscaled(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void loop_unscaled(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; + void polygon_unscaled(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE; + void polygon_unscaled(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE; // Scaling and clipping stuff for internal usage. // Currently specific to Fl_Xlib_Graphics_Driver (16-bit coordinate clipping) @@ -184,36 +184,36 @@ protected: void draw_clipped_line(int x1, int y1, int x2, int y2); // --- clipping - void push_clip(int x, int y, int w, int h); - int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H); - int not_clipped(int x, int y, int w, int h); - void restore_clip(); - void end_points(); - void end_line(); - void end_loop(); - void end_polygon(); - void end_complex_polygon(); - bool can_fill_non_convex_polygon(); - void gap(); - virtual void ellipse_unscaled(double xt, double yt, double rx, double ry); - virtual void arc_unscaled(int x, int y, int w, int h, double a1, double a2); - virtual void pie_unscaled(int x, int y, int w, int h, double a1, double a2); - virtual void line_style_unscaled(int style, int width, char* dashes); - void color(Fl_Color c); - void set_color(Fl_Color i, unsigned int c); - void free_color(Fl_Color i, int overlay); - Fl_Color color() { return color_; } - void color(uchar r, uchar g, uchar b); - virtual float scale_font_for_PostScript(Fl_Font_Descriptor *desc, int s); - virtual const char* get_font_name(Fl_Font fnum, int* ap); - virtual int get_font_sizes(Fl_Font fnum, int*& sizep); + void push_clip(int x, int y, int w, int h) FL_OVERRIDE; + int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H) FL_OVERRIDE; + int not_clipped(int x, int y, int w, int h) FL_OVERRIDE; + void restore_clip() FL_OVERRIDE; + void end_points() FL_OVERRIDE; + void end_line() FL_OVERRIDE; + void end_loop() FL_OVERRIDE; + void end_polygon() FL_OVERRIDE; + void end_complex_polygon() FL_OVERRIDE; + bool can_fill_non_convex_polygon() FL_OVERRIDE; + void gap() FL_OVERRIDE; + void ellipse_unscaled(double xt, double yt, double rx, double ry) FL_OVERRIDE; + void arc_unscaled(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void pie_unscaled(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE; + void line_style_unscaled(int style, int width, char* dashes) FL_OVERRIDE; + void color(Fl_Color c) FL_OVERRIDE; + void set_color(Fl_Color i, unsigned int c) FL_OVERRIDE; + void free_color(Fl_Color i, int overlay) FL_OVERRIDE; + Fl_Color color() FL_OVERRIDE { return color_; } + void color(uchar r, uchar g, uchar b) FL_OVERRIDE; + float scale_font_for_PostScript(Fl_Font_Descriptor *desc, int s) FL_OVERRIDE; + const char* get_font_name(Fl_Font fnum, int* ap) FL_OVERRIDE; + int get_font_sizes(Fl_Font fnum, int*& sizep) FL_OVERRIDE; #if !USE_XFT - virtual unsigned font_desc_size(); - virtual float scale_bitmap_for_PostScript(); + unsigned font_desc_size() FL_OVERRIDE; + float scale_bitmap_for_PostScript() FL_OVERRIDE; #endif - virtual const char *font_name(int num); - virtual void font_name(int num, const char *name); - virtual Fl_Font set_fonts(const char* xstarname); + const char *font_name(int num) FL_OVERRIDE; + void font_name(int num, const char *name) FL_OVERRIDE; + Fl_Font set_fonts(const char* xstarname) FL_OVERRIDE; }; #endif // FL_XLIB_GRAPHICS_DRIVER_H diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.H b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.H index 3f8ecda7f..ab702840d 100644 --- a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.H +++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.H @@ -23,15 +23,15 @@ #endif // FLTK_USE_CAIRO class Fl_Xlib_Image_Surface_Driver : public Fl_Image_Surface_Driver { - virtual void end_current(); + void end_current() FL_OVERRIDE; public: Window pre_window; Fl_Xlib_Image_Surface_Driver(int w, int h, int high_res, Fl_Offscreen off); ~Fl_Xlib_Image_Surface_Driver(); - void set_current(); - void translate(int x, int y); - void untranslate(); - Fl_RGB_Image *image(); + void set_current() FL_OVERRIDE; + void translate(int x, int y) FL_OVERRIDE; + void untranslate() FL_OVERRIDE; + Fl_RGB_Image *image() FL_OVERRIDE; #if FLTK_USE_CAIRO cairo_t *cairo_; #endif diff --git a/src/fl_dnd_win32.cxx b/src/fl_dnd_win32.cxx index 1c76558ae..5a4408191 100644 --- a/src/fl_dnd_win32.cxx +++ b/src/fl_dnd_win32.cxx @@ -60,7 +60,7 @@ class FLDropTarget : public IDropTarget public: FLDropTarget() : m_cRefCount(0) { } // initialize virtual ~FLDropTarget() { } - HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, LPVOID *ppvObject ) { + HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, LPVOID *ppvObject ) FL_OVERRIDE { if (IID_IUnknown==riid || IID_IDropTarget==riid) { *ppvObject=this; @@ -70,14 +70,14 @@ public: *ppvObject = NULL; return E_NOINTERFACE; } - ULONG STDMETHODCALLTYPE AddRef() { return ++m_cRefCount; } - ULONG STDMETHODCALLTYPE Release() { + ULONG STDMETHODCALLTYPE AddRef() FL_OVERRIDE { return ++m_cRefCount; } + ULONG STDMETHODCALLTYPE Release() FL_OVERRIDE { long nTemp; nTemp = --m_cRefCount; // this is a static object, do not 'delete this' (issue #569) return nTemp; } - HRESULT STDMETHODCALLTYPE DragEnter( IDataObject *pDataObj, DWORD /*grfKeyState*/, POINTL pt, DWORD *pdwEffect) { + HRESULT STDMETHODCALLTYPE DragEnter( IDataObject *pDataObj, DWORD /*grfKeyState*/, POINTL pt, DWORD *pdwEffect) FL_OVERRIDE { if( !pDataObj ) return E_INVALIDARG; // set e_modifiers here from grfKeyState, set e_x and e_root_x // check if FLTK handles this drag and return if it can't (i.e. BMP drag without filename) @@ -107,7 +107,7 @@ public: lastEffect = *pdwEffect; return S_OK; } - HRESULT STDMETHODCALLTYPE DragOver( DWORD /*grfKeyState*/, POINTL pt, DWORD *pdwEffect) { + HRESULT STDMETHODCALLTYPE DragOver( DWORD /*grfKeyState*/, POINTL pt, DWORD *pdwEffect) FL_OVERRIDE { if ( px==pt.x && py==pt.y ) { *pdwEffect = lastEffect; @@ -143,7 +143,7 @@ public: Fl::flush(); return S_OK; } - HRESULT STDMETHODCALLTYPE DragLeave() { + HRESULT STDMETHODCALLTYPE DragLeave() FL_OVERRIDE { if ( fl_dnd_target_window && fillCurrentDragData(0)) { Fl::handle( FL_DND_LEAVE, fl_dnd_target_window ); @@ -152,7 +152,7 @@ public: } return S_OK; } - HRESULT STDMETHODCALLTYPE Drop( IDataObject *data, DWORD /*grfKeyState*/, POINTL pt, DWORD* /*pdwEffect*/) { + HRESULT STDMETHODCALLTYPE Drop( IDataObject *data, DWORD /*grfKeyState*/, POINTL pt, DWORD* /*pdwEffect*/) FL_OVERRIDE { if ( !fl_dnd_target_window ) return S_OK; Fl_Window *target = fl_dnd_target_window; @@ -326,7 +326,7 @@ class FLDropSource : public IDropSource public: FLDropSource() { m_cRefCount = 0; } virtual ~FLDropSource() { } - HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, LPVOID *ppvObject ) { + HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, LPVOID *ppvObject ) FL_OVERRIDE { if (IID_IUnknown==riid || IID_IDropSource==riid) { *ppvObject=this; @@ -336,16 +336,16 @@ public: *ppvObject = NULL; return E_NOINTERFACE; } - ULONG STDMETHODCALLTYPE AddRef() { return ++m_cRefCount; } - ULONG STDMETHODCALLTYPE Release() { + ULONG STDMETHODCALLTYPE AddRef() FL_OVERRIDE { return ++m_cRefCount; } + ULONG STDMETHODCALLTYPE Release() FL_OVERRIDE { long nTemp; nTemp = --m_cRefCount; if(nTemp==0) delete this; return nTemp; } - STDMETHODIMP GiveFeedback( DWORD ) { return DRAGDROP_S_USEDEFAULTCURSORS; } - STDMETHODIMP QueryContinueDrag( BOOL esc, DWORD keyState ) { + STDMETHODIMP GiveFeedback( DWORD ) FL_OVERRIDE { return DRAGDROP_S_USEDEFAULTCURSORS; } + STDMETHODIMP QueryContinueDrag( BOOL esc, DWORD keyState ) FL_OVERRIDE { if ( esc ) return DRAGDROP_S_CANCEL; if ( !(keyState & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON)) ) @@ -359,11 +359,11 @@ public: int n; LONG m_lRefCount; - ULONG __stdcall AddRef(void) { + ULONG __stdcall AddRef(void) FL_OVERRIDE { return InterlockedIncrement(&m_lRefCount); } - ULONG __stdcall Release(void) { + ULONG __stdcall Release(void) FL_OVERRIDE { LONG count = InterlockedDecrement(&m_lRefCount); if(count == 0) { delete this; @@ -374,7 +374,7 @@ public: } - HRESULT __stdcall QueryInterface(REFIID iid, void **ppvObject) { + HRESULT __stdcall QueryInterface(REFIID iid, void **ppvObject) FL_OVERRIDE { if(iid == IID_IEnumFORMATETC || iid == IID_IUnknown) { AddRef(); *ppvObject = this; @@ -385,7 +385,7 @@ public: } } - HRESULT __stdcall Next(ULONG celt, FORMATETC * rgelt, ULONG *pceltFetched) { + HRESULT __stdcall Next(ULONG celt, FORMATETC * rgelt, ULONG *pceltFetched) FL_OVERRIDE { if (n > 0) return S_FALSE; for (ULONG i = 0; i < celt; i++) { n++; @@ -399,17 +399,17 @@ public: return S_OK; } - HRESULT __stdcall Skip(ULONG celt) { + HRESULT __stdcall Skip(ULONG celt) FL_OVERRIDE { n += celt; return (n == 0) ? S_OK : S_FALSE; } - HRESULT __stdcall Reset(void) { + HRESULT __stdcall Reset(void) FL_OVERRIDE { n = 0; return S_OK; } - HRESULT __stdcall Clone(IEnumFORMATETC **ppenum){ + HRESULT __stdcall Clone(IEnumFORMATETC **ppenum) FL_OVERRIDE { *ppenum = new FLEnum(); return S_OK; } @@ -437,7 +437,7 @@ class FLDataObject : public IDataObject public: FLDataObject() { m_cRefCount = 1; }// m_EnumF = new FLEnum();} virtual ~FLDataObject() { } - HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, LPVOID *ppvObject ) { + HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, LPVOID *ppvObject ) FL_OVERRIDE { if (IID_IUnknown==riid || IID_IDataObject==riid) { *ppvObject=this; @@ -447,8 +447,8 @@ public: *ppvObject = NULL; return E_NOINTERFACE; } - ULONG STDMETHODCALLTYPE AddRef() { return ++m_cRefCount; } - ULONG STDMETHODCALLTYPE Release() { + ULONG STDMETHODCALLTYPE AddRef() FL_OVERRIDE { return ++m_cRefCount; } + ULONG STDMETHODCALLTYPE Release() FL_OVERRIDE { long nTemp; nTemp = --m_cRefCount; if(nTemp==0) @@ -456,7 +456,7 @@ public: return nTemp; } // GetData currently allows UNICODE text through Global Memory only - HRESULT STDMETHODCALLTYPE GetData( FORMATETC *pformatetcIn, STGMEDIUM *pmedium ) { + HRESULT STDMETHODCALLTYPE GetData( FORMATETC *pformatetcIn, STGMEDIUM *pmedium ) FL_OVERRIDE { if ((pformatetcIn->dwAspect & DVASPECT_CONTENT) && (pformatetcIn->tymed & TYMED_HGLOBAL) && (pformatetcIn->cfFormat == CF_UNICODETEXT)) @@ -502,7 +502,7 @@ public: } return DV_E_FORMATETC; } - HRESULT STDMETHODCALLTYPE QueryGetData( FORMATETC *pformatetc ) + HRESULT STDMETHODCALLTYPE QueryGetData( FORMATETC *pformatetc ) FL_OVERRIDE { if ((pformatetc->dwAspect & DVASPECT_CONTENT) && (pformatetc->tymed & TYMED_HGLOBAL) && @@ -516,15 +516,15 @@ public: // } // all the following methods are not really needed for a DnD object - HRESULT STDMETHODCALLTYPE GetDataHere( FORMATETC* /*pformatetcIn*/, STGMEDIUM* /*pmedium*/) { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE GetCanonicalFormatEtc( FORMATETC* /*in*/, FORMATETC* /*out*/) { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE SetData( FORMATETC* /*pformatetc*/, STGMEDIUM* /*pmedium*/, BOOL /*fRelease*/) { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE EnumFormatEtc( DWORD /*dir*/, IEnumFORMATETC** /*ppenumFormatEtc*/) { return E_NOTIMPL; } -// HRESULT STDMETHODCALLTYPE EnumFormatEtc( DWORD dir, IEnumFORMATETC** ppenumFormatEtc) {*ppenumFormatEtc = m_EnumF; return S_OK;} + HRESULT STDMETHODCALLTYPE GetDataHere( FORMATETC* /*pformatetcIn*/, STGMEDIUM* /*pmedium*/) FL_OVERRIDE { return E_NOTIMPL; } + HRESULT STDMETHODCALLTYPE GetCanonicalFormatEtc( FORMATETC* /*in*/, FORMATETC* /*out*/) FL_OVERRIDE { return E_NOTIMPL; } + HRESULT STDMETHODCALLTYPE SetData( FORMATETC* /*pformatetc*/, STGMEDIUM* /*pmedium*/, BOOL /*fRelease*/) FL_OVERRIDE { return E_NOTIMPL; } + HRESULT STDMETHODCALLTYPE EnumFormatEtc( DWORD /*dir*/, IEnumFORMATETC** /*ppenumFormatEtc*/) FL_OVERRIDE { return E_NOTIMPL; } +// HRESULT STDMETHODCALLTYPE EnumFormatEtc( DWORD dir, IEnumFORMATETC** ppenumFormatEtc) FL_OVERRIDE {*ppenumFormatEtc = m_EnumF; return S_OK;} HRESULT STDMETHODCALLTYPE DAdvise( FORMATETC* /*pformatetc*/, DWORD /*advf*/, - IAdviseSink* /*pAdvSink*/, DWORD* /*pdwConnection*/) { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE DUnadvise( DWORD /*dwConnection*/) { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE EnumDAdvise( IEnumSTATDATA** /*ppenumAdvise*/) { return E_NOTIMPL; } + IAdviseSink* /*pAdvSink*/, DWORD* /*pdwConnection*/) FL_OVERRIDE { return E_NOTIMPL; } + HRESULT STDMETHODCALLTYPE DUnadvise( DWORD /*dwConnection*/) FL_OVERRIDE { return E_NOTIMPL; } + HRESULT STDMETHODCALLTYPE EnumDAdvise( IEnumSTATDATA** /*ppenumAdvise*/) FL_OVERRIDE { return E_NOTIMPL; } }; diff --git a/src/fl_show_colormap.cxx b/src/fl_show_colormap.cxx index d4677181a..1793547bc 100644 --- a/src/fl_show_colormap.cxx +++ b/src/fl_show_colormap.cxx @@ -32,8 +32,8 @@ class ColorMenu : public Fl_Window { Fl_Color which, previous; int done; void drawbox(Fl_Color); - void draw(); - int handle(int); + void draw() FL_OVERRIDE; + int handle(int) FL_OVERRIDE; public: ColorMenu(Fl_Color oldcol); Fl_Color run(); |