From f93978aba486bf0fea8d9ee857d014a02f3f7d96 Mon Sep 17 00:00:00 2001 From: maxim nikonov Date: Fri, 6 Feb 2026 03:39:53 +0500 Subject: wi[ --- FL/Fl.H | 12 ++++++------ FL/Fl_Anim_GIF_Image.H | 2 +- FL/Fl_Bitmap.H | 2 +- FL/Fl_Browser.H | 24 ++++++++++++------------ FL/Fl_Browser_.H | 2 +- FL/Fl_Button.H | 2 +- FL/Fl_Cairo_Window.H | 2 +- FL/Fl_Check_Browser.H | 18 +++++++++--------- FL/Fl_Copy_Surface.H | 6 +++--- FL/Fl_Device.H | 2 +- FL/Fl_File_Browser.H | 10 +++++----- FL/Fl_Gl_Window.H | 2 +- FL/Fl_Graphics_Driver.H | 2 +- FL/Fl_Image.H | 2 +- FL/Fl_Image_Surface.H | 6 +++--- FL/Fl_Menu_Item.H | 4 ++-- FL/Fl_Native_File_Chooser.H | 24 ++++++++++++------------ FL/Fl_Pixmap.H | 2 +- FL/Fl_SVG_Image.H | 4 ++-- FL/Fl_Scroll.H | 2 +- FL/Fl_Shared_Image.H | 2 +- FL/Fl_Table.H | 10 +++++----- FL/Fl_Table_Row.H | 2 +- FL/Fl_Text_Display.H | 2 +- FL/Fl_Tiled_Image.H | 2 +- FL/Fl_Tooltip.H | 4 ++-- FL/Fl_Tree_Item.H | 4 ++-- FL/Fl_Tree_Prefs.H | 2 +- FL/Fl_Value_Input.H | 2 +- FL/Fl_Widget.H | 2 +- FL/Fl_Window.H | 4 ++-- FL/fl_attr.h | 8 ++++---- FL/fl_draw.H | 4 ++-- FL/x11.H | 2 +- 34 files changed, 90 insertions(+), 90 deletions(-) (limited to 'FL') diff --git a/FL/Fl.H b/FL/Fl.H index dd5958750..31d230da6 100644 --- a/FL/Fl.H +++ b/FL/Fl.H @@ -276,7 +276,7 @@ FL_EXPORT extern void flush(); The default version on all other platforms prints the warning message to stderr. - You can override the behavior by setting the function pointer to your + You can the behavior by setting the function pointer to your own routine. Fl::warning() means that there was a recoverable problem, the display may @@ -294,7 +294,7 @@ FL_EXPORT extern void (*warning)(const char*, ...); The default version on all other platforms prints the error message to stderr. - You can override the behavior by setting the function pointer to your + You can the behavior by setting the function pointer to your own routine. Fl::error() means there is a recoverable error such as the inability to read @@ -310,7 +310,7 @@ FL_EXPORT extern void (*error)(const char*, ...); The default version on all other platforms prints the error message to stderr. - You can override the behavior by setting the function pointer to your + You can the behavior by setting the function pointer to your own routine. Fl::fatal() must not return, as FLTK is in an unusable state, however your @@ -338,7 +338,7 @@ FL_EXPORT extern Fl_Window* next_window(const Fl_Window*); if there are no modal() windows shown(). The modal() window has its handle() method called for all events, and no other windows will have handle() - called (grab() overrides this). + called (grab() s this). */ FL_EXPORT inline Fl_Window* modal() {return modal_;} @@ -355,13 +355,13 @@ FL_EXPORT inline Fl_Window* grab() {return grab_;} Send all events to the passed window no matter where the pointer or focus is (including in other programs). The window does not have to be shown() , this lets the handle() method of a - "dummy" window override all event handling and allows you to + "dummy" window all event handling and allows you to map and unmap a complex set of windows (under both X and Windows some window must be mapped because the system interface needs a window id). If grab() is on it will also affect show() of windows by doing - system-specific operations (on X it turns on override-redirect). + system-specific operations (on X it turns on -redirect). These are designed to make menus popup reliably and faster on the system. diff --git a/FL/Fl_Anim_GIF_Image.H b/FL/Fl_Anim_GIF_Image.H index 3b8c08558..eea6d26ef 100644 --- a/FL/Fl_Anim_GIF_Image.H +++ b/FL/Fl_Anim_GIF_Image.H @@ -128,7 +128,7 @@ public: // -- overridden methods void color_average(Fl_Color c, float i); - Fl_Image *copy(int W, int H) const override; + Fl_Image *copy(int W, int H) const ; Fl_Image *copy() const { return Fl_Pixmap::copy(); } void desaturate(); void draw(int x, int y, int w, int h, int cx = 0, int cy = 0); diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H index a2b79ce5f..563ca6205 100644 --- a/FL/Fl_Bitmap.H +++ b/FL/Fl_Bitmap.H @@ -54,7 +54,7 @@ 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 override; + Fl_Image *copy(int W, int H) const ; Fl_Image *copy() const { return Fl_Image::copy(); } 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);} diff --git a/FL/Fl_Browser.H b/FL/Fl_Browser.H index bc341b7ac..ef5064171 100644 --- a/FL/Fl_Browser.H +++ b/FL/Fl_Browser.H @@ -98,18 +98,18 @@ class FL_EXPORT Fl_Browser : public Fl_Browser_ { protected: // required routines for Fl_Browser_ subclass: - 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_first() const ; + void* item_next(void* item) const ; + void* item_prev(void* item) const ; + void* item_last()const ; + int item_selected(void* item) const ; 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; - int full_height() const override; - int incr_height() const override; - const char *item_text(void *item) const override; + int item_height(void* item) const ; + int item_width(void* item) const ; + void item_draw(void* item, int X, int Y, int W, int H) const ; + int full_height() const ; + int incr_height() const ; + const char *item_text(void *item) const ; /** 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. @@ -121,7 +121,7 @@ protected: \returns The item, or NULL if line out of range. \see item_at(), find_line(), lineno() */ - void *item_at(int line) const override { return (void*)find_line(line); } + void *item_at(int line) const { return (void*)find_line(line); } FL_BLINE* find_line(int line) const ; FL_BLINE* _remove(int line) ; diff --git a/FL/Fl_Browser_.H b/FL/Fl_Browser_.H index 8eabee60d..4192485d3 100644 --- a/FL/Fl_Browser_.H +++ b/FL/Fl_Browser_.H @@ -360,7 +360,7 @@ public: has a consistent UI, is the default behavior, and is normally what you want. - Only use THIS method if you really need to override the global + Only use THIS method if you really need to the global scrollbar size. The need for this should be rare. Setting \p newSize to the special value of 0 causes the widget to diff --git a/FL/Fl_Button.H b/FL/Fl_Button.H index a6554e2d2..03e9e1f36 100644 --- a/FL/Fl_Button.H +++ b/FL/Fl_Button.H @@ -123,7 +123,7 @@ public: /** Sets the shortcut key to \c s. - Setting this overrides the use of '\&' in the label(). + Setting this s the use of '\&' in the label(). The value is a bitwise OR of a key and a set of shift flags, for example: FL_ALT | 'a', or FL_ALT | (FL_F + 10), or just diff --git a/FL/Fl_Cairo_Window.H b/FL/Fl_Cairo_Window.H index bdfe1488d..55fe0ebac 100644 --- a/FL/Fl_Cairo_Window.H +++ b/FL/Fl_Cairo_Window.H @@ -81,7 +81,7 @@ CMake option FLTK_OPTION_CAIRO_WINDOW or FLTK_OPTION_CAIRO_EXT. \note You can alternatively define your custom Cairo FLTK window, - and thus at least override the draw() method to provide custom Cairo + and thus at least the draw() method to provide custom Cairo support. In this case you will probably use Fl::cairo_make_current(Fl_Window*) to attach a context to your window. You should do this only when your window is the current window. \see Fl_Window::current() diff --git a/FL/Fl_Check_Browser.H b/FL/Fl_Check_Browser.H index cf01be626..8618abd2c 100644 --- a/FL/Fl_Check_Browser.H +++ b/FL/Fl_Check_Browser.H @@ -31,18 +31,18 @@ class FL_EXPORT Fl_Check_Browser : public Fl_Browser_ { protected: /* required routines for Fl_Browser_ subclass: */ - 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_first() const ; + void *item_next(void *) const ; + void *item_prev(void *) const ; + int item_height(void *) const ; + int item_width(void *) const ; + void item_draw(void *, int, int, int, int) const ; void item_select(void *, int); - int item_selected(void *) const override; - const char *item_text(void *item) const override; + int item_selected(void *) const ; + const char *item_text(void *item) const ; public: - void *item_at(int index) const override; + void *item_at(int index) const ; void item_swap(int ia, int ib); void item_swap(void *a, void *b); diff --git a/FL/Fl_Copy_Surface.H b/FL/Fl_Copy_Surface.H index e6410f791..bfbf53c57 100644 --- a/FL/Fl_Copy_Surface.H +++ b/FL/Fl_Copy_Surface.H @@ -88,9 +88,9 @@ 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() override = 0; - void translate(int x, int y) override = 0; - void untranslate() override = 0; + void set_current() = 0; + void translate(int x, int y) = 0; + void untranslate() = 0; int printable_rect(int *w, int *h); /** Each platform implements this function its own way. It returns an object implementing all virtual functions diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H index 764bcd114..166b2d654 100644 --- a/FL/Fl_Device.H +++ b/FL/Fl_Device.H @@ -77,7 +77,7 @@ public: /** The current drawing surface. In other words, the Fl_Surface_Device object that currently receives all graphics requests. \note It's possible to transiently remove the GUI scaling factor in place in the current - drawing surface with \ref fl_override_scale(). */ + drawing surface with \ref fl__scale(). */ static inline Fl_Surface_Device *surface() { return surface_ ? surface_ : default_surface(); } diff --git a/FL/Fl_File_Browser.H b/FL/Fl_File_Browser.H index d516be7a4..075af0f71 100644 --- a/FL/Fl_File_Browser.H +++ b/FL/Fl_File_Browser.H @@ -42,11 +42,11 @@ class FL_EXPORT Fl_File_Browser : public Fl_Browser { const char *pattern_; const char *errmsg_; - 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()); } + int full_height() const ; + int item_height(void *) const ; + int item_width(void *) const ; + void item_draw(void *, int, int, int, int) const ; + int incr_height() const { return (item_height(0) + linespacing()); } public: enum { FILES, DIRECTORIES }; diff --git a/FL/Fl_Gl_Window.H b/FL/Fl_Gl_Window.H index 03ba20c9a..2f1262f70 100644 --- a/FL/Fl_Gl_Window.H +++ b/FL/Fl_Gl_Window.H @@ -215,7 +215,7 @@ public: // Note: Doxygen docs in Fl_Widget.H to avoid redundancy. Fl_Gl_Window* as_gl_window() { return this; } - Fl_Gl_Window const* as_gl_window() const override { return this; } + Fl_Gl_Window const* as_gl_window() const { return this; } float pixels_per_unit(); /** Gives the window width in OpenGL pixels. diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H index d5c402ddf..471c06615 100644 --- a/FL/Fl_Graphics_Driver.H +++ b/FL/Fl_Graphics_Driver.H @@ -366,7 +366,7 @@ public: virtual void font_name(int num, const char *name); // Defaut implementation may be enough virtual void overlay_rect(int x, int y, int w , int h); - virtual float override_scale(); + virtual float _scale(); virtual void restore_scale(float); virtual PangoFontDescription* pango_font_description() { return NULL; } virtual void antialias(int state); diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H index 8acc3de5d..878e18595 100644 --- a/FL/Fl_Image.H +++ b/FL/Fl_Image.H @@ -366,7 +366,7 @@ public: 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_Image *copy(int W, int H) const override; + Fl_Image *copy(int W, int H) const ; Fl_Image *copy() const { return Fl_Image::copy(); } void color_average(Fl_Color c, float i); void desaturate(); diff --git a/FL/Fl_Image_Surface.H b/FL/Fl_Image_Surface.H index a658be493..46a84dbaa 100644 --- a/FL/Fl_Image_Surface.H +++ b/FL/Fl_Image_Surface.H @@ -111,9 +111,9 @@ 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() override = 0; - void translate(int x, int y) override = 0; - void untranslate() override = 0; + void set_current() = 0; + void translate(int x, int y) = 0; + void untranslate() = 0; int printable_rect(int *w, int *h); virtual Fl_RGB_Image *image() = 0; virtual void mask(const Fl_RGB_Image *) {} diff --git a/FL/Fl_Menu_Item.H b/FL/Fl_Menu_Item.H index 4dab9c624..7986af8a7 100644 --- a/FL/Fl_Menu_Item.H +++ b/FL/Fl_Menu_Item.H @@ -531,7 +531,7 @@ struct FL_EXPORT Fl_Menu_Item { /** Calls the Fl_Menu_Item item's callback, and provides the Fl_Widget argument. - This call overrides the callback's second argument with the given value \p arg. + This call s the callback's second argument with the given value \p arg. You must first check that callback() is non-zero before calling this. */ void do_callback(Fl_Widget* o, void* arg, Fl_Callback_Reason reason=FL_REASON_UNKNOWN) const { @@ -540,7 +540,7 @@ struct FL_EXPORT Fl_Menu_Item { /** Calls the Fl_Menu_Item item's callback, and provides the Fl_Widget argument. - This call overrides the callback's second argument with the + This call s the callback's second argument with the given value \p arg. long \p arg is cast to void* when calling the callback. You must first check that callback() is non-zero before calling this. diff --git a/FL/Fl_Native_File_Chooser.H b/FL/Fl_Native_File_Chooser.H index b1339921e..9948882be 100644 --- a/FL/Fl_Native_File_Chooser.H +++ b/FL/Fl_Native_File_Chooser.H @@ -253,24 +253,24 @@ public: Fl_Native_File_Chooser_FLTK_Driver(int val); virtual ~Fl_Native_File_Chooser_FLTK_Driver(); void type(int t); - int type() const override; + int type() const ; void options(int o); - int options() const override; - int count() const override; - const char *filename() const override; - const char *filename(int i) const override; + int options() const ; + int count() const ; + const char *filename() const ; + const char *filename(int i) const ; void directory(const char *val); - const char *directory() const override; + const char *directory() const ; void title(const char *t); - const char* title() const override; - const char *filter() const override; + const char* title() const ; + const char *filter() const ; void filter(const char *f); - int filters() const override; + int filters() const ; void filter_value(int i); - int filter_value() const override; + int filter_value() const ; void preset_file(const char*f); - const char* preset_file() const override; - const char *errmsg() const override; + const char* preset_file() const ; + const char *errmsg() const ; int show(); }; diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index 8078bfb6f..4eaba9f28 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -63,7 +63,7 @@ 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 override; + Fl_Image *copy(int W, int H) const ; Fl_Image *copy() const { return Fl_Image::copy(); } void color_average(Fl_Color c, float i); void desaturate(); diff --git a/FL/Fl_SVG_Image.H b/FL/Fl_SVG_Image.H index 0a47b0ca6..c5e4d8516 100644 --- a/FL/Fl_SVG_Image.H +++ b/FL/Fl_SVG_Image.H @@ -160,7 +160,7 @@ 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 override; + Fl_Image *copy(int W, int H) const ; Fl_Image *copy() const { return Fl_Image::copy(); } @@ -170,7 +170,7 @@ public: 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() { return this; } - const Fl_SVG_Image *as_svg_image() const override { return this; } + const Fl_SVG_Image *as_svg_image() const { return this; } void normalize(); }; diff --git a/FL/Fl_Scroll.H b/FL/Fl_Scroll.H index bec7c06c7..21a3616f1 100644 --- a/FL/Fl_Scroll.H +++ b/FL/Fl_Scroll.H @@ -204,7 +204,7 @@ public: has a consistent UI, is the default behavior, and is normally what you want. - Only use THIS method if you really need to override the global + Only use THIS method if you really need to the global scrollbar size. The need for this should be rare. Setting \p newSize to the special value of 0 causes the widget to diff --git a/FL/Fl_Shared_Image.H b/FL/Fl_Shared_Image.H index 2490c283a..4c521984b 100644 --- a/FL/Fl_Shared_Image.H +++ b/FL/Fl_Shared_Image.H @@ -152,7 +152,7 @@ public: return this; } - Fl_Image *copy(int W, int H) const override; + Fl_Image *copy(int W, int H) const ; Fl_Image *copy() const; Fl_Image *copy(); diff --git a/FL/Fl_Table.H b/FL/Fl_Table.H index 6d7c5d373..80a96593c 100644 --- a/FL/Fl_Table.H +++ b/FL/Fl_Table.H @@ -239,7 +239,7 @@ protected: Fl_Scrollbar *hscrollbar; ///< child horizontal scrollbar widget // Fltk - int handle(int e); // fltk handle() override + int handle(int e); // fltk handle() // Class maintenance void recalc_dimensions(); @@ -255,7 +255,7 @@ protected: // clamp r/c to known universe /** - Subclass should override this method to handle drawing the cells. + Subclass should this method to handle drawing the cells. This method will be called whenever the table is redrawn, once per cell. @@ -312,7 +312,7 @@ protected: X/Y/W/H will be the position and dimensions of where the cell should be drawn. - In the case of custom widgets, a minimal draw_cell() override might + In the case of custom widgets, a minimal draw_cell() might look like the following. With custom widgets it is up to the caller to handle drawing everything within the dimensions of the cell, including handling the selection color. Note all clipping must be handled as well; this allows drawing @@ -732,7 +732,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); // fltk resize() override + void resize(int X, int Y, int W, int H); // fltk resize() // This crashes sortapp() during init. // void box(Fl_Boxtype val) { @@ -1045,7 +1045,7 @@ public: widgets' scrollbars. This ensures your application has a consistent UI, is the default behavior, and is normally what you want. - Only use THIS method if you really need to override the global + Only use THIS method if you really need to the global scrollbar size. The need for this should be rare. Setting \p newSize to the special value of 0 causes the widget to diff --git a/FL/Fl_Table_Row.H b/FL/Fl_Table_Row.H index 6e17d356f..767b576a7 100644 --- a/FL/Fl_Table_Row.H +++ b/FL/Fl_Table_Row.H @@ -36,7 +36,7 @@ To be useful it must be subclassed and at minimum the draw_cell() method must be overridden to provide the content of the cells. This widget does \em not manage the cell's data content; it is up to the parent - class's draw_cell() method override to provide this. + class's draw_cell() method to provide this. Events on the cells and/or headings generate callbacks when they are clicked by the user. You control when events are generated based on diff --git a/FL/Fl_Text_Display.H b/FL/Fl_Text_Display.H index ab3d2a1b5..b3ccc899e 100644 --- a/FL/Fl_Text_Display.H +++ b/FL/Fl_Text_Display.H @@ -293,7 +293,7 @@ public: has a consistent UI, is the default behavior, and is normally what you want. - Only use THIS method if you really need to override the global + Only use THIS method if you really need to the global scrollbar size. The need for this should be rare. Setting \p newSize to the special value of 0 causes the widget to diff --git a/FL/Fl_Tiled_Image.H b/FL/Fl_Tiled_Image.H index 4efc89b6f..531260151 100644 --- a/FL/Fl_Tiled_Image.H +++ b/FL/Fl_Tiled_Image.H @@ -39,7 +39,7 @@ public: Fl_Tiled_Image(Fl_Image *i, int W = 0, int H = 0); virtual ~Fl_Tiled_Image(); - Fl_Image *copy(int W, int H) const override; + Fl_Image *copy(int W, int H) const ; Fl_Image *copy() const { return Fl_Image::copy(); } diff --git a/FL/Fl_Tooltip.H b/FL/Fl_Tooltip.H index 3e07e2852..477380017 100644 --- a/FL/Fl_Tooltip.H +++ b/FL/Fl_Tooltip.H @@ -96,7 +96,7 @@ public: /** Returns the window that is used for tooltips */ static Fl_Window* current_window(void); /** \brief Temporarily Override Tooltip Text during an FL_BEFORE_TOOLTIP event. */ - static int override_text(const char *new_text); + static int _text(const char *new_text); // These should not be public, but Fl_Widget::tooltip() needs them... // fabien: made it private with only a friend function access @@ -121,7 +121,7 @@ private: static int margin_height_; //!< distance around tooltip text top+bottom static int wrap_width_; //!< maximum width of tooltip text before it word wraps static const int draw_symbols_; // 1 = draw @-symbols in tooltips, 0 = no - static char *override_text_; //!< a copy of the last text for an overridden tooltip + static char *_text_; //!< a copy of the last text for an overridden tooltip }; #endif diff --git a/FL/Fl_Tree_Item.H b/FL/Fl_Tree_Item.H index 620fb7dc5..ba5188219 100644 --- a/FL/Fl_Tree_Item.H +++ b/FL/Fl_Tree_Item.H @@ -52,7 +52,7 @@ /// /// New 1.3.3 ABI feature: /// You can define custom items by either adding a custom widget to the item -/// with Fl_Tree_Item::widget(), or override the draw_item_content() method +/// with Fl_Tree_Item::widget(), or the draw_item_content() method /// if you want to just redefine how the label is drawn. /// /// The following shows the Fl_Tree_Item's dimensions, useful when overriding @@ -181,7 +181,7 @@ public: } /// Return item's label background text color. /// If the color is 0xffffffff, the default behavior is the parent tree's - /// bg color will be used. (An overloaded draw_item_content() can override + /// bg color will be used. (An overloaded draw_item_content() can /// this behavior.) Fl_Color labelbgcolor() const { return(_labelbgcolor); diff --git a/FL/Fl_Tree_Prefs.H b/FL/Fl_Tree_Prefs.H index 349fffedd..6d1d22b0e 100644 --- a/FL/Fl_Tree_Prefs.H +++ b/FL/Fl_Tree_Prefs.H @@ -161,7 +161,7 @@ public: return _labelbgcolor; } /// Set the default label background color. - /// Once set, overrides the default behavior of using Fl_Tree::color(). + /// Once set, s the default behavior of using Fl_Tree::color(). /// inline void item_labelbgcolor(Fl_Color val) { _labelbgcolor = val; diff --git a/FL/Fl_Value_Input.H b/FL/Fl_Value_Input.H index f0f30e626..1c5310690 100644 --- a/FL/Fl_Value_Input.H +++ b/FL/Fl_Value_Input.H @@ -87,7 +87,7 @@ public: int shortcut() const {return input.shortcut();} /** Sets the shortcut key to \p s. Setting this - overrides the use of '&' in the label(). The value is a bitwise + s the use of '&' in the label(). The value is a bitwise OR of a key and a set of shift flags, for example FL_ALT | 'a' , FL_ALT | (FL_F + 10), or just 'a'. A value of 0 disables the shortcut. diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index 8a62c128d..e9d48310b 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -269,7 +269,7 @@ public: don't handle. In this last case you should return the callee retval. One exception to the rule in the previous paragraph is if you really - want to \e override the behavior of the base class. This requires + want to \e the behavior of the base class. This requires knowledge of the details of the inherited class. In rare cases you may want to return 1 from your handle() method diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 827ca8035..a1420e7c2 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -234,7 +234,7 @@ public: /** Activates the flags NOBORDER|OVERRIDE */ void set_override() {set_flag(NOBORDER|OVERRIDE);} /** Returns non zero if OVERRIDE flag is set, 0 otherwise. */ - unsigned int override() const { return flags()&OVERRIDE; } + unsigned int override_flag() const { return flags()&OVERRIDE; } /** A "modal" window, when shown(), will prevent any events from being delivered to other windows in the same program, and will also @@ -561,7 +561,7 @@ public: // Note: Doxygen docs in Fl_Widget.H to avoid redundancy. Fl_Window* as_window() { return this; } - Fl_Window const* as_window() const override { return this; } + Fl_Window const* as_window() const { return this; } /** Return non-null if this is an Fl_Overlay_Window object. diff --git a/FL/fl_attr.h b/FL/fl_attr.h index ef9587997..e5e8a487b 100644 --- a/FL/fl_attr.h +++ b/FL/fl_attr.h @@ -24,18 +24,18 @@ /** - This macro makes it safe to use the C++11 keyword \c override with + This macro makes it safe to use the C++11 keyword \c with older compilers. Since FLTK 1.5.0 a C++11 capable compiler is required, hence we can safely - define FL_OVERRIDE unconditionally as 'override'. + define FL_OVERRIDE unconditionally as ''. This macro is kept for backwards compatibility with old (1.4.x) user code that uses the FL_OVERRIDE macro. - We recommend to use 'override' explicitly if C++11 or higher is available. + We recommend to use '' explicitly if C++11 or higher is available. */ -#define FL_OVERRIDE override +#define FL_OVERRIDE /** diff --git a/FL/fl_draw.H b/FL/fl_draw.H index 11375125d..8a834c944 100644 --- a/FL/fl_draw.H +++ b/FL/fl_draw.H @@ -875,7 +875,7 @@ inline double fl_width(const char *txt, int n) { Example: \code - auto width = fl_width(0x20ac); // measures the width of the `€` sign. + double width = fl_width(0x20ac); // measures the width of the `€` sign. \endcode \internal If a valid fl_gc is NOT found then it uses the first window gc, @@ -969,7 +969,7 @@ FL_EXPORT const char *fl_local_to_mac_roman(const char *t, int n = -1); /** \addtogroup fl_drawings @{ */ -FL_EXPORT float fl_override_scale(); +FL_EXPORT float fl__scale(); FL_EXPORT void fl_restore_scale(float s); diff --git a/FL/x11.H b/FL/x11.H index c3473020b..a42c0fb55 100644 --- a/FL/x11.H +++ b/FL/x11.H @@ -118,7 +118,7 @@ private: }; extern FL_EXPORT Fl_XFont_On_Demand fl_xfont; -extern FL_EXPORT char fl_override_redirect; // hack into Fl_X::make_xid() +extern FL_EXPORT char fl__redirect; // hack into Fl_X::make_xid() #endif // FL_LIBRARY || FL_INTERNALS -- cgit v1.2.3