From 4d4b43a6bcbcd3926b3dc1fc220c3e4b5b7a8c94 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sat, 2 Apr 2016 07:29:09 +0000
Subject: Move function Fl_X::calc_mac_os_version() to class
 Fl_Darwin_System_Driver

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11502 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/drivers/Darwin/Fl_Darwin_System_Driver.H   | 1 +
 src/drivers/Darwin/Fl_Darwin_System_Driver.cxx | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/drivers/Darwin')

diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.H b/src/drivers/Darwin/Fl_Darwin_System_Driver.H
index ab99c54d0..633e56dc6 100644
--- a/src/drivers/Darwin/Fl_Darwin_System_Driver.H
+++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.H
@@ -64,6 +64,7 @@ public:
   virtual int rename(const char* f, const char *n) {return ::rename(f, n);}
   virtual int clocale_printf(FILE *output, const char *format, va_list args);
   static void *get_carbon_function(const char *name);
+  static int calc_mac_os_version(); // computes the fl_mac_os_version global variable
 };
 
 #endif // FL_DARWIN_SYSTEM_DRIVER_H
diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
index 450857652..2f6d52fc6 100644
--- a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
+++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
@@ -20,17 +20,15 @@
 #include "../../config_lib.h"
 #include "Fl_Darwin_System_Driver.H"
 #include <FL/Fl.H>
-#include <FL/x.H>
 #include <string.h>
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
 #include <xlocale.h>
-#else
-#include <locale.h>
 #endif
+#include <locale.h>
 #include <stdio.h>
 #include <dlfcn.h>
 
-int Fl_X::next_marked_length = 0;
+extern int fl_mac_os_version;	// the version number of the running Mac OS X
 
 //const char* fl_local_alt   = "\xe2\x8c\xa5\\"; // U+2325 (option key)
 const char* fl_local_alt   = "⌥\\"; // U+2325 (option key)
@@ -53,7 +51,7 @@ Fl_System_Driver *Fl_System_Driver::newSystemDriver()
 }
 
 Fl_Darwin_System_Driver::Fl_Darwin_System_Driver() {
-  if (fl_mac_os_version == 0) fl_mac_os_version = Fl_X::calc_mac_os_version();
+  if (fl_mac_os_version == 0) fl_mac_os_version = calc_mac_os_version();
 }
 
 int Fl_Darwin_System_Driver::single_arg(const char *arg) {
-- 
cgit v1.2.3