diff options
| author | Manolo Gouy <Manolo> | 2016-04-13 10:48:14 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-04-13 10:48:14 +0000 |
| commit | 562d29bd7cd57d657cdfa6ea9ed23c8948224c1f (patch) | |
| tree | 579509dc3ae02fac98e2bfc348d977572d4f8ff7 | |
| parent | d92a0c396119f9d2566c633ee490ed93effd0ae1 (diff) | |
Remove platform-dependent code from Enumerations.H
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11596 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Enumerations.H | 13 | ||||
| -rw-r--r-- | FL/Fl_Menu_Item.H | 1 | ||||
| -rw-r--r-- | FL/platform_types.h | 8 |
3 files changed, 10 insertions, 12 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 2983dfc69..9203b514c 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -48,6 +48,7 @@ # include "Fl_Export.H" # include "fl_types.h" +# include <FL/platform_types.h> // for FL_COMMAND and FL_CONTROL /** \name Version Numbers @@ -574,18 +575,6 @@ enum Fl_When { // Fl_Widget::when(): #define FL_KEY_MASK 0x0000ffff ///< All keys are 16 bit for now // FIXME: Unicode needs 24 bits! -#ifdef __APPLE__ // look and feel -# define FL_COMMAND FL_META ///< An alias for FL_CTRL on WIN32 and X11, or FL_META on MacOS X -# define FL_CONTROL FL_CTRL ///< An alias for FL_META on WIN32 and X11, or FL_CTRL on MacOS X -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: you need to define aliases for FL_COMMAND and FL_CONTROL" -# define FL_COMMAND FL_CTRL -# define FL_CONTROL FL_META -#else -# define FL_COMMAND FL_CTRL ///< An alias for FL_CTRL on WIN32 and X11, or FL_META on MacOS X -# define FL_CONTROL FL_META ///< An alias for FL_META on WIN32 and X11, or FL_CTRL on MacOS X -#endif // __APPLE__ look and feel - /*@}*/ // group: Event States /** \name Box Types diff --git a/FL/Fl_Menu_Item.H b/FL/Fl_Menu_Item.H index c04bdab8f..ebff23ae2 100644 --- a/FL/Fl_Menu_Item.H +++ b/FL/Fl_Menu_Item.H @@ -21,6 +21,7 @@ # include "Fl_Widget.H" # include "Fl_Image.H" +# include <FL/platform_types.h> // for FL_COMMAND and FL_CONTROL enum { // values for flags: FL_MENU_INACTIVE = 1, ///< Deactivate menu item (gray out) diff --git a/FL/platform_types.h b/FL/platform_types.h index 000a9c910..9db3e46c7 100644 --- a/FL/platform_types.h +++ b/FL/platform_types.h @@ -30,6 +30,8 @@ typedef int FL_SOCKET; #include <sys/stat.h> #include <sys/types.h> #include <dirent.h> +# define FL_COMMAND FL_META +# define FL_CONTROL FL_CTRL #elif defined(WIN32) typedef struct HBITMAP__ *HBITMAP; @@ -72,6 +74,12 @@ typedef int FL_SOCKET; #endif /* __APPLE__ */ + +#ifndef __APPLE__ +# define FL_COMMAND FL_CTRL ///< An alias for FL_CTRL on WIN32 and X11, or FL_META on MacOS X +# define FL_CONTROL FL_META ///< An alias for FL_META on WIN32 and X11, or FL_CTRL on MacOS X +#endif + #endif /* PLATFORM_TYPES_H */ /* |