diff options
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx | 1 | ||||
| -rw-r--r-- | src/drivers/Darwin/Fl_Darwin_System_Driver.H | 1 | ||||
| -rw-r--r-- | src/drivers/Darwin/Fl_Darwin_System_Driver.cxx | 8 | ||||
| -rw-r--r-- | src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx index 6f616cb56..a048bb4b2 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx @@ -31,6 +31,7 @@ extern "C" void NSBeep(void); extern double fl_mac_flush_and_wait(double time_to_wait); extern int fl_ready(); +int Fl_X::next_marked_length = 0; /** Creates a driver that manages all screen and display related calls. 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) { diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx index 8840d4a4f..c01de98d3 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx @@ -20,6 +20,7 @@ #ifdef FL_CFG_GFX_QUARTZ #include "Fl_Quartz_Graphics_Driver.h" +#include "../Darwin/Fl_Darwin_System_Driver.H" #include <math.h> #include <FL/Fl.H> #include <FL/x.H> @@ -417,7 +418,7 @@ static UniChar *mac_Utf8_to_Utf16(const char *txt, int len, int *new_len) Fl_Fontdesc* Fl_X::calc_fl_fonts(void) { - if (!fl_mac_os_version) fl_mac_os_version = calc_mac_os_version(); + if (!fl_mac_os_version) fl_mac_os_version = Fl_Darwin_System_Driver::calc_mac_os_version(); #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 return (fl_mac_os_version >= Fl_X::CoreText_threshold ? built_in_table_PS : built_in_table_full); #else |