adapt defines

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-08-16 11:55:39 +00:00
parent d0f93bc7dc
commit 5266f34590
2 changed files with 6 additions and 4 deletions

View File

@@ -34,10 +34,11 @@ enum wxAcceleratorEntryFlags
wxACCEL_CTRL = 0x0002, // hold Ctrl key down wxACCEL_CTRL = 0x0002, // hold Ctrl key down
wxACCEL_SHIFT = 0x0004, // hold Shift key down wxACCEL_SHIFT = 0x0004, // hold Shift key down
#if defined(__WXMAC__) || defined(__WXCOCOA__) #if defined(__WXMAC__) || defined(__WXCOCOA__)
wxACCEL_CMD = 0x0008 // Command key on OS X wxACCEL_RAW_CTRL= 0x0008, //
#else #else
wxACCEL_CMD = wxACCEL_CTRL wxACCEL_RAW_CTRL= wxACCEL_CTRL,
#endif #endif
wxACCEL_CMD = wxACCEL_CTRL
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@@ -2572,10 +2572,11 @@ enum wxKeyModifier
wxMOD_META = 0x0008, wxMOD_META = 0x0008,
wxMOD_WIN = wxMOD_META, wxMOD_WIN = wxMOD_META,
#if defined(__WXMAC__) || defined(__WXCOCOA__) #if defined(__WXMAC__) || defined(__WXCOCOA__)
wxMOD_CMD = wxMOD_META, wxMOD_RAW_CONTROL = wxMOD_META,
#else #else
wxMOD_CMD = wxMOD_CONTROL, wxMOD_RAW_CONTROL = wxMOD_CONTROL,
#endif #endif
wxMOD_CMD = wxMOD_CONTROL,
wxMOD_ALL = 0xffff wxMOD_ALL = 0xffff
}; };