Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adapting to new ctrl constant handling on OSX

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-08-16 13:36:24 +00:00
parent 773db5dfb3
commit cfc77ac09a
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
interface/wx/accel.h
View File

@@ -16,13 +16,16 @@ enum wxAcceleratorEntryFlags
/** hold Alt key down */ /** hold Alt key down */
wxACCEL_ALT, wxACCEL_ALT,
/** hold Ctrl key down */ /** hold Ctrl key down, corresponds to Command key on OS X */
wxACCEL_CTRL, wxACCEL_CTRL,
/** hold Shift key down */ /** hold Shift key down */
wxACCEL_SHIFT, wxACCEL_SHIFT,
/** Command key on OS X; identic to wxACCEL_CTRL on other platforms. */ /** corresponds to real Ctrl key on OS X, identic to @c wxACCEL_CTRL on other platforms */
wxACCEL_RAW_CTRL,
/** deprecated, identic to @c wxACCEL_CTRL on all platforms. */
wxACCEL_CMD wxACCEL_CMD
}; };

17
interface/wx/defs.h
View File

@@ -653,20 +653,19 @@ enum wxKeyModifier
{ {
wxMOD_NONE = 0x0000, wxMOD_NONE = 0x0000,
wxMOD_ALT = 0x0001, wxMOD_ALT = 0x0001,
/** Ctlr Key, corresponds to Command key on OS X */
wxMOD_CONTROL = 0x0002, wxMOD_CONTROL = 0x0002,
wxMOD_ALTGR = wxMOD_ALT | wxMOD_CONTROL, wxMOD_ALTGR = wxMOD_ALT | wxMOD_CONTROL,
wxMOD_SHIFT = 0x0004, wxMOD_SHIFT = 0x0004,
wxMOD_META = 0x0008, wxMOD_META = 0x0008,
wxMOD_WIN = wxMOD_META, wxMOD_WIN = wxMOD_META,
/** /** used to describe the true Ctrl Key under OSX,
Notice that @c wxMOD_CMD should be used instead of @c wxMOD_CONTROL identic to @c wxMOD_CONTROL on other platforms */
in portable code to account for the fact that although wxMOD_RAW_CONTROL,
@c Control modifier exists under Mac OS, it is not used for the same
purpose as under Windows or Unix there while the special Mac-specific /** deprecated, identic to @c wxMOD_CONTROL on all platforms */
@c Command modifier is used in exactly the same way. wxMOD_CMD = wxMOD_CONTROL,
*/
wxMOD_CMD = wxMOD_META,
wxMOD_ALL = 0xffff wxMOD_ALL = 0xffff
}; };