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
9b57038c
Commit
9b57038c
authored
Feb 03, 2010
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 2 minor problems
parent
dc4bfd8f
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
17 deletions
+11
-17
gerberframe.cpp
gerbview/gerberframe.cpp
+2
-0
options.cpp
gerbview/options.cpp
+0
-1
tool_gerber.cpp
gerbview/tool_gerber.cpp
+1
-1
dialog_copper_zones.cpp
pcbnew/dialog_copper_zones.cpp
+4
-9
dialog_copper_zones.h
pcbnew/dialog_copper_zones.h
+3
-2
dialog_copper_zones_base.cpp
pcbnew/dialog_copper_zones_base.cpp
+0
-1
dialog_copper_zones_base.fbp
pcbnew/dialog_copper_zones_base.fbp
+1
-1
dialog_copper_zones_base.h
pcbnew/dialog_copper_zones_base.h
+0
-2
No files found.
gerbview/gerberframe.cpp
View file @
9b57038c
...
...
@@ -111,6 +111,8 @@ BEGIN_EVENT_TABLE( WinEDA_GerberFrame, WinEDA_BasePcbFrame )
WinEDA_GerberFrame
::
OnSelectOptionToolbar
)
EVT_TOOL
(
ID_TB_OPTIONS_SHOW_LAYERS_MANAGER_VERTICAL_TOOLBAR
,
WinEDA_GerberFrame
::
OnSelectOptionToolbar
)
EVT_TOOL
(
ID_TB_OPTIONS_SHOW_DCODES
,
WinEDA_GerberFrame
::
OnSelectOptionToolbar
)
END_EVENT_TABLE
()
...
...
gerbview/options.cpp
View file @
9b57038c
...
...
@@ -26,7 +26,6 @@ void WinEDA_GerberFrame::OnSelectOptionToolbar( wxCommandEvent& event )
{
int
id
=
event
.
GetId
();
bool
state
;
switch
(
id
)
{
case
ID_MENU_GERBVIEW_SHOW_HIDE_LAYERS_MANAGER_DIALOG
:
...
...
gerbview/tool_gerber.cpp
View file @
9b57038c
...
...
@@ -324,7 +324,7 @@ void WinEDA_GerberFrame::ReCreateOptToolbar( void )
_
(
"Show/hide the layers manager toolbar"
),
wxITEM_CHECK
);
m_OptionsToolBar
->
Realize
();
SetToolbars
();
...
...
pcbnew/dialog_copper_zones.cpp
View file @
9b57038c
...
...
@@ -6,10 +6,6 @@
/// Licence: GNU License
/////////////////////////////////////////////////////////////////////////////
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "zones.h"
#endif
#include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h"
...
...
@@ -41,17 +37,16 @@ dialog_copper_zone::dialog_copper_zone( WinEDA_PcbFrame* parent, ZONE_SETTING* z
}
SetReturnCode
(
ZONE_ABORT
);
// Will be changed on buttons click
initDialog
();
if
(
GetSizer
()
)
{
GetSizer
()
->
SetSizeHints
(
this
);
}
GetSizer
()
->
SetSizeHints
(
this
);
Center
();
}
/*****************************************************************/
void
dialog_copper_zone
::
OnInitDialog
(
wxInitDialogEvent
&
event
)
void
dialog_copper_zone
::
initDialog
(
)
/*****************************************************************/
// Initialise all dialog options and values in wxTextCtrl
...
...
pcbnew/dialog_copper_zones.h
View file @
9b57038c
...
...
@@ -9,7 +9,7 @@
*/
class
dialog_copper_zone
:
public
dialog_copper_zone_base
{
p
ublic
:
p
rivate
:
WinEDA_PcbFrame
*
m_Parent
;
wxConfig
*
m_Config
;
// Current config
int
m_OnExitCode
;
/* exit code: ZONE_ABORT if no change,
...
...
@@ -23,7 +23,8 @@ public:
public
:
dialog_copper_zone
(
WinEDA_PcbFrame
*
parent
,
ZONE_SETTING
*
zone_setting
);
void
OnInitDialog
(
wxInitDialogEvent
&
event
);
private
:
void
initDialog
(
);
void
OnButtonOkClick
(
wxCommandEvent
&
event
);
void
OnButtonCancelClick
(
wxCommandEvent
&
event
);
bool
AcceptOptions
(
bool
aPromptForErrors
,
bool
aUseExportableSetupOnly
=
false
);
...
...
pcbnew/dialog_copper_zones_base.cpp
View file @
9b57038c
...
...
@@ -10,7 +10,6 @@
///////////////////////////////////////////////////////////////////////////
BEGIN_EVENT_TABLE
(
dialog_copper_zone_base
,
wxDialog
)
EVT_INIT_DIALOG
(
dialog_copper_zone_base
::
_wxFB_OnInitDialog
)
EVT_RADIOBOX
(
wxID_PADS_IN_ZONE_OPTIONS
,
dialog_copper_zone_base
::
_wxFB_OnPadsInZoneClick
)
EVT_BUTTON
(
wxID_BUTTON_EXPORT
,
dialog_copper_zone_base
::
_wxFB_ExportSetupToOtherCopperZones
)
EVT_BUTTON
(
wxID_OK
,
dialog_copper_zone_base
::
_wxFB_OnButtonOkClick
)
...
...
pcbnew/dialog_copper_zones_base.fbp
View file @
9b57038c
...
...
@@ -49,7 +49,7 @@
<event
name=
"OnHibernate"
></event>
<event
name=
"OnIconize"
></event>
<event
name=
"OnIdle"
></event>
<event
name=
"OnInitDialog"
>
OnInitDialog
</event>
<event
name=
"OnInitDialog"
></event>
<event
name=
"OnKeyDown"
></event>
<event
name=
"OnKeyUp"
></event>
<event
name=
"OnKillFocus"
></event>
...
...
pcbnew/dialog_copper_zones_base.h
View file @
9b57038c
...
...
@@ -35,7 +35,6 @@ class dialog_copper_zone_base : public wxDialog
private
:
// Private event handlers
void
_wxFB_OnInitDialog
(
wxInitDialogEvent
&
event
){
OnInitDialog
(
event
);
}
void
_wxFB_OnPadsInZoneClick
(
wxCommandEvent
&
event
){
OnPadsInZoneClick
(
event
);
}
void
_wxFB_ExportSetupToOtherCopperZones
(
wxCommandEvent
&
event
){
ExportSetupToOtherCopperZones
(
event
);
}
void
_wxFB_OnButtonOkClick
(
wxCommandEvent
&
event
){
OnButtonOkClick
(
event
);
}
...
...
@@ -87,7 +86,6 @@ class dialog_copper_zone_base : public wxDialog
wxListBox
*
m_LayerSelectionCtrl
;
// Virtual event handlers, overide them in your derived class
virtual
void
OnInitDialog
(
wxInitDialogEvent
&
event
){
event
.
Skip
();
}
virtual
void
OnPadsInZoneClick
(
wxCommandEvent
&
event
){
event
.
Skip
();
}
virtual
void
ExportSetupToOtherCopperZones
(
wxCommandEvent
&
event
){
event
.
Skip
();
}
virtual
void
OnButtonOkClick
(
wxCommandEvent
&
event
){
event
.
Skip
();
}
...
...
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