Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-10 05:27:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace 'FL_OVERRIDE' with 'override' in public headers

Browse Source 
... except FL/fl_attr.h where FL_OVERRIDE is #define'd
This commit is contained in:
Albrecht Schlosser
2025-07-08 14:59:37 +02:00
parent 2803f70f58
commit 3cf5a302fd
75 changed files with 319 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Fl_Adjuster.H
+3 -3
View File
@@ -43,9 +43,9 @@ class FL_EXPORT Fl_Adjuster : public Fl_Valuator {
int ix;
int soft_;
protected:
void draw() FL_OVERRIDE;
int handle(int) FL_OVERRIDE;
void value_damage() FL_OVERRIDE;
void draw() override;
int handle(int) override;
void value_damage() override;
public:
Fl_Adjuster(int X,int Y,int W,int H,const char *l=0);
/**
FL/Fl_Anim_GIF_Image.H
+8 -8
View File
@@ -83,7 +83,7 @@ public:
const size_t length, Fl_Widget *canvas = 0,
unsigned short flags = 0);
Fl_Anim_GIF_Image();
~Fl_Anim_GIF_Image() FL_OVERRIDE;
~Fl_Anim_GIF_Image() override;
// -- file handling
bool load(const char *name, const unsigned char *imgdata=NULL, size_t imglength=0);
@@ -127,12 +127,12 @@ public:
int frame_h(int frame) const;
// -- overridden methods
void color_average(Fl_Color c, float i) FL_OVERRIDE;
Fl_Image *copy(int W, int H) const FL_OVERRIDE;
void color_average(Fl_Color c, float i) override;
Fl_Image *copy(int W, int H) const override;
Fl_Image *copy() const { return Fl_Pixmap::copy(); }
void desaturate() FL_OVERRIDE;
void draw(int x, int y, int w, int h, int cx = 0, int cy = 0) FL_OVERRIDE;
void uncache() FL_OVERRIDE;
void desaturate() override;
void draw(int x, int y, int w, int h, int cx = 0, int cy = 0) override;
void uncache() override;
// -- debugging and logging
int debug() const;
@@ -167,8 +167,8 @@ protected:
static void cb_animate(void *d);
void scale_frame();
void set_frame();
void on_frame_data(Fl_GIF_Image::GIF_FRAME &f) FL_OVERRIDE;
void on_extension_data(Fl_GIF_Image::GIF_FRAME &f) FL_OVERRIDE;
void on_frame_data(Fl_GIF_Image::GIF_FRAME &f) override;
void on_extension_data(Fl_GIF_Image::GIF_FRAME &f) override;
private:
FL/Fl_Bitmap.H
+5 -5
View File
@@ -54,13 +54,13 @@ public:
Fl_Bitmap(const uchar *bits, int bits_length, int W, int H);
Fl_Bitmap(const char *bits, int bits_length, int W, int H);
virtual ~Fl_Bitmap();
Fl_Image *copy(int W, int H) const FL_OVERRIDE;
Fl_Image *copy(int W, int H) const override;
Fl_Image *copy() const { return Fl_Image::copy(); }
void draw(int X, int Y, int W, int H, int cx=0, int cy=0) FL_OVERRIDE;
void draw(int X, int Y, int W, int H, int cx=0, int cy=0) override;
void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);}
void label(Fl_Widget*w) FL_OVERRIDE;
void label(Fl_Menu_Item*m) FL_OVERRIDE;
void uncache() FL_OVERRIDE;
void label(Fl_Widget*w) override;
void label(Fl_Menu_Item*m) override;
void uncache() override;
int cache_w() {return cache_w_;}
int cache_h() {return cache_h_;}
};
FL/Fl_Box.H
+2 -2
View File
@@ -33,7 +33,7 @@
*/
class FL_EXPORT Fl_Box : public Fl_Widget {
protected:
void draw() FL_OVERRIDE;
void draw() override;
public:
/**
Creates a new Fl_Box widget with the given coordinates, size, and label.
@@ -72,7 +72,7 @@ public:
*/
Fl_Box(Fl_Boxtype B, int X, int Y, int W, int H, const char *L);
int handle(int) FL_OVERRIDE;
int handle(int) override;
};
#endif
FL/Fl_Browser.H
+16 -16
View File
@@ -98,30 +98,30 @@ class FL_EXPORT Fl_Browser : public Fl_Browser_ {
protected:
// required routines for Fl_Browser_ subclass:
void* item_first() const FL_OVERRIDE;
void* item_next(void* item) const FL_OVERRIDE;
void* item_prev(void* item) const FL_OVERRIDE;
void* item_last()const FL_OVERRIDE;
int item_selected(void* item) const FL_OVERRIDE;
void item_select(void* item, int val) FL_OVERRIDE;
int item_height(void* item) const FL_OVERRIDE;
int item_width(void* item) const FL_OVERRIDE;
void item_draw(void* item, int X, int Y, int W, int H) const FL_OVERRIDE;
int full_height() const FL_OVERRIDE;
int incr_height() const FL_OVERRIDE;
const char *item_text(void *item) const FL_OVERRIDE;
void* item_first() const override;
void* item_next(void* item) const override;
void* item_prev(void* item) const override;
void* item_last()const override;
int item_selected(void* item) const override;
void item_select(void* item, int val) override;
int item_height(void* item) const override;
int item_width(void* item) const override;
void item_draw(void* item, int X, int Y, int W, int H) const override;
int full_height() const override;
int incr_height() const override;
const char *item_text(void *item) const override;
/** Swap the items \p a and \p b.
You must call redraw() to make any changes visible.
\param[in] a,b the items to be swapped.
\see swap(int,int), item_swap()
*/
void item_swap(void *a, void *b) FL_OVERRIDE { swap((FL_BLINE*)a, (FL_BLINE*)b); }
void item_swap(void *a, void *b) override { swap((FL_BLINE*)a, (FL_BLINE*)b); }
/** Return the item at specified \p line.
\param[in] line The line of the item to return. (1 based)
\returns The item, or NULL if line out of range.
\see item_at(), find_line(), lineno()
*/
void *item_at(int line) const FL_OVERRIDE { return (void*)find_line(line); }
void *item_at(int line) const override { return (void*)find_line(line); }
FL_BLINE* find_line(int line) const ;
FL_BLINE* _remove(int line) ;
@@ -188,10 +188,10 @@ public:
int selected(int line) const ;
void show(int line);
/** Shows the entire Fl_Browser widget -- opposite of hide(). */
void show() FL_OVERRIDE { Fl_Widget::show(); }
void show() override { Fl_Widget::show(); }
void hide(int line);
/** Hides the entire Fl_Browser widget -- opposite of show(). */
void hide() FL_OVERRIDE { Fl_Widget::hide(); }
void hide() override { Fl_Widget::hide(); }
int visible(int line) const ;
int value() const ;
FL/Fl_Browser_.H
+3 -3
View File
@@ -206,7 +206,7 @@ protected:
int leftedge() const; // x position after scrollbar & border
void *find_item(int ypos); // item under mouse
void draw() FL_OVERRIDE;
void draw() override;
Fl_Browser_(int X,int Y,int W,int H,const char *L=0);
public:
@@ -232,8 +232,8 @@ public:
*/
Fl_Scrollbar hscrollbar;
int handle(int event) FL_OVERRIDE;
void resize(int X,int Y,int W,int H) FL_OVERRIDE;
int handle(int event) override;
void resize(int X,int Y,int W,int H) override;
int select(void *item,int val=1,int docallbacks=0);
int select_only(void *item,int docallbacks=0);
FL/Fl_Button.H
+2 -2
View File
@@ -87,11 +87,11 @@ protected:
static void key_release_timeout(void*);
void simulate_key_action();
void draw() FL_OVERRIDE;
void draw() override;
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
Fl_Button(int X, int Y, int W, int H, const char *L = 0);
FL/Fl_Cairo_Window.H
+1 -1
View File
@@ -96,7 +96,7 @@ public:
protected:
/** Overloaded to provide Cairo callback support. */
void draw() FL_OVERRIDE {
void draw() override {
Fl_Double_Window::draw();
if (draw_cb_) { // call the Cairo draw callback
// manual method ? if yes explicitly get a cairo_context here
FL/Fl_Chart.H
+1 -1
View File
@@ -80,7 +80,7 @@ class FL_EXPORT Fl_Chart : public Fl_Widget {
Fl_Color textcolor_;
protected:
void draw() FL_OVERRIDE;
void draw() override;
// (static) protected draw methods (STR 2022)
// these methods are documented in src/Fl_Chart.cxx
FL/Fl_Check_Browser.H
+12 -12
View File
@@ -31,20 +31,20 @@ class FL_EXPORT Fl_Check_Browser : public Fl_Browser_ {
protected:
/* required routines for Fl_Browser_ subclass: */
void *item_first() const FL_OVERRIDE;
void *item_next(void *) const FL_OVERRIDE;
void *item_prev(void *) const FL_OVERRIDE;
int item_height(void *) const FL_OVERRIDE;
int item_width(void *) const FL_OVERRIDE;
void item_draw(void *, int, int, int, int) const FL_OVERRIDE;
void item_select(void *, int) FL_OVERRIDE;
int item_selected(void *) const FL_OVERRIDE;
const char *item_text(void *item) const FL_OVERRIDE;
void *item_first() const override;
void *item_next(void *) const override;
void *item_prev(void *) const override;
int item_height(void *) const override;
int item_width(void *) const override;
void item_draw(void *, int, int, int, int) const override;
void item_select(void *, int) override;
int item_selected(void *) const override;
const char *item_text(void *item) const override;
public:
void *item_at(int index) const FL_OVERRIDE;
void *item_at(int index) const override;
void item_swap(int ia, int ib);
void item_swap(void *a, void *b) FL_OVERRIDE;
void item_swap(void *a, void *b) override;
/* private data */
@@ -104,7 +104,7 @@ public:
char *text(int item) const; // returns pointer to internal buffer
protected:
int handle(int) FL_OVERRIDE;
int handle(int) override;
};
#endif // Fl_Check_Browser_H
FL/Fl_Choice.H
+2 -2
View File
@@ -107,9 +107,9 @@
*/
class FL_EXPORT Fl_Choice : public Fl_Menu_ {
protected:
void draw() FL_OVERRIDE;
void draw() override;
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
Fl_Choice(int X, int Y, int W, int H, const char *L = 0);
FL/Fl_Clock.H
+2 -2
View File
@@ -68,7 +68,7 @@ class FL_EXPORT Fl_Clock_Output : public Fl_Widget {
int shadow_; // draw shadows of hands
void drawhands(Fl_Color,Fl_Color); // part of draw
protected:
void draw() FL_OVERRIDE;
void draw() override;
void draw(int X, int Y, int W, int H);
public:
@@ -151,7 +151,7 @@ public:
*/
class FL_EXPORT Fl_Clock : public Fl_Clock_Output {
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
Fl_Clock(int X, int Y, int W, int H, const char *L = 0);
FL/Fl_Color_Chooser.H
+6 -6
View File
@@ -36,10 +36,10 @@
class FL_EXPORT Flcc_HueBox : public Fl_Widget {
int px, py;
protected:
void draw() FL_OVERRIDE;
void draw() override;
int handle_key(int);
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
Flcc_HueBox(int X, int Y, int W, int H) : Fl_Widget(X,Y,W,H) {
px = py = 0;}
};
@@ -48,10 +48,10 @@ public:
class FL_EXPORT Flcc_ValueBox : public Fl_Widget {
int py;
protected:
void draw() FL_OVERRIDE;
void draw() override;
int handle_key(int);
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
Flcc_ValueBox(int X, int Y, int W, int H) : Fl_Widget(X,Y,W,H) {
py = 0;}
};
@@ -59,7 +59,7 @@ public:
/** For internal use only */
class FL_EXPORT Flcc_Value_Input : public Fl_Value_Input {
public:
int format(char*) FL_OVERRIDE;
int format(char*) override;
Flcc_Value_Input(int X, int Y, int W, int H) : Fl_Value_Input(X,Y,W,H) {}
};
@@ -124,7 +124,7 @@ class FL_EXPORT Fl_Color_Chooser : public Fl_Group {
static void mode_cb(Fl_Widget*, void*);
public:
int handle(int e) FL_OVERRIDE;
int handle(int e) override;
/**
Returns which Fl_Color_Chooser variant is currently active
FL/Fl_Copy_Surface.H
+11 -11
View File
@@ -50,20 +50,20 @@ class FL_EXPORT Fl_Copy_Surface : public Fl_Widget_Surface {
private:
class Fl_Copy_Surface_Driver *platform_surface;
protected:
void translate(int x, int y) FL_OVERRIDE;
void untranslate() FL_OVERRIDE;
void translate(int x, int y) override;
void untranslate() override;
public:
Fl_Copy_Surface(int w, int h);
~Fl_Copy_Surface();
void set_current() FL_OVERRIDE;
bool is_current() FL_OVERRIDE;
void set_current() override;
bool is_current() override;
/** Returns the pixel width of the copy surface */
int w();
/** Returns the pixel height of the copy surface */
int h();
void origin(int *x, int *y) FL_OVERRIDE;
void origin(int x, int y) FL_OVERRIDE;
int printable_rect(int *w, int *h) FL_OVERRIDE;
void origin(int *x, int *y) override;
void origin(int x, int y) override;
int printable_rect(int *w, int *h) override;
};
@@ -88,10 +88,10 @@ protected:
int height;
Fl_Copy_Surface_Driver(int w, int h) : Fl_Widget_Surface(NULL), width(w), height(h) {}
virtual ~Fl_Copy_Surface_Driver() {}
void set_current() FL_OVERRIDE = 0;
void translate(int x, int y) FL_OVERRIDE = 0;
void untranslate() FL_OVERRIDE = 0;
int printable_rect(int *w, int *h) FL_OVERRIDE;
void set_current() override = 0;
void translate(int x, int y) override = 0;
void untranslate() override = 0;
int printable_rect(int *w, int *h) override;
/** Each platform implements this function its own way.
It returns an object implementing all virtual functions
of class Fl_Copy_Surface_Driver for the platform.
FL/Fl_Counter.H
+2 -2
View File
@@ -54,13 +54,13 @@ class FL_EXPORT Fl_Counter : public Fl_Valuator {
protected:
void draw() FL_OVERRIDE;
void draw() override;
// compute widths of arrow boxes
void arrow_widths(int &w1, int &w2);
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
Fl_Counter(int X, int Y, int W, int H, const char* L = 0);
~Fl_Counter();
FL/Fl_Dial.H
+2 -2
View File
@@ -51,11 +51,11 @@ protected:
// these allow subclasses to put the dial in a smaller area:
void draw(int X, int Y, int W, int H);
int handle(int event, int X, int Y, int W, int H);
void draw() FL_OVERRIDE;
void draw() override;
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
/**
Creates a new Fl_Dial widget using the given position, size,
and label string. The default type is FL_NORMAL_DIAL.
FL/Fl_Double_Window.H
+5 -5
View File
@@ -30,13 +30,13 @@
class FL_EXPORT Fl_Double_Window : public Fl_Window
{
public:
Fl_Double_Window *as_double_window() FL_OVERRIDE {return this; }
void show() FL_OVERRIDE;
Fl_Double_Window *as_double_window() override {return this; }
void show() override;
/** Same as Fl_Window::show(int a, char **b) */
void show(int a, char **b) {Fl_Window::show(a,b);}
void resize(int,int,int,int) FL_OVERRIDE;
void hide() FL_OVERRIDE;
void flush() FL_OVERRIDE;
void resize(int,int,int,int) override;
void hide() override;
void flush() override;
~Fl_Double_Window();
/**
FL/Fl_File_Browser.H
+5 -5
View File
@@ -42,11 +42,11 @@ class FL_EXPORT Fl_File_Browser : public Fl_Browser {
const char *pattern_;
const char *errmsg_;
int full_height() const FL_OVERRIDE;
int item_height(void *) const FL_OVERRIDE;
int item_width(void *) const FL_OVERRIDE;
void item_draw(void *, int, int, int, int) const FL_OVERRIDE;
int incr_height() const FL_OVERRIDE { return (item_height(0) + linespacing()); }
int full_height() const override;
int item_height(void *) const override;
int item_width(void *) const override;
void item_draw(void *, int, int, int, int) const override;
int incr_height() const override { return (item_height(0) + linespacing()); }
public:
enum { FILES, DIRECTORIES };
FL/Fl_File_Input.H
+2 -2
View File
@@ -57,10 +57,10 @@ public:
Fl_File_Input(int X, int Y, int W, int H, const char *L=0);
int handle(int event) FL_OVERRIDE;
int handle(int event) override;
protected:
void draw() FL_OVERRIDE;
void draw() override;
public:
/** Gets the box type used for the navigation bar. */
FL/Fl_Flex.H
+3 -3
View File
@@ -145,7 +145,7 @@ public:
virtual ~Fl_Flex();
virtual void end();
void resize(int x, int y, int w, int h) FL_OVERRIDE;
void resize(int x, int y, int w, int h) override;
/**
Set the horizontal or vertical size of a child widget.
@@ -168,8 +168,8 @@ protected:
virtual int alloc_size(int size) const;
void on_remove(int) FL_OVERRIDE;
void draw() FL_OVERRIDE;
void on_remove(int) override;
void draw() override;
public:
FL/Fl_FormsBitmap.H
+1 -1
View File
@@ -28,7 +28,7 @@
class FL_EXPORT Fl_FormsBitmap : public Fl_Widget {
Fl_Bitmap *b;
protected:
void draw() FL_OVERRIDE;
void draw() override;
public:
Fl_FormsBitmap(Fl_Boxtype, int, int, int, int, const char * = 0);
void set(int W, int H, const uchar *bits);
FL/Fl_FormsPixmap.H
+1 -1
View File
@@ -29,7 +29,7 @@
class FL_EXPORT Fl_FormsPixmap : public Fl_Widget {
Fl_Pixmap *b;
protected:
void draw() FL_OVERRIDE;
void draw() override;
public:
Fl_FormsPixmap(Fl_Boxtype t, int X, int Y, int W, int H, const char *L= 0);
FL/Fl_Free.H
+2 -2
View File
@@ -56,9 +56,9 @@ class FL_EXPORT Fl_Free : public Fl_Widget {
FL_HANDLEPTR hfunc;
static void step(void *);
protected:
void draw() FL_OVERRIDE;
void draw() override;
public:
int handle(int e) FL_OVERRIDE;
int handle(int e) override;
Fl_Free(uchar t,int X,int Y,int W,int H,const char *L,FL_HANDLEPTR hdl);
~Fl_Free();
};
FL/Fl_Gl_Window.H
+8 -8
View File
@@ -73,17 +73,17 @@ class FL_EXPORT Fl_Gl_Window : public Fl_Window {
static int gl_plugin_linkage();
protected:
void draw_begin();
void draw() FL_OVERRIDE;
void draw() override;
void draw_end();
public:
void show() FL_OVERRIDE;
void show() override;
/** Same as Fl_Window::show(int a, char **b) */
void show(int a, char **b) {Fl_Window::show(a,b);}
void flush() FL_OVERRIDE;
void hide() FL_OVERRIDE;
void resize(int,int,int,int) FL_OVERRIDE;
int handle(int) FL_OVERRIDE;
void flush() override;
void hide() override;
void resize(int,int,int,int) override;
int handle(int) override;
/**
Is turned off when FLTK creates a new context for this window or
@@ -213,8 +213,8 @@ public:
void make_overlay_current();
// Note: Doxygen docs in Fl_Widget.H to avoid redundancy.
Fl_Gl_Window* as_gl_window() FL_OVERRIDE { return this; }
Fl_Gl_Window const* as_gl_window() const FL_OVERRIDE { return this; }
Fl_Gl_Window* as_gl_window() override { return this; }
Fl_Gl_Window const* as_gl_window() const override { return this; }
float pixels_per_unit();
/** Gives the window width in OpenGL pixels.
FL/Fl_Grid.H
+3 -3
View File
@@ -270,7 +270,7 @@ public:
virtual void layout(int rows, int cols, int margin = -1, int gap = -1);
virtual void layout();
virtual void clear_layout();
virtual void resize(int X, int Y, int W, int H) FL_OVERRIDE;
virtual void resize(int X, int Y, int W, int H) override;
short rows() const { return rows_; }
short cols() const { return cols_; }
@@ -303,8 +303,8 @@ public:
}
protected:
virtual void draw() FL_OVERRIDE;
void on_remove(int) FL_OVERRIDE;
virtual void draw() override;
void on_remove(int) override;
virtual void draw_grid(); // draw grid lines for debugging
public:
FL/Fl_Group.H
+5 -5
View File
@@ -72,7 +72,7 @@ class FL_EXPORT Fl_Group : public Fl_Widget {
Fl_Group& operator=(const Fl_Group&);
protected:
void draw() FL_OVERRIDE;
void draw() override;
void draw_child(Fl_Widget& widget) const;
void draw_children();
void draw_outside_label(const Fl_Widget& widget) const ;
@@ -85,7 +85,7 @@ protected:
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
void begin();
void end();
static Fl_Group *current();
@@ -119,7 +119,7 @@ public:
Fl_Widget* const* array() const;
void resize(int,int,int,int) FL_OVERRIDE;
void resize(int,int,int,int) override;
/**
Creates a new Fl_Group widget using the given position, size,
and label string. The default boxtype is FL_NO_BOX.
@@ -239,8 +239,8 @@ public:
unsigned int clip_children() { return (flags() & CLIP_CHILDREN) != 0; }
// Note: Doxygen docs in Fl_Widget.H to avoid redundancy.
Fl_Group* as_group() FL_OVERRIDE { return this; }
Fl_Group const* as_group() const FL_OVERRIDE { return this; }
Fl_Group* as_group() override { return this; }
Fl_Group const* as_group() const override { return this; }
// back compatibility functions:
FL/Fl_Image.H
+8 -8
View File
@@ -365,16 +365,16 @@ public:
Fl_RGB_Image(const uchar *bits, int W, int H, int D=3, int LD=0);
Fl_RGB_Image(const uchar *bits, int bits_length, int W, int H, int D, int LD);
Fl_RGB_Image(const Fl_Pixmap *pxm, Fl_Color bg=FL_GRAY);
~Fl_RGB_Image() FL_OVERRIDE;
Fl_Image *copy(int W, int H) const FL_OVERRIDE;
~Fl_RGB_Image() override;
Fl_Image *copy(int W, int H) const override;
Fl_Image *copy() const { return Fl_Image::copy(); }
void color_average(Fl_Color c, float i) FL_OVERRIDE;
void desaturate() FL_OVERRIDE;
void draw(int X, int Y, int W, int H, int cx=0, int cy=0) FL_OVERRIDE;
void color_average(Fl_Color c, float i) override;
void desaturate() override;
void draw(int X, int Y, int W, int H, int cx=0, int cy=0) override;
void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);}
void label(Fl_Widget*w) FL_OVERRIDE;
void label(Fl_Menu_Item*m) FL_OVERRIDE;
void uncache() FL_OVERRIDE;
void label(Fl_Widget*w) override;
void label(Fl_Menu_Item*m) override;
void uncache() override;
int cache_w() {return cache_w_;}
int cache_h() {return cache_h_;}
/** Sets the maximum allowed image size in bytes when creating an Fl_RGB_Image object.
FL/Fl_Image_Surface.H
+11 -11
View File
@@ -68,18 +68,18 @@ private:
class Fl_Image_Surface_Driver *platform_surface;
Fl_Offscreen get_offscreen_before_delete_();
protected:
void translate(int x, int y) FL_OVERRIDE;
void untranslate() FL_OVERRIDE;
void translate(int x, int y) override;
void untranslate() override;
public:
Fl_Image_Surface(int w, int h, int high_res = 0, Fl_Offscreen off = 0);
~Fl_Image_Surface();
void set_current() FL_OVERRIDE;
bool is_current() FL_OVERRIDE;
void set_current() override;
bool is_current() override;
Fl_RGB_Image *image();
Fl_Shared_Image *highres_image();
void origin(int *x, int *y) FL_OVERRIDE;
void origin(int x, int y) FL_OVERRIDE;
int printable_rect(int *w, int *h) FL_OVERRIDE;
void origin(int *x, int *y) override;
void origin(int x, int y) override;
int printable_rect(int *w, int *h) override;
Fl_Offscreen offscreen();
void rescale();
void mask(const Fl_RGB_Image *);
@@ -111,10 +111,10 @@ protected:
static void copy_with_mask(Fl_RGB_Image* mask, uchar *dib_dst, uchar *dib_src,
int line_size, bool bottom_to_top);
static Fl_RGB_Image *RGB3_to_RGB1(const Fl_RGB_Image *rgb3, int W, int H);
void set_current() FL_OVERRIDE = 0;
void translate(int x, int y) FL_OVERRIDE = 0;
void untranslate() FL_OVERRIDE = 0;
int printable_rect(int *w, int *h) FL_OVERRIDE;
void set_current() override = 0;
void translate(int x, int y) override = 0;
void untranslate() override = 0;
int printable_rect(int *w, int *h) override;
virtual Fl_RGB_Image *image() = 0;
virtual void mask(const Fl_RGB_Image *) {}
/** Each platform implements this function its own way.
FL/Fl_Input.H
+2 -2
View File
@@ -255,12 +255,12 @@ class FL_EXPORT Fl_Input : public Fl_Input_ {
int kf_copy_cut();
protected:
void draw() FL_OVERRIDE;
void draw() override;
int handle_key();
int handle_rmb();
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
Fl_Input(int,int,int,int,const char * = 0);
static const char *cut_menu_text;
static const char *copy_menu_text;
FL/Fl_Input_.H
+1 -1
View File
@@ -224,7 +224,7 @@ protected:
public:
/* Change the size of the widget. */
void resize(int, int, int, int) FL_OVERRIDE;
void resize(int, int, int, int) override;
/* Constructor */
Fl_Input_(int, int, int, int, const char* = 0);
FL/Fl_Input_Choice.H
+4 -4
View File
@@ -44,11 +44,11 @@ class FL_EXPORT Fl_Input_Choice : public Fl_Group {
// Private class to handle slightly 'special' behavior of menu button
class InputMenuButton : public Fl_Menu_Button {
void draw() FL_OVERRIDE;
void draw() override;
const Fl_Menu_Item* popup();
public:
InputMenuButton(int X, int Y, int W, int H, const char *L=0);
int handle(int e) FL_OVERRIDE;
int handle(int e) override;
};
Fl_Input *inp_;
@@ -89,13 +89,13 @@ protected:
/** See menu_x() for info. */
virtual int menu_h() const { return h() - Fl::box_dh(box()); }
void draw() FL_OVERRIDE;
void draw() override;
public:
Fl_Input_Choice(int X, int Y, int W, int H, const char *L=0);
void resize(int X, int Y, int W, int H) FL_OVERRIDE;
void resize(int X, int Y, int W, int H) override;
/** Adds an item to the menu.
When any item is selected, the Fl_Input_Choice callback() is invoked,
FL/Fl_Light_Button.H
+2 -2
View File
@@ -35,9 +35,9 @@
*/
class FL_EXPORT Fl_Light_Button : public Fl_Button {
protected:
void draw() FL_OVERRIDE;
void draw() override;
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
Fl_Light_Button(int x,int y,int w,int h,const char *l = 0);
};
FL/Fl_Menu_Bar.H
+2 -2
View File
@@ -69,9 +69,9 @@
class FL_EXPORT Fl_Menu_Bar : public Fl_Menu_ {
friend class Fl_Sys_Menu_Bar_Driver;
protected:
void draw() FL_OVERRIDE;
void draw() override;
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
/**
Creates a new Fl_Menu_Bar widget using the given position,
size, and label string. The default boxtype is FL_UP_BOX.
FL/Fl_Menu_Button.H
+2 -2
View File
@@ -59,7 +59,7 @@
*/
class FL_EXPORT Fl_Menu_Button : public Fl_Menu_ {
protected:
void draw() FL_OVERRIDE;
void draw() override;
static Fl_Menu_Button* pressed_menu_button_;
public:
/**
@@ -76,7 +76,7 @@ public:
POPUP23, /**< pops up with the mouse 2nd or 3rd buttons. */
POPUP123 /**< pops up with any mouse button. */
};
int handle(int) FL_OVERRIDE;
int handle(int) override;
const Fl_Menu_Item* popup();
Fl_Menu_Button(int,int,int,int,const char * =0);
};
FL/Fl_Native_File_Chooser.H
+20 -20
View File
@@ -252,26 +252,26 @@ protected:
public:
Fl_Native_File_Chooser_FLTK_Driver(int val);
virtual ~Fl_Native_File_Chooser_FLTK_Driver();
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;
void type(int t) override;
int type() const override;
void options(int o) override;
int options() const override;
int count() const override;
const char *filename() const override;
const char *filename(int i) const override;
void directory(const char *val) override;
const char *directory() const override;
void title(const char *t) override;
const char* title() const override;
const char *filter() const override;
void filter(const char *f) override;
int filters() const override;
void filter_value(int i) override;
int filter_value() const override;
void preset_file(const char*f) override;
const char* preset_file() const override;
const char *errmsg() const override;
int show() override;
};
/**
FL/Fl_Overlay_Window.H
+5 -5
View File
@@ -49,10 +49,10 @@ public:
private:
Fl_Window *overlay_;
public:
void show() FL_OVERRIDE;
void hide() FL_OVERRIDE;
void flush() FL_OVERRIDE;
void resize(int,int,int,int) FL_OVERRIDE;
void show() override;
void hide() override;
void flush() override;
void resize(int,int,int,int) override;
~Fl_Overlay_Window();
/** Returns non-zero if there's hardware overlay support */
int can_do_overlay();
@@ -72,7 +72,7 @@ protected:
public:
/** Same as Fl_Window::show(int a, char **b) */
void show(int a, char **b) {Fl_Double_Window::show(a,b);}
Fl_Overlay_Window *as_overlay_window() FL_OVERRIDE {return this; }
Fl_Overlay_Window *as_overlay_window() override {return this; }
};
#endif
FL/Fl_Pack.H
+2 -2
View File
@@ -61,7 +61,7 @@ public:
};
protected:
void draw() FL_OVERRIDE;
void draw() override;
public:
Fl_Pack(int X, int Y, int W, int H, const char *L = 0);
@@ -92,7 +92,7 @@ public:
*/
uchar horizontal() const {return type();}
void resize(int X, int Y, int W, int H) FL_OVERRIDE;
void resize(int X, int Y, int W, int H) override;
/** Deletes all child widgets with Fl_Group::clear().
And sets to NULL the resizable() widget. */
void clear() { Fl_Group::clear(); resizable(NULL); }
FL/Fl_Pixmap.H
+7 -7
View File
@@ -63,15 +63,15 @@ public:
/** The constructors create a new pixmap from the specified XPM data. */
explicit Fl_Pixmap(const uchar* const * D) : Fl_Image(-1,0,1), alloc_data(0), id_(0), mask_(0) {set_data((const char*const*)D); measure();}
virtual ~Fl_Pixmap();
Fl_Image *copy(int W, int H) const FL_OVERRIDE;
Fl_Image *copy(int W, int H) const override;
Fl_Image *copy() const { return Fl_Image::copy(); }
void color_average(Fl_Color c, float i) FL_OVERRIDE;
void desaturate() FL_OVERRIDE;
void draw(int X, int Y, int W, int H, int cx=0, int cy=0) FL_OVERRIDE;
void color_average(Fl_Color c, float i) override;
void desaturate() override;
void draw(int X, int Y, int W, int H, int cx=0, int cy=0) override;
void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);}
void label(Fl_Widget*w) FL_OVERRIDE;
void label(Fl_Menu_Item*m) FL_OVERRIDE;
void uncache() FL_OVERRIDE;
void label(Fl_Widget*w) override;
void label(Fl_Menu_Item*m) override;
void uncache() override;
int cache_w() {return cache_w_;}
int cache_h() {return cache_h_;}
};
FL/Fl_Positioner.H
+2 -2
View File
@@ -44,11 +44,11 @@ protected:
// these allow subclasses to put the dial in a smaller area:
void draw(int, int, int, int);
int handle(int, int, int, int, int);
void draw() FL_OVERRIDE;
void draw() override;
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
/**
Creates a new Fl_Positioner widget using the given position,
size, and label string. The default boxtype is FL_NO_BOX.
FL/Fl_PostScript.H
+19 -19
View File
@@ -91,7 +91,7 @@ public:
/** The destructor. */
~Fl_PostScript_File_Device();
/** Don't use with this class. */
int begin_job(int pagecount, int* from, int* to, char **perr_message) FL_OVERRIDE;
int begin_job(int pagecount, int* from, int* to, char **perr_message) override;
/** Begins the session where all graphics requests will go to a local PostScript file.
Opens a file dialog to select an output PostScript file.
This member function makes end_job() close the resulting PostScript file and display an
@@ -128,28 +128,28 @@ public:
return begin_job(ps_output, pagecount, format, layout);
}
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;
int begin_page (void) override;
int printable_rect(int *w, int *h) override;
void margins(int *left, int *top, int *right, int *bottom) override;
void origin(int *x, int *y) override;
void origin(int x, int y) override;
void scale (float scale_x, float scale_y = 0.) override;
void rotate(float angle) override;
void translate(int x, int y) override;
void untranslate(void) override;
int end_page (void) override;
/** Completes all PostScript output.
This also closes with \p fclose() the underlying file() unless close_command() was used to set another function.
*/
void end_job(void) FL_OVERRIDE;
void end_job(void) override;
/** Label of the PostScript file chooser window */
static const char *file_chooser_title;
/** Returns the underlying FILE* receiving all PostScript data */
FILE *file();
/** Sets the function end_job() calls to close the file() */
void close_command(Fl_PostScript_Close_Command cmd);
void set_current() FL_OVERRIDE;
void end_current() FL_OVERRIDE;
void set_current() override;
void end_current() override;
};
/** Encapsulated PostScript drawing surface.
@@ -198,13 +198,13 @@ public:
with fl_alert().
*/
~Fl_EPS_File_Surface();
int printable_rect(int *w, int *h) FL_OVERRIDE;
int printable_rect(int *w, int *h) override;
/** Returns the underlying FILE pointer */
FILE *file();
void origin(int x, int y) FL_OVERRIDE;
void origin(int *px, int *py) FL_OVERRIDE;
void translate(int x, int y) FL_OVERRIDE;
void untranslate() FL_OVERRIDE;
void origin(int x, int y) override;
void origin(int *px, int *py) override;
void translate(int x, int y) override;
void untranslate() override;
/** Completes all EPS output.
The only operation possible with the Fl_EPS_File_Surface object after calling close() is its destruction.
\return The status code of output operations to the FILE object. 0 indicates success. */
FL/Fl_Printer.H
+14 -14
View File
@@ -106,20 +106,20 @@ private:
public:
/** The constructor */
Fl_Printer(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;
void set_current(void) FL_OVERRIDE;
bool is_current() FL_OVERRIDE;
int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message = NULL) override;
int begin_page(void) override;
int printable_rect(int *w, int *h) override;
void margins(int *left, int *top, int *right, int *bottom) override;
void origin(int *x, int *y) override;
void origin(int x, int y) override;
void scale(float scale_x, float scale_y = 0.) override;
void rotate(float angle) override;
void translate(int x, int y) override;
void untranslate(void) override;
int end_page (void) override;
void end_job (void) override;
void set_current(void) override;
bool is_current() override;
/** \name These attributes are useful for the Linux/Unix platform only.
\{
FL/Fl_Progress.H
+1 -1
View File
@@ -41,7 +41,7 @@ class FL_EXPORT Fl_Progress : public Fl_Widget {
protected:
void draw() FL_OVERRIDE;
void draw() override;
public:
FL/Fl_Repeat_Button.H
+1 -1
View File
@@ -31,7 +31,7 @@
class FL_EXPORT Fl_Repeat_Button : public Fl_Button {
static void repeat_callback(void *);
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
/**
Creates a new Fl_Repeat_Button widget using the given
position, size, and label string. The default boxtype is FL_UP_BOX.
FL/Fl_Return_Button.H
+2 -2
View File
@@ -30,9 +30,9 @@
*/
class FL_EXPORT Fl_Return_Button : public Fl_Button {
protected:
void draw() FL_OVERRIDE;
void draw() override;
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
/**
Creates a new Fl_Return_Button widget using the given
position, size, and label string. The default boxtype is FL_UP_BOX.
FL/Fl_Roller.H
+2 -2
View File
@@ -37,9 +37,9 @@
*/
class FL_EXPORT Fl_Roller : public Fl_Valuator {
protected:
void draw() FL_OVERRIDE;
void draw() override;
public:
int handle(int) FL_OVERRIDE;
int handle(int) override;
Fl_Roller(int X,int Y,int W,int H,const char* L=0);
};
FL/Fl_SVG_File_Surface.H
+5 -5
View File
@@ -65,11 +65,11 @@ public:
~Fl_SVG_File_Surface();
/** Returns the underlying FILE pointer */
FILE *file();
void origin(int x, int y) FL_OVERRIDE;
void origin(int *x, int *y) FL_OVERRIDE;
void translate(int x, int y) FL_OVERRIDE;
void untranslate() FL_OVERRIDE;
int printable_rect(int *w, int *h) FL_OVERRIDE;
void origin(int x, int y) override;
void origin(int *x, int *y) override;
void translate(int x, int y) override;
void untranslate() override;
int printable_rect(int *w, int *h) override;
/** Closes the FILE pointer where SVG data is output.
The underlying FILE is closed by function fclose() unless another function was set at object's construction time.
The only operation possible after this on the Fl_SVG_File_Surface object is its destruction.
FL/Fl_SVG_Image.H
+7 -7
View File
@@ -146,7 +146,7 @@ private:
float average_weight_;
float svg_scaling_(int W, int H);
void rasterize_(int W, int H);
void cache_size_(int &width, int &height) FL_OVERRIDE;
void cache_size_(int &width, int &height) override;
void init_(const char *name, const unsigned char *filedata, size_t length);
Fl_SVG_Image(const Fl_SVG_Image *source);
public:
@@ -157,17 +157,17 @@ public:
Fl_SVG_Image(const char *sharedname, const char *svg_data);
Fl_SVG_Image(const char *sharedname, const unsigned char *svg_data, size_t length);
virtual ~Fl_SVG_Image();
Fl_Image *copy(int W, int H) const FL_OVERRIDE;
Fl_Image *copy(int W, int H) const override;
Fl_Image *copy() const {
return Fl_Image::copy();
}
void resize(int width, int height);
void desaturate() FL_OVERRIDE;
void color_average(Fl_Color c, float i) FL_OVERRIDE;
void draw(int X, int Y, int W, int H, int cx = 0, int cy = 0) FL_OVERRIDE;
void desaturate() override;
void color_average(Fl_Color c, float i) override;
void draw(int X, int Y, int W, int H, int cx = 0, int cy = 0) override;
void draw(int X, int Y) { draw(X, Y, w(), h(), 0, 0); }
Fl_SVG_Image *as_svg_image() FL_OVERRIDE { return this; }
void normalize() FL_OVERRIDE;
Fl_SVG_Image *as_svg_image() override { return this; }
void normalize() override;
};
#endif // FL_SVG_IMAGE_H
FL/Fl_Scheme_Choice.H
+1 -1
View File
@@ -28,7 +28,7 @@ protected:
public:
Fl_Scheme_Choice(int X, int Y, int W, int H, const char *L = 0);
int handle(int event) FL_OVERRIDE;
int handle(int event) override;
// set the current value according to the active scheme
virtual void init_value();
FL/Fl_Scroll.H
+6 -6
View File
@@ -146,19 +146,19 @@ protected: // (STR#1895)
protected:
int on_insert(Fl_Widget*, int) FL_OVERRIDE;
int on_move(int, int) FL_OVERRIDE;
int on_insert(Fl_Widget*, int) override;
int on_move(int, int) override;
void fix_scrollbar_order();
void bbox(int&,int&,int&,int&) const;
void draw() FL_OVERRIDE;
void draw() override;
public:
Fl_Scrollbar scrollbar;
Fl_Scrollbar hscrollbar;
void resize(int X, int Y, int W, int H) FL_OVERRIDE;
int handle(int) FL_OVERRIDE;
void resize(int X, int Y, int W, int H) override;
int handle(int) override;
Fl_Scroll(int X, int Y, int W, int H, const char *L = 0);
virtual ~Fl_Scroll();
@@ -181,7 +181,7 @@ public:
void clear();
/* delete child n (by index) */
int delete_child(int n) FL_OVERRIDE;
int delete_child(int n) override;
/**
Gets the current size of the scrollbars' troughs, in pixels.
FL/Fl_Scrollbar.H
+2 -2
View File
@@ -45,13 +45,13 @@ class FL_EXPORT Fl_Scrollbar : public Fl_Slider {
static void timeout_cb(void*);
void increment_cb();
protected:
void draw() FL_OVERRIDE;
void draw() override;
public:
Fl_Scrollbar(int X,int Y,int W,int H, const char *L = 0);
~Fl_Scrollbar();
int handle(int) FL_OVERRIDE;
int handle(int) override;
/**
Gets the integer value (position) of the slider in the scrollbar.

Some files were not shown because too many files have changed in this diff Show More