From f1a157bdd94c7680629145a577c2ce1d97f2e161 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Fri, 1 Apr 2016 10:28:03 +0000
Subject: Replace Fl_System_Driver::driver() by Fl::system_driver()

for coherence with the Fl::screen_driver() function.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11494 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/Fl.H               | 3 ++-
 FL/Fl_Screen_Driver.H | 4 +++-
 FL/Fl_System_Driver.H | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'FL')

diff --git a/FL/Fl.H b/FL/Fl.H
index 24e9ec458..990847125 100644
--- a/FL/Fl.H
+++ b/FL/Fl.H
@@ -23,7 +23,7 @@
 #ifndef Fl_H
 #  define Fl_H
 
-#include <FL/Fl_System_Driver.H>
+#include <FL/Fl_System_Driver.H> // for FL_SOCKET
 #ifdef FLTK_HAVE_CAIRO
 # include <FL/Fl_Cairo.H>
 #endif
@@ -135,6 +135,7 @@ private:
 public:
 
   static Fl_Screen_Driver *screen_driver();
+  static Fl_System_Driver *system_driver();
 
 public: // run time information about compile time configuration
   /** \defgroup cfg_gfx runtime graphics driver configuration */
diff --git a/FL/Fl_Screen_Driver.H b/FL/Fl_Screen_Driver.H
index 752b701b2..7804af6a9 100644
--- a/FL/Fl_Screen_Driver.H
+++ b/FL/Fl_Screen_Driver.H
@@ -20,7 +20,9 @@
 #define FL_SCREEN_DRIVER_H
 
 #include <FL/Fl_Device.H>
-#include <FL/Fl.H>
+#include <FL/fl_types.h>
+#include <FL/Fl.H> // for Fl_Timeout_Handler
+
 
 // TODO: add text composition?
 // TODO: add Fl::display
diff --git a/FL/Fl_System_Driver.H b/FL/Fl_System_Driver.H
index c946f6836..a46820100 100644
--- a/FL/Fl_System_Driver.H
+++ b/FL/Fl_System_Driver.H
@@ -65,12 +65,13 @@ typedef int FL_SOCKET;
  \brief A base class for platform-specific system operations.
   */
 class FL_EXPORT Fl_System_Driver {
+  friend class Fl;
 protected:
+  // implement once for each platform
+  static Fl_System_Driver *newSystemDriver();
   Fl_System_Driver();
 public:
   virtual ~Fl_System_Driver();
-  // copy the implementation in Fl_XXX_System_Driver.cxx to the corresponding file for the new platform
-  static Fl_System_Driver *driver();
   // These flags are useful after calling XParseGeometry(). They indicate which of its arguments
   // contain meaningful data upon return.
   static const int flNoValue;
@@ -80,6 +81,7 @@ public:
   static const int flYValue;
   static const int flXNegative;
   static const int flYNegative;
+  
   // implement if the system adds unwanted program argument(s)
   virtual int single_arg(const char *arg) { return 0; }
   // implement if the system adds unwanted program argument pair(s)
-- 
cgit v1.2.3