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

Clean up duplicted Find action processing.

This commit is contained in:
Jeff Young 2019-06-13 15:41:15 +01:00
parent ce1f35a1be
commit f0cd7a5fd9
4 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/draw_panel_gal.cpp
View File

@ -96,10 +96,7 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
}; };
for( wxEventType eventType : events ) for( wxEventType eventType : events )
{ Connect( eventType, wxEventHandler( EDA_DRAW_PANEL_GAL::OnEvent ), NULL, m_eventDispatcher );
Connect( eventType, wxEventHandler( EDA_DRAW_PANEL_GAL::OnEvent ),
NULL, m_eventDispatcher );
}
m_pendingRefresh = false; m_pendingRefresh = false;
m_drawing = false; m_drawing = false;

4
common/status_popup.cpp
View File

@ -51,8 +51,8 @@ STATUS_POPUP::STATUS_POPUP( wxWindow* aParent ) :
void STATUS_POPUP::onCharHook( wxKeyEvent& aEvent ) void STATUS_POPUP::onCharHook( wxKeyEvent& aEvent )
{ {
// Key events from popups don't get put through the wxWidgets event system on OSX, // Key events from the status popup don't get put through the wxWidgets event system on
// so we have to fall back to the CHAR_HOOK to forward hotkeys from the popup to // OSX, so we have to fall back to the CHAR_HOOK to forward hotkeys from the popup to
// the canvas / frame. // the canvas / frame.
aEvent.SetEventType( wxEVT_CHAR ); aEvent.SetEventType( wxEVT_CHAR );

10
pcbnew/tools/pcb_editor_control.cpp
View File

@ -623,14 +623,6 @@ int PCB_EDITOR_CONTROL::TogglePythonConsole( const TOOL_EVENT& aEvent )
} }
int PCB_EDITOR_CONTROL::Find( const TOOL_EVENT& aEvent )
{
DIALOG_FIND dlg( m_frame );
dlg.ShowModal();
return 0;
}
// Track & via size control // Track & via size control
int PCB_EDITOR_CONTROL::TrackWidthInc( const TOOL_EVENT& aEvent ) int PCB_EDITOR_CONTROL::TrackWidthInc( const TOOL_EVENT& aEvent )
{ {
@ -1583,8 +1575,6 @@ void PCB_EDITOR_CONTROL::setTransitions()
Go( &PCB_EDITOR_CONTROL::GenerateFabFiles, PCB_ACTIONS::generateD356File.MakeEvent() ); Go( &PCB_EDITOR_CONTROL::GenerateFabFiles, PCB_ACTIONS::generateD356File.MakeEvent() );
Go( &PCB_EDITOR_CONTROL::GenerateFabFiles, PCB_ACTIONS::generateBOM.MakeEvent() ); Go( &PCB_EDITOR_CONTROL::GenerateFabFiles, PCB_ACTIONS::generateBOM.MakeEvent() );
Go( &PCB_EDITOR_CONTROL::Find, ACTIONS::find.MakeEvent() );
// Track & via size control // Track & via size control
Go( &PCB_EDITOR_CONTROL::TrackWidthInc, PCB_ACTIONS::trackWidthInc.MakeEvent() ); Go( &PCB_EDITOR_CONTROL::TrackWidthInc, PCB_ACTIONS::trackWidthInc.MakeEvent() );
Go( &PCB_EDITOR_CONTROL::TrackWidthDec, PCB_ACTIONS::trackWidthDec.MakeEvent() ); Go( &PCB_EDITOR_CONTROL::TrackWidthDec, PCB_ACTIONS::trackWidthDec.MakeEvent() );

2
pcbnew/tools/pcb_editor_control.h
View File

@ -72,8 +72,6 @@ public:
int ToggleMicrowaveToolbar( const TOOL_EVENT& aEvent ); int ToggleMicrowaveToolbar( const TOOL_EVENT& aEvent );
int TogglePythonConsole( const TOOL_EVENT& aEvent ); int TogglePythonConsole( const TOOL_EVENT& aEvent );
int Find( const TOOL_EVENT& aEvent );
// Track & via size control // Track & via size control
int TrackWidthInc( const TOOL_EVENT& aEvent ); int TrackWidthInc( const TOOL_EVENT& aEvent );
int TrackWidthDec( const TOOL_EVENT& aEvent ); int TrackWidthDec( const TOOL_EVENT& aEvent );