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

Add comment and tidy up

This commit is contained in:
Chris Pavlina 2016-01-15 21:07:28 -05:00 committed by Chris Pavlina
parent 165f42daaf
commit 6e52c228bc
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/widgets/widget_hotkey_list.cpp
View File

@ -158,13 +158,15 @@ public:
// both events, and simply skip the EVT_CHAR_HOOK if it receives a // both events, and simply skip the EVT_CHAR_HOOK if it receives a
// "normal" key. // "normal" key.
const enum wxKeyCode skipped_keys[] = { const enum wxKeyCode skipped_keys[] =
WXK_NONE, WXK_SHIFT, WXK_ALT, WXK_CONTROL, WXK_CAPITAL, {
WXK_NUMLOCK, WXK_SCROLL, WXK_RAW_CONTROL }; WXK_NONE, WXK_SHIFT, WXK_ALT, WXK_CONTROL, WXK_CAPITAL,
WXK_NUMLOCK, WXK_SCROLL, WXK_RAW_CONTROL
};
int key = aEvent.GetKeyCode(); int key = aEvent.GetKeyCode();
for( size_t i = 0; i < sizeof( skipped_keys )/sizeof( skipped_keys[0] ); ++i ) for( size_t i = 0; i < sizeof( skipped_keys ) / sizeof( skipped_keys[0] ); ++i )
{ {
if( key == skipped_keys[i] ) if( key == skipped_keys[i] )
return; return;
@ -174,6 +176,10 @@ public:
{ {
// Let EVT_CHAR handle this one // Let EVT_CHAR handle this one
aEvent.DoAllowNextEvent(); aEvent.DoAllowNextEvent();
// On Windows, wxEvent::Skip must NOT be called.
// On Linux and OSX, wxEvent::Skip MUST be called.
// No, I don't know why.
#ifndef __WXMSW__ #ifndef __WXMSW__
aEvent.Skip(); aEvent.Skip();
#endif #endif
@ -182,7 +188,6 @@ public:
{ {
OnChar( aEvent ); OnChar( aEvent );
} }
} }