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

FL/Fl.H

@@ -3,7 +3,7 @@
 //
 // Main header file 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
@@ -1084,7 +1084,7 @@ int main() {
  /** \defgroup  fl_drawings  Drawing functions
   FLTK global graphics and GUI drawing functions.
   These functions are declared in <FL/fl_draw.H>, 
-  and in <FL/x.H> for offscreen buffer-related ones.
+  and in <FL/platform.H> for offscreen buffer-related ones.
      @{ */
   // <Hack to re-order the 'Drawing functions' group>
  /** @} */

FL/mac.H

@@ -3,7 +3,7 @@
 //
 // Mac header file 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
@@ -16,13 +16,13 @@
 //     http://www.fltk.org/str.php
 //
 
-// Do not directly include this file, instead use <FL/x.H>.  It will
+// Do not directly include this file, instead use <FL/platform.H>.  It will
 // include this file if "__APPLE__" is defined.  This is to encourage
 // portability of even the system-specific code...
 #ifndef FL_DOXYGEN
 
 #if !defined(Fl_X_H)
-#  error "Never use <FL/mac.H> directly; include <FL/x.H> instead."
+#  error "Never use <FL/mac.H> directly; include <FL/platform.H> instead."
 #endif // !Fl_X_H
 
 #ifdef __OBJC__
@@ -109,7 +109,7 @@ extern CGContextRef fl_gc;
  */
 
 /** \defgroup group_macosx Mac OS X-specific symbols
- Mac OS X-specific symbols declared in <FL/x.H> or <FL/gl.h>
+ Mac OS X-specific symbols declared in <FL/platform.H> or <FL/gl.h>
  \sa \ref osissues_macos
  @{ */
 

FL/porting.H

@@ -3,7 +3,7 @@
 //
 // Template header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 2016 by Bill Spitzak and others.
+// Copyright 2016-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
@@ -16,13 +16,13 @@
 //     http://www.fltk.org/str.php
 //
 
-// Do not directly include this file, instead use <FL/x.H>.
+// Do not directly include this file, instead use <FL/platform.H>.
 
 // These types and variables give access to internal, platform-specific data through the public API.
-// They require to include x.H (in contrast to types defined in platform_types.h)
+// They require to include platform.H (in contrast to types defined in platform_types.h)
 
 #if !defined(Fl_X_H)
-#  error "Never use <FL/porting.H> directly; include <FL/x.H> instead."
+#  error "Never use <FL/porting.H> directly; include <FL/platform.H> instead."
 #endif // !Fl_X_H
 
 typedef void *Window; // used by fl_find(), fl_xid() and class Fl_X

FL/win32.H

@@ -3,7 +3,7 @@
 //
 // WIN32 header file 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
@@ -16,13 +16,13 @@
 //     http://www.fltk.org/str.php
 //
 
-// Do not directly include this file, instead use <FL/x.H>.  It will
+// Do not directly include this file, instead use <FL/platform.H>.  It will
 // include this file if WIN32 is defined.  This is to encourage
 // portability of even the system-specific code...
 
 #ifndef FL_DOXYGEN
 #ifndef Fl_X_H
-#  error "Never use <FL/win32.H> directly; include <FL/x.H> instead."
+#  error "Never use <FL/win32.H> directly; include <FL/platform.H> instead."
 #endif // !Fl_X_H
 
 #include <windows.h>

cairo/Fl_Cairo.cxx

@@ -3,7 +3,7 @@
 //
 // Main header file 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
@@ -20,7 +20,7 @@
 
 #ifdef FLTK_HAVE_CAIRO
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Window.H>
 
 // Cairo is currently supported for the following platforms:

examples/OpenGL3test.cxx

@@ -3,7 +3,7 @@
 //
 // Tiny OpenGL v3 demo 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
@@ -18,7 +18,7 @@
 
 #include <stdarg.h>
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Gl_Window.H>
 #include <FL/Fl_Light_Button.H>

fltk.list.in

@@ -5,7 +5,7 @@
 #
 # (EPM can be found at http://www.epmhome.org/)
 #
-# 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
@@ -19,7 +19,7 @@
 #
 
 %product Fast Light Tool Kit (FLTK)
-%copyright 1998-2011 by Bill Spitzak and others.
+%copyright 1998-2018 by Bill Spitzak and others.
 %vendor FLTK Development Team
 %license COPYING
 %readme README
@@ -350,6 +350,7 @@ l 0000 root sys $includedir/FL/forms.h forms.H
 l 0000 root sys $includedir/FL/gl_draw.h gl_draw.H
 l 0000 root sys $includedir/FL/glut.h glut.H
 l 0000 root sys $includedir/FL/mac.h mac.H
+l 0000 root sys $includedir/FL/platform.h platform.H
 l 0000 root sys $includedir/FL/win32.h win32.H
 l 0000 root sys $includedir/FL/x.h x.H
 %system all

fluid/Fl_Window_Type.cxx

@@ -7,7 +7,7 @@
 // for interacting with the overlay, which allows the user to
 // select, move, and resize the children widgets.
 //
-// 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
@@ -24,7 +24,7 @@
 #include <FL/Fl_Overlay_Window.H>
 #include <FL/fl_message.H>
 #include <FL/fl_draw.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Menu_Item.H>
 #include <FL/Fl_Round_Button.H>
 #include "Fl_Widget_Type.h"

fluid/fluid.cxx

@@ -3,7 +3,7 @@
 //
 // FLUID main entry 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_open_callback
+#include <FL/platform.H> // for fl_open_callback
 #endif
 #include <FL/Fl_Double_Window.H>
 #include <FL/Fl_Box.H>
@@ -54,7 +54,7 @@
 #  include <io.h>
 #  include <fcntl.h>
 #  include <commdlg.h>
-#  include <FL/x.H>
+#  include <FL/platform.H>
 #else
 #  include <unistd.h>
 #endif

fluid/makedepend

@@ -169,8 +169,8 @@ Fl_Window_Type.o: ../FL/fl_draw.H ../FL/Enumerations.H
 Fl_Window_Type.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H
 Fl_Window_Type.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H
 Fl_Window_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
-Fl_Window_Type.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/x.H
+Fl_Window_Type.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/platform.H
-Fl_Window_Type.o: ../FL/platform.H ../FL/fl_types.h ../FL/Fl_Menu_Item.H
+Fl_Window_Type.o: ../FL/fl_types.h ../FL/Fl_Menu_Item.H
 Fl_Window_Type.o: ../FL/Fl_Round_Button.H ../FL/Fl_Light_Button.H
 Fl_Window_Type.o: ../FL/Fl_Button.H Fl_Widget_Type.h Fl_Type.h
 Fl_Window_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H

src/Fl.cxx

@@ -3,7 +3,7 @@
 //
 // Main event handling code 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
@@ -19,7 +19,7 @@
 #include "config_lib.h"
 
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Screen_Driver.H>
 #include <FL/Fl_Window_Driver.H>
 #include <FL/Fl_System_Driver.H>

src/Fl_Double_Window.cxx

@@ -3,7 +3,7 @@
 //
 // Double-buffered window code 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
@@ -20,7 +20,7 @@
  */
 
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Double_Window.H>
 #include <FL/Fl_Printer.H>
 #include <FL/fl_draw.H>

src/Fl_File_Chooser2.cxx

@@ -3,7 +3,7 @@
 //
 // More Fl_File_Chooser routines.
 //
-// Copyright 1999-2011 by Michael Sweet.
+// Copyright 1999-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
@@ -348,7 +348,7 @@
 #include <FL/Fl.H>
 #include <FL/filename.H>
 #include <FL/fl_ask.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Shared_Image.H>
 #include <FL/fl_draw.H>
 

src/Fl_Gl_Choice.cxx

@@ -3,7 +3,7 @@
 //
 // OpenGL visual selection code 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
@@ -122,7 +122,7 @@ void Fl_Cocoa_Gl_Window_Driver::delete_gl_context(GLContext context) {
 #endif // FL_CFG_GFX_QUARTZ
 
 #ifdef FL_CFG_GFX_GDI
-#  include <FL/x.H>
+#  include <FL/platform.H>
 #  include <FL/Fl_Graphics_Driver.H>
 #include "drivers/WinAPI/Fl_WinAPI_Window_Driver.H"
 extern void fl_save_dc(HWND, HDC);
@@ -219,7 +219,7 @@ void Fl_WinAPI_Gl_Window_Driver::delete_gl_context(GLContext context) {
 #endif // FL_CFG_GFX_GDI
 
 #ifdef FL_CFG_GFX_XLIB
-#  include <FL/x.H>
+#  include <FL/platform.H>
 
 Fl_Gl_Choice *Fl_X11_Gl_Window_Driver::find(int m, const int *alistp)
 {

src/Fl_Gl_Overlay.cxx

@@ -3,7 +3,7 @@
 //
 // OpenGL overlay code 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
@@ -99,7 +99,7 @@ void Fl_Cocoa_Gl_Window_Driver::redraw_overlay() {
 
 
 #ifdef FL_CFG_GFX_XLIB
-#include <FL/x.H>
+#include <FL/platform.H>
 ////////////////////////////////////////////////////////////////
 // X version
 

src/Fl_Gl_Window.cxx

@@ -3,7 +3,7 @@
 //
 // OpenGL window code 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
@@ -497,7 +497,7 @@ void* Fl_Gl_Window_Driver::GetProcAddress(const char *procName) {
 
 
 #ifdef FL_CFG_GFX_QUARTZ
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <OpenGL/OpenGL.h>
 #include "drivers/Cocoa/Fl_Cocoa_Window_Driver.H"
 
@@ -602,7 +602,7 @@ char Fl_Cocoa_Gl_Window_Driver::swap_type() {return COPY;}
 
 #if defined(FL_CFG_GFX_GDI)
 #include "drivers/WinAPI/Fl_WinAPI_Window_Driver.H"
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Graphics_Driver.H>
 #include <FL/Fl_Screen_Driver.H>
 
@@ -694,7 +694,7 @@ void* Fl_WinAPI_Gl_Window_Driver::GetProcAddress(const char *procName) {
 
 
 #if defined(FL_CFG_GFX_XLIB)
-#include <FL/x.H>
+#include <FL/platform.H>
 #include "Fl_Gl_Choice.H"
 #include <FL/Fl_Screen_Driver.H>
 #include <FL/Fl_Window_Driver.H>

src/Fl_Graphics_Driver.cxx

@@ -3,7 +3,7 @@
 //
 // implementation of Fl_Graphics_Driver class for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 2010-2017 by Bill Spitzak and others.
+// Copyright 2010-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
@@ -24,7 +24,7 @@
 #include <FL/fl_draw.H>
 #include <FL/Fl_Image_Surface.H>
 #include <FL/math.h>
-#include <FL/x.H>
+#include <FL/platform.H>
 
 FL_EXPORT Fl_Graphics_Driver *fl_graphics_driver; // the current driver of graphics operations
 

src/Fl_Help_View.cxx

@@ -7,7 +7,7 @@
 // Image support by Matthias Melcher, Copyright 2000-2009.
 //
 // Buffer management (HV_Edit_Buffer) and more by AlbrechtS and others.
-// Copyright 2011-2016 by Bill Spitzak and others.
+// Copyright 2011-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
@@ -209,7 +209,7 @@ img->draw()
 */
 
 // We don't put the offscreen buffer in the help view class because
-// we'd need to include x.H in the header...
+// we'd need to include platform.H in the header...
 static Fl_Offscreen fl_help_view_buffer;
 int Fl_Help_View::selection_first = 0;
 int Fl_Help_View::selection_last = 0;

src/Fl_Input.cxx

@@ -3,7 +3,7 @@
 //
 // Input widget 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
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_System_Driver.H>
 #include <FL/Fl_Screen_Driver.H>

src/Fl_MacOS_Sys_Menu_Bar.mm

@@ -3,7 +3,7 @@
 //
 // MacOS system menu bar widget 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
@@ -19,7 +19,7 @@
 #if defined(__APPLE__)
 
 #include <FL/Fl_Sys_Menu_Bar_Driver.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include "drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H"
 #include "flstring.h"
 #include <stdio.h>

src/Fl_Native_File_Chooser_GTK.cxx

@@ -2,7 +2,7 @@
 //
 // FLTK native file chooser widget wrapper for GTK's GtkFileChooserDialog 
 //
-// Copyright 1998-2014 by Bill Spitzak and others.
+// Copyright 1998-2018 by Bill Spitzak and others.
 // Copyright 2012 IMM
 //
 // This library is free software. Distribution and use rights are outlined in
@@ -19,7 +19,7 @@
 #include "config_lib.h"
 
 #ifdef FL_CFG_WIN_X11
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Native_File_Chooser.H>
 
 #if HAVE_DLSYM && HAVE_DLFCN_H

src/Fl_Native_File_Chooser_MAC.mm

@@ -2,7 +2,7 @@
 //
 // FLTK native OS file chooser widget
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2018 by Bill Spitzak and others.
 // Copyright 2004 Greg Ercolano.
 //
 // This library is free software. Distribution and use rights are outlined in
@@ -24,7 +24,7 @@
 #ifdef __APPLE__
 
 #include <FL/Fl.H>
-#include <FL/x.H> // for fl_mac_os_version
+#include <FL/platform.H> // for fl_mac_os_version
 #include <FL/Fl_Native_File_Chooser.H>
 #include <FL/Fl_File_Chooser.H>
 #include <FL/filename.H>

src/Fl_Native_File_Chooser_WIN32.cxx

@@ -2,7 +2,7 @@
 //
 // FLTK native OS file chooser widget
 //
-// Copyright 1998-2017 by Bill Spitzak and others.
+// Copyright 1998-2018 by Bill Spitzak and others.
 // Copyright 2004 Greg Ercolano.
 // API changes + filter improvements by Nathan Vander Wilt 2005
 //
@@ -35,7 +35,7 @@
 #  include <commdlg.h>		// OPENFILENAMEW, GetOpenFileName()
 #  include <shlobj.h>		// BROWSEINFOW, SHBrowseForFolder()
 #  include <FL/filename.H>	// FL_EXPORT
-#include <FL/x.H>		// fl_open_display
+#include <FL/platform.H>	// fl_open_display
 
 
 class Fl_WinAPI_Native_File_Chooser_Driver : public Fl_Native_File_Chooser_Driver {

src/Fl_Pixmap.cxx

@@ -24,7 +24,7 @@
 // it interferes with the color cube used by fl_draw_image).
 
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/fl_draw.H>
 #include <FL/Fl_Widget.H>
 #include <FL/Fl_Menu_Item.H>

src/Fl_Screen_Driver.cxx

@@ -3,7 +3,7 @@
 //
 // All screen related calls in a driver style class.
 //
-// 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
@@ -19,7 +19,7 @@
 #include <FL/Fl_Screen_Driver.H>
 #include <FL/Fl_Image.H>
 #include <FL/Fl.H>
-#include <FL/x.H> // for fl_window
+#include <FL/platform.H> // for fl_window
 #include <FL/Fl_Plugin.H>
 #include <FL/Fl_Group.H>
 #include <FL/Fl_Window.H>

src/Fl_Sys_Menu_Bar.cxx

@@ -3,7 +3,7 @@
 //
 // system menu bar widget 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_Sys_Menu_Bar_Driver.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 
 
 Fl_Sys_Menu_Bar *fl_sys_menu_bar = 0;

src/Fl_Text_Display.cxx

@@ -1,7 +1,7 @@
 //
 // "$Id$"
 //
-// Copyright 2001-2017 by Bill Spitzak and others.
+// Copyright 2001-2018 by Bill Spitzak and others.
 // Original code Copyright Mark Edel.  Permission to distribute under
 // the LGPL for the FLTK library granted by Mark Edel.
 //
@@ -27,7 +27,7 @@
 #include <ctype.h>
 #include <string.h>	// strdup()
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Text_Buffer.H>
 #include <FL/Fl_Text_Display.H>
 #include <FL/Fl_Window.H>

src/Fl_Widget_Surface.cxx

@@ -3,7 +3,7 @@
 //
 // Drivers code 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
@@ -19,7 +19,7 @@
 #include <FL/Fl_Widget_Surface.H>
 #include <FL/fl_draw.H>
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Shared_Image.H>
 #include <FL/Fl_Window_Driver.H>
 #include <FL/Fl_Screen_Driver.H>

src/Fl_Window.cxx

@@ -3,7 +3,7 @@
 //
 // Window widget class 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 @@
 
 #include <config.h>
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Window_Driver.H>
 #include <FL/Fl_RGB_Image.H>
 #include <FL/Fl_Window.H>

src/Fl_Window_Driver.cxx

@@ -4,7 +4,7 @@
 // A base class for platform specific window handling code
 // 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
@@ -22,7 +22,7 @@
 #include <FL/Fl_Overlay_Window.H>
 #include <FL/fl_draw.H>
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 
 extern void fl_throw_focus(Fl_Widget *o);
 

src/Fl_cocoa.mm

@@ -3,7 +3,7 @@
 //
 // MacOS-Cocoa specific code 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
@@ -36,7 +36,7 @@ extern "C" {
 
 #include "config_lib.h"
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Window_Driver.H>
 #include <FL/Fl_Screen_Driver.H>
 #include <FL/Fl_Window.H>

src/Fl_get_key.cxx

@@ -3,7 +3,7 @@
 //
 // Keyboard state routines 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
@@ -25,7 +25,7 @@
 
 #include <FL/Fl.H>
 #include "drivers/X11/Fl_X11_System_Driver.H"
-#include <FL/x.H> // for fl_display
+#include <FL/platform.H> // for fl_display
 
 extern char fl_key_vector[32]; // in Fl_x.cxx
 

src/Fl_get_key_mac.cxx

@@ -3,7 +3,7 @@
 //
 // MacOS keyboard state routines 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
@@ -21,7 +21,7 @@
 // symbols.
 
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include "drivers/Darwin/Fl_Darwin_System_Driver.H"
 
 // The list of Mac OS virtual keycodes appears with OS 10.5 in

src/Fl_get_key_win32.cxx

@@ -3,7 +3,7 @@
 //
 // WIN32 keyboard state routines 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
@@ -21,7 +21,7 @@
 // VK_x symbols.
 
 #include "drivers/WinAPI//Fl_WinAPI_System_Driver.H"
-#include <FL/x.H>
+#include <FL/platform.H>
 
 // convert an Fltk (X) keysym to a MSWindows VK symbol:
 // See also the inverse converter in Fl_win32.cxx

src/Fl_get_system_colors.cxx

@@ -3,7 +3,7 @@
 //
 // System color support 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_Screen_Driver.H>
 #include <FL/Fl_System_Driver.H>
 #include <FL/fl_draw.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/math.h>
 #include <FL/fl_utf8.h>
 #include "flstring.h"

src/Fl_lock.cxx

@@ -3,7 +3,7 @@
 //
 // Multi-threading support code 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
@@ -199,7 +199,7 @@ int Fl::awake(Fl_Awake_Handler func, void *data) {
 // Windows threading...
 #  include <windows.h>
 #  include <process.h>
-#  include <FL/x.H>
+#  include <FL/platform.H>
 
 // These pointers are in Fl_win32.cxx:
 extern void (*fl_lock_function)();

src/Fl_own_colormap.cxx

@@ -3,7 +3,7 @@
 //
 // Private colormap support 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
@@ -26,7 +26,7 @@
 
 #include "config_lib.h"
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_System_Driver.H>
 
 

src/Fl_win32.cxx

@@ -3,7 +3,7 @@
 //
 // WIN32-specific code 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
@@ -51,7 +51,7 @@ void fl_cleanup_dc_list(void);
 
 #include "config_lib.h"
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Window_Driver.H>
 #include <FL/Fl_Screen_Driver.H>
 #include <FL/Fl_Graphics_Driver.H> // for fl_graphics_driver

src/Fl_x.cxx

@@ -3,7 +3,7 @@
 //
 // X specific code 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
@@ -24,7 +24,7 @@
 
 #  include <config.h>
 #  include <FL/Fl.H>
-#  include <FL/x.H>
+#  include <FL/platform.H>
 #  include <FL/Fl_Window_Driver.H>
 #  include <FL/Fl_Window.H>
 #  include <FL/fl_utf8.h>

src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm

@@ -3,7 +3,7 @@
 //
 // Mac OS X-specific printing support (objective-c++) for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 2010-2016 by Bill Spitzak and others.
+// Copyright 2010-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
@@ -25,7 +25,7 @@
 #include "Fl_Cocoa_Window_Driver.H"
 
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/fl_ask.H>
 #include <FL/fl_draw.H>
 #import <Cocoa/Cocoa.h>

src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx

@@ -3,7 +3,7 @@
 //
 // Definition of Apple Cocoa Screen interface.
 //
-// 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
@@ -22,7 +22,7 @@
 #include "Fl_Cocoa_Window_Driver.H"
 #include "../Quartz/Fl_Font.H"
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Graphics_Driver.H>
 #include <FL/Fl_Input.H>
 #include <FL/fl_ask.H>

src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx

@@ -3,7 +3,7 @@
 //
 // Definition of Apple Cocoa window driver.
 //
-// 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
@@ -25,7 +25,7 @@
 #include <FL/Fl_Image_Surface.H>
 #include <FL/fl_draw.H>
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 
 Fl_Window_Driver *Fl_Window_Driver::newWindowDriver(Fl_Window *w)
 {

src/drivers/Darwin/Fl_Darwin_System_Driver.cxx

@@ -3,7 +3,7 @@
 //
 // Definition of Apple Darwin system driver.
 //
-// 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
@@ -19,7 +19,7 @@
 
 #include "../../config_lib.h"
 #include "Fl_Darwin_System_Driver.H"
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl.H>
 #include <FL/Fl_File_Browser.H>
 #include <FL/filename.H>

src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx

@@ -3,7 +3,7 @@
 //
 // Copy-to-clipboard code 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
@@ -20,7 +20,7 @@
 
 #ifdef FL_CFG_GFX_GDI
 #include <FL/Fl_Copy_Surface.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include "Fl_GDI_Graphics_Driver.H"
 #include "../WinAPI/Fl_WinAPI_Screen_Driver.H"
 #include <windows.h>

src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx

@@ -3,7 +3,7 @@
 //
 // Rectangle drawing routines 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
@@ -20,7 +20,7 @@
 #include "../../config_lib.h"
 #include "Fl_GDI_Graphics_Driver.H"
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 
 
 /*

src/drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx

@@ -3,7 +3,7 @@
 //
 // Arc (integer) drawing functions 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
@@ -30,7 +30,7 @@
 #include "Fl_GDI_Graphics_Driver.H"
 
 #include <FL/math.h>
-#include <FL/x.H>
+#include <FL/platform.H>
 
 void Fl_GDI_Graphics_Driver::arc_unscaled(float x, float y, float w, float h, double a1, double a2) {
   if (w <= 0 || h <= 0) return;

src/drivers/GDI/Fl_GDI_Graphics_Driver_color.cxx

@@ -3,7 +3,7 @@
 //
 // MSWidnows' GDI color functions 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
@@ -25,7 +25,7 @@
 
 #include <config.h>
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/fl_draw.H>
 
 // FIXME: all the global functions in this file should probably be protected

src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx

@@ -40,7 +40,7 @@
 #include "../../flstring.h"
 #include <FL/Fl.H>
 #include <FL/fl_draw.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include "Fl_Font.H"
 
 #include <stdio.h>

src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx

@@ -3,7 +3,7 @@
 //
 // WIN32 image drawing code 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
@@ -41,7 +41,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Printer.H>
 #include <FL/fl_draw.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/Fl_Image_Surface.H>
 
 #define MAXBUFFER 0x40000 // 256k

src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx

@@ -3,7 +3,7 @@
 //
 // Line style code 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
@@ -23,7 +23,7 @@
 */
 
 #include <FL/Fl.H>
-#include <FL/x.H>
+#include <FL/platform.H>
 #include <FL/fl_draw.H>
 #include <FL/Fl_Printer.H>