Remove CodeWarrior "support"

Metrowerks CodeWarrior was an ancient macOS compiler (discontinued
since 2005) that defined the macro __MWERKS__. Code using this macro
and several comments have been removed.

6 files changed, 27 insertions, 63 deletions

diff --git a/FL/math.h b/FL/math.h
index a113eb112..e5182352b 100644
--- a/FL/math.h
+++ b/FL/math.h
@@ -3,20 +3,20 @@
 //
 // Math header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2016 by Bill Spitzak and others.
+// Copyright 1998-2020 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
 // Please report all bugs and problems on the following page:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/str.php
 //
 
-// Xcode on OS X includes files by recursing down into directories.
+// Xcode on macOS includes files by recursing down into directories.
 // This code catches the cycle and directly includes the required file.
 #ifdef fl_math_h_cyclic_include 
 #  include "/usr/include/math.h"
@@ -42,12 +42,12 @@
 #    define M_SQRT1_2       0.70710678118654752440
 #  endif // !M_SQRT2
 
-#  if (defined(_WIN32) || defined(CRAY)) && !defined(__MINGW32__) && !defined(__MWERKS__)
+#  if (defined(_WIN32) || defined(CRAY)) && !defined(__MINGW32__)
 
 inline double rint(double v) {return floor(v+.5);}
 inline double copysign(double a, double b) {return b<0 ? -a : a;}
 
-#  endif // (_WIN32 || CRAY) && !__MINGW32__ && !__MWERKS__
+#  endif // (_WIN32 || CRAY) && !__MINGW32__
 
 #endif // !fl_math_h
 
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index c80d35140..8c4df1e3c 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -3,17 +3,17 @@
 //
 // FLUID main entry for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2018 by Bill Spitzak and others.
+// Copyright 1998-2020 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
 // Please report all bugs and problems on the following page:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/str.php
 //
 
 #include <FL/Fl.H>
@@ -1480,7 +1480,6 @@ static bool prepare_shell_command(const char * &command)  { // common pre-shell
   return true;
 }
 
-#if !defined(__MWERKS__)
 // Support the full piped shell command...
 void
 shell_pipe_cb(FL_SOCKET, void*) {
@@ -1537,22 +1536,6 @@ do_shell_command(Fl_Return_Button*, void*) {
 
   while (shell_run_window->shown()) Fl::wait();
 }
-#else
-// Just do basic shell command stuff, no status window...
-void
-do_shell_command(Fl_Return_Button*, void*) {
-  const char	*command;	// Command to run
-  int		status;		// Status from command...
-
-  if (!prepare_shell_command(command)) return;
-
-  if ((status = system(command)) != 0) {
-    fl_alert("Shell command returned status %d!", status);
-  } else if (completion_button->value()) {
-    fl_message("Shell command completed successfully!");
-  }
-}
-#endif // !__MWERKS__
 
 void
 show_shell_window() {
diff --git a/src/Fl_Group.cxx b/src/Fl_Group.cxx
index 4d4c3df61..229d33fbe 100644
--- a/src/Fl_Group.cxx
+++ b/src/Fl_Group.cxx
@@ -3,17 +3,17 @@
 //
 // Group widget for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2018 by Bill Spitzak and others.
+// Copyright 1998-2020 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
 // Please report all bugs and problems on the following page:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/str.php
 //
 
 // The Fl_Group is the only defined container type in FLTK.
@@ -54,7 +54,7 @@ int Fl_Group::find(const Fl_Widget* o) const {
   return i;
 }
 
-// Metrowerks CodeWarrior and others can't export the static
+// Some (* which? *) compilers / toolchains can't export the static
 // class member: current_, so these methods can't be inlined...
 
 /**
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 258209091..7ae551263 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -3,31 +3,19 @@
 //
 // MacOS-Cocoa specific code for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2019 by Bill Spitzak and others.
+// Copyright 1998-2020 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
 // Please report all bugs and problems on the following page:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/str.php
 //
 
-//// From the inner edge of a MetroWerks CodeWarrior CD:
-// (without permission)
-//
-// "Three Compiles for 68Ks under the sky,
-// Seven Compiles for PPCs in their fragments of code,
-// Nine Compiles for Mortal Carbon doomed to die,
-// One Compile for Mach-O Cocoa on its Mach-O throne,
-// in the Land of MacOS X where the Drop-Shadows lie.
-// 
-// One Compile to link them all, One Compile to merge them,
-// One Compile to copy them all and in the bundle bind them,
-// in the Land of MacOS X where the Drop-Shadows lie."
 
 #define CONSOLIDATE_MOTION 0
 extern "C" {
diff --git a/test/demo.cxx b/test/demo.cxx
index ddee12234..b68a66756 100644
--- a/test/demo.cxx
+++ b/test/demo.cxx
@@ -32,23 +32,20 @@
 #include <FL/filename.H>
 #include <FL/platform.H>
 
-/* Define a macro to decide if a trailing 'd' needs to be removed
+/* Define a macro to decide whether a trailing 'd' needs to be removed
    from the executable file name. Previous versions of Visual Studio
    added a 'd' to the executable file name ('demod.exe') in Debug
    configurations that needed to be removed.
    This is no longer true with CMake-generated IDE's since FLTK 1.4.
-   The 'old' behavior obviously applied or still applies to
-   CodeWarrior (__MWERKS__).
-   *FIXME* is this still true and necessary?
+   Just in case we add it again: leave macro DEBUG_EXE_WITH_D defined
+   and leave the code using this macro as-is.
 */
 
-// #if ( defined _MSC_VER || defined __MWERKS__ ) && defined _DEBUG
-
-#if defined(_WIN32) && defined(__MWERKS__) && defined(_DEBUG)
-# define DEBUG_EXE_WITH_D 1
-#else
+// #if defined(_MSC_VER) && defined(_DEBUG) // Visual Studio in Debug mode
+// # define DEBUG_EXE_WITH_D 1
+// #else
 # define DEBUG_EXE_WITH_D 0
-#endif
+// #endif
 
 /* The form description */
 
@@ -446,7 +443,7 @@ int main(int argc, char **argv) {
   char buf[FL_PATH_MAX];
   strcpy(buf, argv[0]);
 #if DEBUG_EXE_WITH_D
-  // MS_VisualC appends a 'd' to debugging executables. Remove it.
+  // MS_Visual Studio appends a 'd' to debugging executables. Remove it.
   fl_filename_setext( buf, "" );
   buf[ strlen(buf)-1 ] = 0;
 #endif
diff --git a/test/editor.cxx b/test/editor.cxx
index 1a67fc7d6..176a8d79b 100644
--- a/test/editor.cxx
+++ b/test/editor.cxx
@@ -5,17 +5,17 @@
 //
 // This program is described in Chapter 4 of the FLTK Programmer's Guide.
 //
-// Copyright 1998-2018 by Bill Spitzak and others.
+// Copyright 1998-2020 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
 // Please report all bugs and problems on the following page:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/str.php
 //
 
 //
@@ -28,10 +28,6 @@
 #include <ctype.h>
 #include <errno.h>
 
-#ifdef __MWERKS__
-# define FL_DLL
-#endif
-
 #include <FL/Fl.H>
 #include <FL/platform.H> // for fl_open_callback
 #include <FL/Fl_Group.H>