diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-03-26 01:39:22 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-03-26 01:39:22 +0000 |
| commit | de9dc764f1a34a3032d560839687b551865c532f (patch) | |
| tree | 205e9699d209f28ea578db3dd34ed8b49beabc49 | |
| parent | 9de6339d8167d8e49ce02780fdef7e9aeb4304e6 (diff) | |
Move fl_local_* decl. and short docs back to FL/Fl.H.
Note: these declarations must be in an (official) public header.
FL/Fl_System_Driver.H should not be included in user space.
Maybe move FL/Fl_System_Driver.H to src/drivers ?
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11427 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl.H | 8 | ||||
| -rw-r--r-- | FL/Fl_System_Driver.H | 7 | ||||
| -rw-r--r-- | src/drivers/Posix/Fl_Posix_System_Driver.cxx | 8 |
3 files changed, 12 insertions, 11 deletions
@@ -65,6 +65,14 @@ class Fl_Screen_Driver; # define FL_SOCKET int #endif +// Pointers you can use to change FLTK to a foreign language. +// Note: Similar pointers are defined in FL/fl_ask.H and src/fl_ask.cxx + +extern FL_EXPORT const char* fl_local_alt; ///< string pointer used in shortcuts, you can change it to another language +extern FL_EXPORT const char* fl_local_ctrl; ///< string pointer used in shortcuts, you can change it to another language +extern FL_EXPORT const char* fl_local_meta; ///< string pointer used in shortcuts, you can change it to another language +extern FL_EXPORT const char* fl_local_shift; ///< string pointer used in shortcuts, you can change it to another language + /** \defgroup callback_functions Callback function typedefs \brief Typedefs defined in <FL/Fl.H> for callback or handler functions passed as function parameters. diff --git a/FL/Fl_System_Driver.H b/FL/Fl_System_Driver.H index f5384407d..da2446542 100644 --- a/FL/Fl_System_Driver.H +++ b/FL/Fl_System_Driver.H @@ -27,13 +27,6 @@ #include <FL/Fl_Device.H> #include <FL/Fl_Export.H> -// Pointers you can use to change FLTK to a foreign language. -// Note: Similar pointers are defined in FL/fl_ask.H and src/fl_ask.cxx -extern FL_EXPORT const char* fl_local_alt; -extern FL_EXPORT const char* fl_local_ctrl; -extern FL_EXPORT const char* fl_local_meta; -extern FL_EXPORT const char* fl_local_shift; - /** \brief A base class for platform specific window handling code. */ diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.cxx b/src/drivers/Posix/Fl_Posix_System_Driver.cxx index 763dca752..886397b35 100644 --- a/src/drivers/Posix/Fl_Posix_System_Driver.cxx +++ b/src/drivers/Posix/Fl_Posix_System_Driver.cxx @@ -22,10 +22,10 @@ // Pointers you can use to change FLTK to a foreign language. // Note: Similar pointers are defined in FL/fl_ask.H and src/fl_ask.cxx -const char* fl_local_alt = "Alt"; ///< string pointer used in shortcuts, you can change it to another language -const char* fl_local_ctrl = "Ctrl"; ///< string pointer used in shortcuts, you can change it to another language -const char* fl_local_meta = "Meta"; ///< string pointer used in shortcuts, you can change it to another language -const char* fl_local_shift = "Shift"; ///< string pointer used in shortcuts, you can change it to another language +const char* fl_local_alt = "Alt"; +const char* fl_local_ctrl = "Ctrl"; +const char* fl_local_meta = "Meta"; +const char* fl_local_shift = "Shift"; // // End of "$Id$". |