diff options
Diffstat (limited to 'FL')
80 files changed, 296 insertions, 296 deletions
@@ -723,8 +723,8 @@ FL_EXPORT extern void unlock(); FL_EXPORT extern void awake(); FL_DEPRECATED("since 1.5.0 - use Fl::awake() or Fl::awake(handler, user_data) instead", FL_EXPORT extern void awake(void* message)); -FL_EXPORT extern int awake(Fl_Awake_Handler handler, void* user_data=nullptr); -FL_EXPORT extern int awake_once(Fl_Awake_Handler handler, void* user_data=nullptr); +FL_EXPORT extern int awake(Fl_Awake_Handler handler, void* user_data=0); +FL_EXPORT extern int awake_once(Fl_Awake_Handler handler, void* user_data=0); FL_DEPRECATED("since 1.5.0 - use Fl::awake() or Fl::awake(handler, user_data) instead", FL_EXPORT extern void* thread_message()); // platform dependent diff --git a/FL/Fl_Adjuster.H b/FL/Fl_Adjuster.H index e8d7161b8..c2e308128 100644 --- a/FL/Fl_Adjuster.H +++ b/FL/Fl_Adjuster.H @@ -43,9 +43,9 @@ class FL_EXPORT Fl_Adjuster : public Fl_Valuator { int ix; int soft_; protected: - void draw() override; - int handle(int) override; - void value_damage() override; + void draw(); + int handle(int); + void value_damage(); public: Fl_Adjuster(int X,int Y,int W,int H,const char *l=0); /** diff --git a/FL/Fl_Anim_GIF_Image.H b/FL/Fl_Anim_GIF_Image.H index 08f8d62c4..3b8c08558 100644 --- a/FL/Fl_Anim_GIF_Image.H +++ b/FL/Fl_Anim_GIF_Image.H @@ -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() override; + ~Fl_Anim_GIF_Image(); // -- 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) override; + void color_average(Fl_Color c, float i); Fl_Image *copy(int W, int H) const override; Fl_Image *copy() const { return Fl_Pixmap::copy(); } - void desaturate() override; - void draw(int x, int y, int w, int h, int cx = 0, int cy = 0) override; - void uncache() override; + void desaturate(); + void draw(int x, int y, int w, int h, int cx = 0, int cy = 0); + void uncache(); // -- 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) override; - void on_extension_data(Fl_GIF_Image::GIF_FRAME &f) override; + void on_frame_data(Fl_GIF_Image::GIF_FRAME &f); + void on_extension_data(Fl_GIF_Image::GIF_FRAME &f); private: diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H index 5baedd4e9..a2b79ce5f 100644 --- a/FL/Fl_Bitmap.H +++ b/FL/Fl_Bitmap.H @@ -56,11 +56,11 @@ public: virtual ~Fl_Bitmap(); 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) override; + void draw(int X, int Y, int W, int H, int cx=0, int cy=0); void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);} - void label(Fl_Widget*w) override; - void label(Fl_Menu_Item*m) override; - void uncache() override; + void label(Fl_Widget*w); + void label(Fl_Menu_Item*m); + void uncache(); int cache_w() {return cache_w_;} int cache_h() {return cache_h_;} }; diff --git a/FL/Fl_Box.H b/FL/Fl_Box.H index 1023e7d77..d8db91fda 100644 --- a/FL/Fl_Box.H +++ b/FL/Fl_Box.H @@ -33,7 +33,7 @@ */ class FL_EXPORT Fl_Box : public Fl_Widget { protected: - void draw() override; + void draw(); public: /** Creates a new Fl_Box widget with the given coordinates, size, and label. @@ -58,7 +58,7 @@ public: This constructor sets box() to the given Fl_Boxtype \c B. - You must also specify a label but it can be \c nullptr (0, NULL) if you + You must also specify a label but it can be \c 0 (0, NULL) if you don't want or need a visible label. The destructor removes the box from its parent group. @@ -72,7 +72,7 @@ public: */ Fl_Box(Fl_Boxtype B, int X, int Y, int W, int H, const char *L); - int handle(int) override; + int handle(int); }; #endif diff --git a/FL/Fl_Browser.H b/FL/Fl_Browser.H index 182adb871..bc341b7ac 100644 --- a/FL/Fl_Browser.H +++ b/FL/Fl_Browser.H @@ -103,7 +103,7 @@ protected: 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; + void item_select(void* item, int val); 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; @@ -115,7 +115,7 @@ protected: \param[in] a,b the items to be swapped. \see swap(int,int), item_swap() */ - void item_swap(void *a, void *b) override { swap((FL_BLINE*)a, (FL_BLINE*)b); } + void item_swap(void *a, void *b) { 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. @@ -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() override { Fl_Widget::show(); } + void show() { Fl_Widget::show(); } void hide(int line); /** Hides the entire Fl_Browser widget -- opposite of show(). */ - void hide() override { Fl_Widget::hide(); } + void hide() { Fl_Widget::hide(); } int visible(int line) const ; int value() const ; diff --git a/FL/Fl_Browser_.H b/FL/Fl_Browser_.H index 75760c579..8eabee60d 100644 --- a/FL/Fl_Browser_.H +++ b/FL/Fl_Browser_.H @@ -206,7 +206,7 @@ protected: int leftedge() const; // x position after scrollbar & border void *find_item(int ypos); // item under mouse - void draw() override; + void draw(); 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) override; - void resize(int X,int Y,int W,int H) override; + int handle(int event); + void resize(int X,int Y,int W,int H); int select(void *item,int val=1,int docallbacks=0); int select_only(void *item,int docallbacks=0); diff --git a/FL/Fl_Button.H b/FL/Fl_Button.H index dc31e17b8..a6554e2d2 100644 --- a/FL/Fl_Button.H +++ b/FL/Fl_Button.H @@ -86,11 +86,11 @@ protected: static void key_release_timeout(void*); void simulate_key_action(); - void draw() override; + void draw(); public: - int handle(int) override; + int handle(int); Fl_Button(int X, int Y, int W, int H, const char *L = 0); diff --git a/FL/Fl_Cairo_Window.H b/FL/Fl_Cairo_Window.H index d61d05026..bdfe1488d 100644 --- a/FL/Fl_Cairo_Window.H +++ b/FL/Fl_Cairo_Window.H @@ -96,7 +96,7 @@ public: protected: /** Overloaded to provide Cairo callback support. */ - void draw() override { + void draw() { Fl_Double_Window::draw(); if (draw_cb_) { // call the Cairo draw callback // manual method ? if yes explicitly get a cairo_context here diff --git a/FL/Fl_Chart.H b/FL/Fl_Chart.H index 3bb601f39..66ed21787 100644 --- a/FL/Fl_Chart.H +++ b/FL/Fl_Chart.H @@ -80,7 +80,7 @@ class FL_EXPORT Fl_Chart : public Fl_Widget { Fl_Color textcolor_; protected: - void draw() override; + void draw(); // (static) protected draw methods (STR 2022) // these methods are documented in src/Fl_Chart.cxx diff --git a/FL/Fl_Check_Browser.H b/FL/Fl_Check_Browser.H index 63eb55dc1..cf01be626 100644 --- a/FL/Fl_Check_Browser.H +++ b/FL/Fl_Check_Browser.H @@ -37,14 +37,14 @@ protected: 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; + void item_select(void *, int); int item_selected(void *) const override; const char *item_text(void *item) const override; public: void *item_at(int index) const override; void item_swap(int ia, int ib); - void item_swap(void *a, void *b) override; + void item_swap(void *a, void *b); /* private data */ @@ -104,7 +104,7 @@ public: char *text(int item) const; // returns pointer to internal buffer protected: - int handle(int) override; + int handle(int); }; #endif // Fl_Check_Browser_H diff --git a/FL/Fl_Choice.H b/FL/Fl_Choice.H index 522f0ea25..26acbba72 100644 --- a/FL/Fl_Choice.H +++ b/FL/Fl_Choice.H @@ -107,9 +107,9 @@ */ class FL_EXPORT Fl_Choice : public Fl_Menu_ { protected: - void draw() override; + void draw(); public: - int handle(int) override; + int handle(int); Fl_Choice(int X, int Y, int W, int H, const char *L = 0); diff --git a/FL/Fl_Clock.H b/FL/Fl_Clock.H index a0024ca83..aa29ec04a 100644 --- a/FL/Fl_Clock.H +++ b/FL/Fl_Clock.H @@ -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() override; + void draw(); 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) override; + int handle(int); Fl_Clock(int X, int Y, int W, int H, const char *L = 0); diff --git a/FL/Fl_Color_Chooser.H b/FL/Fl_Color_Chooser.H index d3e56bdef..5be4c2c71 100644 --- a/FL/Fl_Color_Chooser.H +++ b/FL/Fl_Color_Chooser.H @@ -38,10 +38,10 @@ class FL_EXPORT Flcc_HueBox : public Fl_Widget { int px, py; protected: - void draw() override; + void draw(); int handle_key(int); public: - int handle(int) override; + int handle(int); Flcc_HueBox(int X, int Y, int W, int H) : Fl_Widget(X,Y,W,H) { px = py = 0;} }; @@ -50,10 +50,10 @@ public: class FL_EXPORT Flcc_ValueBox : public Fl_Widget { int py; protected: - void draw() override; + void draw(); int handle_key(int); public: - int handle(int) override; + int handle(int); Flcc_ValueBox(int X, int Y, int W, int H) : Fl_Widget(X,Y,W,H) { py = 0;} }; @@ -61,8 +61,8 @@ public: /** For internal use only */ class FL_EXPORT Flcc_Value_Input : public Fl_Value_Input { public: - int format(char*) override; - std::string format_str() override; + int format(char*); + std::string format_str(); Flcc_Value_Input(int X, int Y, int W, int H) : Fl_Value_Input(X,Y,W,H) {} }; @@ -127,7 +127,7 @@ class FL_EXPORT Fl_Color_Chooser : public Fl_Group { static void mode_cb(Fl_Widget*, void*); public: - int handle(int e) override; + int handle(int e); /** Returns which Fl_Color_Chooser variant is currently active diff --git a/FL/Fl_Copy_Surface.H b/FL/Fl_Copy_Surface.H index 905daaad8..e6410f791 100644 --- a/FL/Fl_Copy_Surface.H +++ b/FL/Fl_Copy_Surface.H @@ -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) override; - void untranslate() override; + void translate(int x, int y); + void untranslate(); public: Fl_Copy_Surface(int w, int h); ~Fl_Copy_Surface(); - void set_current() override; - bool is_current() override; + void set_current(); + bool is_current(); /** 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) override; - void origin(int x, int y) override; - int printable_rect(int *w, int *h) override; + void origin(int *x, int *y); + void origin(int x, int y); + int printable_rect(int *w, int *h); }; @@ -91,7 +91,7 @@ protected: 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; + int printable_rect(int *w, int *h); /** 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. diff --git a/FL/Fl_Counter.H b/FL/Fl_Counter.H index c28bdcb9a..f6bbbef6a 100644 --- a/FL/Fl_Counter.H +++ b/FL/Fl_Counter.H @@ -54,13 +54,13 @@ class FL_EXPORT Fl_Counter : public Fl_Valuator { protected: - void draw() override; + void draw(); // compute widths of arrow boxes void arrow_widths(int &w1, int &w2); public: - int handle(int) override; + int handle(int); Fl_Counter(int X, int Y, int W, int H, const char* L = 0); ~Fl_Counter(); diff --git a/FL/Fl_Dial.H b/FL/Fl_Dial.H index a6614d736..e11d3cb26 100644 --- a/FL/Fl_Dial.H +++ b/FL/Fl_Dial.H @@ -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() override; + void draw(); public: - int handle(int) override; + int handle(int); /** Creates a new Fl_Dial widget using the given position, size, and label string. The default type is FL_NORMAL_DIAL. diff --git a/FL/Fl_Double_Window.H b/FL/Fl_Double_Window.H index 05aae6551..62ce0ba49 100644 --- a/FL/Fl_Double_Window.H +++ b/FL/Fl_Double_Window.H @@ -30,13 +30,13 @@ class FL_EXPORT Fl_Double_Window : public Fl_Window { public: - Fl_Double_Window *as_double_window() override {return this; } - void show() override; + Fl_Double_Window *as_double_window() {return this; } + void show(); /** 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) override; - void hide() override; - void flush() override; + void resize(int,int,int,int); + void hide(); + void flush(); ~Fl_Double_Window(); /** diff --git a/FL/Fl_File_Input.H b/FL/Fl_File_Input.H index 0516484f2..e41a505a7 100644 --- a/FL/Fl_File_Input.H +++ b/FL/Fl_File_Input.H @@ -57,10 +57,10 @@ public: Fl_File_Input(int X, int Y, int W, int H, const char *L=0); - int handle(int event) override; + int handle(int event); protected: - void draw() override; + void draw(); public: /** Gets the box type used for the navigation bar. */ diff --git a/FL/Fl_Flex.H b/FL/Fl_Flex.H index adb798ea9..7f558d569 100644 --- a/FL/Fl_Flex.H +++ b/FL/Fl_Flex.H @@ -145,7 +145,7 @@ public: virtual ~Fl_Flex(); virtual void end(); - void resize(int x, int y, int w, int h) override; + void resize(int x, int y, int w, int h); /** 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) override; - void draw() override; + void on_remove(int); + void draw(); public: diff --git a/FL/Fl_FormsBitmap.H b/FL/Fl_FormsBitmap.H index 5ab5ad951..e5d6fb1db 100644 --- a/FL/Fl_FormsBitmap.H +++ b/FL/Fl_FormsBitmap.H @@ -28,7 +28,7 @@ class FL_EXPORT Fl_FormsBitmap : public Fl_Widget { Fl_Bitmap *b; protected: - void draw() override; + void draw(); public: Fl_FormsBitmap(Fl_Boxtype, int, int, int, int, const char * = 0); void set(int W, int H, const uchar *bits); diff --git a/FL/Fl_FormsPixmap.H b/FL/Fl_FormsPixmap.H index 83ff6bde3..43cccd966 100644 --- a/FL/Fl_FormsPixmap.H +++ b/FL/Fl_FormsPixmap.H @@ -29,7 +29,7 @@ class FL_EXPORT Fl_FormsPixmap : public Fl_Widget { Fl_Pixmap *b; protected: - void draw() override; + void draw(); public: Fl_FormsPixmap(Fl_Boxtype t, int X, int Y, int W, int H, const char *L= 0); diff --git a/FL/Fl_Free.H b/FL/Fl_Free.H index bee95d7ac..1424a5956 100644 --- a/FL/Fl_Free.H +++ b/FL/Fl_Free.H @@ -56,9 +56,9 @@ class FL_EXPORT Fl_Free : public Fl_Widget { FL_HANDLEPTR hfunc; static void step(void *); protected: - void draw() override; + void draw(); public: - int handle(int e) override; + int handle(int e); Fl_Free(uchar t,int X,int Y,int W,int H,const char *L,FL_HANDLEPTR hdl); ~Fl_Free(); }; diff --git a/FL/Fl_Gl_Window.H b/FL/Fl_Gl_Window.H index e81fa212d..03ba20c9a 100644 --- a/FL/Fl_Gl_Window.H +++ b/FL/Fl_Gl_Window.H @@ -73,17 +73,17 @@ class FL_EXPORT Fl_Gl_Window : public Fl_Window { static int gl_plugin_linkage(); protected: void draw_begin(); - void draw() override; + void draw(); void draw_end(); public: - void show() override; + void show(); /** Same as Fl_Window::show(int a, char **b) */ void show(int a, char **b) {Fl_Window::show(a,b);} - void flush() override; - void hide() override; - void resize(int,int,int,int) override; - int handle(int) override; + void flush(); + void hide(); + void resize(int,int,int,int); + int handle(int); /** Is turned off when FLTK creates a new context for this window or @@ -214,7 +214,7 @@ public: void make_overlay_current(); // Note: Doxygen docs in Fl_Widget.H to avoid redundancy. - Fl_Gl_Window* as_gl_window() override { return this; } + Fl_Gl_Window* as_gl_window() { return this; } Fl_Gl_Window const* as_gl_window() const override { return this; } float pixels_per_unit(); diff --git a/FL/Fl_Grid.H b/FL/Fl_Grid.H index 639988b2f..5636fddc0 100644 --- a/FL/Fl_Grid.H +++ b/FL/Fl_Grid.H @@ -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) override; + virtual void resize(int X, int Y, int W, int H); short rows() const { return rows_; } short cols() const { return cols_; } @@ -303,8 +303,8 @@ public: } protected: - virtual void draw() override; - void on_remove(int) override; + virtual void draw(); + void on_remove(int); virtual void draw_grid(); // draw grid lines for debugging public: diff --git a/FL/Fl_Group.H b/FL/Fl_Group.H index fe17684b9..8e11adb01 100644 --- a/FL/Fl_Group.H +++ b/FL/Fl_Group.H @@ -72,7 +72,7 @@ class FL_EXPORT Fl_Group : public Fl_Widget { Fl_Group& operator=(const Fl_Group&); protected: - void draw() override; + void draw(); 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) override; + int handle(int); void begin(); void end(); static Fl_Group *current(); @@ -99,15 +99,15 @@ public: /** Returns the n'th child. - Returns \c nullptr if \c n is out of range (since FLTK 1.4.0). + Returns \c 0 if \c n is out of range (since FLTK 1.4.0). <i>No range checking was done in FLTK 1.3 and older versions!</i> \param[in] n index of child (0 .. children() - 1) - \return pointer to the n'th child or nullptr if out of range + \return pointer to the n'th child or 0 if out of range */ Fl_Widget *child(int n) const { - if (n < 0 || n > children() - 1) return nullptr; + if (n < 0 || n > children() - 1) return 0; return child_[n]; } @@ -119,7 +119,7 @@ public: Fl_Widget* const* array() const; - void resize(int,int,int,int) override; + void resize(int,int,int,int); /** Creates a new Fl_Group widget using the given position, size, and label string. The default boxtype is FL_NO_BOX. @@ -239,7 +239,7 @@ public: unsigned int clip_children() { return (flags() & CLIP_CHILDREN) != 0; } // Note: Doxygen docs in Fl_Widget.H to avoid redundancy. - Fl_Group* as_group() override { return this; } + Fl_Group* as_group() { return this; } Fl_Group const* as_group() const override { return this; } // back compatibility functions: diff --git a/FL/Fl_Help_View.H b/FL/Fl_Help_View.H index f671c11db..079b6ef83 100644 --- a/FL/Fl_Help_View.H +++ b/FL/Fl_Help_View.H @@ -128,7 +128,7 @@ protected: // Widget management - void draw() override; + void draw(); public: @@ -137,10 +137,10 @@ public: // Widget management Fl_Help_View(int xx, int yy, int ww, int hh, const char *l = 0); - ~Fl_Help_View() override; + ~Fl_Help_View(); - int handle(int) override; - void resize(int,int,int,int) override; + int handle(int); + void resize(int,int,int,int); void size(int W, int H) { Fl_Widget::size(W, H); } // HTML source and raw data diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H index b342bad83..8acc3de5d 100644 --- a/FL/Fl_Image.H +++ b/FL/Fl_Image.H @@ -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() override; + ~Fl_RGB_Image(); 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) override; - void desaturate() override; - void draw(int X, int Y, int W, int H, int cx=0, int cy=0) override; + void color_average(Fl_Color c, float i); + void desaturate(); + void draw(int X, int Y, int W, int H, int cx=0, int cy=0); void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);} - void label(Fl_Widget*w) override; - void label(Fl_Menu_Item*m) override; - void uncache() override; + void label(Fl_Widget*w); + void label(Fl_Menu_Item*m); + void uncache(); 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. diff --git a/FL/Fl_Image_Surface.H b/FL/Fl_Image_Surface.H index 13aa2d40b..a658be493 100644 --- a/FL/Fl_Image_Surface.H +++ b/FL/Fl_Image_Surface.H @@ -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) override; - void untranslate() override; + void translate(int x, int y); + void untranslate(); public: Fl_Image_Surface(int w, int h, int high_res = 0, Fl_Offscreen off = 0); ~Fl_Image_Surface(); - void set_current() override; - bool is_current() override; + void set_current(); + bool is_current(); Fl_RGB_Image *image(); Fl_Shared_Image *highres_image(); - void origin(int *x, int *y) override; - void origin(int x, int y) override; - int printable_rect(int *w, int *h) override; + void origin(int *x, int *y); + void origin(int x, int y); + int printable_rect(int *w, int *h); Fl_Offscreen offscreen(); void rescale(); void mask(const Fl_RGB_Image *); @@ -114,7 +114,7 @@ protected: 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; + int printable_rect(int *w, int *h); virtual Fl_RGB_Image *image() = 0; virtual void mask(const Fl_RGB_Image *) {} /** Each platform implements this function its own way. diff --git a/FL/Fl_Input.H b/FL/Fl_Input.H index 4aebeebc5..1ef0d8fed 100644 --- a/FL/Fl_Input.H +++ b/FL/Fl_Input.H @@ -255,12 +255,12 @@ class FL_EXPORT Fl_Input : public Fl_Input_ { int kf_copy_cut(); protected: - void draw() override; + void draw(); int handle_key(); int handle_rmb(); public: - int handle(int) override; + int handle(int); Fl_Input(int,int,int,int,const char * = 0); static const char *cut_menu_text; static const char *copy_menu_text; diff --git a/FL/Fl_Input_.H b/FL/Fl_Input_.H index 80d3869dc..81d1baf6a 100644 --- a/FL/Fl_Input_.H +++ b/FL/Fl_Input_.H @@ -224,7 +224,7 @@ protected: public: /* Change the size of the widget. */ - void resize(int, int, int, int) override; + void resize(int, int, int, int); /* Constructor */ Fl_Input_(int, int, int, int, const char* = 0); diff --git a/FL/Fl_Input_Choice.H b/FL/Fl_Input_Choice.H index 0339add1f..b2023052f 100644 --- a/FL/Fl_Input_Choice.H +++ b/FL/Fl_Input_Choice.H @@ -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() override; + void draw(); const Fl_Menu_Item* popup(); public: InputMenuButton(int X, int Y, int W, int H, const char *L=0); - int handle(int e) override; + int handle(int e); }; 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() override; + void draw(); 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) override; + void resize(int X, int Y, int W, int H); /** Adds an item to the menu. When any item is selected, the Fl_Input_Choice callback() is invoked, diff --git a/FL/Fl_Light_Button.H b/FL/Fl_Light_Button.H index fb914b9ce..4eaa5c05e 100644 --- a/FL/Fl_Light_Button.H +++ b/FL/Fl_Light_Button.H @@ -35,9 +35,9 @@ */ class FL_EXPORT Fl_Light_Button : public Fl_Button { protected: - void draw() override; + void draw(); public: - int handle(int) override; + int handle(int); Fl_Light_Button(int x,int y,int w,int h,const char *l = 0); }; diff --git a/FL/Fl_Menu_Bar.H b/FL/Fl_Menu_Bar.H index 9def6a536..629936b84 100644 --- a/FL/Fl_Menu_Bar.H +++ b/FL/Fl_Menu_Bar.H @@ -69,9 +69,9 @@ class FL_EXPORT Fl_Menu_Bar : public Fl_Menu_ { friend class Fl_Sys_Menu_Bar_Driver; protected: - void draw() override; + void draw(); public: - int handle(int) override; + int handle(int); /** Creates a new Fl_Menu_Bar widget using the given position, size, and label string. The default boxtype is FL_UP_BOX. diff --git a/FL/Fl_Menu_Button.H b/FL/Fl_Menu_Button.H index 115f6f0a0..01c77b484 100644 --- a/FL/Fl_Menu_Button.H +++ b/FL/Fl_Menu_Button.H @@ -59,7 +59,7 @@ */ class FL_EXPORT Fl_Menu_Button : public Fl_Menu_ { protected: - void draw() override; + void draw(); 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) override; + int handle(int); const Fl_Menu_Item* popup(); Fl_Menu_Button(int,int,int,int,const char * =0); }; diff --git a/FL/Fl_Native_File_Chooser.H b/FL/Fl_Native_File_Chooser.H index f2055f925..b1339921e 100644 --- a/FL/Fl_Native_File_Chooser.H +++ b/FL/Fl_Native_File_Chooser.H @@ -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) override; + void type(int t); int type() const override; - void options(int o) override; + void options(int o); 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; + void directory(const char *val); const char *directory() const override; - void title(const char *t) override; + void title(const char *t); const char* title() const override; const char *filter() const override; - void filter(const char *f) override; + void filter(const char *f); int filters() const override; - void filter_value(int i) override; + void filter_value(int i); int filter_value() const override; - void preset_file(const char*f) override; + void preset_file(const char*f); const char* preset_file() const override; const char *errmsg() const override; - int show() override; + int show(); }; /** diff --git a/FL/Fl_Overlay_Window.H b/FL/Fl_Overlay_Window.H index 064ddd734..b5bc167d9 100644 --- a/FL/Fl_Overlay_Window.H +++ b/FL/Fl_Overlay_Window.H @@ -49,10 +49,10 @@ public: private: Fl_Window *overlay_; public: - void show() override; - void hide() override; - void flush() override; - void resize(int,int,int,int) override; + void show(); + void hide(); + void flush(); + void resize(int,int,int,int); ~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() override {return this; } + Fl_Overlay_Window *as_overlay_window() {return this; } }; #endif diff --git a/FL/Fl_PDF_File_Surface.H b/FL/Fl_PDF_File_Surface.H index 16eabce5c..f10ff7f75 100644 --- a/FL/Fl_PDF_File_Surface.H +++ b/FL/Fl_PDF_File_Surface.H @@ -54,7 +54,7 @@ public: */ int begin_job(const char* defaultfilename, char **perr = NULL); /** Don't use for this class */ - int begin_job(int, int *, int *, char **) override {return 1;} + int begin_job(int, int *, int *, char **) {return 1;} /** Prepare to draw to a PDF document identified by its pathname. \param pathname Path name for the PDF document \param format The paper format for the PDF document @@ -67,23 +67,23 @@ public: enum Fl_Paged_Device::Page_Format format = Fl_Paged_Device::A4, enum Fl_Paged_Device::Page_Layout layout = Fl_Paged_Device::PORTRAIT, char **perr = NULL); - int printable_rect(int *w, int *h) override { return platform_surface_->printable_rect(w,h); } - void margins(int *left, int *top, int *right, int *bottom) override { + int printable_rect(int *w, int *h) { return platform_surface_->printable_rect(w,h); } + void margins(int *left, int *top, int *right, int *bottom) { platform_surface_->margins(left,top,right,bottom); } - void origin(int x, int y) override {platform_surface_->origin(x, y);} - void origin(int *x, int *y) override {platform_surface_->origin(x, y);} - void scale(float s_x, float s_y = 0) override {platform_surface_->scale(s_x, s_y);} - void rotate(float angle) override {platform_surface_->rotate(angle);} - void translate(int x, int y) override {platform_surface_->translate(x, y);} - void untranslate() override {platform_surface_->untranslate();} - int begin_page(void) override {return platform_surface_->begin_page();} - int end_page(void) override {return platform_surface_->end_page();} - void end_job(void) override {return platform_surface_->end_job();} + void origin(int x, int y) {platform_surface_->origin(x, y);} + void origin(int *x, int *y) {platform_surface_->origin(x, y);} + void scale(float s_x, float s_y = 0) {platform_surface_->scale(s_x, s_y);} + void rotate(float angle) {platform_surface_->rotate(angle);} + void translate(int x, int y) {platform_surface_->translate(x, y);} + void untranslate() {platform_surface_->untranslate();} + int begin_page(void) {return platform_surface_->begin_page();} + int end_page(void) {return platform_surface_->end_page();} + void end_job(void) {return platform_surface_->end_job();} /** Returns the name of the PDF document */ inline const char *pdf_filename() { return *out_filename_; } - void set_current() override { if (platform_surface_) platform_surface_->set_current(); } - bool is_current() override { return surface() == platform_surface_; } + void set_current() { if (platform_surface_) platform_surface_->set_current(); } + bool is_current() { return surface() == platform_surface_; } }; #endif // PDF_FILE_SURFACE_H diff --git a/FL/Fl_Pack.H b/FL/Fl_Pack.H index 334123115..9bcbbb551 100644 --- a/FL/Fl_Pack.H +++ b/FL/Fl_Pack.H @@ -69,7 +69,7 @@ public: protected: void draw_filler_(const Fl_Rect& rect); - void draw() override; + void draw(); public: Fl_Pack(int X, int Y, int W, int H, const char *L = 0); @@ -100,7 +100,7 @@ public: */ uchar horizontal() const {return type();} - void resize(int X, int Y, int W, int H) override; + void resize(int X, int Y, int W, int H); /** Deletes all child widgets with Fl_Group::clear(). And sets to NULL the resizable() widget. */ void clear() { Fl_Group::clear(); resizable(NULL); } diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index 13809063f..8078bfb6f 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -65,13 +65,13 @@ public: virtual ~Fl_Pixmap(); 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) override; - void desaturate() override; - void draw(int X, int Y, int W, int H, int cx=0, int cy=0) override; + void color_average(Fl_Color c, float i); + void desaturate(); + void draw(int X, int Y, int W, int H, int cx=0, int cy=0); void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);} - void label(Fl_Widget*w) override; - void label(Fl_Menu_Item*m) override; - void uncache() override; + void label(Fl_Widget*w); + void label(Fl_Menu_Item*m); + void uncache(); int cache_w() {return cache_w_;} int cache_h() {return cache_h_;} }; diff --git a/FL/Fl_Positioner.H b/FL/Fl_Positioner.H index 57d16a073..17963f614 100644 --- a/FL/Fl_Positioner.H +++ b/FL/Fl_Positioner.H @@ -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() override; + void draw(); public: - int handle(int) override; + int handle(int); /** Creates a new Fl_Positioner widget using the given position, size, and label string. The default boxtype is FL_NO_BOX. diff --git a/FL/Fl_PostScript.H b/FL/Fl_PostScript.H index 8de3f60c1..a0ccde431 100644 --- a/FL/Fl_PostScript.H +++ b/FL/Fl_PostScript.H @@ -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) override; + int begin_job(int pagecount, int* from, int* to, char **perr_message); /** 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) 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; + 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); /** 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) override; + void end_job(void); /** 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() override; - void end_current() override; + void set_current(); + void end_current(); }; /** Encapsulated PostScript drawing surface. @@ -198,13 +198,13 @@ public: with fl_alert(). */ ~Fl_EPS_File_Surface(); - int printable_rect(int *w, int *h) override; + int printable_rect(int *w, int *h); /** Returns the underlying FILE pointer */ FILE *file(); - void origin(int x, int y) override; - void origin(int *px, int *py) override; - void translate(int x, int y) override; - void untranslate() override; + void origin(int x, int y); + void origin(int *px, int *py); + void translate(int x, int y); + void untranslate(); /** 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. */ diff --git a/FL/Fl_Printer.H b/FL/Fl_Printer.H index 31926eff3..084e37736 100644 --- a/FL/Fl_Printer.H +++ b/FL/Fl_Printer.H @@ -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) 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; + 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); + void set_current(void); + bool is_current(); /** \name These attributes are useful for the Linux/Unix platform only. \{ diff --git a/FL/Fl_Progress.H b/FL/Fl_Progress.H index 9fa7b72a8..6a09a19db 100644 --- a/FL/Fl_Progress.H +++ b/FL/Fl_Progress.H @@ -41,7 +41,7 @@ class FL_EXPORT Fl_Progress : public Fl_Widget { protected: - void draw() override; + void draw(); public: diff --git a/FL/Fl_Repeat_Button.H b/FL/Fl_Repeat_Button.H index 7e85b0bfb..08ac61a33 100644 --- a/FL/Fl_Repeat_Button.H +++ b/FL/Fl_Repeat_Button.H @@ -31,7 +31,7 @@ class FL_EXPORT Fl_Repeat_Button : public Fl_Button { static void repeat_callback(void *); public: - int handle(int) override; + int handle(int); /** Creates a new Fl_Repeat_Button widget using the given position, size, and label string. The default boxtype is FL_UP_BOX. diff --git a/FL/Fl_Return_Button.H b/FL/Fl_Return_Button.H index 2f344aeeb..d998dd31f 100644 --- a/FL/Fl_Return_Button.H +++ b/FL/Fl_Return_Button.H @@ -30,9 +30,9 @@ */ class FL_EXPORT Fl_Return_Button : public Fl_Button { protected: - void draw() override; + void draw(); public: - int handle(int) override; + int handle(int); /** Creates a new Fl_Return_Button widget using the given position, size, and label string. The default boxtype is FL_UP_BOX. diff --git a/FL/Fl_Roller.H b/FL/Fl_Roller.H index 03ec835ac..5f3c61d10 100644 --- a/FL/Fl_Roller.H +++ b/FL/Fl_Roller.H @@ -37,9 +37,9 @@ */ class FL_EXPORT Fl_Roller : public Fl_Valuator { protected: - void draw() override; + void draw(); public: - int handle(int) override; + int handle(int); Fl_Roller(int X,int Y,int W,int H,const char* L=0); }; diff --git a/FL/Fl_SVG_File_Surface.H b/FL/Fl_SVG_File_Surface.H index 0fe06daa6..f00f2f788 100644 --- a/FL/Fl_SVG_File_Surface.H +++ b/FL/Fl_SVG_File_Surface.H @@ -65,11 +65,11 @@ public: ~Fl_SVG_File_Surface(); /** Returns the underlying FILE pointer */ FILE *file(); - 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; + void origin(int x, int y); + void origin(int *x, int *y); + void translate(int x, int y); + void untranslate(); + int printable_rect(int *w, int *h); /** 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. diff --git a/FL/Fl_SVG_Image.H b/FL/Fl_SVG_Image.H index d49d1db59..0a47b0ca6 100644 --- a/FL/Fl_SVG_Image.H +++ b/FL/Fl_SVG_Image.H @@ -149,7 +149,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) override; + void cache_size_(int &width, int &height); void init_(const char *name, const unsigned char *filedata, size_t length); Fl_SVG_Image(const Fl_SVG_Image *source); public: @@ -165,13 +165,13 @@ public: return Fl_Image::copy(); } void resize(int width, int height); - 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 desaturate(); + void color_average(Fl_Color c, float i); + void draw(int X, int Y, int W, int H, int cx = 0, int cy = 0); void draw(int X, int Y) { draw(X, Y, w(), h(), 0, 0); } - Fl_SVG_Image *as_svg_image() override { return this; } + Fl_SVG_Image *as_svg_image() { return this; } const Fl_SVG_Image *as_svg_image() const override { return this; } - void normalize() override; + void normalize(); }; #endif // FL_SVG_IMAGE_H diff --git a/FL/Fl_Scheme_Choice.H b/FL/Fl_Scheme_Choice.H index 7bcdd05bb..7a6a93612 100644 --- a/FL/Fl_Scheme_Choice.H +++ b/FL/Fl_Scheme_Choice.H @@ -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) override; + int handle(int event); // set the current value according to the active scheme virtual void init_value(); diff --git a/FL/Fl_Scroll.H b/FL/Fl_Scroll.H index fbcd02946..bec7c06c7 100644 --- a/FL/Fl_Scroll.H +++ b/FL/Fl_Scroll.H @@ -146,19 +146,19 @@ protected: // (STR#1895) protected: - int on_insert(Fl_Widget*, int) override; - int on_move(int, int) override; + int on_insert(Fl_Widget*, int); + int on_move(int, int); void fix_scrollbar_order(); void bbox(int&,int&,int&,int&) const; - void draw() override; + void draw(); public: Fl_Scrollbar scrollbar; Fl_Scrollbar hscrollbar; - void resize(int X, int Y, int W, int H) override; - int handle(int) override; + void resize(int X, int Y, int W, int H); + int handle(int); 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) override; + int delete_child(int n); /** Gets the current size of the scrollbars' troughs, in pixels. diff --git a/FL/Fl_Scrollbar.H b/FL/Fl_Scrollbar.H index 23cc21d9c..f4542cfdc 100644 --- a/FL/Fl_Scrollbar.H +++ b/FL/Fl_Scrollbar.H @@ -45,13 +45,13 @@ class FL_EXPORT Fl_Scrollbar : public Fl_Slider { static void timeout_cb(void*); void increment_cb(); protected: - void draw() override; + void draw(); public: Fl_Scrollbar(int X,int Y,int W,int H, const char *L = 0); ~Fl_Scrollbar(); - int handle(int) override; + int handle(int); /** Gets the integer value (position) of the slider in the scrollbar. diff --git a/FL/Fl_Secret_Input.H b/FL/Fl_Secret_Input.H index 0d66d70a4..0c7eb1666 100644 --- a/FL/Fl_Secret_Input.H +++ b/FL/Fl_Secret_Input.H @@ -39,7 +39,7 @@ public: Inherited destructor destroys the widget and any value associated with it. */ Fl_Secret_Input(int X,int Y,int W,int H,const char *l = 0); - int handle(int) override; + int handle(int); }; #endif diff --git a/FL/Fl_Shared_Image.H b/FL/Fl_Shared_Image.H index c8dee6239..2490c283a 100644 --- a/FL/Fl_Shared_Image.H +++ b/FL/Fl_Shared_Image.H @@ -145,10 +145,10 @@ public: */ int original() { return original_; } - void release() override; + void release(); virtual void reload(); - Fl_Shared_Image *as_shared_image() override { + Fl_Shared_Image *as_shared_image() { return this; } @@ -156,11 +156,11 @@ public: Fl_Image *copy() const; Fl_Image *copy(); - 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 color_average(Fl_Color c, float i); + void desaturate(); + void draw(int X, int Y, int W, int H, int cx = 0, int cy = 0); void draw(int X, int Y) { draw(X, Y, w(), h(), 0, 0); } - void uncache() override; + void uncache(); static Fl_Shared_Image *find(const char *name, int W = 0, int H = 0); static Fl_Shared_Image *get(const char *name, int W = 0, int H = 0); diff --git a/FL/Fl_Shortcut_Button.H b/FL/Fl_Shortcut_Button.H index 2baa55f3a..055869858 100644 --- a/FL/Fl_Shortcut_Button.H +++ b/FL/Fl_Shortcut_Button.H @@ -27,8 +27,8 @@ private: protected: Fl_Shortcut shortcut_value; void do_end_hot_callback(); - int handle(int) override; - void draw() override; + int handle(int); + void draw(); public: Fl_Shortcut_Button(int X,int Y,int W,int H, const char* l = 0); void value(Fl_Shortcut shortcut); diff --git a/FL/Fl_Single_Window.H b/FL/Fl_Single_Window.H index 6c8a669ea..a1aba9f57 100644 --- a/FL/Fl_Single_Window.H +++ b/FL/Fl_Single_Window.H @@ -31,7 +31,7 @@ */ class FL_EXPORT Fl_Single_Window : public Fl_Window { public: - void show() override; + void show(); /** Same as Fl_Window::show(int argc, char **argv) */ void show(int argc, char **argv) { Fl_Window::show(argc, argv);} @@ -55,7 +55,7 @@ public: /** Same as Fl_Window::flush() */ - void flush() override { Fl_Window::flush(); } + void flush() { Fl_Window::flush(); } }; #endif diff --git a/FL/Fl_Slider.H b/FL/Fl_Slider.H index ded8cde38..b22d98026 100644 --- a/FL/Fl_Slider.H +++ b/FL/Fl_Slider.H @@ -98,7 +98,7 @@ protected: // these allow subclasses to put the slider in a smaller area: void draw(int, int, int, int); int handle(int, int, int, int, int); - void draw() override; + void draw(); void draw_ticks(const Fl_Rect& r, int S); double value_to_position(double val) const; double position_to_value(double pos) const; @@ -106,7 +106,7 @@ protected: public: - int handle(int) override; + int handle(int); Fl_Slider(int X,int Y,int W,int H, const char *L = 0); Fl_Slider(uchar t,int X,int Y,int W,int H, const char *L); diff --git a/FL/Fl_Spinner.H b/FL/Fl_Spinner.H index 93b3431bc..d90a837b5 100644 --- a/FL/Fl_Spinner.H +++ b/FL/Fl_Spinner.H @@ -58,7 +58,7 @@ protected: public: Fl_Spinner_Input(int X, int Y, int W, int H) : Fl_Input(X, Y, W, H) {} - int handle(int event) override; // implemented in src/Fl_Spinner.cxx + int handle(int event); // implemented in src/Fl_Spinner.cxx }; Fl_Spinner_Input input_; // Input field for the value @@ -66,16 +66,16 @@ protected: up_button_, // Up button down_button_; // Down button - void draw() override; + void draw(); public: // Constructor Fl_Spinner(int X, int Y, int W, int H, const char *L = 0); // Event handling - int handle(int event) override; + int handle(int event); // Resize group and subwidgets - void resize(int X, int Y, int W, int H) override; + void resize(int X, int Y, int W, int H); /** Returns the format string for the value. */ const char *format() const { return (format_); } diff --git a/FL/Fl_Sys_Menu_Bar.H b/FL/Fl_Sys_Menu_Bar.H index fbc145219..d20c0a6a7 100644 --- a/FL/Fl_Sys_Menu_Bar.H +++ b/FL/Fl_Sys_Menu_Bar.H @@ -95,7 +95,7 @@ class Fl_Sys_Menu_Bar_Driver; class FL_EXPORT Fl_Sys_Menu_Bar : public Fl_Menu_Bar { static Fl_Sys_Menu_Bar_Driver *driver(); protected: - void draw() override; + void draw(); public: /** Possible styles of the Window menu in the system menu bar */ typedef enum { @@ -110,8 +110,8 @@ public: */ const Fl_Menu_Item *menu() const {return Fl_Menu_::menu();} void menu(const Fl_Menu_Item *m); - void update() override; - void play_menu(const Fl_Menu_Item *) override; + void update(); + void play_menu(const Fl_Menu_Item *); int add(const char* label, int shortcut, Fl_Callback*, void *user_data=0, int flags=0); /** Adds a new menu item. \see Fl_Menu_::add(const char* label, int shortcut, Fl_Callback*, void *user_data=0, int flags=0) diff --git a/FL/Fl_Table.H b/FL/Fl_Table.H index 3e3c1d695..655df6b91 100644 --- a/FL/Fl_Table.H +++ b/FL/Fl_Table.H @@ -237,7 +237,7 @@ protected: Fl_Scrollbar *hscrollbar; ///< child horizontal scrollbar widget // Fltk - int handle(int e) override; // fltk handle() override + int handle(int e); // fltk handle() override // Class maintenance void recalc_dimensions(); @@ -403,7 +403,7 @@ protected: } // draw() has to be protected per FLTK convention (was public in 1.3.x) - void draw() override; + void draw(); public: Fl_Table(int X, int Y, int W, int H, const char *l=0); @@ -730,7 +730,7 @@ public: void set_selection(int row_top, int col_left, int row_bot, int col_right); int move_cursor(int R, int C, int shiftselect); int move_cursor(int R, int C); - void resize(int X, int Y, int W, int H) override; // fltk resize() override + void resize(int X, int Y, int W, int H); // fltk resize() override // This crashes sortapp() during init. // void box(Fl_Boxtype val) { diff --git a/FL/Fl_Table_Row.H b/FL/Fl_Table_Row.H index 5e561104d..87c0eed15 100644 --- a/FL/Fl_Table_Row.H +++ b/FL/Fl_Table_Row.H @@ -67,7 +67,7 @@ private: TableRowSelectMode _selectmode; protected: - int handle(int event) override; + int handle(int event); int find_cell(TableContext context, // find cell's x/y/w/h given r/c int R, int C, int &X, int &Y, int &W, int &H) { return(Fl_Table::find_cell(context, R, C, X, Y, W, H)); @@ -94,7 +94,7 @@ public: */ ~Fl_Table_Row() { } - void rows(int val) override; // set number of rows + void rows(int val); // set number of rows int rows() { // get number of rows return(Fl_Table::rows()); } @@ -124,7 +124,7 @@ public: */ void select_all_rows(int flag=1); // all rows to a known state - void clear() override { + void clear() { rows(0); // implies clearing selection cols(0); Fl_Table::clear(); // clear the table diff --git a/FL/Fl_Tabs.H b/FL/Fl_Tabs.H index 3ac76e3b5..0d2c1f283 100644 --- a/FL/Fl_Tabs.H +++ b/FL/Fl_Tabs.H @@ -266,9 +266,9 @@ protected: void handle_overflow_menu(); void draw_overflow_menu_button(); - int on_insert(Fl_Widget*, int) override; - int on_move(int, int) override; - void on_remove(int) override; + int on_insert(Fl_Widget*, int); + int on_move(int, int); + void on_remove(int); virtual void redraw_tabs(); virtual int tab_positions(); // allocate and calculate tab positions @@ -279,17 +279,17 @@ protected: virtual int hit_overflow_menu(int event_x, int event_y); virtual int hit_tabs_area(int event_x, int event_y); - void draw() override; + void draw(); public: Fl_Tabs(int X, int Y, int W, int H, const char *L = 0); - ~Fl_Tabs() override; + ~Fl_Tabs(); - void resize(int, int, int, int) override; - void show() override; + void resize(int, int, int, int); + void show(); - int handle(int) override; + int handle(int); Fl_Widget *value(); int value(Fl_Widget *); diff --git a/FL/Fl_Terminal.H b/FL/Fl_Terminal.H index 97f2ca081..cfe98df26 100644 --- a/FL/Fl_Terminal.H +++ b/FL/Fl_Terminal.H @@ -1041,9 +1041,9 @@ private: int handle_selection(int e); public: // FLTK: draw(), resize(), handle() - void draw(void) override; - void resize(int X,int Y,int W,int H) override; - int handle(int e) override; + void draw(void); + void resize(int X,int Y,int W,int H); + int handle(int e); const char* text(bool lines_below_cursor=false) const; protected: diff --git a/FL/Fl_Text_Display.H b/FL/Fl_Text_Display.H index d1975c851..ab3d2a1b5 100644 --- a/FL/Fl_Text_Display.H +++ b/FL/Fl_Text_Display.H @@ -167,7 +167,7 @@ public: Fl_Text_Display(int X, int Y, int W, int H, const char *l = 0); ~Fl_Text_Display(); - int handle(int e) override; + int handle(int e); void buffer(Fl_Text_Buffer* buf); @@ -434,7 +434,7 @@ public: virtual void recalc_display(); virtual void display_needs_recalc(); - void resize(int X, int Y, int W, int H) override; + void resize(int X, int Y, int W, int H); /** Convert an x pixel position into a column number. @@ -472,7 +472,7 @@ protected: // Anything with "vline" indicates thats it deals with currently // visible lines. - void draw() override; + void draw(); void draw_text(int X, int Y, int W, int H); void draw_range(int start, int end); void draw_cursor(int, int); diff --git a/FL/Fl_Text_Editor.H b/FL/Fl_Text_Editor.H index fbe38ddb8..e018ee059 100644 --- a/FL/Fl_Text_Editor.H +++ b/FL/Fl_Text_Editor.H @@ -50,7 +50,7 @@ class FL_EXPORT Fl_Text_Editor : public Fl_Text_Display { Fl_Text_Editor(int X, int Y, int W, int H, const char* l = 0); ~Fl_Text_Editor() { remove_all_key_bindings(); } - int handle(int e) override; + int handle(int e); /** Sets the current insert mode; if non-zero, new text is inserted before the current cursor position. Otherwise, new diff --git a/FL/Fl_Tile.H b/FL/Fl_Tile.H index aecb382ba..70cc0dbd4 100644 --- a/FL/Fl_Tile.H +++ b/FL/Fl_Tile.H @@ -26,10 +26,10 @@ class FL_EXPORT Fl_Tile : public Fl_Group { public: - int handle(int event) override; + int handle(int event); Fl_Tile(int X, int Y, int W, int H, const char *L=0); - ~Fl_Tile() override; - void resize(int X, int Y, int W, int H) override; + ~Fl_Tile(); + void resize(int X, int Y, int W, int H); virtual void move_intersection(int oldx, int oldy, int newx, int newy); virtual void drag_intersection(int oldx, int oldy, int newx, int newy); FL_DEPRECATED("since 1.4.0 - use move_intersection(p) instead", @@ -67,9 +67,9 @@ protected: void request_grow_t(int old_t, int &new_t, Fl_Rect *final_size); void request_grow_b(int old_b, int &new_b, Fl_Rect *final_size); - int on_insert(Fl_Widget*, int) override; - int on_move(int, int) override; - void on_remove(int) override; + int on_insert(Fl_Widget*, int); + int on_move(int, int); + void on_remove(int); }; #endif diff --git a/FL/Fl_Tiled_Image.H b/FL/Fl_Tiled_Image.H index bfc748ddb..4efc89b6f 100644 --- a/FL/Fl_Tiled_Image.H +++ b/FL/Fl_Tiled_Image.H @@ -43,9 +43,9 @@ public: Fl_Image *copy() const { return Fl_Image::copy(); } - 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 color_average(Fl_Color c, float i); + void desaturate(); + void draw(int X, int Y, int W, int H, int cx = 0, int cy = 0); void draw(int X, int Y) { draw(X, Y, w(), h(), 0, 0); } /** Gets The image that is tiled */ Fl_Image *image() { return image_; } diff --git a/FL/Fl_Timer.H b/FL/Fl_Timer.H index 89f1a5d26..6c9db28a1 100644 --- a/FL/Fl_Timer.H +++ b/FL/Fl_Timer.H @@ -43,9 +43,9 @@ class FL_EXPORT Fl_Timer : public Fl_Widget { double delay, total; long lastsec,lastusec; protected: - void draw() override; + void draw(); public: - int handle(int) override; + int handle(int); Fl_Timer(uchar t,int x,int y,int w,int h, const char *l); ~Fl_Timer(); void value(double); diff --git a/FL/Fl_Tree.H b/FL/Fl_Tree.H index d9b2a47aa..3d85066e8 100644 --- a/FL/Fl_Tree.H +++ b/FL/Fl_Tree.H @@ -312,14 +312,14 @@ protected: // undocmented draw_tree() dropped -- draw() does all the work now // draw() has to be protected per FLTK convention (was public in 1.3.x) - void draw() override; + void draw(); public: Fl_Tree(int X, int Y, int W, int H, const char *L=0); ~Fl_Tree(); - int handle(int e) override; + int handle(int e); void show_self(); - void resize(int,int,int,int) override; + void resize(int,int,int,int); /////////////////////// // root methods diff --git a/FL/Fl_Valuator.H b/FL/Fl_Valuator.H index 74f17049a..5855971fb 100644 --- a/FL/Fl_Valuator.H +++ b/FL/Fl_Valuator.H @@ -72,7 +72,7 @@ protected: public: /** Destructor is accessible despite protected constructor. */ - ~Fl_Valuator() override { } + ~Fl_Valuator() { } /** Sets the minimum (a) and maximum (b) values for the valuator widget. */ void bounds(double a, double b) {min=a; max=b;} /** Gets the minimum value for the valuator. */ diff --git a/FL/Fl_Value_Input.H b/FL/Fl_Value_Input.H index f46818146..f0f30e626 100644 --- a/FL/Fl_Value_Input.H +++ b/FL/Fl_Value_Input.H @@ -61,13 +61,13 @@ public: private: char soft_; static void input_cb(Fl_Widget*,void*); - void value_damage() override; // cause damage() due to value() changing + void value_damage(); // cause damage() due to value() changing public: - int handle(int) override; + int handle(int); protected: - void draw() override; + void draw(); public: - void resize(int,int,int,int) override; + void resize(int,int,int,int); Fl_Value_Input(int x,int y,int w,int h,const char *l=0); ~Fl_Value_Input(); diff --git a/FL/Fl_Value_Output.H b/FL/Fl_Value_Output.H index 1d1984da0..c78383286 100644 --- a/FL/Fl_Value_Output.H +++ b/FL/Fl_Value_Output.H @@ -43,10 +43,10 @@ class FL_EXPORT Fl_Value_Output : public Fl_Valuator { Fl_Color textcolor_; protected: - void draw() override; + void draw(); public: - int handle(int) override; + int handle(int); Fl_Value_Output(int x,int y,int w,int h,const char *l=0); /** diff --git a/FL/Fl_Value_Slider.H b/FL/Fl_Value_Slider.H index 9293c6831..e49b046a1 100644 --- a/FL/Fl_Value_Slider.H +++ b/FL/Fl_Value_Slider.H @@ -36,10 +36,10 @@ class FL_EXPORT Fl_Value_Slider : public Fl_Slider { short value_height_; protected: - void draw() override; + void draw(); public: - int handle(int) override; + int handle(int); Fl_Value_Slider(int x, int y, int w, int h, const char *l = 0); /** Gets the typeface of the text in the value box. */ diff --git a/FL/Fl_Widget_Tracker.H b/FL/Fl_Widget_Tracker.H index fb2182e5f..0a2a5b6da 100644 --- a/FL/Fl_Widget_Tracker.H +++ b/FL/Fl_Widget_Tracker.H @@ -87,11 +87,11 @@ public: /** Clear the widget pointer. */ - void clear() { wp_ = nullptr; } + void clear() { wp_ = 0; } /** Returns a pointer to the watched widget. - \return nullptr if the widget was deleted. + \return 0 if the widget was deleted. */ Fl_Widget *widget() { return wp_; } @@ -99,13 +99,13 @@ public: Check if the widget was deleted since the tracker was created. \return 1 if the watched widget has been deleted, otherwise 0 */ - int deleted() {return wp_ == nullptr;} + int deleted() {return wp_ == 0;} /** Check if the widget exists and was not deleted since the tracker was created. \return 1 if the watched widget exists, otherwise 0 */ - int exists() { return wp_ != nullptr; } + int exists() { return wp_ != 0; } }; diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index d832b1b88..827ca8035 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -97,7 +97,7 @@ protected: /** Stores the last window that was made current. See current() const */ static Fl_Window *current_; - void draw() override; + void draw(); public: @@ -198,7 +198,7 @@ public: */ virtual ~Fl_Window(); - int handle(int) override; + int handle(int); /** Changes the size and position of the window. If shown() is true, @@ -216,7 +216,7 @@ public: dimensions. It is up to the application developer to verify window parameters after the resize request. */ - void resize(int X,int Y,int W,int H) override; + void resize(int X,int Y,int W,int H); /** Sets whether or not the window manager border is around the window. The default value is true. The macOS platform ignores requests to change the border state of a fullscreen or maximized window. @@ -422,12 +422,12 @@ public: \see Fl_Window::show(int argc, char **argv) */ - void show() override; + void show(); /** Removes the window from the screen. If the window is already hidden or has not been shown then this does nothing and is harmless. */ - void hide() override; + void hide(); /** Puts the window on the screen with show() and parses command-line arguments. @@ -560,7 +560,7 @@ public: int decorated_h() const; // Note: Doxygen docs in Fl_Widget.H to avoid redundancy. - Fl_Window* as_window() override { return this; } + Fl_Window* as_window() { return this; } Fl_Window const* as_window() const override { return this; } /** diff --git a/FL/Fl_Wizard.H b/FL/Fl_Wizard.H index 37b781d3a..2fc06be19 100644 --- a/FL/Fl_Wizard.H +++ b/FL/Fl_Wizard.H @@ -43,7 +43,7 @@ class FL_EXPORT Fl_Wizard : public Fl_Group { protected: - void draw() override; + void draw(); public: diff --git a/FL/core/function_types.H b/FL/core/function_types.H index 7961f7632..741b781fb 100644 --- a/FL/core/function_types.H +++ b/FL/core/function_types.H @@ -90,7 +90,7 @@ typedef void (*Fl_Idle_Handler)(void *data); /** Signature of add_idle callback function passed as parameter. This signature allows an idle callback without parameters. When the callback is called it is called with an additional - parameter (set to nullptr) which is not used by the callback. + parameter (set to 0) which is not used by the callback. */ typedef void (*Fl_Old_Idle_Handler)(); diff --git a/FL/forms.H b/FL/forms.H index c8c6df10a..e68c1cc97 100644 --- a/FL/forms.H +++ b/FL/forms.H @@ -817,7 +817,7 @@ inline void fl_set_slider_precision(Fl_Widget* o, int i) { // meaning of FL_ALIGN_INSIDE. Implementation in forms.cxx class FL_EXPORT Fl_FormsText : public Fl_Widget { protected: - void draw() override; + void draw(); public: Fl_FormsText(Fl_Boxtype b, int X, int Y, int W, int H, const char* l=0) : Fl_Widget(X,Y,W,H,l) {box(b); align(FL_ALIGN_LEFT);} @@ -54,9 +54,9 @@ class FL_EXPORT Fl_Glut_Window : public Fl_Gl_Window { void _init(); int mouse_down; protected: - void draw() override; - void draw_overlay() override; - int handle(int) override; + void draw(); + void draw_overlay(); + int handle(int); public: // so the inline functions work int number; int menu[3]; diff --git a/FL/names.h b/FL/names.h index e2072e058..33bc6caa4 100644 --- a/FL/names.h +++ b/FL/names.h @@ -190,7 +190,7 @@ const char * const fl_callback_reason_names[] = \return C++ symbol of reason as a string */ inline std::string fl_callback_reason_str(int reason) { - if ((reason < 0) || (reason >= FL_REASON_USER+3) || (fl_callback_reason_names[reason] == nullptr)) { + if ((reason < 0) || (reason >= FL_REASON_USER+3) || (fl_callback_reason_names[reason] == 0)) { return "FL_REASON_" + std::to_string(reason); } else { return fl_callback_reason_names[reason]; |