]> git.saurik.com Git - wxWidgets.git/commitdiff
adapt defines
authorStefan Csomor <csomor@advancedconcepts.ch>
Tue, 16 Aug 2011 11:55:39 +0000 (11:55 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Tue, 16 Aug 2011 11:55:39 +0000 (11:55 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/accel.h
include/wx/defs.h

index 6d0e2701ea23fcf412bd3192e88e1ba72592fc45..ca2d8dfb0e0bbb822678e36469653effde53ca53 100644 (file)
@@ -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
 };
 
 // ----------------------------------------------------------------------------
index 3b66b2e0a46ba00746d44fa39582c68b291cb4ac..0fcac961c83c999997793248695f646c1fb9ded8 100644 (file)
@@ -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
 };