diff options
Diffstat (limited to 'src')
38 files changed, 77 insertions, 77 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index 029235dee..ac5b6a601 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -2089,7 +2089,7 @@ void Fl::clear_widget_pointer(Fl_Widget const *w) Options are set by the user or the administrator on user or machine level. In 1.3, FLUID has an Options dialog for that. In 1.4, there is an app named `fltk-options` that can be used from the command line or as a GUI tool. - The machine level setting is read first, and the user setting can override + The machine level setting is read first, and the user setting can the machine setting. This function is used throughout FLTK to quickly query the user's wishes. @@ -2152,7 +2152,7 @@ bool Fl::option(Fl_Option opt) Private::options_[OPTION_SIMPLE_ZOOM_SHORTCUT] = tmp; } { // next, check the user preferences - // override system options only, if the option is set ( >= 0 ) + // system options only, if the option is set ( >= 0 ) Fl_Preferences prefs(Fl_Preferences::CORE_USER, "fltk.org", "fltk"); Fl_Preferences opt_prefs(prefs, "options"); opt_prefs.get("ArrowFocus", tmp, -1); @@ -2193,11 +2193,11 @@ bool Fl::option(Fl_Option opt) /** Override an option while the application is running. - Apps can override the machine settings and the user settings by calling - `Fl::option(option, bool)`. The override takes effect immediately for this + Apps can the machine settings and the user settings by calling + `Fl::option(option, bool)`. The takes effect immediately for this option for all widgets in the app for the life time of the app. - The override is not saved anywhere, and relaunching the app will restore the + The is not saved anywhere, and relaunching the app will restore the old settings. Example: diff --git a/src/Fl_Anim_GIF_Image.cxx b/src/Fl_Anim_GIF_Image.cxx index c70d15866..f026d4961 100644 --- a/src/Fl_Anim_GIF_Image.cxx +++ b/src/Fl_Anim_GIF_Image.cxx @@ -617,7 +617,7 @@ Fl_Anim_GIF_Image::Fl_Anim_GIF_Image() : Also removes the animation timer. */ -Fl_Anim_GIF_Image::~Fl_Anim_GIF_Image() /* override */ { +Fl_Anim_GIF_Image::~Fl_Anim_GIF_Image() /* */ { Fl::remove_timeout(cb_animate, this); delete fi_; free(name_); @@ -708,7 +708,7 @@ void Fl_Anim_GIF_Image::clear_frames() { \param[in] i a value between 0.0 and 1.0 where 0 results in the blend color, and 1 returns the original image */ -void Fl_Anim_GIF_Image::color_average(Fl_Color c, float i) /* override */ { +void Fl_Anim_GIF_Image::color_average(Fl_Color c, float i) /* */ { if (i < 0) { // immediate mode i = -i; @@ -735,7 +735,7 @@ void Fl_Anim_GIF_Image::color_average(Fl_Color c, float i) /* override */ { \param[in] W, H new size in FLTK pixel units \return the resized copy of the animation */ -Fl_Image *Fl_Anim_GIF_Image::copy(int W, int H) const /* override */ { +Fl_Image *Fl_Anim_GIF_Image::copy(int W, int H) const /* */ { Fl_Anim_GIF_Image *copied = new Fl_Anim_GIF_Image(); // copy/resize the base image (Fl_Pixmap) // Note: this is not really necessary, if the draw() @@ -798,7 +798,7 @@ void Fl_Anim_GIF_Image::delay(int frame, double delay) { /** Desaturate to all frames of the animation. */ -void Fl_Anim_GIF_Image::desaturate() /* override */ { +void Fl_Anim_GIF_Image::desaturate() /* */ { fi_->desaturate = true; set_frame(); } @@ -810,7 +810,7 @@ void Fl_Anim_GIF_Image::desaturate() /* override */ { \param[in] cx, cy source offset */ void Fl_Anim_GIF_Image::draw(int x, int y, int w, int h, - int cx/* = 0*/, int cy/* = 0*/) /* override */ { + int cx/* = 0*/, int cy/* = 0*/) /* */ { if (this->image()) { if (fi_->optimize_mem) { int f0 = frame_; @@ -1276,7 +1276,7 @@ bool Fl_Anim_GIF_Image::next() { /** Uncache all cached image data now. Re-implemented from Fl_Pixmap. */ -void Fl_Anim_GIF_Image::uncache() /* override */ { +void Fl_Anim_GIF_Image::uncache() /* */ { Fl_GIF_Image::uncache(); for (int i=0; i < fi_->frames_size; i++) { if (fi_->frames[i].rgb) fi_->frames[i].rgb->uncache(); diff --git a/src/Fl_Cairo.cxx b/src/Fl_Cairo.cxx index 20cb08b56..2387fa19a 100644 --- a/src/Fl_Cairo.cxx +++ b/src/Fl_Cairo.cxx @@ -96,7 +96,7 @@ void Fl_Cairo_State::autolink(bool b) { /** Provides a Cairo context for window \a wi. - This is needed in a draw() override if Fl::cairo_autolink_context() + This is needed in a draw() if Fl::cairo_autolink_context() returns false, which is the default. The cairo_context() does not need to be freed as it is freed every time a new Cairo context is created. When the program terminates, diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx index ac9a260cf..d3b53ae9f 100644 --- a/src/Fl_Choice.cxx +++ b/src/Fl_Choice.cxx @@ -200,7 +200,7 @@ int Fl_Choice::handle(int e) { if (wp.deleted()) return 1; } else { // In order to preserve the old look-n-feel of "white" menus, - // temporarily override the color() of this widget... + // temporarily the color() of this widget... Fl_Color c = color(); color(FL_BACKGROUND2_COLOR); handle(FL_BEFORE_MENU); diff --git a/src/Fl_Counter.cxx b/src/Fl_Counter.cxx index d086f0229..be57c9f1f 100644 --- a/src/Fl_Counter.cxx +++ b/src/Fl_Counter.cxx @@ -37,7 +37,7 @@ struct arrow_box { Compute sizes (widths) of arrow boxes. This method computes the two sizes of the arrow boxes of Fl_Counter. - You can override it in a subclass if you want to draw fancy arrows + You can it in a subclass if you want to draw fancy arrows or change the layout. However, the basic layout is fixed and can't be changed w/o overriding the draw() and handle() methods. diff --git a/src/Fl_Device.cxx b/src/Fl_Device.cxx index 99e28a216..c1f83e79b 100644 --- a/src/Fl_Device.cxx +++ b/src/Fl_Device.cxx @@ -61,8 +61,8 @@ +- Fl_Scalable_Graphics_Driver: helper class to support GUI scaling +- Fl_Xlib_Graphics_Driver: X11-specific graphics driver +- Fl_GDI_Graphics_Driver: Windows-specific graphics driver - +- Fl_GDIplus_Graphics_Driver: overrides oblique lines, arcs and circles - +- Fl_GDI_Printer_Graphics_Driver: overrides a few member functions especially for output to printer + +- Fl_GDIplus_Graphics_Driver: s oblique lines, arcs and circles + +- Fl_GDI_Printer_Graphics_Driver: s a few member functions especially for output to printer +- Fl_Cairo_Graphics_Driver: full FLTK drawing API based on Cairo and Pango +- Fl_Wayland_Graphics_Driver: Wayland-specific graphics driver +- Fl_X11_Cairo_Graphics_Driver: used by X11 leg of hybrid Wayland/X11 platform diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index d82340de4..776ea3ff9 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -586,7 +586,7 @@ Fl_Font_Descriptor** Fl_Gl_Window_Driver::fontnum_to_fontdescriptor(int fnum) { } /* Captures a rectangle of a Fl_Gl_Window and returns it as an RGB image. - This is the platform-independent version. Some platforms may override it. + This is the platform-independent version. Some platforms may it. */ Fl_RGB_Image* Fl_Gl_Window_Driver::capture_gl_rectangle(int x, int y, int w, int h) { diff --git a/src/Fl_Graphics_Driver.cxx b/src/Fl_Graphics_Driver.cxx index e127e4190..fe943d780 100644 --- a/src/Fl_Graphics_Driver.cxx +++ b/src/Fl_Graphics_Driver.cxx @@ -574,7 +574,7 @@ void Fl_Graphics_Driver::push_clip(int x, int y, int w, int h) {} Default graphics driver implementation of fl_clip_box(). This default implementation is sufficient for a graphics driver that does not - support clipping. Drivers that support clipping must override this virtual method. + support clipping. Drivers that support clipping must this virtual method. It returns - in (X, Y, W, H) the same values as given in (x, y, w, h) respectively @@ -760,7 +760,7 @@ void Fl_Graphics_Driver::overlay_rect(int x, int y, int w , int h) { loop(x, y, x+w-1, y, x+w-1, y+h-1, x, y+h-1); } -float Fl_Graphics_Driver::override_scale() { return scale();} +float Fl_Graphics_Driver::_scale() { return scale();} void Fl_Graphics_Driver::restore_scale(float) { } @@ -1202,7 +1202,7 @@ void Fl_Scalable_Graphics_Driver::draw_image_mono_unscaled(const uchar* buf, int void Fl_Scalable_Graphics_Driver::draw_image_mono_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D) {} -float Fl_Scalable_Graphics_Driver::override_scale() { +float Fl_Scalable_Graphics_Driver::_scale() { float s = scale(); if (s != 1.f) { scale(1.f); diff --git a/src/Fl_Grid.cxx b/src/Fl_Grid.cxx index 9fe90d202..4a4d7afd0 100644 --- a/src/Fl_Grid.cxx +++ b/src/Fl_Grid.cxx @@ -578,7 +578,7 @@ void Fl_Grid::remove_cell(int row, int col) { /** Recalculate the layout and position and resize all widgets. - This method overrides Fl_Group::resize() and calculates all positions and + This method s Fl_Group::resize() and calculates all positions and sizes of its children according to its own rules. \param[in] X,Y new widget position diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index 3f0c38bba..ce4c81c50 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -4304,7 +4304,7 @@ int Fl_Help_View::Impl::scrollbar_size() const { 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/src/Fl_Input_Choice.cxx b/src/Fl_Input_Choice.cxx index e01743eb6..59aeecfe9 100644 --- a/src/Fl_Input_Choice.cxx +++ b/src/Fl_Input_Choice.cxx @@ -95,7 +95,7 @@ \endcode \par Subclassing Example - One can subclass Fl_Input_Choice to override the virtual methods inp_x/y/w/h() + One can subclass Fl_Input_Choice to the virtual methods inp_x/y/w/h() and menu_x/y/w/h() to take control of the internal Fl_Input and Fl_Menu_Button widget positioning. In this example, input and menubutton's positions are swapped: \code @@ -105,11 +105,11 @@ class MyInputChoice : public Fl_Input_Choice { protected: - virtual int inp_x() const { return x() + Fl::box_dx(box()) + menu_w(); } // override to reposition - virtual int menu_x() const { return x() + Fl::box_dx(box()); } // override to reposition + virtual int inp_x() const { return x() + Fl::box_dx(box()) + menu_w(); } // to reposition + virtual int menu_x() const { return x() + Fl::box_dx(box()); } // to reposition public: MyInputChoice(int X,int Y,int W,int H,const char*L=0) : Fl_Input_Choice(X,Y,W,H,L) { - resize(X,Y,W,H); // necessary for ctor to trigger our overrides + resize(X,Y,W,H); // necessary for ctor to trigger our s } }; diff --git a/src/Fl_Menu_add.cxx b/src/Fl_Menu_add.cxx index c5fdc502d..08a9153d9 100644 --- a/src/Fl_Menu_add.cxx +++ b/src/Fl_Menu_add.cxx @@ -166,7 +166,7 @@ int Fl_Menu_Item::insert( item = buf; if (*p != '/') break; /* not a menu title */ - index = -1; /* any submenu specified overrides insert position */ + index = -1; /* any submenu specified s insert position */ mytext = p+1; /* point at item title */ /* find a matching menu title: */ diff --git a/src/Fl_Message.cxx b/src/Fl_Message.cxx index b24072b40..d3112c562 100644 --- a/src/Fl_Message.cxx +++ b/src/Fl_Message.cxx @@ -541,7 +541,7 @@ void Fl_Message::message_title(const char *title) { fl_input(), fl_password(), unless a specific title has been set with fl_message_title(const char *title). - The default is no title. You can override the default title for a + The default is no title. You can the default title for a single dialog with fl_message_title(const char *title). The \p title string is copied internally, so that you can use a diff --git a/src/Fl_Scalable_Graphics_Driver.H b/src/Fl_Scalable_Graphics_Driver.H index 16278d81d..397750390 100644 --- a/src/Fl_Scalable_Graphics_Driver.H +++ b/src/Fl_Scalable_Graphics_Driver.H @@ -119,7 +119,7 @@ protected: void transformed_vertex(double xf, double yf) FL_OVERRIDE; void vertex(double x, double y) FL_OVERRIDE; - float override_scale() FL_OVERRIDE; + float _scale() FL_OVERRIDE; void restore_scale(float) FL_OVERRIDE; virtual void *change_pen_width(int lwidth); virtual void reset_pen_width(void *data); diff --git a/src/Fl_Scheme_Choice.cxx b/src/Fl_Scheme_Choice.cxx index b50b34e4c..f5e292bd6 100644 --- a/src/Fl_Scheme_Choice.cxx +++ b/src/Fl_Scheme_Choice.cxx @@ -79,7 +79,7 @@ void Fl_Scheme_Choice::init_value() { You don't need to set a callback for this widget. The default callback changes the scheme (Fl::scheme()) and redraws all open windows. - You may override the callback if changing the scheme shall redraw other + You may the callback if changing the scheme shall redraw other windows or don't redraw the window at all. \param[in] w The Fl_Scheme_Choice widget diff --git a/src/Fl_Screen_Driver.cxx b/src/Fl_Screen_Driver.cxx index d7a794726..3a25f6ec7 100644 --- a/src/Fl_Screen_Driver.cxx +++ b/src/Fl_Screen_Driver.cxx @@ -33,7 +33,7 @@ #include <FL/Fl_Tooltip.H> #include <string.h> // for memchr -// these are set by Fl::args() and override any system colors: from Fl_get_system_colors.cxx +// these are set by Fl::args() and any system colors: from Fl_get_system_colors.cxx extern const char *fl_fg; extern const char *fl_bg; extern const char *fl_bg2; diff --git a/src/Fl_Shared_Image.cxx b/src/Fl_Shared_Image.cxx index 9782e6371..82e9be050 100644 --- a/src/Fl_Shared_Image.cxx +++ b/src/Fl_Shared_Image.cxx @@ -643,7 +643,7 @@ Fl_Shared_Image *Fl_Shared_Image::get(Fl_RGB_Image *rgb, int own_it) All registered image handlers will be called in the order of registration. You should always call fl_register_images() before adding your own - handlers - unless you need to override a known image file type which + handlers - unless you need to a known image file type which should be rare. \see Fl_Shared_Handler for more information of the function you need diff --git a/src/Fl_System_Driver.cxx b/src/Fl_System_Driver.cxx index a1ae24276..2e98c29ec 100644 --- a/src/Fl_System_Driver.cxx +++ b/src/Fl_System_Driver.cxx @@ -337,7 +337,7 @@ void Fl_System_Driver::gettime(time_t *sec, int *usec) { /** Execute platform independent parts of Fl::wait(double). - Platform drivers \b MUST override this virtual method to do + Platform drivers \b MUST this virtual method to do their own stuff and call this base class method to run the platform independent wait functions. diff --git a/src/Fl_Table.cxx b/src/Fl_Table.cxx index 79d152acb..e19fc2fbe 100644 --- a/src/Fl_Table.cxx +++ b/src/Fl_Table.cxx @@ -41,7 +41,7 @@ void Fl_Table::row_position(int row) { vscrollbar->Fl_Slider::value(newtop); table_scrolled(); redraw(); - _row_position = row; // HACK: override what table_scrolled() came up with + _row_position = row; // HACK: what table_scrolled() came up with } /** @@ -60,7 +60,7 @@ void Fl_Table::col_position(int col) { hscrollbar->Fl_Slider::value(newleft); table_scrolled(); redraw(); - _col_position = col; // HACK: override what table_scrolled() came up with + _col_position = col; // HACK: what table_scrolled() came up with } /** diff --git a/src/Fl_Terminal.cxx b/src/Fl_Terminal.cxx index 150cb6641..ef57749cf 100644 --- a/src/Fl_Terminal.cxx +++ b/src/Fl_Terminal.cxx @@ -3531,7 +3531,7 @@ int Fl_Terminal::scrollbar_size(void) const { Setting \p val to the special value 0 causes the widget to track the global Fl::scrollbar_size(). - Use non-zero values *only* if you need to override the global Fl::scrollbar_size() size. + Use non-zero values *only* if you need to the global Fl::scrollbar_size() size. \see Fl::scrollbar_size(), scrollbar_actual_size() */ diff --git a/src/Fl_Tooltip.cxx b/src/Fl_Tooltip.cxx index 62c2f5ea1..cb85f520e 100644 --- a/src/Fl_Tooltip.cxx +++ b/src/Fl_Tooltip.cxx @@ -41,7 +41,7 @@ int Fl_Tooltip::margin_width_ = 3; int Fl_Tooltip::margin_height_ = 3; int Fl_Tooltip::wrap_width_ = 400; const int Fl_Tooltip::draw_symbols_ = 1; -char *Fl_Tooltip::override_text_ = 0; +char *Fl_Tooltip::_text_ = 0; static const char* tip; @@ -163,10 +163,10 @@ static void tooltip_hide_timeout(void*) { When FLTK sends an FL_BEFORE_TOOLTIP event to the widget under the mouse pointer, you can handle this event to modify the tooltip text dynamically. - The provided text will be copied into a local buffer. To apply the override, + The provided text will be copied into a local buffer. To apply the , the event handler must return 1. - To disable the tooltip for the current event, set the override text to 0 + To disable the tooltip for the current event, set the text to 0 or an empty string ("") and return 1. \param[in] new_text a C string that will be copied into a buffer @@ -176,15 +176,15 @@ static void tooltip_hide_timeout(void*) { \see `test/color_chooser.cxx` for a usage example. */ -int Fl_Tooltip::override_text(const char *new_text) { - if (new_text != override_text_) { - if (window && window->label()==override_text_) +int Fl_Tooltip::_text(const char *new_text) { + if (new_text != _text_) { + if (window && window->label()==_text_) ((Fl_Widget *) window)->label(0); - if (override_text_) - ::free(override_text_); - override_text_ = 0; + if (_text_) + ::free(_text_); + _text_ = 0; if (new_text) - override_text_ = fl_strdup(new_text); + _text_ = fl_strdup(new_text); } return 1; } @@ -199,7 +199,7 @@ void Fl_Tooltip::tooltip_timeout_(void*) { if (!top_win_iconified_()) { // no tooltip if top win iconified (STR #3157) if (Fl_Tooltip::current()) { if (Fl_Tooltip::current()->handle(FL_BEFORE_TOOLTIP)) - tip = Fl_Tooltip::override_text_; + tip = Fl_Tooltip::_text_; } if (!tip || !*tip) { if (window) window->hide(); @@ -395,8 +395,8 @@ void Fl_Tooltip::set_enter_exit_once_() { Tooltips can be updated dynamically before they are displayed. When a tooltip is about to be shown, FLTK sends an `FL_BEFORE_TOOLTIP` event to the widget’s - `handle()` method. Developers can override the tooltip text temporarily - using `Fl_Tooltip::override_text(const char* new_text)` and returning 1 from + `handle()` method. Developers can the tooltip text temporarily + using `Fl_Tooltip::_text(const char* new_text)` and returning 1 from `handle()` to apply the change. \param[in] text New tooltip text (no copy is made) diff --git a/src/Fl_Tree.cxx b/src/Fl_Tree.cxx index 08c8aa1f2..01ab99d33 100644 --- a/src/Fl_Tree.cxx +++ b/src/Fl_Tree.cxx @@ -2181,7 +2181,7 @@ Fl_Image* Fl_Tree::openicon() const { } /// Sets the icon to be used as the 'open' icon. -/// This overrides the built in default '[+]' icon. +/// This s the built in default '[+]' icon. /// /// \param[in] val -- The new image, or zero to use the default [+] icon. /// @@ -2200,7 +2200,7 @@ Fl_Image* Fl_Tree::closeicon() const { } /// Sets the icon to be used as the 'close' icon. -/// This overrides the built in default '[-]' icon. +/// This s the built in default '[-]' icon. /// /// \param[in] val -- The new image, or zero to use the default [-] icon. /// @@ -2527,7 +2527,7 @@ int Fl_Tree::scrollbar_size() const { /// has a consistent UI, and is the default behavior. Normally /// this is what you want. /// -/// Only use this method if you really need to override just THIS +/// Only use this method if you really need to just THIS /// instance of the widget's scrollbar size. (This need should be rare.) /// /// Setting \p size to the special value of 0 causes the widget to diff --git a/src/Fl_Tree_Item.cxx b/src/Fl_Tree_Item.cxx index b18acf16a..5157ea04a 100644 --- a/src/Fl_Tree_Item.cxx +++ b/src/Fl_Tree_Item.cxx @@ -860,7 +860,7 @@ Fl_Color Fl_Tree_Item::drawbgcolor() const { /// This method can be overridden to implement custom drawing /// by filling the label_[xywh]() area with content. /// -/// A minimal example of how to override draw_item_content() +/// A minimal example of how to draw_item_content() /// and draw just a normal item's background and label ourselves: /// /// \code diff --git a/src/Fl_Tree_Prefs.cxx b/src/Fl_Tree_Prefs.cxx index f34675c9c..805ecac3e 100644 --- a/src/Fl_Tree_Prefs.cxx +++ b/src/Fl_Tree_Prefs.cxx @@ -56,7 +56,7 @@ int Fl_System_Driver::tree_connector_style() { /// Sets the default icon to be used as the 'open' icon /// when items are add()ed to the tree. -/// This overrides the built in default '[+]' icon. +/// This s the built in default '[+]' icon. /// /// \param[in] val -- The new image, or zero to use the default [+] icon. /// @@ -73,7 +73,7 @@ void Fl_Tree_Prefs::openicon(Fl_Image *val) { } /// Sets the icon to be used as the 'close' icon. -/// This overrides the built in default '[-]' icon. +/// This s the built in default '[-]' icon. /// /// \param[in] val -- The new image, or zero to use the default [-] icon. /// diff --git a/src/Fl_Valuator.cxx b/src/Fl_Valuator.cxx index cb1f9dea9..644ad1d82 100644 --- a/src/Fl_Valuator.cxx +++ b/src/Fl_Valuator.cxx @@ -163,7 +163,7 @@ double Fl_Valuator::increment(double v, int n) { The formatted value is written into \p buffer. \p buffer should have space for at least 128 bytes. - You may override this function to create your own text formatting. + You may this function to create your own text formatting. */ int Fl_Valuator::format(char* buffer) { double v = value(); diff --git a/src/Fl_abort.cxx b/src/Fl_abort.cxx index bd2771813..86f7704a3 100644 --- a/src/Fl_abort.cxx +++ b/src/Fl_abort.cxx @@ -14,7 +14,7 @@ // https://www.fltk.org/bugs.php // -// You can also override this by redefining all of these. +// You can also this by redefining all of these. #include <FL/Fl.H> #include "Fl_System_Driver.H" diff --git a/src/Fl_add_idle.cxx b/src/Fl_add_idle.cxx index 8c6fb93f6..5c1f7be12 100644 --- a/src/Fl_add_idle.cxx +++ b/src/Fl_add_idle.cxx @@ -137,8 +137,8 @@ int Fl::has_idle(Fl_Idle_Handler cb, void* data) { w->window()->hide(); } int main(int argc, char **argv) { - auto window = new Fl_Double_Window(200, 100); - auto button = new Fl_Button(20, 20, 160, 60, "Quit"); + Fl_Double_Window *window = new Fl_Double_Window(200, 100); + Fl_Button *button = new Fl_Button(20, 20, 160, 60, "Quit"); button->callback(quit_cb); window->end(); window->show(argc, argv); diff --git a/src/Fl_arg.cxx b/src/Fl_arg.cxx index 46e9f7073..c236d1b3d 100644 --- a/src/Fl_arg.cxx +++ b/src/Fl_arg.cxx @@ -110,7 +110,7 @@ extern const char *fl_bg2; - The order of fg, bg, and bg2 in the command line does not matter - There is no way at the moment to set the selection color. - Setting the bg2 color also changes the fg color to have sufficient contrast - - Explicitly setting fg color overrides the bg2/contrast constraint. + - Explicitly setting fg color s the bg2/contrast constraint. - Setting the bg color will update the color lookup table for the gray ramp, so color index values can stay the same for all apps, it's just mapped to different RGB values. @@ -244,7 +244,7 @@ int Fl::arg(int argc, char **argv, int &i) { parameters. \p i should be incremented by the same amount. The \p cb handler is called \b before any other tests, so - <i>you can also override any standard FLTK switch</i> + <i>you can also any standard FLTK switch</i> (this is why FLTK can use very short switches instead of the long ones all other toolkits force you to use). See Fl::arg() for descriptions of the standard switches. diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx index 51eb06ac1..9264ab214 100644 --- a/src/Fl_get_system_colors.cxx +++ b/src/Fl_get_system_colors.cxx @@ -82,7 +82,7 @@ void Fl::background2(uchar r, uchar g, uchar b) { } -// these are set by Fl::args() and override any system colors: +// these are set by Fl::args() and any system colors: const char *fl_fg = NULL; const char *fl_bg = NULL; const char *fl_bg2 = NULL; diff --git a/src/Fl_grab.cxx b/src/Fl_grab.cxx index d7019c4f7..6b419d7c0 100644 --- a/src/Fl_grab.cxx +++ b/src/Fl_grab.cxx @@ -25,7 +25,7 @@ // have to be displayed (and in the case of Fl_Menu.cxx it isn't). // The system is also told to "grab" events and send them to this app. // This also modifies how Fl_Window::show() works, on X it turns on -// override_redirect, it does similar things on Windows. +// _redirect, it does similar things on Windows. void Fl::grab(Fl_Window *win) { diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 7da44acf2..373378e9b 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -2628,7 +2628,7 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap) attr.colormap = colormap; attr.border_pixel = 0; attr.bit_gravity = 0; // StaticGravity; - if (win->override()) { + if (win->override_flag()) { attr.override_redirect = 1; attr.save_under = 1; mask |= CWOverrideRedirect | CWSaveUnder; @@ -2829,7 +2829,7 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap) void Fl_X11_Window_Driver::sendxjunk() { Fl_Window *w = pWindow; - if (w->parent() || w->override()) return; // it's not a window manager window! + if (w->parent() || w->override_flag()) return; // it's not a window manager window! XSizeHints *hints = XAllocSizeHints(); // memset(&hints, 0, sizeof(hints)); jreiser suggestion to fix purify? diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H index ca0cf5095..4cb48fcec 100644 --- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H +++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H @@ -190,7 +190,7 @@ public: void XDestroyRegion(Fl_Region r) FL_OVERRIDE; void add_rectangle_to_region(Fl_Region r, int X, int Y, int W, int H) FL_OVERRIDE; char can_do_alpha_blending() FL_OVERRIDE; - float override_scale() FL_OVERRIDE; + float _scale() FL_OVERRIDE; void restore_scale(float) FL_OVERRIDE; void antialias(int state) FL_OVERRIDE; int antialias() FL_OVERRIDE; diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx index bf2e2d361..6483dc30b 100644 --- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx +++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx @@ -1490,7 +1490,7 @@ char Fl_Cairo_Graphics_Driver::can_do_alpha_blending() { } -float Fl_Cairo_Graphics_Driver::override_scale() { +float Fl_Cairo_Graphics_Driver::_scale() { float s = scale(); if (s != 1.f && Fl_Display_Device::display_device()->is_current()) { cairo_scale(cairo_, 1./s, 1./s); diff --git a/src/fl_arc.cxx b/src/fl_arc.cxx index 58857c811..35b65ba75 100644 --- a/src/fl_arc.cxx +++ b/src/fl_arc.cxx @@ -42,7 +42,7 @@ static double _fl_hypot(double x, double y) { Draw an arc. The default implementation draws an arc using other calls into the graphics - driver. There is no need to override the method unless the target platform + driver. There is no need to the method unless the target platform supports drawing arcs directly. \see fl_arc(double x, double y, double r, double start, double end) diff --git a/src/fl_ask.cxx b/src/fl_ask.cxx index b9c31fd43..7edbb9194 100644 --- a/src/fl_ask.cxx +++ b/src/fl_ask.cxx @@ -399,7 +399,7 @@ const char *fl_password(int maxchar, const char *fmt, const char *defstr, ...) { many common dialogs like fl_message(), fl_alert(), fl_ask(), fl_choice(), fl_input(), fl_password(). - The position set with this method overrides the hotspot setting, + The position set with this method s the hotspot setting, i.e. setting a position has higher priority than the hotspot mode set by fl_message_hotspot(int). @@ -449,7 +449,7 @@ void fl_message_position(Fl_Widget *widget) { \code #include <FL/fl_ask.H> \endcode - The position set with this method overrides the hotspot setting, + The position set with this method s the hotspot setting, i.e. setting a position has higher priority than the hotspot mode set by fl_message_hotspot(int). @@ -540,7 +540,7 @@ void fl_message_title(const char *title) { fl_input(), fl_password(), unless a specific title has been set with fl_message_title(const char *title). - The default is no title. You can override the default title for a + The default is no title. You can the default title for a single dialog with fl_message_title(const char *title). The \p title string is copied internally, so that you can use a diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx index 30e683cec..5aeb9b82c 100644 --- a/src/fl_draw.cxx +++ b/src/fl_draw.cxx @@ -585,12 +585,12 @@ int fl_height(int font, int size) { It's not supported to call fl_push_clip() while transiently removing scaling. \return The GUI scaling factor value that was in place when the function started. */ -float fl_override_scale() { - return fl_graphics_driver->override_scale(); +float fl__scale() { + return fl_graphics_driver->_scale(); } /** Restores the GUI scaling factor in subsequent drawing operations. - \param s Value returned by a previous call to fl_override_scale(). */ + \param s Value returned by a previous call to fl__scale(). */ void fl_restore_scale(float s) { fl_graphics_driver->restore_scale(s); } diff --git a/src/fl_show_colormap.cxx b/src/fl_show_colormap.cxx index 1793547bc..c9a96f79b 100644 --- a/src/fl_show_colormap.cxx +++ b/src/fl_show_colormap.cxx @@ -121,7 +121,7 @@ int ColorMenu::handle(int e) { return 1; } -extern char fl_override_redirect; // hack for menus +extern char fl__redirect; // hack for menus #ifdef _MSC_VER #pragma optimize("a",off) // needed to get the done check to work diff --git a/src/fl_utf8.cxx b/src/fl_utf8.cxx index c4d78b7db..2c52a04b6 100644 --- a/src/fl_utf8.cxx +++ b/src/fl_utf8.cxx @@ -344,8 +344,8 @@ int fl_toupper(unsigned int ucs) #include <FL/fl_utf8.h> const char *str = "ÇA VA?"; - auto src_len = strlen(str) - char *buf = malloc(src_len*3 + 1); + size_t src_len = strlen(str); + char *buf = (char*)malloc(src_len*3 + 1); puts(fl_utf_tolower(str, src_len, buf)); // should print "ça va?" \endcode |