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

Don't show Ctrl-W for Close on MSW. 

Fixes https://gitlab.com/kicad/code/kicad/issues/8391
This commit is contained in:
Jeff Young 2021-07-04 23:21:53 +01:00
parent 6c161eec68
commit dd11f86000
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/hotkey_store.cpp
View File

@ -60,7 +60,9 @@ static PSEUDO_ACTION* g_gesturePseudoActions[] = {
}; };
static PSEUDO_ACTION* g_standardPlatformCommands[] = { static PSEUDO_ACTION* g_standardPlatformCommands[] = {
#ifndef __WINDOWS__
new PSEUDO_ACTION( _( "Close" ), MD_CTRL + 'W' ), new PSEUDO_ACTION( _( "Close" ), MD_CTRL + 'W' ),
#endif
new PSEUDO_ACTION( _( "Quit" ), MD_CTRL + 'Q' ) new PSEUDO_ACTION( _( "Quit" ), MD_CTRL + 'Q' )
}; };

7
common/tool/action_menu.cpp
View File

@ -208,10 +208,17 @@ wxMenuItem* ACTION_MENU::Add( ACTION_MENU* aMenu )
void ACTION_MENU::AddClose( wxString aAppname ) void ACTION_MENU::AddClose( wxString aAppname )
{ {
#ifdef __WINDOWS_
Add( _( "Close" ),
wxString::Format( _( "Close %s" ), aAppname ),
wxID_CLOSE,
BITMAPS::exit );
#else
Add( _( "Close" ) + "\tCtrl+W", Add( _( "Close" ) + "\tCtrl+W",
wxString::Format( _( "Close %s" ), aAppname ), wxString::Format( _( "Close %s" ), aAppname ),
wxID_CLOSE, wxID_CLOSE,
BITMAPS::exit ); BITMAPS::exit );
#endif
} }