int flags = GetFlags();
if ( flags & wxACCEL_ALT )
- text += _("Alt-");
+ text += _("Alt+");
if ( flags & wxACCEL_CTRL )
- text += _("Ctrl-");
+ text += _("Ctrl+");
if ( flags & wxACCEL_SHIFT )
- text += _("Shift-");
+ text += _("Shift+");
const int code = GetKeyCode();
// must be a simple key
if (
#if !wxUSE_UNICODE
- isascii(code) &&
+ // we can't call wxIsalnum() for non-ASCII characters in ASCII
+ // build as they're only defined for the ASCII range (or EOF)
+ wxIsascii(code) &&
#endif // ANSI
wxIsalnum(code) )
{