Pull fix back from master.
This commit is contained in:
parent
7a4650a1a9
commit
82a5f307ed
|
@ -55,6 +55,7 @@
|
||||||
#include <widgets/paged_dialog.h>
|
#include <widgets/paged_dialog.h>
|
||||||
#include <widgets/wx_infobar.h>
|
#include <widgets/wx_infobar.h>
|
||||||
#include <widgets/wx_aui_art_providers.h>
|
#include <widgets/wx_aui_art_providers.h>
|
||||||
|
#include <widgets/wx_grid.h>
|
||||||
#include <wx/app.h>
|
#include <wx/app.h>
|
||||||
#include <wx/config.h>
|
#include <wx/config.h>
|
||||||
#include <wx/display.h>
|
#include <wx/display.h>
|
||||||
|
@ -403,6 +404,8 @@ void EDA_BASE_FRAME::HandleUpdateUIEvent( wxUpdateUIEvent& aEvent, EDA_BASE_FRAM
|
||||||
enableRes = true;
|
enableRes = true;
|
||||||
else if( textEntry && isPaste && textEntry->CanPaste() )
|
else if( textEntry && isPaste && textEntry->CanPaste() )
|
||||||
enableRes = true;
|
enableRes = true;
|
||||||
|
else if( dynamic_cast<WX_GRID*>( focus ) )
|
||||||
|
enableRes = false; // Must disable menu in order to get command as CharHook event
|
||||||
}
|
}
|
||||||
|
|
||||||
aEvent.Enable( enableRes );
|
aEvent.Enable( enableRes );
|
||||||
|
|
Loading…
Reference in New Issue