diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-05-15 21:58:26 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-05-15 21:58:26 +0200 |
| commit | 238c3b7ceff7b1bb6e568ff93b593e8c08ff9ecd (patch) | |
| tree | ec6ede0a9196a4133c06839e8f1ad5f416b1f7dc /FL | |
| parent | 88c2994e20be93122bbd316d65711321f97ea2ba (diff) | |
| parent | 5df7a7678a4641cc9234ac8ea0d54623628d922a (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_File_Input.H | 22 | ||||
| -rw-r--r-- | FL/Fl_Text_Buffer.H | 8 |
2 files changed, 21 insertions, 9 deletions
diff --git a/FL/Fl_File_Input.H b/FL/Fl_File_Input.H index 6c8ee578b..859652284 100644 --- a/FL/Fl_File_Input.H +++ b/FL/Fl_File_Input.H @@ -46,7 +46,6 @@ */ class FL_EXPORT Fl_File_Input : public Fl_Input { - Fl_Color errorcolor_; char ok_entry_; uchar down_box_; short buttons_[200]; @@ -73,11 +72,24 @@ public: /** Gets the current error color. - \todo Better docs for Fl_File_Input::errorcolor() - is it even used? + + Returns \p FL_RED since FLTK 1.4.0 (default in 1.3.x). + Retained for backwards compatibility. + + \deprecated Will be removed in FLTK 1.4.2 or higher. + \todo Remove Fl_File_Input::errorcolor() in FLTK 1.4.2 or higher. */ - Fl_Color errorcolor() const { return errorcolor_; } - /** Sets the current error color to \p c */ - void errorcolor(Fl_Color c) { errorcolor_ = c; } + Fl_Color errorcolor() const { return FL_RED; } + + /** + Sets the current error color to \p c. + + Does nothing since FLTK 1.4.0. Retained for backwards compatibility. + + \deprecated Will be removed in FLTK 1.4.2 or higher. + \todo Remove Fl_File_Input::errorcolor(Fl_Color) in FLTK 1.4.2 or higher. + */ + void errorcolor(Fl_Color c) {} int value(const char *str); int value(const char *str, int len); diff --git a/FL/Fl_Text_Buffer.H b/FL/Fl_Text_Buffer.H index 8fba33f16..59f686cc6 100644 --- a/FL/Fl_Text_Buffer.H +++ b/FL/Fl_Text_Buffer.H @@ -182,16 +182,16 @@ typedef void (*Fl_Text_Predelete_Cb)(int pos, int nDeleted, void* cbArg); /** - \brief This class manages Unicode text displayed in one or more Fl_Text_Display widgets. + This class manages Unicode text displayed in one or more Fl_Text_Display widgets. All text in Fl_Text_Buffer must be encoded in UTF-8. All indices used in the function calls must be aligned to the start of a UTF-8 sequence. All indices and pointers returned will be aligned. All functions that return a single character will return that in an unsiged int in UCS-4 encoding. - The Fl_Text_Buffer class is used by the Fl_Text_Display - and Fl_Text_Editor to manage complex text data and is based upon the - excellent NEdit text editor engine - see http://www.nedit.org/. + The Fl_Text_Buffer class is used by the Fl_Text_Display and Fl_Text_Editor + to manage complex text data and is based upon the excellent NEdit text + editor engine - see https://sourceforge.net/projects/nedit/. */ class FL_EXPORT Fl_Text_Buffer { public: |