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

pcbnew: tool initialization should belong to PCB_EDIT_FRAME to avoid linking errors on cvpcb.

This commit is contained in:
tomasz. 2013-08-02 17:25:53 +02:00
parent 69a44d5f13
commit 31389c4063
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wxBasePcbFrame.h
View File

@ -98,7 +98,6 @@ protected:
TOOL_MANAGER *m_toolManager;
TOOL_DISPATCHER *m_toolDispatcher;
void setupTools();
void updateGridSelectBox();
void updateZoomSelectBox();
virtual void unitsChangeRefresh();

1
include/wxPcbStruct.h
View File

@ -117,6 +117,7 @@ protected:
bool m_useCmpFileForFpNames; ///< is true, use the .cmp file from CvPcb, else use the netlist
// to know the footprint name of components.
void setupTools();
void onGenericCommand( wxCommandEvent& aEvent );
// we'll use lower case function names for private member functions.

2
pcbnew/basepcbframe.cpp
View File

@ -115,8 +115,6 @@ PCB_BASE_FRAME::PCB_BASE_FRAME( wxWindow* aParent, ID_DRAWFRAME_TYPE aFrameType,
m_galCanvas = new EDA_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize,
EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL );
setupTools();
m_auxiliaryToolBar = NULL;
}

3
pcbnew/pcbframe.cpp
View File

@ -321,6 +321,8 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( wxWindow* parent, const wxString& title,
for ( int i = 0; i < 10; i++ )
m_Macros[i].m_Record.clear();
setupTools();
SetBoard( new BOARD() );
// Create the PCB_LAYER_WIDGET *after* SetBoard():
@ -481,7 +483,6 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( wxWindow* parent, const wxString& title,
}
}
setupTools();
}
PCB_EDIT_FRAME::~PCB_EDIT_FRAME()

4
pcbnew/tools/pcb_tools.cpp
View File

@ -36,11 +36,11 @@
#include "selection_tool.h"
void PCB_BASE_FRAME::setupTools()
void PCB_EDIT_FRAME::setupTools()
{
// create the manager and dispatcher. Route draw panel events to the dispatcher.
m_toolManager = new TOOL_MANAGER;
m_toolDispatcher = new TOOL_DISPATCHER_PCBNEW( m_toolManager, this );
m_toolDispatcher = new TOOL_DISPATCHER( m_toolManager, this );
m_galCanvas->SetEventDispatcher (m_toolDispatcher);
// register our selection tool.