Convert the initialisation of global variables fl_local_shift, fl_local_meta, etc... using the driver approach.

This avoids repeating the default values "Shift", "Meta", etc... for several platforms.

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

1 files changed, 12 insertions, 9 deletions

diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
index 19a200c69..8a103c2e9 100644
--- a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
+++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
@@ -38,15 +38,18 @@
 #include <sys/mount.h>
 #include <sys/stat.h>
 
-//const char* fl_local_alt   = "\xe2\x8c\xa5\\"; // U+2325 (option key)
-const char* fl_local_alt   = "⌥\\"; // U+2325 (option key)
-//const char* fl_local_ctrl  = "\xe2\x8c\x83\\"; // U+2303 (up arrowhead)
-const char* fl_local_ctrl  = "⌃\\"; // U+2303 (up arrowhead)
-//const char* fl_local_meta  = "\xe2\x8c\x98\\"; // U+2318 (place of interest sign)
-const char* fl_local_meta  = "⌘\\"; // U+2318 (place of interest sign)
-//const char* fl_local_shift = "\xe2\x87\xa7\\"; // U+21E7 (upwards white arrow)
-const char* fl_local_shift = "⇧\\"; // U+21E7 (upwards white arrow)
-
+const char *Fl_Darwin_System_Driver::shift_name() {
+  return "⇧\\"; // "\xe2\x87\xa7\\"; // U+21E7 (upwards white arrow)
+}
+const char *Fl_Darwin_System_Driver::meta_name() {
+  return "⌘\\"; // "\xe2\x8c\x98\\"; // U+2318 (place of interest sign)
+}
+const char *Fl_Darwin_System_Driver::alt_name() {
+  return "⌥\\"; // "\xe2\x8c\xa5\\"; // U+2325 (option key)
+}
+const char *Fl_Darwin_System_Driver::control_name() {
+  return "⌃\\"; // "\xe2\x8c\x83\\"; // U+2303 (up arrowhead)
+}
 
 /*
  Creates a driver that manages all system related calls.