From 5266f345907f3e283169b8603c04653f0e8393f4 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 16 Aug 2011 11:55:39 +0000 Subject: [PATCH] adapt defines git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/accel.h | 5 +++-- include/wx/defs.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wx/accel.h b/include/wx/accel.h index 6d0e2701ea..ca2d8dfb0e 100644 --- a/include/wx/accel.h +++ b/include/wx/accel.h @@ -34,10 +34,11 @@ enum wxAcceleratorEntryFlags wxACCEL_CTRL = 0x0002, // hold Ctrl key down wxACCEL_SHIFT = 0x0004, // hold Shift key down #if defined(__WXMAC__) || defined(__WXCOCOA__) - wxACCEL_CMD = 0x0008 // Command key on OS X + wxACCEL_RAW_CTRL= 0x0008, // #else - wxACCEL_CMD = wxACCEL_CTRL + wxACCEL_RAW_CTRL= wxACCEL_CTRL, #endif + wxACCEL_CMD = wxACCEL_CTRL }; // ---------------------------------------------------------------------------- diff --git a/include/wx/defs.h b/include/wx/defs.h index 3b66b2e0a4..0fcac961c8 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -2572,10 +2572,11 @@ enum wxKeyModifier wxMOD_META = 0x0008, wxMOD_WIN = wxMOD_META, #if defined(__WXMAC__) || defined(__WXCOCOA__) - wxMOD_CMD = wxMOD_META, + wxMOD_RAW_CONTROL = wxMOD_META, #else - wxMOD_CMD = wxMOD_CONTROL, + wxMOD_RAW_CONTROL = wxMOD_CONTROL, #endif + wxMOD_CMD = wxMOD_CONTROL, wxMOD_ALL = 0xffff }; -- 2.45.2