Finally remove FLTK_ABI_VERSION preprocessor macro from code.

FLTK_ABI_VERSION has been renamed to FL_ABI_VERSION in FLTK 1.4.0.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12121 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 10 insertions, 28 deletions

diff --git a/FL/Enumerations.H b/FL/Enumerations.H
index 5612bd5c9..c31a9a677 100644
--- a/FL/Enumerations.H
+++ b/FL/Enumerations.H
@@ -25,15 +25,8 @@
 
 /*
  ******************************************************************************
- * Notes on FL_ABI_VERSION and deprecated (obsolete) FLTK_ABI_VERSION:
- *
- * (1)	FLTK_ABI_VERSION is deprecated, but still defined below.
- *	Do NOT define FLTK_ABI_VERSION here - it would be overwritten later.
- *
- * (2)	FL_ABI_VERSION is now (as of FLTK 1.3.4) defined by configure
- *	or CMake. Do NOT define it here. Its definition will be included
- *	below by "#include <FL/abi-version.h>".
- *
+ * FL_ABI_VERSION is defined by configure or CMake since FLTK 1.3.4.
+ * It is written to FL/abi-version.h and #included here.
  ******************************************************************************
  * For more informations on FL_ABI_VERSION see README.abi-version.txt.
  ******************************************************************************
@@ -181,19 +174,6 @@
 
 #endif
 
-/*
-  FLTK_ABI_VERSION is deprecated (replaced by FL_ABI_VERSION).
-
-  This deprecated constant will be removed in FLTK 1.4.0 and later.
-  Please use FL_ABI_VERSION when FLTK 1.4.0 has been released.
-*/
-
-#ifdef FLTK_ABI_VERSION
-#undef FLTK_ABI_VERSION
-#endif
-
-#define FLTK_ABI_VERSION FL_ABI_VERSION
-
 /*@}*/	// group: Version Numbers
 
 /**
@@ -214,7 +194,7 @@
 
     \sa Fl::event_text(), Fl::event_key(), class Fl::
  */
-// DEV NOTE: Keep this list in sync with FL/names.H
+// DEV NOTE: Keep this list in sync with FL/names.h
 enum Fl_Event {	// events
   /** No event. */
   FL_NO_EVENT		= 0,
@@ -424,6 +404,8 @@ enum Fl_Event {	// events
       Fl::event_x() and Fl::event_y() are set as well.
      */
   FL_ZOOM_GESTURE	= 26
+
+// DEV NOTE: Keep this list in sync with FL/names.h
 };
 
 /** \name When Conditions */
diff --git a/FL/names.h b/FL/names.h
index cee584b05..46525d600 100644
--- a/FL/names.h
+++ b/FL/names.h
@@ -3,7 +3,7 @@
 //
 // Event names header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2016 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
@@ -69,10 +69,10 @@ const char * const fl_eventnames[] =
   "FL_SCREEN_CONFIGURATION_CHANGED",
   "FL_FULLSCREEN",
   "FL_ZOOM_GESTURE",
-  "FL_EVENT_27",  // not yet defined, just in case they /will/ be defined ...
-  "FL_EVENT_28",
-  "FL_EVENT_29",
-  "FL_EVENT_30"
+  "FL_EVENT_27", // not yet defined, just in case it /will/ be defined ...
+  "FL_EVENT_28", // not yet defined, just in case it /will/ be defined ...
+  "FL_EVENT_29", // not yet defined, just in case it /will/ be defined ...
+  "FL_EVENT_30"  // not yet defined, just in case it /will/ be defined ...
 };
 
 /**