diff options
Diffstat (limited to 'src')
89 files changed, 299 insertions, 312 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index dd1533ad8..ca629ab94 100644 --- a/src/Fl.cxx +++ b/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> diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx index dfce3ea9b..fd2a1ca8f 100644 --- a/src/Fl_Double_Window.cxx +++ b/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> diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx index 791a97c19..94cbbfe63 100644 --- a/src/Fl_File_Chooser2.cxx +++ b/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> diff --git a/src/Fl_Gl_Choice.cxx b/src/Fl_Gl_Choice.cxx index 7af80398a..c1707cd5e 100644 --- a/src/Fl_Gl_Choice.cxx +++ b/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) { diff --git a/src/Fl_Gl_Overlay.cxx b/src/Fl_Gl_Overlay.cxx index 187943851..0c98ca707 100644 --- a/src/Fl_Gl_Overlay.cxx +++ b/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 diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index c95220ce5..27aa4ced5 100644 --- a/src/Fl_Gl_Window.cxx +++ b/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> diff --git a/src/Fl_Graphics_Driver.cxx b/src/Fl_Graphics_Driver.cxx index 7c09a7cc6..2cbf0f238 100644 --- a/src/Fl_Graphics_Driver.cxx +++ b/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 diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index f794c1c2b..0838db41e 100644 --- a/src/Fl_Help_View.cxx +++ b/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; diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx index 4054ae603..69abcc013 100644 --- a/src/Fl_Input.cxx +++ b/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> diff --git a/src/Fl_MacOS_Sys_Menu_Bar.mm b/src/Fl_MacOS_Sys_Menu_Bar.mm index fa487d54f..b5a9fba9a 100644 --- a/src/Fl_MacOS_Sys_Menu_Bar.mm +++ b/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> diff --git a/src/Fl_Native_File_Chooser_GTK.cxx b/src/Fl_Native_File_Chooser_GTK.cxx index 21fb69ece..2d6b819f9 100644 --- a/src/Fl_Native_File_Chooser_GTK.cxx +++ b/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 diff --git a/src/Fl_Native_File_Chooser_MAC.mm b/src/Fl_Native_File_Chooser_MAC.mm index 2b366b249..413692b8a 100644 --- a/src/Fl_Native_File_Chooser_MAC.mm +++ b/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> diff --git a/src/Fl_Native_File_Chooser_WIN32.cxx b/src/Fl_Native_File_Chooser_WIN32.cxx index c726dd8bf..3f6b6d9e7 100644 --- a/src/Fl_Native_File_Chooser_WIN32.cxx +++ b/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 { diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx index 3086af36b..54410a401 100644 --- a/src/Fl_Pixmap.cxx +++ b/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> diff --git a/src/Fl_Screen_Driver.cxx b/src/Fl_Screen_Driver.cxx index 5c537ef14..cd0bdbde3 100644 --- a/src/Fl_Screen_Driver.cxx +++ b/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> diff --git a/src/Fl_Sys_Menu_Bar.cxx b/src/Fl_Sys_Menu_Bar.cxx index 1e1dab81b..53241fc05 100644 --- a/src/Fl_Sys_Menu_Bar.cxx +++ b/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; diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index b70327898..8aa9f5c6d 100644 --- a/src/Fl_Text_Display.cxx +++ b/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> diff --git a/src/Fl_Widget_Surface.cxx b/src/Fl_Widget_Surface.cxx index c3cb1fcc0..7adc4361e 100644 --- a/src/Fl_Widget_Surface.cxx +++ b/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> diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx index f69899f1b..7a2ae7270 100644 --- a/src/Fl_Window.cxx +++ b/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> diff --git a/src/Fl_Window_Driver.cxx b/src/Fl_Window_Driver.cxx index 0e16aa88b..7a391e13f 100644 --- a/src/Fl_Window_Driver.cxx +++ b/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); diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index f8ff28004..f738c3221 100644 --- a/src/Fl_cocoa.mm +++ b/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> diff --git a/src/Fl_get_key.cxx b/src/Fl_get_key.cxx index e7b753d64..5bfbb5f1a 100644 --- a/src/Fl_get_key.cxx +++ b/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 diff --git a/src/Fl_get_key_mac.cxx b/src/Fl_get_key_mac.cxx index d68bde430..362169c70 100644 --- a/src/Fl_get_key_mac.cxx +++ b/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 diff --git a/src/Fl_get_key_win32.cxx b/src/Fl_get_key_win32.cxx index 0684bb512..66b27c7ae 100644 --- a/src/Fl_get_key_win32.cxx +++ b/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 diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx index 59eb95422..bd36c9a4b 100644 --- a/src/Fl_get_system_colors.cxx +++ b/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" diff --git a/src/Fl_lock.cxx b/src/Fl_lock.cxx index dd6c58cdd..902f9fc43 100644 --- a/src/Fl_lock.cxx +++ b/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)(); diff --git a/src/Fl_own_colormap.cxx b/src/Fl_own_colormap.cxx index 2588be958..4ca5fe857 100644 --- a/src/Fl_own_colormap.cxx +++ b/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> diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 37d0e3789..74b2f317b 100644 --- a/src/Fl_win32.cxx +++ b/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 diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 239f82473..65d83a76c 100644 --- a/src/Fl_x.cxx +++ b/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> diff --git a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm index 607aed8fc..192eb6878 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm +++ b/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> diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx index c009af328..213995126 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx +++ b/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> diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx index d46134c87..f6a05607c 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx +++ b/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) { diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx index f3e2318cc..ddcf5b812 100644 --- a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx +++ b/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> diff --git a/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx b/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx index 017302be7..c68bf7e20 100644 --- a/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx +++ b/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> diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx index c6b7026f8..4a49db6d5 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx +++ b/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> /* diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx index 5701b6cd9..9d4b0b354 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx +++ b/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; diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_color.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_color.cxx index 584a7f47e..c495b5223 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_color.cxx +++ b/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 diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx index 1ee84ed67..360076b0f 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx +++ b/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> diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx index e6d471b0b..63dded34d 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx +++ b/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 diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx index 2fd2da3e9..91f1a164d 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx +++ b/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> diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx index 435364160..d347cc6a8 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx @@ -3,7 +3,7 @@ // // Rectangle drawing routines 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 @@ -28,7 +28,7 @@ #include <FL/Fl_Widget.H> #include <FL/Fl_Printer.H> #include <FL/fl_draw.H> -#include <FL/x.H> +#include <FL/platform.H> #include "Fl_GDI_Graphics_Driver.H" diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx index c5ab1a760..b8ee81d65 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx @@ -3,7 +3,7 @@ // // Portable 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 @@ -26,7 +26,7 @@ #include "Fl_GDI_Graphics_Driver.H" #include <FL/fl_draw.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/math.h> diff --git a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx index 23ad79d04..573bca696 100644 --- a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx @@ -3,7 +3,7 @@ // // Draw-to-image 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 "../WinAPI/Fl_WinAPI_Screen_Driver.H" #include <FL/Fl_Image_Surface.H> #include <FL/fl_draw.H> -#include <FL/x.H> +#include <FL/platform.H> #include <windows.h> class Fl_GDI_Image_Surface_Driver : public Fl_Image_Surface_Driver { diff --git a/src/drivers/Pico/Fl_Pico_Window_Driver.cxx b/src/drivers/Pico/Fl_Pico_Window_Driver.cxx index 80635f17c..a9b7034af 100644 --- a/src/drivers/Pico/Fl_Pico_Window_Driver.cxx +++ b/src/drivers/Pico/Fl_Pico_Window_Driver.cxx @@ -3,7 +3,7 @@ // // Definition of SDL Window interface based on Pico // -// 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 "../../config_lib.h" #include "Fl_Pico_Window_Driver.H" -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl_Window.H> #include <FL/fl_draw.H> diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx index 4ea51e80b..77161e473 100644 --- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx +++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx @@ -3,7 +3,7 @@ // // Definition of Android Screen interface based on Pico // -// 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 @@ -24,7 +24,7 @@ #include <android/window.h> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl.H> #include <FL/Fl_Window.H> #include <FL/Fl_Double_Window.H> diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx index 4fb0dbac5..ce1eeac1d 100644 --- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx +++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx @@ -3,7 +3,7 @@ // // Definition of Android Window interface based on SDL // -// 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 @@ -29,7 +29,7 @@ #include <android/log.h> #include <android_native_app_glue.h> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl.H> #include <FL/Fl_Window.H> #include <FL/Fl_Window_Driver.H> diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx index 2fc906535..00b0c8828 100644 --- a/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx +++ b/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx @@ -3,7 +3,7 @@ // // Rectangle drawing routines 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 @@ -21,7 +21,7 @@ #include "Fl_PicoSDL_Graphics_Driver.H" #include "Fl_PicoSDL_Screen_Driver.H" -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl_Window_Driver.H> #include <FL/Fl.H> diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx index 2645519cb..4d676a928 100644 --- a/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx +++ b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx @@ -3,7 +3,7 @@ // // Definition of SDL Screen interface based on Pico // -// 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 "../../config_lib.h" #include "Fl_PicoSDL_Screen_Driver.H" -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl_Window_Driver.H> #define __APPLE__ diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.cxx index 1cfe1f477..208a90063 100644 --- a/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.cxx +++ b/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.cxx @@ -3,7 +3,7 @@ // // Definition of SDL Window interface based on SDL // -// 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 "../../config_lib.h" #include "Fl_PicoSDL_Window_Driver.H" -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl.H> #include <FL/Fl_Window.H> diff --git a/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.cxx index 06f9a2514..c3f386c3d 100644 --- a/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.cxx @@ -3,7 +3,7 @@ // // Copy-to-clipboard 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 @@ #ifdef FL_CFG_GFX_QUARTZ #include <FL/Fl_Copy_Surface.H> -#include <FL/x.H> +#include <FL/platform.H> #include "Fl_Quartz_Graphics_Driver.H" #include "Fl_Quartz_Copy_Surface_Driver.H" diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H index 60d8d6f0b..7e936c2d3 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H @@ -4,7 +4,7 @@ // Definition of Apple Quartz graphics driver // 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 @@ #ifndef FL_QUARTZ_GRAPHICS_DRIVER_H #define FL_QUARTZ_GRAPHICS_DRIVER_H -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl_Graphics_Driver.H> #include <ApplicationServices/ApplicationServices.h> diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx index 8e9ae0906..698d3d9de 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx @@ -3,7 +3,7 @@ // // Rectangle drawing routines 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 @@ -19,7 +19,7 @@ #include "../../config_lib.h" #include "Fl_Quartz_Graphics_Driver.H" #include "../Darwin/Fl_Darwin_System_Driver.H" -#include <FL/x.H> +#include <FL/platform.H> #include <FL/fl_draw.H> #include <FL/Fl_Image_Surface.H> diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx index 428f94118..f20b4135d 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx @@ -3,7 +3,7 @@ // // Arc (integer) drawing 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 @@ -20,7 +20,7 @@ #ifdef FL_CFG_GFX_QUARTZ #include "Fl_Quartz_Graphics_Driver.H" -#include <FL/x.H> +#include <FL/platform.H> /** \file quartz_arci.cxx diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx index 3f66fc260..8164b9188 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx @@ -3,7 +3,7 @@ // // MacOS 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 @@ -31,7 +31,7 @@ #include <config.h> #include <FL/Fl.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/fl_draw.H> extern unsigned fl_cmap[256]; // defined in fl_color.cxx diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx index 9787808dd..597c1c1cc 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx @@ -80,7 +80,7 @@ #include "Fl_Font.H" #include <math.h> #include <FL/Fl.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/fl_utf8.h> // for fl_utf8toUtf16() Fl_Fontdesc* fl_fonts = NULL; diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx index 117e2cb8a..e9200f3c2 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx @@ -3,7 +3,7 @@ // // MacOS image drawing 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 @@ -24,7 +24,7 @@ #include <FL/Fl.H> #include <FL/fl_draw.H> #include <FL/Fl_Printer.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl_Image_Surface.H> #define MAXBUFFER 0x40000 // 256k diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx index 54a92725c..88071d8df 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx @@ -3,7 +3,7 @@ // // Line style 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 @@ #ifdef FL_CFG_GFX_QUARTZ #include <FL/fl_draw.H> -#include <FL/x.H> +#include <FL/platform.H> /** diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx index f120477bc..3a83b94d6 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx @@ -3,7 +3,7 @@ // // Rectangle drawing routines 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 @@ -21,7 +21,7 @@ #ifdef FL_CFG_GFX_QUARTZ #include <FL/Fl.H> -#include <FL/x.H> +#include <FL/platform.H> /** diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx index 5f196238c..4a63b364d 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx @@ -3,7 +3,7 @@ // // Portable drawing routines 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 @@ -28,7 +28,7 @@ #include "Fl_Quartz_Graphics_Driver.H" #include <FL/fl_draw.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/math.h> diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx index 1702ca4ab..1910d3f46 100644 --- a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx @@ -3,7 +3,7 @@ // // Draw-to-image 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" #ifdef FL_CFG_GFX_QUARTZ -#include <FL/x.H> +#include <FL/platform.H> #include <FL/fl_draw.H> #include <FL/Fl_Image_Surface.H> #include "Fl_Quartz_Graphics_Driver.H" diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx index 03aa93ecf..9373d345d 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx @@ -3,7 +3,7 @@ // // Definition of MSWindows Win32/64 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 @@ -21,7 +21,7 @@ #include "Fl_WinAPI_Screen_Driver.H" #include "../GDI/Fl_Font.H" #include <FL/Fl.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl_Graphics_Driver.H> #include <FL/Fl_RGB_Image.H> #include <FL/fl_ask.H> diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx index e796f3860..278fe740a 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx @@ -3,7 +3,7 @@ // // Definition of Apple Cocoa window driver. // -// 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 <FL/Fl_Bitmap.H> #include <FL/Fl_Window.H> #include <FL/Fl_Overlay_Window.H> -#include <FL/x.H> +#include <FL/platform.H> #include "Fl_WinAPI_Window_Driver.H" #include "Fl_WinAPI_Screen_Driver.H" #include "../GDI/Fl_GDI_Graphics_Driver.H" diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx index 05e17ddcc..6b253931d 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx @@ -3,7 +3,7 @@ // // Definition of X11 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 @@ -23,7 +23,7 @@ #include "Fl_X11_Window_Driver.H" #include "../Xlib/Fl_Xlib_Graphics_Driver.H" #include <FL/Fl.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/fl_ask.H> #include <FL/Fl_Box.H> #include <FL/Fl_Image_Surface.H> diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H index f70a01594..ad1c29c3d 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.H +++ b/src/drivers/X11/Fl_X11_Window_Driver.H @@ -4,7 +4,7 @@ // Definition of X11 window driver // 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 @@ -27,7 +27,7 @@ #include <FL/Fl_Window_Driver.H> #include <config.h> // for USE_XDBE -#include <FL/x.H> // for Cursor +#include <FL/platform.H> // for Cursor class Fl_Bitmap; /* diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx index c94ea8f97..5612ce4df 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx @@ -3,7 +3,7 @@ // // Definition of X11 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 @@ -30,7 +30,7 @@ #include <FL/fl_draw.H> #include <FL/fl_ask.H> #include <FL/Fl.H> -#include <FL/x.H> +#include <FL/platform.H> #include <string.h> #if HAVE_DLFCN_H #include <dlfcn.h> diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx index d804ac9ad..73a69109b 100644 --- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_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 @@ -21,7 +21,7 @@ #ifdef FL_CFG_GFX_XLIB #include <FL/Fl_Copy_Surface.H> #include <FL/Fl.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/fl_draw.H> #include "Fl_Xlib_Graphics_Driver.H" #include "../X11/Fl_X11_Screen_Driver.H" diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H index 1648d7c57..09f0dd31b 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H @@ -3,7 +3,7 @@ // // Definition of class Fl_Xlib_Graphics_Driver 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 @@ -26,7 +26,7 @@ #include <config.h> #include <FL/Fl_Graphics_Driver.H> -#include <FL/x.H> +#include <FL/platform.H> #if HAVE_X11_XREGION_H # include <X11/Xregion.h> diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx index 876c20619..fd21de07c 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_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 @@ -21,7 +21,7 @@ #include "Fl_Xlib_Graphics_Driver.H" #include "Fl_Font.H" #include <FL/fl_draw.H> -#include <FL/x.H> +#include <FL/platform.H> #include <string.h> diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx index cd0b7915f..578c6b5b0 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx +++ b/src/drivers/Xlib/Fl_Xlib_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 @@ -19,7 +19,7 @@ #include <config.h> #include "Fl_Xlib_Graphics_Driver.H" #include <FL/fl_draw.H> -#include <FL/x.H> +#include <FL/platform.H> /** \file Fl_Xlib_Graphics_Driver_arci.cxx diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx index 5c60da092..ee9b874b3 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx @@ -3,7 +3,7 @@ // // 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 @@ -35,7 +35,7 @@ #include "Fl_Xlib_Graphics_Driver.H" # include "../../Fl_XColor.H" # include <FL/Fl.H> -# include <FL/x.H> +# include <FL/platform.H> # include <FL/fl_draw.H> extern unsigned fl_cmap[256]; // defined in fl_color.cxx diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx index 7626ce010..dcb209154 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx @@ -21,7 +21,7 @@ #include "Fl_Xlib_Graphics_Driver.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> diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx index 17b2b65b0..5bda05e5c 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx @@ -3,7 +3,7 @@ // // More font utilities 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_Xlib_Graphics_Driver.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> diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx index 0a487daa5..901ec0078 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx @@ -3,7 +3,7 @@ // // Image 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 @@ -51,7 +51,7 @@ #include "../X11/Fl_X11_Window_Driver.H" # include <FL/Fl.H> # include <FL/fl_draw.H> -# include <FL/x.H> +# include <FL/platform.H> # include <FL/Fl_Image_Surface.H> # include <FL/Fl_Screen_Driver.H> # include "../../Fl_XColor.H" diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx index 43ed99d15..34ae4bd38 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx +++ b/src/drivers/Xlib/Fl_Xlib_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/fl_draw.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl_Printer.H> #include "../../flstring.h" diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx index 6d0f60f38..954b36b60 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.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 @@ -27,7 +27,7 @@ #include <FL/Fl_Widget.H> #include <FL/Fl_Printer.H> #include <FL/fl_draw.H> -#include <FL/x.H> +#include <FL/platform.H> #include "Fl_Xlib_Graphics_Driver.H" diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx index d36b540e7..e64c893eb 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx @@ -3,7 +3,7 @@ // // Portable 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 @@ -26,7 +26,7 @@ #include "Fl_Xlib_Graphics_Driver.H" #include <FL/fl_draw.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/math.h> diff --git a/src/fl_ask.cxx b/src/fl_ask.cxx index e3e36bb2b..be23217f7 100644 --- a/src/fl_ask.cxx +++ b/src/fl_ask.cxx @@ -3,7 +3,7 @@ // // Standard dialog functions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2011 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 @@ -40,7 +40,7 @@ #include <FL/Fl_Window.H> #include <FL/Fl_Input.H> #include <FL/Fl_Secret_Input.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl_Screen_Driver.H> #include <FL/fl_draw.H> diff --git a/src/fl_cursor.cxx b/src/fl_cursor.cxx index 30f523c26..0f0491034 100644 --- a/src/fl_cursor.cxx +++ b/src/fl_cursor.cxx @@ -3,7 +3,7 @@ // // Mouse cursor support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2012 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 @@ // portable to other systems. #include <FL/Fl.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl_Window.H> #include <FL/Fl_Pixmap.H> #include <FL/Fl_RGB_Image.H> diff --git a/src/fl_dnd_win32.cxx b/src/fl_dnd_win32.cxx index 4ce2183cf..0c625c1d0 100644 --- a/src/fl_dnd_win32.cxx +++ b/src/fl_dnd_win32.cxx @@ -3,7 +3,7 @@ // // Drag & Drop 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 @@ -21,7 +21,7 @@ // for other system-specific code. #include <FL/Fl.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl_Window.H> #include <FL/Fl_Window_Driver.H> #include <FL/fl_utf8.h> diff --git a/src/fl_dnd_x.cxx b/src/fl_dnd_x.cxx index 3772b8439..8fbad597f 100644 --- a/src/fl_dnd_x.cxx +++ b/src/fl_dnd_x.cxx @@ -3,7 +3,7 @@ // // Drag & Drop code 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 @@ -18,7 +18,7 @@ #include <FL/Fl.H> #include <FL/Fl_Window.H> -#include <FL/x.H> +#include <FL/platform.H> #include "flstring.h" #include "drivers/X11/Fl_X11_Screen_Driver.H" diff --git a/src/fl_draw_pixmap.cxx b/src/fl_draw_pixmap.cxx index b4bfe543d..5b8286d39 100644 --- a/src/fl_draw_pixmap.cxx +++ b/src/fl_draw_pixmap.cxx @@ -3,7 +3,7 @@ // // Pixmap drawing code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2012 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 @@ -38,7 +38,7 @@ #if defined(FL_CFG_SYS_WIN32) #include "drivers/WinAPI/Fl_WinAPI_System_Driver.H" #endif -#include <FL/x.H> +#include <FL/platform.H> #include <FL/fl_draw.H> #include <stdio.h> #include "flstring.h" diff --git a/src/fl_overlay.cxx b/src/fl_overlay.cxx index 09669ba5b..c1a8e2d32 100644 --- a/src/fl_overlay.cxx +++ b/src/fl_overlay.cxx @@ -3,7 +3,7 @@ // // Overlay support 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 @@ -21,7 +21,7 @@ // to erase the overlay before drawing anything that might intersect // it. -#include <FL/x.H> +#include <FL/platform.H> #include <FL/fl_draw.H> //#define USE_XOR diff --git a/src/fl_overlay_visual.cxx b/src/fl_overlay_visual.cxx index 9832f0860..a014a1b64 100644 --- a/src/fl_overlay_visual.cxx +++ b/src/fl_overlay_visual.cxx @@ -3,7 +3,7 @@ // // X overlay 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 @@ -24,7 +24,7 @@ #include <config.h> #if HAVE_OVERLAY #include <FL/Fl.H> -#include <FL/x.H> +#include <FL/platform.H> // SERVER_OVERLAY_VISUALS property element: struct OverlayInfo { diff --git a/src/fl_rect.cxx b/src/fl_rect.cxx index 751b7b813..54155aca3 100644 --- a/src/fl_rect.cxx +++ b/src/fl_rect.cxx @@ -3,7 +3,7 @@ // // Rectangle drawing routines 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 @@ -26,7 +26,7 @@ // Also all fl_clip routines, since they are always linked in so // that minimal update works. -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl_Graphics_Driver.H> // ----------------------------------------------------------------------------- diff --git a/src/fl_set_font.cxx b/src/fl_set_font.cxx index 2091aa00e..d3569c8f1 100644 --- a/src/fl_set_font.cxx +++ b/src/fl_set_font.cxx @@ -3,7 +3,7 @@ // // Font utilities 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 @@ -20,7 +20,7 @@ // Also see fl_set_fonts.cxx which adds all possible fonts. #include <FL/Fl.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/fl_draw.H> #include <FL/Fl_Screen_Driver.H> #include "flstring.h" diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 22e629be2..6ce4c8d57 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -3,7 +3,7 @@ // // OpenGL drawing support routines 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 @@ -245,7 +245,7 @@ void gl_color(Fl_Color i) { #if defined(FL_CFG_GFX_XLIB) -#include <FL/x.H> +#include <FL/platform.H> #include <GL/glx.h> @@ -360,7 +360,7 @@ void gl_draw_image(const uchar* b, int x, int y, int w, int h, int d, int ld) { #if ! defined(FL_DOXYGEN) -#include <FL/x.H> +#include <FL/platform.H> #if !defined(kCGBitmapByteOrder32Host) // doc says available 10.4 but some 10.4 don't have it # define kCGBitmapByteOrder32Host 0 #endif diff --git a/src/gl_start.cxx b/src/gl_start.cxx index 2e4ea3219..878b99a55 100644 --- a/src/gl_start.cxx +++ b/src/gl_start.cxx @@ -3,7 +3,7 @@ // // OpenGL context routines 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 @@ -95,7 +95,7 @@ void Fl_Cocoa_Gl_Window_Driver::gl_start() { #ifdef FL_CFG_GFX_XLIB -#include <FL/x.H> +#include <FL/platform.H> #include "Fl_Gl_Choice.H" void Fl_X11_Gl_Window_Driver::gl_visual(Fl_Gl_Choice *c) { diff --git a/src/makedepend b/src/makedepend index 429ccf599..8038d1dcd 100644 --- a/src/makedepend +++ b/src/makedepend @@ -2,7 +2,7 @@ Fl.o: config_lib.h ../config.h ../FL/Fl.H ../FL/Fl_Export.H Fl.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H -Fl.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h ../FL/x.H +Fl.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h Fl.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H Fl.o: ../FL/Fl_Screen_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H Fl.o: ../FL/Fl_Preferences.H ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H @@ -122,8 +122,8 @@ Fl_Device.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H Fl_Device.o: ../FL/Fl_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H Fl_Double_Window.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_Double_Window.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h -Fl_Double_Window.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/x.H -Fl_Double_Window.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H +Fl_Double_Window.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H +Fl_Double_Window.o: ../FL/fl_types.h ../FL/Enumerations.H Fl_Double_Window.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H Fl_Double_Window.o: ../FL/Fl_Printer.H ../FL/Fl_Paged_Device.H Fl_Double_Window.o: ../FL/Fl_Widget_Surface.H ../FL/Fl_Device.H @@ -168,7 +168,7 @@ Fl_File_Chooser2.o: ../FL/filename.H ../FL/Fl_Box.H ../FL/Fl_Check_Button.H Fl_File_Chooser2.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H Fl_File_Chooser2.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H ../FL/Fl_Input_.H Fl_File_Chooser2.o: ../FL/Fl_Return_Button.H ../FL/fl_ask.H -Fl_File_Chooser2.o: ../FL/Fl_System_Driver.H ../FL/filename.H ../FL/x.H +Fl_File_Chooser2.o: ../FL/Fl_System_Driver.H ../FL/filename.H Fl_File_Chooser2.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H Fl_File_Chooser2.o: ../FL/Fl_Shared_Image.H ../FL/fl_draw.H flstring.h Fl_File_Chooser2.o: ../config.h @@ -202,8 +202,7 @@ Fl_Graphics_Driver.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H Fl_Graphics_Driver.o: ../FL/Fl_Text_Buffer.H ../FL/fl_draw.H Fl_Graphics_Driver.o: ../FL/Fl_Image_Surface.H ../FL/Fl_Widget_Surface.H Fl_Graphics_Driver.o: ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_Graphics_Driver.o: ../FL/Fl_Shared_Image.H ../FL/math.h ../FL/x.H -Fl_Graphics_Driver.o: ../FL/platform.H +Fl_Graphics_Driver.o: ../FL/Fl_Shared_Image.H ../FL/math.h ../FL/platform.H Fl_Group.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_Group.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h Fl_Group.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Group.H @@ -244,13 +243,13 @@ Fl_Image_Surface.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Pixmap.H Fl_Image_Surface.o: ../FL/Fl_RGB_Image.H Fl_Input.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_Input.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h -Fl_Input.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/x.H -Fl_Input.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H -Fl_Input.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Bitmap.H -Fl_Input.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl_System_Driver.H -Fl_Input.o: ../FL/filename.H ../FL/Fl_Preferences.H ../FL/Fl_Screen_Driver.H -Fl_Input.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H -Fl_Input.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H +Fl_Input.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H +Fl_Input.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Window.H +Fl_Input.o: ../FL/Fl_Group.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H +Fl_Input.o: ../FL/Fl_Widget.H ../FL/Fl_System_Driver.H ../FL/filename.H +Fl_Input.o: ../FL/Fl_Preferences.H ../FL/Fl_Screen_Driver.H ../FL/Fl_Device.H +Fl_Input.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Text_Editor.H +Fl_Input.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H Fl_Input.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H Fl_Input.o: ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H ../FL/Fl_Rect.H Fl_Input.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H @@ -366,14 +365,14 @@ Fl_Paged_Device.o: ../FL/Fl_Group.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H Fl_Paged_Device.o: ../FL/Fl_Widget.H ../FL/Fl_Shared_Image.H ../FL/fl_draw.H Fl_Pixmap.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_Pixmap.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h -Fl_Pixmap.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/x.H -Fl_Pixmap.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H -Fl_Pixmap.o: ../FL/fl_draw.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H -Fl_Pixmap.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H -Fl_Pixmap.o: ../FL/Fl_Printer.H ../FL/Fl_Paged_Device.H -Fl_Pixmap.o: ../FL/Fl_Widget_Surface.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H -Fl_Pixmap.o: ../FL/Fl_Preferences.H ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_Pixmap.o: ../FL/Fl_Bitmap.H flstring.h ../config.h +Fl_Pixmap.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H +Fl_Pixmap.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/fl_draw.H +Fl_Pixmap.o: ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H +Fl_Pixmap.o: ../FL/Fl_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_Printer.H +Fl_Pixmap.o: ../FL/Fl_Paged_Device.H ../FL/Fl_Widget_Surface.H +Fl_Pixmap.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H +Fl_Pixmap.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Bitmap.H flstring.h +Fl_Pixmap.o: ../config.h Fl_Positioner.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_Positioner.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h Fl_Positioner.o: ../FL/Enumerations.H ../FL/abi-version.h @@ -427,13 +426,12 @@ Fl_Screen_Driver.o: ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H Fl_Screen_Driver.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H Fl_Screen_Driver.o: ../FL/Fl_Rect.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H Fl_Screen_Driver.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_Screen_Driver.o: ../FL/Fl_Text_Buffer.H ../FL/x.H ../FL/platform.H -Fl_Screen_Driver.o: ../FL/Fl_Group.H ../FL/Fl_Window.H ../FL/Fl_Input.H -Fl_Screen_Driver.o: ../FL/Fl_Input_.H ../FL/Fl_Window_Driver.H -Fl_Screen_Driver.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H -Fl_Screen_Driver.o: ../FL/Fl_Window.H ../FL/Fl_Image_Surface.H -Fl_Screen_Driver.o: ../FL/Fl_Widget_Surface.H ../FL/Fl_Shared_Image.H -Fl_Screen_Driver.o: ../FL/Fl_Box.H ../FL/Fl_Tooltip.H +Fl_Screen_Driver.o: ../FL/Fl_Text_Buffer.H ../FL/platform.H ../FL/Fl_Group.H +Fl_Screen_Driver.o: ../FL/Fl_Window.H ../FL/Fl_Input.H ../FL/Fl_Input_.H +Fl_Screen_Driver.o: ../FL/Fl_Window_Driver.H ../FL/Fl_Overlay_Window.H +Fl_Screen_Driver.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H +Fl_Screen_Driver.o: ../FL/Fl_Image_Surface.H ../FL/Fl_Widget_Surface.H +Fl_Screen_Driver.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Box.H ../FL/Fl_Tooltip.H Fl_Scroll.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_Scroll.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h Fl_Scroll.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Tiled_Image.H @@ -483,9 +481,8 @@ Fl_Sys_Menu_Bar.o: ../FL/Fl_Sys_Menu_Bar_Driver.H ../FL/Fl_Sys_Menu_Bar.H Fl_Sys_Menu_Bar.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H ../FL/Fl_Widget.H Fl_Sys_Menu_Bar.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Export.H Fl_Sys_Menu_Bar.o: ../FL/fl_types.h ../FL/platform_types.h -Fl_Sys_Menu_Bar.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H ../FL/x.H -Fl_Sys_Menu_Bar.o: ../FL/platform.H ../FL/Fl_Export.H ../FL/fl_types.h -Fl_Sys_Menu_Bar.o: ../FL/Enumerations.H +Fl_Sys_Menu_Bar.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H ../FL/platform.H +Fl_Sys_Menu_Bar.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H Fl_System_Driver.o: ../FL/Fl_System_Driver.H ../FL/Fl.H ../FL/Fl_Export.H Fl_System_Driver.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H Fl_System_Driver.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h @@ -517,15 +514,15 @@ Fl_Text_Buffer.o: ../FL/abi-version.h ../FL/Fl_Text_Buffer.H ../FL/fl_ask.H Fl_Text_Display.o: ../FL/fl_utf8.h flstring.h ../FL/Fl_Export.H ../config.h Fl_Text_Display.o: ../FL/Fl.H ../FL/platform_types.h ../FL/fl_utf8.h Fl_Text_Display.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H -Fl_Text_Display.o: ../FL/abi-version.h ../FL/x.H ../FL/platform.H -Fl_Text_Display.o: ../FL/fl_types.h ../FL/Enumerations.H -Fl_Text_Display.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H -Fl_Text_Display.o: ../FL/fl_draw.H ../FL/Fl_Graphics_Driver.H -Fl_Text_Display.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H -Fl_Text_Display.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H -Fl_Text_Display.o: ../FL/Fl_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H -Fl_Text_Display.o: ../FL/Fl_Group.H ../FL/Fl_Rect.H ../FL/Fl_Widget.H -Fl_Text_Display.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H +Fl_Text_Display.o: ../FL/abi-version.h ../FL/platform.H ../FL/fl_types.h +Fl_Text_Display.o: ../FL/Enumerations.H ../FL/Fl_Text_Buffer.H +Fl_Text_Display.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H +Fl_Text_Display.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H +Fl_Text_Display.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H +Fl_Text_Display.o: ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H +Fl_Text_Display.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H +Fl_Text_Display.o: ../FL/Fl_Rect.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H +Fl_Text_Display.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H Fl_Text_Display.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Window.H ../FL/Fl_Group.H Fl_Text_Display.o: ../FL/Fl_Screen_Driver.H ../FL/Fl_Text_Editor.H Fl_Text_Display.o: ../FL/Fl_Text_Display.H @@ -619,34 +616,32 @@ Fl_Widget_Surface.o: ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h Fl_Widget_Surface.o: ../FL/fl_types.h ../FL/Enumerations.H Fl_Widget_Surface.o: ../FL/abi-version.h ../FL/Fl_Group.H ../FL/Fl_Bitmap.H Fl_Widget_Surface.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Widget_Surface.o: ../FL/x.H ../FL/platform.H ../FL/fl_types.h -Fl_Widget_Surface.o: ../FL/Enumerations.H ../FL/Fl_Shared_Image.H -Fl_Widget_Surface.o: ../FL/Fl_Window_Driver.H ../FL/Fl_Overlay_Window.H -Fl_Widget_Surface.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H -Fl_Widget_Surface.o: ../FL/Fl_Screen_Driver.H ../FL/Fl_Text_Editor.H -Fl_Widget_Surface.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H -Fl_Widget_Surface.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Image.H -Fl_Widget_Surface.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H -Fl_Widget_Surface.o: ../FL/Fl_Rect.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H -Fl_Widget_Surface.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_Widget_Surface.o: ../FL/Fl_Text_Buffer.H +Fl_Widget_Surface.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H +Fl_Widget_Surface.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Window_Driver.H +Fl_Widget_Surface.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H +Fl_Widget_Surface.o: ../FL/Fl_Window.H ../FL/Fl_Screen_Driver.H +Fl_Widget_Surface.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H +Fl_Widget_Surface.o: ../FL/fl_draw.H ../FL/Fl_Graphics_Driver.H +Fl_Widget_Surface.o: ../FL/Fl_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H +Fl_Widget_Surface.o: ../FL/Fl_Group.H ../FL/Fl_Rect.H ../FL/Fl_Widget.H +Fl_Widget_Surface.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H +Fl_Widget_Surface.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H Fl_Window.o: ../config.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_Window.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h -Fl_Window.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/x.H -Fl_Window.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H -Fl_Window.o: ../FL/Fl_Window_Driver.H ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_Window.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Widget.H -Fl_Window.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H -Fl_Window.o: ../FL/Fl_Window.H ../FL/Fl_RGB_Image.H ../FL/Fl_Tooltip.H -Fl_Window.o: ../FL/Fl_Widget.H ../FL/fl_draw.H flstring.h +Fl_Window.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H +Fl_Window.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Window_Driver.H +Fl_Window.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Bitmap.H +Fl_Window.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl_Overlay_Window.H +Fl_Window.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_RGB_Image.H +Fl_Window.o: ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H ../FL/fl_draw.H flstring.h Fl_Window_Driver.o: ../FL/Fl_Window_Driver.H ../FL/Fl_Export.H Fl_Window_Driver.o: ../FL/Fl_Window.H ../FL/Fl.H ../FL/platform_types.h Fl_Window_Driver.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h Fl_Window_Driver.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Group.H Fl_Window_Driver.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Widget.H Fl_Window_Driver.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H -Fl_Window_Driver.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/x.H -Fl_Window_Driver.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H +Fl_Window_Driver.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/platform.H +Fl_Window_Driver.o: ../FL/fl_types.h ../FL/Enumerations.H Fl_Window_fullscreen.o: ../FL/Fl_Window.H ../FL/Fl.H ../FL/Fl_Export.H Fl_Window_fullscreen.o: ../FL/platform_types.h ../FL/fl_utf8.h Fl_Window_fullscreen.o: ../FL/Fl_Export.H ../FL/fl_types.h @@ -736,8 +731,8 @@ Fl_get_system_colors.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H Fl_get_system_colors.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H Fl_get_system_colors.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_System_Driver.H Fl_get_system_colors.o: ../FL/filename.H ../FL/Fl_Preferences.H -Fl_get_system_colors.o: ../FL/fl_draw.H ../FL/x.H ../FL/platform.H -Fl_get_system_colors.o: ../FL/math.h ../FL/fl_utf8.h flstring.h ../config.h +Fl_get_system_colors.o: ../FL/fl_draw.H ../FL/platform.H ../FL/math.h +Fl_get_system_colors.o: ../FL/fl_utf8.h flstring.h ../config.h Fl_get_system_colors.o: ../FL/Fl_Tiled_Image.H tile.xpm Fl_grab.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_grab.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h @@ -758,10 +753,9 @@ Fl_lock.o: drivers/Posix/Fl_Posix_System_Driver.H Fl_own_colormap.o: config_lib.h ../config.h ../FL/Fl.H ../FL/Fl_Export.H Fl_own_colormap.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H Fl_own_colormap.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h -Fl_own_colormap.o: ../FL/x.H ../FL/platform.H ../FL/fl_types.h -Fl_own_colormap.o: ../FL/Enumerations.H ../FL/Fl_System_Driver.H -Fl_own_colormap.o: ../FL/filename.H ../FL/Fl_Preferences.H -Fl_own_colormap.o: drivers/X11/Fl_X11_System_Driver.H +Fl_own_colormap.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H +Fl_own_colormap.o: ../FL/Fl_System_Driver.H ../FL/filename.H +Fl_own_colormap.o: ../FL/Fl_Preferences.H drivers/X11/Fl_X11_System_Driver.H Fl_own_colormap.o: drivers/Posix/Fl_Posix_System_Driver.H Fl_visual.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_visual.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h @@ -808,7 +802,7 @@ fl_ask.o: ../FL/fl_ask.H ../FL/Fl_Box.H ../FL/Fl_Widget.H ../FL/Fl_Button.H fl_ask.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H ../FL/Fl_Window.H fl_ask.o: ../FL/Fl_Group.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H fl_ask.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Secret_Input.H -fl_ask.o: ../FL/Fl_Input.H ../FL/x.H ../FL/platform.H ../FL/fl_types.h +fl_ask.o: ../FL/Fl_Input.H ../FL/platform.H ../FL/fl_types.h fl_ask.o: ../FL/Enumerations.H ../FL/Fl_Screen_Driver.H ../FL/Fl_Device.H fl_ask.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Text_Editor.H fl_ask.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Graphics_Driver.H @@ -829,15 +823,14 @@ fl_color.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H fl_color.o: ../FL/Fl_RGB_Image.H fl_cmap.h fl_cursor.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h fl_cursor.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h -fl_cursor.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/x.H -fl_cursor.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H -fl_cursor.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Bitmap.H -fl_cursor.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl_Pixmap.H -fl_cursor.o: ../FL/Fl_RGB_Image.H ../FL/Fl_Window_Driver.H -fl_cursor.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H -fl_cursor.o: ../FL/Fl_Window.H ../FL/fl_draw.H fl_cursor_wait.xpm -fl_cursor.o: fl_cursor_help.xpm fl_cursor_nwse.xpm fl_cursor_nesw.xpm -fl_cursor.o: fl_cursor_none.xpm +fl_cursor.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H +fl_cursor.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Window.H +fl_cursor.o: ../FL/Fl_Group.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H +fl_cursor.o: ../FL/Fl_Widget.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H +fl_cursor.o: ../FL/Fl_Window_Driver.H ../FL/Fl_Overlay_Window.H +fl_cursor.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/fl_draw.H +fl_cursor.o: fl_cursor_wait.xpm fl_cursor_help.xpm fl_cursor_nwse.xpm +fl_cursor.o: fl_cursor_nesw.xpm fl_cursor_none.xpm fl_curve.o: ../FL/fl_draw.H fl_diamond_box.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h fl_diamond_box.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h @@ -851,9 +844,8 @@ fl_draw_pixmap.o: config_lib.h ../config.h ../FL/Fl.H ../FL/Fl_Export.H fl_draw_pixmap.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H fl_draw_pixmap.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h fl_draw_pixmap.o: ../FL/Fl_System_Driver.H ../FL/filename.H -fl_draw_pixmap.o: ../FL/Fl_Preferences.H ../FL/x.H ../FL/platform.H -fl_draw_pixmap.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/fl_draw.H -fl_draw_pixmap.o: flstring.h +fl_draw_pixmap.o: ../FL/Fl_Preferences.H ../FL/platform.H ../FL/fl_types.h +fl_draw_pixmap.o: ../FL/Enumerations.H ../FL/fl_draw.H flstring.h fl_encoding_latin1.o: config_lib.h ../config.h ../FL/fl_draw.H ../FL/Fl.H fl_encoding_latin1.o: ../FL/Fl_Export.H ../FL/platform_types.h fl_encoding_latin1.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h @@ -906,12 +898,12 @@ fl_open_uri.o: drivers/Posix/Fl_Posix_System_Driver.H fl_oval_box.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h fl_oval_box.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h fl_oval_box.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/fl_draw.H -fl_overlay.o: ../FL/x.H ../FL/platform.H ../FL/Fl_Export.H -fl_overlay.o: ../FL/platform_types.h ../FL/fl_types.h ../FL/Enumerations.H -fl_overlay.o: ../FL/fl_draw.H ../FL/Fl_Screen_Driver.H ../FL/Fl_Device.H -fl_overlay.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Export.H -fl_overlay.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/fl_types.h -fl_overlay.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Text_Editor.H +fl_overlay.o: ../FL/platform.H ../FL/Fl_Export.H ../FL/platform_types.h +fl_overlay.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/fl_draw.H +fl_overlay.o: ../FL/Fl_Screen_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H +fl_overlay.o: ../FL/Fl_Preferences.H ../FL/Fl_Export.H ../FL/Fl.H +fl_overlay.o: ../FL/fl_utf8.h ../FL/fl_types.h ../FL/Enumerations.H +fl_overlay.o: ../FL/abi-version.h ../FL/Fl_Text_Editor.H fl_overlay.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H fl_overlay.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Image.H ../FL/Fl_Widget.H fl_overlay.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H @@ -936,13 +928,13 @@ fl_read_image.o: ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H fl_read_image.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H fl_read_image.o: ../FL/Fl_Rect.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H fl_read_image.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H -fl_rect.o: ../FL/x.H ../FL/platform.H ../FL/Fl_Export.H -fl_rect.o: ../FL/platform_types.h ../FL/fl_types.h ../FL/Enumerations.H -fl_rect.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H -fl_rect.o: ../FL/Fl_Preferences.H ../FL/Fl_Export.H ../FL/Fl_Image.H -fl_rect.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/fl_types.h -fl_rect.o: ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H -fl_rect.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H +fl_rect.o: ../FL/platform.H ../FL/Fl_Export.H ../FL/platform_types.h +fl_rect.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Graphics_Driver.H +fl_rect.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H +fl_rect.o: ../FL/Fl_Export.H ../FL/Fl_Image.H ../FL/Enumerations.H +fl_rect.o: ../FL/abi-version.h ../FL/fl_types.h ../FL/Fl_Widget.H +fl_rect.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H +fl_rect.o: ../FL/Fl_RGB_Image.H fl_round_box.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h fl_round_box.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h fl_round_box.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/fl_draw.H @@ -951,11 +943,11 @@ fl_rounded_box.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h fl_rounded_box.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/fl_draw.H fl_set_font.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h fl_set_font.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h -fl_set_font.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/x.H -fl_set_font.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H -fl_set_font.o: ../FL/fl_draw.H ../FL/Fl_Screen_Driver.H ../FL/Fl_Device.H -fl_set_font.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H -fl_set_font.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H +fl_set_font.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H +fl_set_font.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/fl_draw.H +fl_set_font.o: ../FL/Fl_Screen_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H +fl_set_font.o: ../FL/Fl_Preferences.H ../FL/Fl_Text_Editor.H +fl_set_font.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H fl_set_font.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Image.H ../FL/Fl_Widget.H fl_set_font.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H fl_set_font.o: ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H ../FL/Fl_Rect.H @@ -997,11 +989,10 @@ fl_vertex.o: ../FL/Fl_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H fl_vertex.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/fl_utf8.h ../FL/math.h screen_xywh.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h screen_xywh.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h -screen_xywh.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/x.H -screen_xywh.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H -screen_xywh.o: ../FL/Fl_Screen_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H -screen_xywh.o: ../FL/Fl_Preferences.H ../FL/Fl_Text_Editor.H -screen_xywh.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H +screen_xywh.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H +screen_xywh.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Screen_Driver.H +screen_xywh.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H +screen_xywh.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H screen_xywh.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Image.H ../FL/Fl_Widget.H screen_xywh.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H screen_xywh.o: ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H ../FL/Fl_Rect.H @@ -1066,9 +1057,9 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/abi-version.h ../FL/fl_types.h drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/platform_types.h drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/Fl_Image.H ../FL/Fl_Pixmap.H -drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/Fl_RGB_Image.H ../FL/x.H -drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/platform.H ../FL/Fl_Export.H -drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/fl_types.h ../FL/Enumerations.H +drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/Fl_RGB_Image.H ../FL/platform.H +drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/Fl_Export.H ../FL/fl_types.h +drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/Enumerations.H drivers/Xlib/Fl_Xlib_Graphics_Driver.o: drivers/Xlib/Fl_Font.H drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/fl_draw.H drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../config.h @@ -1087,7 +1078,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/Fl_Widget.H drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/Fl_Bitmap.H drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/Fl_Image.H drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/Fl_Pixmap.H -drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/Fl_RGB_Image.H ../FL/x.H +drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/Fl_RGB_Image.H drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/platform.H drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/Fl_Export.H drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/fl_types.h @@ -1109,7 +1100,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/Fl_Widget.H drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/Fl_Bitmap.H drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/Fl_Image.H drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/Fl_Pixmap.H -drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/Fl_RGB_Image.H ../FL/x.H +drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/Fl_RGB_Image.H drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/platform.H drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/Fl_Export.H drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/fl_types.h @@ -1132,7 +1123,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Widget.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Bitmap.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Image.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Pixmap.H -drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_RGB_Image.H ../FL/x.H +drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_RGB_Image.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/platform.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Export.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/fl_types.h @@ -1170,7 +1161,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Export.H drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/fl_types.h drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Enumerations.H drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/abi-version.h -drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/fl_draw.H ../FL/x.H +drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/fl_draw.H drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/platform.H drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/fl_types.h drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Enumerations.H @@ -1211,8 +1202,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/Fl_Group.H drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/Fl_Bitmap.H drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/Fl_Image.H drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/Fl_Widget.H -drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/fl_draw.H ../FL/x.H -drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/platform.H +drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/fl_draw.H ../FL/platform.H drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/fl_types.h drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/Enumerations.H drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H @@ -1236,7 +1226,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/Fl_Widget.H drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/Fl_Bitmap.H drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/Fl_Image.H drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/Fl_Pixmap.H -drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/Fl_RGB_Image.H ../FL/x.H +drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/Fl_RGB_Image.H drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/platform.H drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/Fl_Export.H drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/fl_types.h @@ -1258,7 +1248,7 @@ drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/abi-version.h drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Group.H drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Bitmap.H drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Image.H -drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Widget.H ../FL/x.H +drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Widget.H drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/platform.H ../FL/fl_types.h drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Enumerations.H drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/fl_draw.H @@ -1294,7 +1284,7 @@ drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Widget.H drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Bitmap.H drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Image.H drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Pixmap.H -drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_RGB_Image.H ../FL/x.H +drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_RGB_Image.H drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/platform.H drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Export.H drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/fl_types.h @@ -1326,9 +1316,8 @@ drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Widget.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Overlay_Window.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Double_Window.H -drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Window.H ../FL/x.H -drivers/X11/Fl_X11_Window_Driver.o: ../FL/platform.H ../FL/fl_types.h -drivers/X11/Fl_X11_Window_Driver.o: ../FL/Enumerations.H +drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Window.H ../FL/platform.H +drivers/X11/Fl_X11_Window_Driver.o: ../FL/fl_types.h ../FL/Enumerations.H drivers/X11/Fl_X11_Window_Driver.o: drivers/X11/Fl_X11_Screen_Driver.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Screen_Driver.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H @@ -1374,8 +1363,7 @@ drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Window_Driver.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Window.H ../FL/Fl_Group.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Overlay_Window.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Double_Window.H -drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Window.H ../FL/x.H -drivers/X11/Fl_X11_Screen_Driver.o: ../FL/platform.H +drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Window.H ../FL/platform.H drivers/X11/Fl_X11_Screen_Driver.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/fl_ask.H ../FL/Fl_Box.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Image_Surface.H @@ -1443,7 +1431,7 @@ drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Int_Input.H drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Input.H ../FL/Fl_Pixmap.H Fl_x.o: ../config.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_x.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h -Fl_x.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/x.H ../FL/platform.H +Fl_x.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H Fl_x.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Window_Driver.H Fl_x.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H Fl_x.o: ../FL/Fl_Widget.H ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H @@ -1464,7 +1452,7 @@ fl_dnd_x.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h fl_dnd_x.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h fl_dnd_x.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Window.H fl_dnd_x.o: ../FL/Fl_Group.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H -fl_dnd_x.o: ../FL/Fl_Widget.H ../FL/x.H ../FL/platform.H ../FL/fl_types.h +fl_dnd_x.o: ../FL/Fl_Widget.H ../FL/platform.H ../FL/fl_types.h fl_dnd_x.o: ../FL/Enumerations.H flstring.h ../config.h fl_dnd_x.o: drivers/X11/Fl_X11_Screen_Driver.H ../FL/Fl_Screen_Driver.H fl_dnd_x.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H @@ -1495,10 +1483,9 @@ Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H Fl_Native_File_Chooser_FLTK.o: ../FL/fl_ask.H ../FL/Fl_File_Icon.H Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_System_Driver.H ../FL/filename.H -Fl_Native_File_Chooser_GTK.o: config_lib.h ../config.h ../FL/x.H -Fl_Native_File_Chooser_GTK.o: ../FL/platform.H ../FL/Fl_Export.H -Fl_Native_File_Chooser_GTK.o: ../FL/platform_types.h ../FL/fl_types.h -Fl_Native_File_Chooser_GTK.o: ../FL/Enumerations.H +Fl_Native_File_Chooser_GTK.o: config_lib.h ../config.h ../FL/platform.H +Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Export.H ../FL/platform_types.h +Fl_Native_File_Chooser_GTK.o: ../FL/fl_types.h ../FL/Enumerations.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Native_File_Chooser.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H Fl_Native_File_Chooser_GTK.o: ../FL/fl_utf8.h ../FL/Fl_Export.H @@ -1523,8 +1510,8 @@ Fl_get_key.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H Fl_get_key.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h Fl_get_key.o: drivers/X11/Fl_X11_System_Driver.H Fl_get_key.o: drivers/Posix/Fl_Posix_System_Driver.H ../FL/Fl_System_Driver.H -Fl_get_key.o: ../FL/filename.H ../FL/Fl_Preferences.H ../FL/x.H -Fl_get_key.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H +Fl_get_key.o: ../FL/filename.H ../FL/Fl_Preferences.H ../FL/platform.H +Fl_get_key.o: ../FL/fl_types.h ../FL/Enumerations.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: flstring.h ../FL/Fl_Export.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../config.h drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H @@ -1543,7 +1530,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Bitmap.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Image.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Pixmap.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_RGB_Image.H -drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/x.H ../FL/platform.H +drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/platform.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/fl_types.h drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Enumerations.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl.H ../FL/fl_utf8.h @@ -1693,13 +1680,13 @@ Fl_Gl_Choice.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H Fl_Gl_Choice.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h Fl_Gl_Choice.o: Fl_Gl_Choice.H ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H Fl_Gl_Choice.o: ../FL/Fl_Gl_Window_Driver.H ../FL/gl_draw.H ../FL/gl.h -Fl_Gl_Choice.o: flstring.h ../FL/fl_utf8.h ../FL/x.H ../FL/platform.H -Fl_Gl_Choice.o: ../FL/fl_types.h ../FL/Enumerations.H +Fl_Gl_Choice.o: flstring.h ../FL/fl_utf8.h ../FL/platform.H ../FL/fl_types.h +Fl_Gl_Choice.o: ../FL/Enumerations.H Fl_Gl_Overlay.o: config_lib.h ../config.h ../FL/Fl.H ../FL/Fl_Export.H Fl_Gl_Overlay.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H Fl_Gl_Overlay.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h Fl_Gl_Overlay.o: ../FL/gl.h ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H -Fl_Gl_Overlay.o: ../FL/Fl_Gl_Window_Driver.H ../FL/x.H ../FL/platform.H +Fl_Gl_Overlay.o: ../FL/Fl_Gl_Window_Driver.H ../FL/platform.H Fl_Gl_Overlay.o: ../FL/fl_types.h ../FL/Enumerations.H Fl_Gl_Device_Plugin.o: config_lib.h ../config.h ../FL/Fl_Gl_Window.H Fl_Gl_Device_Plugin.o: ../FL/Fl_Window.H ../FL/Fl_RGB_Image.H @@ -1718,8 +1705,8 @@ Fl_Gl_Window.o: ../FL/Fl_Double_Window.H ../FL/Fl_Graphics_Driver.H Fl_Gl_Window.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H Fl_Gl_Window.o: ../FL/Fl_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H Fl_Gl_Window.o: ../FL/fl_utf8.h drivers/OpenGL/Fl_OpenGL_Display_Device.H -Fl_Gl_Window.o: ../FL/x.H ../FL/platform.H ../FL/fl_types.h -Fl_Gl_Window.o: ../FL/Enumerations.H Fl_Gl_Choice.H ../FL/Fl_Screen_Driver.H +Fl_Gl_Window.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H +Fl_Gl_Window.o: Fl_Gl_Choice.H ../FL/Fl_Screen_Driver.H Fl_Gl_Window.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H Fl_Gl_Window.o: ../FL/fl_draw.H ../FL/Fl_Group.H ../FL/Fl_Rect.H Fl_Gl_Window.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H @@ -1749,7 +1736,7 @@ gl_draw.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H gl_draw.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h gl_draw.o: ../FL/gl.h ../FL/gl_draw.H ../FL/gl.h ../FL/fl_draw.H gl_draw.o: ../FL/Fl_Gl_Window_Driver.H ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H -gl_draw.o: drivers/Xlib/Fl_Font.H ../FL/fl_utf8.h ../FL/x.H ../FL/platform.H +gl_draw.o: drivers/Xlib/Fl_Font.H ../FL/fl_utf8.h ../FL/platform.H gl_draw.o: ../FL/fl_types.h ../FL/Enumerations.H gl_start.o: config_lib.h ../config.h ../FL/Fl.H ../FL/Fl_Export.H gl_start.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H @@ -1757,8 +1744,8 @@ gl_start.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h gl_start.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Bitmap.H gl_start.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/gl.h gl_start.o: ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H -gl_start.o: ../FL/Fl_Gl_Window_Driver.H ../FL/x.H ../FL/platform.H -gl_start.o: ../FL/fl_types.h ../FL/Enumerations.H Fl_Gl_Choice.H +gl_start.o: ../FL/Fl_Gl_Window_Driver.H ../FL/platform.H ../FL/fl_types.h +gl_start.o: ../FL/Enumerations.H Fl_Gl_Choice.H glut_compatibility.o: flstring.h ../FL/Fl_Export.H ../config.h glut_compatibility.o: ../FL/Fl_Gl_Window_Driver.H ../FL/Fl_Gl_Window.H glut_compatibility.o: ../FL/Fl_Window.H ../FL/Fl_Screen_Driver.H diff --git a/src/screen_xywh.cxx b/src/screen_xywh.cxx index ff7c2ea4d..6c214b322 100644 --- a/src/screen_xywh.cxx +++ b/src/screen_xywh.cxx @@ -3,7 +3,7 @@ // // Screen/monitor bounding box API 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 @@ -17,7 +17,7 @@ // #include <FL/Fl.H> -#include <FL/x.H> +#include <FL/platform.H> #include <FL/Fl_Screen_Driver.H> #include <config.h> |