From 6d4b93e9c75023000512e3370b7a75610c8a11d9 Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Sat, 19 Nov 2016 01:20:53 +0000
Subject: 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
---
 examples/tree-custom-draw-items.cxx | 12 +-----------
 examples/tree-of-tables.cxx         | 10 +---------
 examples/tree-simple.cxx            |  4 +---
 3 files changed, 3 insertions(+), 23 deletions(-)

(limited to 'examples')

diff --git a/examples/tree-custom-draw-items.cxx b/examples/tree-custom-draw-items.cxx
index fbee62700..58e7e87fd 100644
--- a/examples/tree-custom-draw-items.cxx
+++ b/examples/tree-custom-draw-items.cxx
@@ -4,7 +4,7 @@
 //	Demonstrate Fl_Tree custom item draw callback. - erco 11/09/2013
 //
 // Copyright 2013 Greg Ercolano.
-// Copyright 1998-2013 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
@@ -26,7 +26,6 @@
 #define MAX(a,b) ((a)>(b))?(a):(b)
 #endif
 
-#if FLTK_ABI_VERSION >= 10303
 // DERIVE CUSTOM CLASS FROM Fl_Tree_Item TO IMPLEMENT SHOWING THE TIME OF DAY
 //     This demonstrates that item content can be dynamic and highly customized.
 //
@@ -176,15 +175,6 @@ int main(int argc, char *argv[]) {
   win->show(argc, argv);
   return(Fl::run());
 }
-#else
-#include <FL/Fl.H>
-#include <FL/fl_message.H>
-int main(int, char**) {
-  fl_alert("This demo is dependent on an ABI feature.\n"
-           "FLTK_ABI_VERSION must be set to 10303 (or higher) in Enumerations.H");
-  return 1;
-}
-#endif
 
 //
 // End of "$Id$".
diff --git a/examples/tree-of-tables.cxx b/examples/tree-of-tables.cxx
index be815551b..b90a015d0 100644
--- a/examples/tree-of-tables.cxx
+++ b/examples/tree-of-tables.cxx
@@ -7,7 +7,7 @@
 //      contains a complex widget.
 //
 // Copyright 2010,2012 Greg Ercolano.
-// 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
@@ -29,7 +29,6 @@
 #define PI 3.14159
 #endif
 
-#if FLTK_ABI_VERSION >= 10301
 class MyTable : public Fl_Table {
   const char *mode;
 public:
@@ -142,13 +141,6 @@ int main(int argc, char *argv[]) {
   win->show(argc, argv);
   return(Fl::run());
 }
-#else /*FLTK_ABI_VERSION*/
-#include <FL/fl_ask.H>
-int main(int argc, char *argv[]) {
-  fl_alert("This example must have FLTK_ABI_VERSION enabled to work properly.");
-  return 1;
-}
-#endif
 
 //
 // End of "$Id$".
diff --git a/examples/tree-simple.cxx b/examples/tree-simple.cxx
index 6450e9849..7e3cf964d 100644
--- a/examples/tree-simple.cxx
+++ b/examples/tree-simple.cxx
@@ -4,7 +4,7 @@
 //	Simple Fl_Tree widget example. - erco 06/05/2010
 //
 // Copyright 2010 Greg Ercolano.
-// 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
@@ -44,12 +44,10 @@ void TreeCallback(Fl_Widget *w, void *data) {
     case FL_TREE_REASON_CLOSED:
       // fprintf(stderr, "TreeCallback: Item '%s' closed\n", item->label());
       break;
-#if FLTK_ABI_VERSION >= 10301
     // To enable this callback, use tree->item_reselect_mode(FL_TREE_SELECTABLE_ALWAYS);
     case FL_TREE_REASON_RESELECTED:
       // fprintf(stderr, "TreeCallback: Item '%s' reselected\n", item->label());
       break;
-#endif
     default:
       break;
   }
-- 
cgit v1.2.3