summaryrefslogtreecommitdiff
path: root/fluid
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2018-01-31 21:17:17 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2018-01-31 21:17:17 +0000
commit42d8aba117e360890f8c3520a5ee380315a9c98f (patch)
tree583563bb0f2b10b42d5278f8a7b5058e72a7e6f5 /fluid
parentcc595ce4edb86965b70e385e62d54efbb8ba5b8f (diff)
Replace FL/x.H with FL/platform.H - step 2 (STR #3435).
This second step replaces FL/x.H with FL/platform.H in all source files. Dependencies have been adjusted as well. This commit completes the replacement of FL/x.H with FL/platform.H. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12641 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
-rw-r--r--fluid/Fl_Window_Type.cxx4
-rw-r--r--fluid/fluid.cxx6
-rw-r--r--fluid/makedepend4
3 files changed, 7 insertions, 7 deletions
diff --git a/fluid/Fl_Window_Type.cxx b/fluid/Fl_Window_Type.cxx
index e6b8b644e..cfad727a1 100644
--- a/fluid/Fl_Window_Type.cxx
+++ b/fluid/Fl_Window_Type.cxx
@@ -7,7 +7,7 @@
// for interacting with the overlay, which allows the user to
// select, move, and resize the children widgets.
//
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2018 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@@ -24,7 +24,7 @@
#include <FL/Fl_Overlay_Window.H>
#include <FL/fl_message.H>
#include <FL/fl_draw.H>
-#include <FL/x.H>
+#include <FL/platform.H>
#include <FL/Fl_Menu_Item.H>
#include <FL/Fl_Round_Button.H>
#include "Fl_Widget_Type.h"
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index 8fddc821c..8bc13ac92 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -3,7 +3,7 @@
//
// FLUID main entry for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2017 by Bill Spitzak and others.
+// Copyright 1998-2018 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@@ -18,7 +18,7 @@
#include <FL/Fl.H>
#ifdef __APPLE__
-#include <FL/x.H> // for fl_open_callback
+#include <FL/platform.H> // for fl_open_callback
#endif
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Box.H>
@@ -54,7 +54,7 @@
# include <io.h>
# include <fcntl.h>
# include <commdlg.h>
-# include <FL/x.H>
+# include <FL/platform.H>
#else
# include <unistd.h>
#endif
diff --git a/fluid/makedepend b/fluid/makedepend
index a6e22decc..e6651ffb1 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -169,8 +169,8 @@ Fl_Window_Type.o: ../FL/fl_draw.H ../FL/Enumerations.H
Fl_Window_Type.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H
Fl_Window_Type.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H
Fl_Window_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
-Fl_Window_Type.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/x.H
-Fl_Window_Type.o: ../FL/platform.H ../FL/fl_types.h ../FL/Fl_Menu_Item.H
+Fl_Window_Type.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/platform.H
+Fl_Window_Type.o: ../FL/fl_types.h ../FL/Fl_Menu_Item.H
Fl_Window_Type.o: ../FL/Fl_Round_Button.H ../FL/Fl_Light_Button.H
Fl_Window_Type.o: ../FL/Fl_Button.H Fl_Widget_Type.h Fl_Type.h
Fl_Window_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H