Replace FL/x.H with FL/platform.H - step 2 (STR #3435).

This second step replaces FL/x.H with FL/platform.H in all source files.
Dependencies have been adjusted as well.

This commit completes the replacement of FL/x.H with FL/platform.H.


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

12 files changed, 32 insertions, 32 deletions

diff --git a/test/animated.cxx b/test/animated.cxx
index 961a10099..442aa4495 100644
--- a/test/animated.cxx
+++ b/test/animated.cxx
@@ -3,7 +3,7 @@
 //
 // Alpha rendering benchmark program for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2015 by Bill Spitzak and others.
+// Copyright 1998-2018 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
@@ -20,7 +20,7 @@
 #include <FL/Fl_Double_Window.H>
 #include <FL/Fl_Button.H>
 #include <FL/Fl_Image.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/fl_draw.H>
 
 #include <stdio.h>
diff --git a/test/blocks.cxx b/test/blocks.cxx
index d9b86839d..691c54130 100644
--- a/test/blocks.cxx
+++ b/test/blocks.cxx
@@ -3,7 +3,7 @@
 //
 // "Block Attack!" scrolling blocks game using the Fast Light Tool Kit (FLTK).
 //
-// Copyright 2006-2017 by Michael Sweet.
+// Copyright 2006-2018 by Michael Sweet.
 //
 // 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
@@ -24,7 +24,7 @@
 #include <FL/Fl_XBM_Image.H>
 #include <FL/Fl_Tiled_Image.H>
 #include <FL/fl_draw.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/test/cairo_test.cxx b/test/cairo_test.cxx
index 62c4b0db7..71dcf7711 100644
--- a/test/cairo_test.cxx
+++ b/test/cairo_test.cxx
@@ -3,7 +3,7 @@
 //
 // Arc drawing test program for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2018 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
@@ -22,7 +22,7 @@
 
 #include <FL/Fl_Cairo_Window.H>
 #include <FL/Fl_Box.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/fl_draw.H>
 #include <FL/math.h>
 #define DEF_WIDTH 0.03
diff --git a/test/color_chooser.cxx b/test/color_chooser.cxx
index d229dd5b8..887962961 100644
--- a/test/color_chooser.cxx
+++ b/test/color_chooser.cxx
@@ -3,7 +3,7 @@
 //
 // Color chooser test program for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2018 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
@@ -23,7 +23,7 @@
 #include <FL/fl_show_colormap.H>
 #include <FL/Fl_Color_Chooser.H>
 #include <FL/Fl_Image.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/fl_draw.H>
 
 #include <stdlib.h>
diff --git a/test/demo.cxx b/test/demo.cxx
index 86887d585..44646af92 100644
--- a/test/demo.cxx
+++ b/test/demo.cxx
@@ -3,7 +3,7 @@
 //
 // Main demo program for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2017 by Bill Spitzak and others.
+// Copyright 1998-2018 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
@@ -48,7 +48,7 @@
 #include <FL/Fl_Button.H>
 #include <FL/Fl_Choice.H>
 #include <FL/filename.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 
 /* Define a macro to decide if a trailing 'd' needs to be removed
    from the executable file name. Previous versions of Visual Studio
diff --git a/test/editor.cxx b/test/editor.cxx
index c9aa6a4bf..868d14c30 100644
--- a/test/editor.cxx
+++ b/test/editor.cxx
@@ -5,7 +5,7 @@
 //
 // This program is described in Chapter 4 of the FLTK Programmer's Guide.
 //
-// Copyright 1998-2016 by Bill Spitzak and others.
+// Copyright 1998-2018 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
@@ -33,7 +33,7 @@
 #endif
 
 #include <FL/Fl.H>
-#include <FL/x.H> // for fl_open_callback
+#include <FL/platform.H> // for fl_open_callback
 #include <FL/Fl_Group.H>
 #include <FL/Fl_Double_Window.H>
 #include <FL/fl_ask.H>
diff --git a/test/image.cxx b/test/image.cxx
index 3c0b1f6b3..ff2f9ab1b 100644
--- a/test/image.cxx
+++ b/test/image.cxx
@@ -7,7 +7,7 @@
 // as an icon or postage stamp.  Use fl_draw_image to go directly
 // from an buffered image that changes often.
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2018 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
@@ -72,7 +72,7 @@ void button_cb(Fl_Widget *,void *) {
   w->redraw();
 }
 
-#include <FL/x.H>
+#include <FL/platform.H>
 #if !defined(WIN32) && !defined(__APPLE__)
 #include "list_visuals.cxx"
 #endif
diff --git a/test/makedepend b/test/makedepend
index 75b19d1cd..17d024bb6 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -37,7 +37,7 @@ animated.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 animated.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Double_Window.H
 animated.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 animated.o: ../FL/Fl_Rect.H ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H
-animated.o: ../FL/Fl_Image.H ../FL/Fl_Button.H ../FL/Fl_Image.H ../FL/x.H
+animated.o: ../FL/Fl_Image.H ../FL/Fl_Button.H ../FL/Fl_Image.H
 animated.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H
 animated.o: ../FL/fl_draw.H
 adjuster.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
@@ -73,7 +73,7 @@ blocks.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Rect.H
 blocks.o: ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
 blocks.o: ../FL/Fl_Button.H ../FL/Fl_Preferences.H ../FL/Fl_XPM_Image.H
 blocks.o: ../FL/Fl_Pixmap.H ../FL/Fl_XBM_Image.H ../FL/Fl_Bitmap.H
-blocks.o: ../FL/Fl_Tiled_Image.H ../FL/fl_draw.H ../FL/x.H ../FL/platform.H
+blocks.o: ../FL/Fl_Tiled_Image.H ../FL/fl_draw.H ../FL/platform.H
 blocks.o: ../FL/fl_types.h ../FL/Enumerations.H ../config.h pixmaps/blast.xpm
 blocks.o: pixmaps/red.xpm pixmaps/red_bomb.xpm pixmaps/green.xpm
 blocks.o: pixmaps/green_bomb.xpm pixmaps/blue.xpm pixmaps/blue_bomb.xpm
@@ -158,7 +158,7 @@ color_chooser.o: ../FL/Fl_Color_Chooser.H ../FL/Fl_Return_Button.H
 color_chooser.o: ../FL/Fl_Button.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
 color_chooser.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Value_Input.H
 color_chooser.o: ../FL/Fl_Valuator.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
-color_chooser.o: ../FL/Fl_Image.H ../FL/x.H ../FL/platform.H ../FL/fl_types.h
+color_chooser.o: ../FL/Fl_Image.H ../FL/platform.H ../FL/fl_types.h
 color_chooser.o: ../FL/Enumerations.H ../FL/fl_draw.H list_visuals.cxx
 color_chooser.o: ../config.h
 cube.o: ../config.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
@@ -209,7 +209,7 @@ demo.o: ../FL/abi-version.h ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
 demo.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Rect.H ../FL/Fl_Widget.H
 demo.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Box.H ../FL/Fl_Button.H
 demo.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
-demo.o: ../FL/filename.H ../FL/x.H ../FL/platform.H ../FL/fl_types.h
+demo.o: ../FL/filename.H ../FL/platform.H ../FL/fl_types.h
 demo.o: ../FL/Enumerations.H
 device.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
 device.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
@@ -244,7 +244,7 @@ doublebuffer.o: ../FL/Fl_Box.H ../FL/fl_draw.H ../FL/Fl_Hor_Slider.H
 doublebuffer.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/math.h
 editor.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
 editor.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
-editor.o: ../FL/abi-version.h ../FL/x.H ../FL/platform.H ../FL/fl_types.h
+editor.o: ../FL/abi-version.h ../FL/platform.H ../FL/fl_types.h
 editor.o: ../FL/Enumerations.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 editor.o: ../FL/Fl_Rect.H ../FL/Fl_Widget.H ../FL/Fl_Double_Window.H
 editor.o: ../FL/Fl_Window.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/fl_ask.H
@@ -394,7 +394,7 @@ image.o: ../FL/abi-version.h ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
 image.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Rect.H ../FL/Fl_Widget.H
 image.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Button.H
 image.o: ../FL/Fl_Image.H ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H
-image.o: ../FL/x.H ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H
+image.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H
 image.o: list_visuals.cxx ../config.h
 inactive.o: inactive.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 inactive.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
@@ -545,7 +545,7 @@ offscreen.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 offscreen.o: ../FL/Enumerations.H ../FL/abi-version.h
 offscreen.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 offscreen.o: ../FL/Fl_Widget.H ../FL/Fl_Rect.H ../FL/Fl_Widget.H
-offscreen.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/x.H ../FL/platform.H
+offscreen.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/platform.H
 offscreen.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Box.H
 offscreen.o: ../FL/fl_draw.H
 output.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
@@ -708,7 +708,7 @@ sudoku.o: ../FL/fl_draw.H ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H
 sudoku.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H
 sudoku.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/filename.H
 sudoku.o: ../FL/Fl_Preferences.H ../FL/Fl_Sys_Menu_Bar.H ../FL/Fl_Menu_Bar.H
-sudoku.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/x.H ../FL/platform.H
+sudoku.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/platform.H
 sudoku.o: ../FL/fl_types.h ../FL/math.h pixmaps/sudoku.xbm ../config.h
 symbols.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 symbols.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
@@ -759,8 +759,8 @@ tiled_image.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 tiled_image.o: ../FL/Fl_Widget.H ../FL/Fl_Rect.H ../FL/Fl_Widget.H
 tiled_image.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Button.H
 tiled_image.o: ../FL/Fl_Pixmap.H ../FL/Fl_Tiled_Image.H pixmaps/tile.xpm
-tiled_image.o: ../FL/x.H ../FL/platform.H ../FL/fl_types.h
-tiled_image.o: ../FL/Enumerations.H list_visuals.cxx ../config.h
+tiled_image.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H
+tiled_image.o: list_visuals.cxx ../config.h
 tree.o: tree.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 tree.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 tree.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Tooltip.H
diff --git a/test/menubar.cxx b/test/menubar.cxx
index 40bc9ffbe..b54336a9e 100644
--- a/test/menubar.cxx
+++ b/test/menubar.cxx
@@ -3,7 +3,7 @@
 //
 // Menubar test program for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2017 by Bill Spitzak and others.
+// Copyright 1998-2018 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
@@ -18,7 +18,7 @@
 
 #include <FL/Fl.H>
 #ifdef __APPLE__
-#include <FL/x.H> // for Fl_Mac_App_Menu
+#include <FL/platform.H> // for Fl_Mac_App_Menu
 #endif
 #include <FL/Fl_Box.H>
 #include <FL/Fl_Double_Window.H>
diff --git a/test/offscreen.cxx b/test/offscreen.cxx
index 11545dea1..e6780f640 100644
--- a/test/offscreen.cxx
+++ b/test/offscreen.cxx
@@ -3,7 +3,7 @@
 //
 // Offscreen drawing test program for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2016 by Bill Spitzak and others.
+// Copyright 1998-2018 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
@@ -23,7 +23,7 @@
 /* Fltk headers */
 #include <FL/Fl.H>
 #include <FL/Fl_Double_Window.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Box.H>
 #include <FL/fl_draw.H>
 
diff --git a/test/sudoku.cxx b/test/sudoku.cxx
index 51004dc59..218e81b35 100644
--- a/test/sudoku.cxx
+++ b/test/sudoku.cxx
@@ -3,7 +3,7 @@
 //
 // Sudoku game using the Fast Light Tool Kit (FLTK).
 //
-// Copyright 2005-2010 by Michael Sweet.
+// Copyright 2005-2018 by Michael Sweet.
 //
 // 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,7 @@
 #include <FL/Fl_Help_Dialog.H>
 #include <FL/Fl_Preferences.H>
 #include <FL/Fl_Sys_Menu_Bar.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/test/tiled_image.cxx b/test/tiled_image.cxx
index 23cb290a8..7d702c28f 100644
--- a/test/tiled_image.cxx
+++ b/test/tiled_image.cxx
@@ -3,7 +3,7 @@
 //
 // Fl_Tiled_Image test program for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2018 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
@@ -34,7 +34,7 @@ void button_cb(Fl_Widget *,void *) {
   w->hide();
 }
 
-#include <FL/x.H>
+#include <FL/platform.H>
 #if !defined(WIN32) && !defined(__APPLE__)
 #include "list_visuals.cxx"
 #endif