gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove platform-dependent code from Enumerations.H

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11596 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-04-13 10:48:14 +00:00
parent d92a0c3961
commit 562d29bd7c
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FL/Enumerations.H
View File

@ -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

1
FL/Fl_Menu_Item.H
View File

@ -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)

8
FL/platform_types.h
View File

@ -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 */
/*