Merge remote-tracking branch 'origin/master'

6 files changed, 31 insertions, 19 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:
diff --git a/documentation/src/development.dox b/documentation/src/development.dox
index b53c3a87e..e2fcefd0c 100644
--- a/documentation/src/development.dox
+++ b/documentation/src/development.dox
@@ -156,7 +156,7 @@ This will appear in the document:
     ", ü, ç, Ç, but not all HTML quoting characters.
 
 For further informations about HTML quoting characters see
-    <br> \b http://www.doxygen.org/htmlcmds.html
+    <br> \b http://www.doxygen.org/manual/htmlcmds.html
 
 Alternatively you can use \b UTF-8 encoding within Doxygen comments.
 
@@ -221,9 +221,9 @@ Links to other documents and external links can be embedded with
     unicode that has been created with a \\page statement.
 
 -   For further informations about quoting see
-    http://www.doxygen.org/htmlcmds.html
+    http://www.doxygen.org/manual/htmlcmds.html
 
--   see <a href="http://www.nedit.org/">Nedit</a> creates
+-   see <a href="https://www.fltk.org/">FLTK Library</a> creates
     a standard HTML link
 
 \endcode
@@ -234,9 +234,9 @@ appears as:
     unicode that has been created with a \\page statement.
 
 -   For further informations about quoting see
-    http://www.doxygen.org/htmlcmds.html
+    http://www.doxygen.org/manual/htmlcmds.html
 
--   see <a href="http://www.nedit.org/">Nedit</a> creates
+-   see <a href="https://www.fltk.org/">FLTK Library</a> creates
     a standard HTML link
 
 
diff --git a/documentation/src/editor.dox b/documentation/src/editor.dox
index 24e13ceb0..2531dfbae 100644
--- a/documentation/src/editor.dox
+++ b/documentation/src/editor.dox
@@ -620,8 +620,8 @@ Fl_Text_Editor widget.
 The Fl_Text_Editor widget supports highlighting
 of text with different fonts, colors, and sizes. The
 implementation is based on the excellent
-<A HREF="http://www.nedit.org/">NEdit</A>
-text editor core, from http://www.nedit.org/, which
+<A HREF="https://sourceforge.net/projects/nedit/">NEdit</A>
+text editor core, from https://sourceforge.net/projects/nedit/, which
 uses a parallel "style" buffer which tracks the font, color, and
 size of the text that is drawn.
 
diff --git a/documentation/src/faq.dox b/documentation/src/faq.dox
index 530f97eef..a407327dd 100644
--- a/documentation/src/faq.dox
+++ b/documentation/src/faq.dox
@@ -125,7 +125,7 @@ because Escape will still close pop-up windows:
 
 \code
 void my_callback(Fl_Widget*, void*) {
-  if (Fl::event()==FL_SHORTCUT && Fl::event_key()==FL_Escape) 
+  if (Fl::event() == FL_SHORTCUT && Fl::event_key() == FL_Escape)
     return; // ignore Escape
   exit(0);
 }
@@ -136,7 +136,8 @@ done with:
 
 \code
 void my_callback(Fl_Widget*, void*) {
-  if (fl_ask("Are you sure you want to quit?"))
+  if (fl_choice("Are you sure you want to quit?",
+                "continue", "quit", NULL))
     exit(0);
 }
 \endcode
diff --git a/src/Fl_File_Input.cxx b/src/Fl_File_Input.cxx
index 4a4f3b49a..201101809 100644
--- a/src/Fl_File_Input.cxx
+++ b/src/Fl_File_Input.cxx
@@ -50,7 +50,6 @@
 Fl_File_Input::Fl_File_Input(int X, int Y, int W, int H, const char *L)
   : Fl_Input(X, Y, W, H, L) {
   buttons_[0] = 0;
-  errorcolor_ = FL_RED;
   ok_entry_   = 1;
   pressed_    = -1;