Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
31389c40
Commit
31389c40
authored
Aug 02, 2013
by
tomasz.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pcbnew: tool initialization should belong to PCB_EDIT_FRAME to avoid linking errors on cvpcb.
parent
69a44d5f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
6 deletions
+5
-6
wxBasePcbFrame.h
include/wxBasePcbFrame.h
+0
-1
wxPcbStruct.h
include/wxPcbStruct.h
+1
-0
basepcbframe.cpp
pcbnew/basepcbframe.cpp
+0
-2
pcbframe.cpp
pcbnew/pcbframe.cpp
+2
-1
pcb_tools.cpp
pcbnew/tools/pcb_tools.cpp
+2
-2
No files found.
include/wxBasePcbFrame.h
View file @
31389c40
...
...
@@ -98,7 +98,6 @@ protected:
TOOL_MANAGER
*
m_toolManager
;
TOOL_DISPATCHER
*
m_toolDispatcher
;
void
setupTools
();
void
updateGridSelectBox
();
void
updateZoomSelectBox
();
virtual
void
unitsChangeRefresh
();
...
...
include/wxPcbStruct.h
View file @
31389c40
...
...
@@ -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.
...
...
pcbnew/basepcbframe.cpp
View file @
31389c40
...
...
@@ -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
;
}
...
...
pcbnew/pcbframe.cpp
View file @
31389c40
...
...
@@ -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
()
...
...
pcbnew/tools/pcb_tools.cpp
View file @
31389c40
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment