adapt defines for ctrl/command key

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp
index f52fc05de373665b0de60a270557c4ecc8051693..4d05f3de4df865e286bec50e7d218a7a5b5b5164 100644 (file)
--- a/src/common/accelcmn.cpp
+++ b/src/common/accelcmn.cpp
@@ -307,7 +307,7 @@ wxString wxAcceleratorEntry::ToString() const
     int flags = GetFlags();
     if ( flags & wxACCEL_ALT )
         text += _("Alt+");
-    if ( flags & (wxACCEL_CTRL | wxACCEL_CMD) )
+    if ( flags & wxACCEL_CTRL )
         text += _("Ctrl+");
     if ( flags & wxACCEL_SHIFT )
         text += _("Shift+");

diff --git a/src/osx/accel.cpp b/src/osx/accel.cpp
index 14f0b1887a839f242946a8c4e0ab5452d31269a5..dbba6195bcae3ab25a2f6c00ce38a01e28e504eb 100644 (file)
--- a/src/osx/accel.cpp
+++ b/src/osx/accel.cpp
@@ -93,10 +93,10 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
     {
         wxAcceleratorEntry *entry = node->GetData();
         if ((event.m_keyCode == entry->GetKeyCode()) &&
-           (((entry->GetFlags() & wxACCEL_CTRL) != 0) == event.ControlDown()) &&
+           (((entry->GetFlags() & wxACCEL_RAW_CTRL) != 0) == event.ControlDown()) &&
            (((entry->GetFlags() & wxACCEL_SHIFT) != 0) == event.ShiftDown()) &&
            (((entry->GetFlags() & wxACCEL_ALT) != 0) == event.AltDown()) &&
-           (((entry->GetFlags() & wxACCEL_CMD) != 0) == event.CmdDown()))
+           (((entry->GetFlags() & wxACCEL_CTRL) != 0) == event.CmdDown()))
         {
             return entry->GetCommand();
         }

diff --git a/src/osx/cocoa/menuitem.mm b/src/osx/cocoa/menuitem.mm
index 543b64f321fa090b1b8ab05a58531b8c92a09e4a..a25ee8bcfa2df01f59df22f368fc1647f7e0b20a 100644 (file)
--- a/src/osx/cocoa/menuitem.mm
+++ b/src/osx/cocoa/menuitem.mm
@@ -137,6 +137,9 @@ void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry*
         if (entry->GetFlags() & wxACCEL_CTRL)
             modifiers |= NSCommandKeyMask;
 
+        if (entry->GetFlags() & wxACCEL_RAW_CTRL)
+            modifiers |= NSControlKeyMask;
+        
         if (entry->GetFlags() & wxACCEL_ALT)
             modifiers |= NSAlternateKeyMask ;
 

diff --git a/src/osx/dialog_osx.cpp b/src/osx/dialog_osx.cpp
index e4088d6cfcc37dad4738e1045f581a6cad1e215e..835afaaa240b78332980de261ad2b97915a12ab1 100644 (file)
--- a/src/osx/dialog_osx.cpp
+++ b/src/osx/dialog_osx.cpp
@@ -80,7 +80,7 @@ wxDialog::~wxDialog()
 // about it
 bool wxDialog::IsEscapeKey(const wxKeyEvent& event)
 {
-    if ( event.GetKeyCode() == '.' && event.GetModifiers() == wxMOD_CMD )
+    if ( event.GetKeyCode() == '.' && event.GetModifiers() == wxMOD_CONTROL )
         return true;
 
     return wxDialogBase::IsEscapeKey(event);

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index 8c2f1d83da432a4dc812ae63e038fe2408de20a8..a49ff2cfe209ea2e8613fa27a8c15f97655f9b7f 100644 (file)
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -339,7 +339,7 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
 
 void wxTextCtrl::OnKeyDown(wxKeyEvent& event)
 {
-    if ( event.GetModifiers() == wxMOD_CMD )
+    if ( event.GetModifiers() == wxMOD_CONTROL )
     {
         switch( event.GetKeyCode() )
         {

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 00115ba251b4ba42d4f7d94cf8927127d08cb350..065426269ad4aa08fbb49973c04cf26aba6d0270 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -2667,9 +2667,9 @@ bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
         mac_modifiers |= optionKey;
     if ( modifiers & wxMOD_SHIFT )
         mac_modifiers |= shiftKey;
-    if ( modifiers & wxMOD_CONTROL )
+    if ( modifiers & wxMOD_RAW_CONTROL )
         mac_modifiers |= controlKey;
-    if ( modifiers & wxMOD_META )
+    if ( modifiers & wxMOD_CONTROL )
         mac_modifiers |= cmdKey;
     
     EventHotKeyRef hotKeyRef;