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

CHANGES

@@ -85,6 +85,11 @@ Changes in FLTK 1.4.0					Released: ??? ?? 2017
   Other Improvements
 
   - (add new items here)
+  - The include file for platform specific functions and definitions
+    (FL/x.H) has been replaced with FL/platform.H. FL/x.H is deprecated
+    but still available for backwards compatibility (STR #3435).
+    FL/x.H will be removed in a (not yet specified) future FLTK release.
+    We recommend to change your #include statements accordingly.
   - The Fl_Boxtype and Fl_Labeltype definitions contained enum values
     (names) with a leading underscore (e.g. _FL_MULTI_LABEL) that had to
     be used in this form. Now all boxtypes and labeltypes can and should

FL/platform.H

@@ -0,0 +1,162 @@
+//
+// "$Id$"
+//
+// Platform header file for the Fast Light Tool Kit (FLTK).
+//
+// 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
+// file is missing or damaged, see the license at:
+//
+//     http://www.fltk.org/COPYING.php
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+// These are FLTK symbols that are necessary or useful for calling
+// platform specific functions. This file #include's certain platform
+// specific system header files that are necessary to declare platform
+// specific FLTK functions, for instance "Windows.h" under Windows.
+
+// You should include this file if (and ONLY if) you need to call
+// platform specific functions directly.
+
+// See FLTK documentation: chapter "Operating System Issues" on when
+// you need to #include <FL/platform.H>
+
+#if !defined(FL_PLATFORM_H) && !defined(FL_DOXYGEN)
+#  define FL_PLATFORM_H
+
+#   include <FL/Fl_Export.H>
+#   include <FL/platform_types.h>
+#   include <FL/fl_types.h> // for uchar
+class Fl_Window;
+
+#  ifdef WIN32
+#    include "win32.H"
+#  elif defined(__APPLE__)
+#    include "mac.H"
+#  elif defined(USE_SDL)
+#    pragma message "FL_PORTING: write a header file based on this file, win32.H, or mac.H to define the FLTK core internals"
+#    include "porting.H"
+#  elif defined(FL_PORTING)
+#    pragma message "FL_PORTING: write a header file based on this file, win32.H, or mac.H to define the FLTK core internals"
+#    include "porting.H"
+#  else // X11
+#   include <FL/fl_types.h>
+#   include <FL/Enumerations.H>
+#    if !defined(USE_X11)
+#      define USE_X11 1
+#    endif
+#    if defined(_ABIN32) || defined(_ABI64) // fix for broken SGI Irix X .h files
+#      pragma set woff 3322
+#    endif
+#    include <X11/Xlib.h>
+#    include <X11/Xutil.h>
+#    if defined(_ABIN32) || defined(_ABI64)
+#      pragma reset woff 3322
+#    endif
+#    include <X11/Xatom.h>
+
+FL_EXPORT void fl_open_display(Display*);
+
+// constant info about the X server connection:
+extern FL_EXPORT Display *fl_display;
+extern FL_EXPORT int fl_screen;
+extern FL_EXPORT XVisualInfo *fl_visual;
+extern FL_EXPORT Colormap fl_colormap;
+
+// drawing functions:
+extern FL_EXPORT GC fl_gc;
+FL_EXPORT ulong fl_xpixel(Fl_Color i);
+FL_EXPORT ulong fl_xpixel(uchar r, uchar g, uchar b);
+
+// feed events into fltk:
+FL_EXPORT int fl_handle(const XEvent&);
+
+// you can use these in Fl::add_handler() to look at events:
+extern FL_EXPORT const XEvent* fl_xevent;
+extern FL_EXPORT ulong fl_event_time;
+
+#if defined(FL_LIBRARY) || defined(FL_INTERNALS)
+extern FL_EXPORT Window fl_message_window;
+extern FL_EXPORT void *fl_xftfont;
+
+// access to core fonts:
+// This class provides a "smart pointer" that returns a pointer to an XFontStruct.
+// The global variable fl_xfont can be called wherever a bitmap "core" font is
+// needed, e.g. when rendering to a GL context under X11.
+// With Xlib / X11 fonts, fl_xfont will return the current selected font.
+// With XFT / X11 fonts, fl_xfont will attempt to return the bitmap "core" font most
+// similar to (usually the same as) the current XFT font.
+class FL_EXPORT Fl_XFont_On_Demand
+{
+public:
+  Fl_XFont_On_Demand(XFontStruct* p = NULL) : ptr(p) { }
+  Fl_XFont_On_Demand& operator=(const Fl_XFont_On_Demand& x)
+  { ptr = x.ptr;  return *this; }
+  Fl_XFont_On_Demand& operator=(XFontStruct* p)
+  { ptr = p;  return *this; }
+  XFontStruct* value();
+  operator XFontStruct*() { return value(); }
+  XFontStruct& operator*() { return *value(); }
+  XFontStruct* operator->() { return value(); }
+  bool operator==(const Fl_XFont_On_Demand& x) { return ptr == x.ptr; }
+  bool operator!=(const Fl_XFont_On_Demand& x) { return ptr != x.ptr; }
+private:
+  XFontStruct *ptr;
+};
+extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
+
+extern FL_EXPORT char fl_override_redirect; // hack into Fl_X::make_xid()
+extern FL_EXPORT int fl_background_pixel;  // hack into Fl_X::make_xid()
+
+#endif // FL_LIBRARY || FL_INTERNALS
+
+#  endif // X11
+
+//
+// cross-platform declarations
+//
+#if defined(FL_LIBRARY) || defined(FL_INTERNALS)
+#  include <FL/Fl_Window.H>
+
+class FL_EXPORT Fl_X {
+public:
+  Window xid;
+  Fl_Window* w;
+  Fl_Region region;
+  Fl_X *next;
+  // static variables, static functions and member functions
+  static Fl_X* first;
+  static Fl_X* i(const Fl_Window* w) {return (Fl_X*)w->i;}
+#  if defined(USE_X11) // for backward compatibility
+  static void make_xid(Fl_Window*, XVisualInfo* =fl_visual, Colormap=fl_colormap);
+  static Fl_X* set_xid(Fl_Window*, Window);
+#  endif
+};
+
+inline Window fl_xid(const Fl_Window* w) { Fl_X *xTemp = Fl_X::i(w); return xTemp ? xTemp->xid : 0; }
+#else
+extern FL_EXPORT Window fl_xid_(const Fl_Window* w);
+#  define fl_xid(w) fl_xid_(w)
+#endif // FL_LIBRARY || FL_INTERNALS
+
+extern FL_EXPORT Fl_Window* fl_find(Window xid);
+extern FL_EXPORT void fl_open_display();
+extern FL_EXPORT void fl_close_display();
+extern FL_EXPORT Window fl_window;
+extern FL_EXPORT Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data);
+extern FL_EXPORT Fl_Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data);
+extern FL_EXPORT void fl_delete_bitmask(Fl_Bitmask bm);
+extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b);
+extern FL_EXPORT void fl_open_callback(void (*)(const char *));
+
+#endif // !FL_PLATFORM_H
+
+//
+// End of "$Id$".
+//

FL/platform_types.h

@@ -1,7 +1,7 @@
 /*
  * "$Id$"
  *
- * Copyright 2016 by Bill Spitzak and others.
+ * Copyright 2016-2018 by Bill Spitzak and others.
  *
  * This library is free software. Distribution and use rights are outlined in
  * the file "COPYING" which should have been included with this file.  If this
@@ -14,8 +14,8 @@
  *     http://www.fltk.org/str.php
  */
 
-#ifndef PLATFORM_TYPES_H
+#ifndef FL_PLATFORM_TYPES_H
-#define PLATFORM_TYPES_H
+#define FL_PLATFORM_TYPES_H
 
 /* Platform-dependent types are defined here.
   These types must be defined by any platform:
@@ -120,7 +120,7 @@ typedef struct __GLXcontextRec *GLContext;
 #  define FL_CONTROL	FL_META   /**< An alias for FL_META on WIN32 and X11, or FL_CTRL on MacOS X */
 #endif
 
-#endif /* PLATFORM_TYPES_H */
+#endif /* FL_PLATFORM_TYPES_H */
 
 /*
  * End of "$Id$".

FL/x.H

@@ -1,9 +1,9 @@
 //
 // "$Id$"
 //
-// X11 header file for the Fast Light Tool Kit (FLTK).
+// *Deprecated* platform header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2017 by Bill Spitzak and others.
+// Copyright 1998-2018 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -16,139 +16,15 @@
 //     http://www.fltk.org/str.php
 //
 
-// These are internal fltk symbols that are necessary or useful for
+// IMPORTANT: This file is deprecated since FLTK 1.4.0. DO NOT include it.
-// calling Xlib.  You should include this file if (and ONLY if) you
+// FL/x.H will be removed in a future FLTK release.
-// need to call Xlib directly.  These symbols may not exist on non-X
+
-// systems.
+// Please #include <FL/platform.H> instead if you really need it. See
+// documentation in FL/platform.H to decide whether you need that file.
 
 #if !defined(Fl_X_H) && !defined(FL_DOXYGEN) 
 #  define Fl_X_H
-
+#  include <FL/platform.H>
-#   include <FL/Fl_Export.H>
-#   include <FL/platform_types.h>
-#   include <FL/fl_types.h> // for uchar
-class Fl_Window;
-
-#  ifdef WIN32
-#    include "win32.H"
-#  elif defined(__APPLE__)
-#    include "mac.H"
-#  elif defined(USE_SDL)
-#    pragma message "FL_PORTING: write a header file based on this file, win32.H, or mac.H to define the FLTK core internals"
-#    include "porting.H"
-#  elif defined(FL_PORTING)
-#    pragma message "FL_PORTING: write a header file based on this file, win32.H, or mac.H to define the FLTK core internals"
-#    include "porting.H"
-#  else // X11
-#   include <FL/fl_types.h>
-#   include <FL/Enumerations.H>
-#    if !defined(USE_X11)
-#      define USE_X11 1
-#    endif
-#    if defined(_ABIN32) || defined(_ABI64) // fix for broken SGI Irix X .h files
-#      pragma set woff 3322
-#    endif
-#    include <X11/Xlib.h>
-#    include <X11/Xutil.h>
-#    if defined(_ABIN32) || defined(_ABI64)
-#      pragma reset woff 3322
-#    endif
-#    include <X11/Xatom.h>
-
-FL_EXPORT void fl_open_display(Display*);
-
-// constant info about the X server connection:
-extern FL_EXPORT Display *fl_display;
-extern FL_EXPORT int fl_screen;
-extern FL_EXPORT XVisualInfo *fl_visual;
-extern FL_EXPORT Colormap fl_colormap;
-
-// drawing functions:
-extern FL_EXPORT GC fl_gc;
-FL_EXPORT ulong fl_xpixel(Fl_Color i);
-FL_EXPORT ulong fl_xpixel(uchar r, uchar g, uchar b);
-
-// feed events into fltk:
-FL_EXPORT int fl_handle(const XEvent&);
-
-// you can use these in Fl::add_handler() to look at events:
-extern FL_EXPORT const XEvent* fl_xevent;
-extern FL_EXPORT ulong fl_event_time;
-
-#if defined(FL_LIBRARY) || defined(FL_INTERNALS)
-extern FL_EXPORT Window fl_message_window;
-extern FL_EXPORT void *fl_xftfont;
-
-// access to core fonts:
-// This class provides a "smart pointer" that returns a pointer to an XFontStruct.
-// The global variable fl_xfont can be called wherever a bitmap "core" font is
-// needed, e.g. when rendering to a GL context under X11.
-// With Xlib / X11 fonts, fl_xfont will return the current selected font.
-// With XFT / X11 fonts, fl_xfont will attempt to return the bitmap "core" font most
-// similar to (usually the same as) the current XFT font.
-class FL_EXPORT Fl_XFont_On_Demand
-{
-public:
-  Fl_XFont_On_Demand(XFontStruct* p = NULL) : ptr(p) { }
-  Fl_XFont_On_Demand& operator=(const Fl_XFont_On_Demand& x)
-  { ptr = x.ptr;  return *this; }
-  Fl_XFont_On_Demand& operator=(XFontStruct* p)
-  { ptr = p;  return *this; }
-  XFontStruct* value();
-  operator XFontStruct*() { return value(); }
-  XFontStruct& operator*() { return *value(); }
-  XFontStruct* operator->() { return value(); }
-  bool operator==(const Fl_XFont_On_Demand& x) { return ptr == x.ptr; }
-  bool operator!=(const Fl_XFont_On_Demand& x) { return ptr != x.ptr; }
-private:
-  XFontStruct *ptr;
-};
-extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
-
-extern FL_EXPORT char fl_override_redirect; // hack into Fl_X::make_xid()
-extern FL_EXPORT int fl_background_pixel;  // hack into Fl_X::make_xid()
-
-#endif // FL_LIBRARY || FL_INTERNALS
-
-#  endif // X11
-
-//
-// cross-platform declarations
-//
-#if defined(FL_LIBRARY) || defined(FL_INTERNALS)
-#  include <FL/Fl_Window.H>
-
-class FL_EXPORT Fl_X {
-public:
-  Window xid;
-  Fl_Window* w;
-  Fl_Region region;
-  Fl_X *next;
-  // static variables, static functions and member functions
-  static Fl_X* first;
-  static Fl_X* i(const Fl_Window* w) {return (Fl_X*)w->i;}
-#  if defined(USE_X11) // for backward compatibility
-  static void make_xid(Fl_Window*, XVisualInfo* =fl_visual, Colormap=fl_colormap);
-  static Fl_X* set_xid(Fl_Window*, Window);
-#  endif
-};
-
-inline Window fl_xid(const Fl_Window* w) { Fl_X *xTemp = Fl_X::i(w); return xTemp ? xTemp->xid : 0; }
-#else
-extern FL_EXPORT Window fl_xid_(const Fl_Window* w);
-#  define fl_xid(w) fl_xid_(w)
-#endif // FL_LIBRARY || FL_INTERNALS
-
-extern FL_EXPORT Fl_Window* fl_find(Window xid);
-extern FL_EXPORT void fl_open_display();
-extern FL_EXPORT void fl_close_display();
-extern FL_EXPORT Window fl_window;
-extern FL_EXPORT Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data);
-extern FL_EXPORT Fl_Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data);
-extern FL_EXPORT void fl_delete_bitmask(Fl_Bitmask bm);
-extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b);
-extern FL_EXPORT void fl_open_callback(void (*)(const char *));
-
 #endif // !Fl_X_H
 
 //

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
+time. This technique can significantly reduce the amount of repeated
-repeated drawing. Offscreen drawing functions are declared in <FL/x.H>.
+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 
+Fl_Double_Window uses offscreen rendering to avoid flickering on
-double-buffering natively. 
+systems that don't support double-buffering natively.
 
 Fl_Offscreen fl_create_offscreen(int w, int h)
 

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
+This header file will define the appropriate interface for your environment.
-appropriate interface for your environment. The pages that
+The pages that follow describe the functionality that is provided for each
-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.

fluid/makedepend

@@ -170,7 +170,7 @@ Fl_Window_Type.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H
 Fl_Window_Type.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H
 Fl_Window_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
 Fl_Window_Type.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/x.H
-Fl_Window_Type.o: ../FL/fl_types.h ../FL/Fl_Menu_Item.H
+Fl_Window_Type.o: ../FL/platform.H ../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

test/makedepend

@@ -21,6 +21,7 @@ unittests.o: unittest_viewport.cxx unittest_scrollbarsize.cxx
 unittests.o: ../FL/Fl_Browser.H ../FL/Fl_Tree.H ../FL/Fl_Scrollbar.H
 unittests.o: ../FL/Fl_Tree_Item.H ../FL/Fl_Tree_Item_Array.H
 unittests.o: ../FL/Fl_Tree_Prefs.H ../FL/Fl_Table.H ../FL/Fl_Scroll.H
+unittests.o: ../FL/Fl_Text_Display.H ../FL/Fl_Text_Buffer.H
 unittests.o: ../FL/Fl_Value_Slider.H unittest_schemes.cxx ../FL/Fl_Choice.H
 unittests.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Tabs.H
 unittests.o: ../FL/Fl_Clock.H ../FL/Fl_Progress.H ../FL/Fl_Slider.H
@@ -28,16 +29,17 @@ unittests.o: ../FL/Fl_Value_Output.H ../FL/Fl_Adjuster.H ../FL/Fl_Counter.H
 unittests.o: ../FL/Fl_Roller.H ../FL/Fl_Value_Input.H ../FL/Fl_Input.H
 unittests.o: ../FL/Fl_Input_.H ../FL/Fl_Input.H ../FL/Fl_Output.H
 unittests.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H
-unittests.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H
 unittests.o: ../FL/Fl_File_Input.H ../FL/Fl_Light_Button.H
 unittests.o: ../FL/Fl_Radio_Round_Button.H ../FL/Fl_Round_Button.H
+unittests.o: unittest_simple_terminal.cxx ../FL/Fl_Simple_Terminal.H
 animated.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 animated.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 animated.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Double_Window.H
 animated.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 animated.o: ../FL/Fl_Rect.H ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H
 animated.o: ../FL/Fl_Image.H ../FL/Fl_Button.H ../FL/Fl_Image.H ../FL/x.H
-animated.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/fl_draw.H
+animated.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H
+animated.o: ../FL/fl_draw.H
 adjuster.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 adjuster.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 adjuster.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Double_Window.H
@@ -71,13 +73,13 @@ blocks.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Rect.H
 blocks.o: ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
 blocks.o: ../FL/Fl_Button.H ../FL/Fl_Preferences.H ../FL/Fl_XPM_Image.H
 blocks.o: ../FL/Fl_Pixmap.H ../FL/Fl_XBM_Image.H ../FL/Fl_Bitmap.H
-blocks.o: ../FL/Fl_Tiled_Image.H ../FL/fl_draw.H ../FL/x.H ../FL/fl_types.h
+blocks.o: ../FL/Fl_Tiled_Image.H ../FL/fl_draw.H ../FL/x.H ../FL/platform.H
-blocks.o: ../FL/Enumerations.H ../config.h pixmaps/blast.xpm pixmaps/red.xpm
+blocks.o: ../FL/fl_types.h ../FL/Enumerations.H ../config.h pixmaps/blast.xpm
-blocks.o: pixmaps/red_bomb.xpm pixmaps/green.xpm pixmaps/green_bomb.xpm
+blocks.o: pixmaps/red.xpm pixmaps/red_bomb.xpm pixmaps/green.xpm
-blocks.o: pixmaps/blue.xpm pixmaps/blue_bomb.xpm pixmaps/yellow.xpm
+blocks.o: pixmaps/green_bomb.xpm pixmaps/blue.xpm pixmaps/blue_bomb.xpm
-blocks.o: pixmaps/yellow_bomb.xpm pixmaps/cyan.xpm pixmaps/cyan_bomb.xpm
+blocks.o: pixmaps/yellow.xpm pixmaps/yellow_bomb.xpm pixmaps/cyan.xpm
-blocks.o: pixmaps/magenta.xpm pixmaps/magenta_bomb.xpm pixmaps/gray.xpm
+blocks.o: pixmaps/cyan_bomb.xpm pixmaps/magenta.xpm pixmaps/magenta_bomb.xpm
-blocks.o: pixmaps/gray_bomb.xpm
+blocks.o: pixmaps/gray.xpm pixmaps/gray_bomb.xpm
 boxtype.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 boxtype.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 boxtype.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Double_Window.H
@@ -93,7 +95,12 @@ browser.o: ../FL/Fl_Widget.H ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
 browser.o: ../FL/Fl_Group.H ../FL/Fl_Rect.H ../FL/Fl_Widget.H
 browser.o: ../FL/Fl_Bitmap.H ../FL/Fl_Button.H ../FL/Fl_Int_Input.H
 browser.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Choice.H
-browser.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/fl_ask.H
+browser.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Simple_Terminal.H
+browser.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Enumerations.H
+browser.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H
+browser.o: ../FL/Fl_Preferences.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H
+browser.o: ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H ../FL/Fl_Text_Buffer.H
+browser.o: ../FL/fl_ask.H
 button.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
 button.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
 button.o: ../FL/abi-version.h ../FL/Fl_Window.H ../FL/Fl_Group.H
@@ -151,7 +158,7 @@ color_chooser.o: ../FL/Fl_Color_Chooser.H ../FL/Fl_Return_Button.H
 color_chooser.o: ../FL/Fl_Button.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
 color_chooser.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Value_Input.H
 color_chooser.o: ../FL/Fl_Valuator.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
-color_chooser.o: ../FL/Fl_Image.H ../FL/x.H ../FL/fl_types.h
+color_chooser.o: ../FL/Fl_Image.H ../FL/x.H ../FL/platform.H ../FL/fl_types.h
 color_chooser.o: ../FL/Enumerations.H ../FL/fl_draw.H list_visuals.cxx
 color_chooser.o: ../config.h
 cube.o: ../config.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
@@ -202,7 +209,8 @@ demo.o: ../FL/abi-version.h ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
 demo.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Rect.H ../FL/Fl_Widget.H
 demo.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Box.H ../FL/Fl_Button.H
 demo.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
-demo.o: ../FL/filename.H ../FL/x.H ../FL/fl_types.h ../FL/Enumerations.H
+demo.o: ../FL/filename.H ../FL/x.H ../FL/platform.H ../FL/fl_types.h
+demo.o: ../FL/Enumerations.H
 device.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
 device.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
 device.o: ../FL/abi-version.h ../FL/Fl_Overlay_Window.H
@@ -236,10 +244,10 @@ doublebuffer.o: ../FL/Fl_Box.H ../FL/fl_draw.H ../FL/Fl_Hor_Slider.H
 doublebuffer.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/math.h
 editor.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
 editor.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
-editor.o: ../FL/abi-version.h ../FL/x.H ../FL/fl_types.h ../FL/Enumerations.H
+editor.o: ../FL/abi-version.h ../FL/x.H ../FL/platform.H ../FL/fl_types.h
-editor.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Rect.H
+editor.o: ../FL/Enumerations.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
-editor.o: ../FL/Fl_Widget.H ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
+editor.o: ../FL/Fl_Rect.H ../FL/Fl_Widget.H ../FL/Fl_Double_Window.H
-editor.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/fl_ask.H
+editor.o: ../FL/Fl_Window.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/fl_ask.H
 editor.o: ../FL/Fl_Native_File_Chooser.H ../FL/Fl_File_Chooser.H
 editor.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
 editor.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Button.H ../FL/Fl_Preferences.H
@@ -250,10 +258,7 @@ editor.o: ../FL/Fl.H ../FL/filename.H ../FL/Fl_Box.H ../FL/Fl_Check_Button.H
 editor.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_File_Input.H
 editor.o: ../FL/Fl_Input.H ../FL/Fl_Return_Button.H ../FL/Fl_Menu_Bar.H
 editor.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H
-editor.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Graphics_Driver.H
+editor.o: ../FL/Fl_Text_Display.H ../FL/filename.H
-editor.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H
-editor.o: ../FL/Fl_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H
-editor.o: ../FL/Fl_Text_Buffer.H ../FL/filename.H
 fast_slow.o: fast_slow.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 fast_slow.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 fast_slow.o: ../FL/Enumerations.H ../FL/abi-version.h
@@ -277,7 +282,11 @@ file_chooser.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
 file_chooser.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H
 file_chooser.o: ../FL/Fl_Return_Button.H ../FL/fl_ask.H ../FL/Fl_File_Icon.H
 file_chooser.o: ../FL/Fl_Shared_Image.H ../FL/Fl_PNM_Image.H
-file_chooser.o: ../FL/Fl_Light_Button.H
+file_chooser.o: ../FL/Fl_Light_Button.H ../FL/Fl_Simple_Terminal.H
+file_chooser.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Enumerations.H
+file_chooser.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H
+file_chooser.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H
+file_chooser.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/Fl_Text_Buffer.H
 fonts.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
 fonts.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
 fonts.o: ../FL/abi-version.h ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
@@ -366,7 +375,7 @@ help_dialog.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H
 help_dialog.o: ../FL/Enumerations.H ../FL/Fl_Graphics_Driver.H
 help_dialog.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H
 help_dialog.o: ../FL/Fl_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H
-help_dialog.o: ../FL/filename.H
+help_dialog.o: ../FL/filename.H ../FL/filename.H
 icon.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
 icon.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
 icon.o: ../FL/abi-version.h ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
@@ -385,8 +394,8 @@ image.o: ../FL/abi-version.h ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
 image.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Rect.H ../FL/Fl_Widget.H
 image.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Button.H
 image.o: ../FL/Fl_Image.H ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H
-image.o: ../FL/x.H ../FL/fl_types.h ../FL/Enumerations.H list_visuals.cxx
+image.o: ../FL/x.H ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H
-image.o: ../config.h
+image.o: list_visuals.cxx ../config.h
 inactive.o: inactive.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 inactive.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 inactive.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Double_Window.H
@@ -411,6 +420,11 @@ input.o: ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H ../FL/Fl_Light_Button.H
 input.o: ../FL/Fl_Color_Chooser.H ../FL/Fl_Box.H ../FL/Fl_Return_Button.H
 input.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
 input.o: ../FL/Fl_Value_Input.H ../FL/Fl_Valuator.H
+input.o: ../FL/Fl_Simple_Terminal.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H
+input.o: ../FL/Enumerations.H ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H
+input.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H
+input.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H
+input.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Text_Buffer.H
 input_choice.o: ../FL/Fl_Button.H ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
 input_choice.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 input_choice.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
@@ -418,7 +432,13 @@ input_choice.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Group.H
 input_choice.o: ../FL/Fl_Widget.H ../FL/Fl_Rect.H ../FL/Fl_Widget.H
 input_choice.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Input_Choice.H
 input_choice.o: ../FL/Fl_Input.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
-input_choice.o: ../FL/Fl_Menu_Item.H
+input_choice.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Simple_Terminal.H
+input_choice.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Enumerations.H
+input_choice.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H
+input_choice.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H
+input_choice.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H
+input_choice.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
+input_choice.o: ../FL/Fl_Text_Buffer.H
 keyboard.o: keyboard_ui.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 keyboard.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 keyboard.o: ../FL/Enumerations.H ../FL/abi-version.h keyboard.h
@@ -469,6 +489,12 @@ menubar.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Sys_Menu_Bar.H
 menubar.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
 menubar.o: ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H ../FL/Fl_Menu_Button.H
 menubar.o: ../FL/Fl_Choice.H ../src/flstring.h ../config.h ../FL/fl_draw.H
+menubar.o: ../FL/Fl_Simple_Terminal.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H
+menubar.o: ../FL/Enumerations.H ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H
+menubar.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H
+menubar.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H
+menubar.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
+menubar.o: ../FL/Fl_Text_Buffer.H
 message.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 message.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 message.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Window.H
@@ -506,6 +532,8 @@ native-filechooser.o: ../FL/fl_draw.H ../FL/Enumerations.H
 native-filechooser.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H
 native-filechooser.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H
 native-filechooser.o: ../FL/Fl_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H
+native-filechooser.o: ../FL/Fl_Simple_Terminal.H ../FL/Fl_Text_Display.H
+native-filechooser.o: ../FL/Fl_Text_Buffer.H
 navigation.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 navigation.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 navigation.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Window.H
@@ -517,8 +545,9 @@ offscreen.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 offscreen.o: ../FL/Enumerations.H ../FL/abi-version.h
 offscreen.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 offscreen.o: ../FL/Fl_Widget.H ../FL/Fl_Rect.H ../FL/Fl_Widget.H
-offscreen.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/x.H ../FL/fl_types.h
+offscreen.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/x.H ../FL/platform.H
-offscreen.o: ../FL/Enumerations.H ../FL/Fl_Box.H ../FL/fl_draw.H
+offscreen.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Box.H
+offscreen.o: ../FL/fl_draw.H
 output.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
 output.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
 output.o: ../FL/abi-version.h ../FL/Fl_Value_Input.H ../FL/Fl_Valuator.H
@@ -679,8 +708,8 @@ sudoku.o: ../FL/fl_draw.H ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H
 sudoku.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H
 sudoku.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/filename.H
 sudoku.o: ../FL/Fl_Preferences.H ../FL/Fl_Sys_Menu_Bar.H ../FL/Fl_Menu_Bar.H
-sudoku.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/x.H ../FL/fl_types.h
+sudoku.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/x.H ../FL/platform.H
-sudoku.o: ../FL/math.h pixmaps/sudoku.xbm ../config.h
+sudoku.o: ../FL/fl_types.h ../FL/math.h pixmaps/sudoku.xbm ../config.h
 symbols.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 symbols.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 symbols.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Double_Window.H
@@ -697,7 +726,11 @@ table.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
 table.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
 table.o: ../FL/fl_draw.H ../FL/fl_ask.H ../FL/Fl_Table_Row.H ../FL/Fl_Table.H
 table.o: ../FL/Fl_Scroll.H ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H
-table.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
+table.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Simple_Terminal.H
+table.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Enumerations.H
+table.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H
+table.o: ../FL/Fl_Preferences.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H
+table.o: ../FL/Fl_RGB_Image.H ../FL/Fl_Text_Buffer.H
 tabs.o: tabs.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 tabs.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 tabs.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Double_Window.H
@@ -726,8 +759,8 @@ tiled_image.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 tiled_image.o: ../FL/Fl_Widget.H ../FL/Fl_Rect.H ../FL/Fl_Widget.H
 tiled_image.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Button.H
 tiled_image.o: ../FL/Fl_Pixmap.H ../FL/Fl_Tiled_Image.H pixmaps/tile.xpm
-tiled_image.o: ../FL/x.H ../FL/fl_types.h ../FL/Enumerations.H
+tiled_image.o: ../FL/x.H ../FL/platform.H ../FL/fl_types.h
-tiled_image.o: list_visuals.cxx ../config.h
+tiled_image.o: ../FL/Enumerations.H list_visuals.cxx ../config.h
 tree.o: tree.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 tree.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 tree.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Tooltip.H
@@ -746,8 +779,11 @@ tree.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/filename.H ../FL/Fl_Box.H
 tree.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
 tree.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H ../FL/Fl_Return_Button.H
 tree.o: ../FL/Fl_Color_Chooser.H ../FL/Fl_Value_Input.H ../FL/Fl_Input.H
-tree.o: ../FL/Fl_Input_.H ../FL/Fl_Text_Display.H ../FL/Fl_Value_Slider.H
+tree.o: ../FL/Fl_Input_.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H
-tree.o: ../FL/Fl_Light_Button.H
+tree.o: ../FL/Enumerations.H ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H
+tree.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_RGB_Image.H
+tree.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Simple_Terminal.H
+tree.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Light_Button.H
 twowin.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
 twowin.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
 twowin.o: ../FL/abi-version.h ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
@@ -757,14 +793,19 @@ twowin.o: ../FL/Fl_Button.H ../FL/Fl_Input.H
 valuators.o: valuators.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 valuators.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 valuators.o: ../FL/Enumerations.H ../FL/abi-version.h
+valuators.o: ../FL/Fl_Simple_Terminal.H ../FL/Fl_Text_Display.H
+valuators.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Graphics_Driver.H
+valuators.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H
+valuators.o: ../FL/Fl_Image.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
+valuators.o: ../FL/Fl_Widget.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H
+valuators.o: ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
+valuators.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H
 valuators.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-valuators.o: ../FL/Fl_Widget.H ../FL/Fl_Rect.H ../FL/Fl_Widget.H
+valuators.o: ../FL/Fl_Rect.H ../FL/Fl_Widget.H ../FL/Fl_Box.H
-valuators.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Box.H
+valuators.o: ../FL/Fl_Slider.H ../FL/Fl_Value_Slider.H ../FL/Fl_Value_Input.H
-valuators.o: ../FL/Fl_Slider.H ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H
+valuators.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Value_Output.H
-valuators.o: ../FL/Fl_Valuator.H ../FL/Fl_Value_Input.H ../FL/Fl_Input.H
+valuators.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Adjuster.H ../FL/Fl_Counter.H
-valuators.o: ../FL/Fl_Input_.H ../FL/Fl_Value_Output.H ../FL/Fl_Scrollbar.H
+valuators.o: ../FL/Fl_Spinner.H ../FL/Fl_Input.H ../FL/Fl_Repeat_Button.H
-valuators.o: ../FL/Fl_Adjuster.H ../FL/Fl_Counter.H ../FL/Fl_Spinner.H
-valuators.o: ../FL/Enumerations.H ../FL/Fl_Input.H ../FL/Fl_Repeat_Button.H
 valuators.o: ../FL/Fl.H ../FL/Fl_Button.H ../FL/Fl_Dial.H ../FL/Fl_Roller.H
 utf8.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
 utf8.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H