Replace FL/x.H with FL/platform.H - step 1.

This first step replaces FL/x.H with FL/platform.H but keeps a small
FL/x.H that #include's FL/platform.H for backwards compatibility.
Documentation sources in documentation/src/*.dox have been fixed,
but references in other source files need to be fixed in another step.
Dependencies have been adjusted.


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

2 files changed, 16 insertions, 10 deletions

diff --git a/documentation/src/drawing.dox b/documentation/src/drawing.dox
index 2d217f2ea..d983c89e8 100644
--- a/documentation/src/drawing.dox
+++ b/documentation/src/drawing.dox
@@ -1066,11 +1066,11 @@ where img is a pointer to any Fl_Image type.
 
 Sometimes it can be very useful to generate a complex drawing
 in memory first and copy it to the screen at a later point in 
-time. This technique can significantly reduce the amount of
-repeated drawing. Offscreen drawing functions are declared in <FL/x.H>.
-Fl_Double_Window uses offscreen rendering
-to avoid flickering on systems that don't support 
-double-buffering natively. 
+time. This technique can significantly reduce the amount of repeated
+drawing. Offscreen drawing functions are declared in <FL/platform.H>.
+
+Fl_Double_Window uses offscreen rendering to avoid flickering on
+systems that don't support double-buffering natively.
 
 Fl_Offscreen fl_create_offscreen(int w, int h)
 
diff --git a/documentation/src/osissues.dox b/documentation/src/osissues.dox
index e8b6822fa..166c0a95d 100644
--- a/documentation/src/osissues.dox
+++ b/documentation/src/osissues.dox
@@ -14,14 +14,20 @@ All programs that need to access the operating system
 specific interfaces must include the following header file:
 
 \code
-#include <FL/x.H>
+#include <FL/platform.H>
 \endcode
 
-Despite the name, this header file will define the
-appropriate interface for your environment. The pages that
-follow describe the functionality that is provided for each
+This header file will define the appropriate interface for your environment.
+The pages that follow describe the functionality that is provided for each
 operating system.
 
+\note	These definitions used to be in FL/x.H up to FLTK 1.3.x. Usage of
+	FL/x.H is deprecated since FLTK 1.4.0. You should replace all references
+	of FL/x.H with FL/platform.H if your target is FLTK 1.4 or later.
+	FL/x.H will be retained for backwards compatibility for some
+	releases but will be removed in a later (not yet specified)
+	FLTK release.
+
 <CENTER>
 <TABLE WIDTH="90%" BORDER="1" CELLPADDING="5" CELLSPACING="0" BGCOLOR="#cccccc">
 <TR>
@@ -801,7 +807,7 @@ is flipped to match
 FLTK's coordinate system. The origin for all drawing is in the top
 left corner of the enclosing Fl_Window. The global variable
 \c fl_gc (of type \c CGContextRef) is the appropriate Quartz 2D drawing environment.
-Include FL/x.H to declare the \c fl_gc variable.
+Include FL/platform.H to declare the \c fl_gc variable.
 
 \subsection osissues_localize Internationalization
 All FLTK programs contain an application menu with, e.g., the About xxx, Hide xxx, and Quit xxx items.