haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New attempt to manage the Cmd key on OSX in menus.

This commit is contained in:
jean-pierre charras 2015-07-04 10:36:58 +02:00
parent bbce641ad5
commit 8d5ee67c9c
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/hotkeys_basic.cpp
View File

@ -144,6 +144,10 @@ static struct hotkey_name_descr hotkeyNameList[] =
// so the code using WXK_CONTROL should be ok on any system. // so the code using WXK_CONTROL should be ok on any system.
// (on Mac OS X the actual Ctrl key code is WXK_RAW_CONTROL) // (on Mac OS X the actual Ctrl key code is WXK_RAW_CONTROL)
#ifdef __WXMAC__ #ifdef __WXMAC__
#define USING_MAC_CMD
#endif
#ifdef USING_MAC_CMD
#define MODIFIER_CTRL wxT( "Cmd+" ) #define MODIFIER_CTRL wxT( "Cmd+" )
#else #else
#define MODIFIER_CTRL wxT( "Ctrl+" ) #define MODIFIER_CTRL wxT( "Ctrl+" )
@ -274,6 +278,12 @@ wxString AddHotkeyName( const wxString& aText, EDA_HOTKEY** aList,
} }
} }
#ifdef USING_MAC_CMD
// On OSX, the modifier euqivalent to the Ctrl key of PCs
// is the Cmd key, but in code we should use Ctrl as prefix in menus
msg.Replace( MODIFIER_CMD_MAC, MODIFIER_CTRL_BASE );
#endif
return msg; return msg;
} }
@ -326,6 +336,12 @@ wxString AddHotkeyName( const wxString& aText,
} }
} }
#ifdef USING_MAC_CMD
// On OSX, the modifier euqivalent to the Ctrl key of PCs
// is the Cmd key, but in code we should use Ctrl as prefix in menus
msg.Replace( MODIFIER_CMD_MAC, MODIFIER_CTRL_BASE );
#endif
return msg; return msg;
} }