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
563502b8
Commit
563502b8
authored
Jun 02, 2014
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Plain Diff
Minor fixes ( including Bug #1325561 )
parents
ea755a10
44014b21
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
6 deletions
+5
-6
class_track.cpp
pcbnew/class_track.cpp
+3
-3
dialog_plot_base.cpp
pcbnew/dialogs/dialog_plot_base.cpp
+0
-1
dialog_plot_base.fbp
pcbnew/dialogs/dialog_plot_base.fbp
+1
-1
pcbframe.cpp
pcbnew/pcbframe.cpp
+1
-1
No files found.
pcbnew/class_track.cpp
View file @
563502b8
...
@@ -624,7 +624,7 @@ void TRACK::Draw( EDA_DRAW_PANEL* panel, wxDC* aDC, GR_DRAWMODE aDrawMode,
...
@@ -624,7 +624,7 @@ void TRACK::Draw( EDA_DRAW_PANEL* panel, wxDC* aDC, GR_DRAWMODE aDrawMode,
#ifdef USE_WX_OVERLAY
#ifdef USE_WX_OVERLAY
// If dragged not draw in OnPaint otherwise remains impressed in wxOverlay
// If dragged not draw in OnPaint otherwise remains impressed in wxOverlay
if
(
(
m_Flags
&
&
IS_DRAGGED
)
&&
aDC
->
IsKindOf
(
wxCLASSINFO
(
wxPaintDC
)))
if
(
(
m_Flags
&
IS_DRAGGED
)
&&
aDC
->
IsKindOf
(
wxCLASSINFO
(
wxPaintDC
)))
return
;
return
;
#endif
#endif
...
@@ -691,7 +691,7 @@ void SEGZONE::Draw( EDA_DRAW_PANEL* panel, wxDC* aDC, GR_DRAWMODE aDrawMode,
...
@@ -691,7 +691,7 @@ void SEGZONE::Draw( EDA_DRAW_PANEL* panel, wxDC* aDC, GR_DRAWMODE aDrawMode,
#ifdef USE_WX_OVERLAY
#ifdef USE_WX_OVERLAY
// If dragged not draw in OnPaint otherwise remains impressed in wxOverlay
// If dragged not draw in OnPaint otherwise remains impressed in wxOverlay
if
(
(
m_Flags
&
&
IS_DRAGGED
)
&&
aDC
->
IsKindOf
(
wxCLASSINFO
(
wxPaintDC
)))
if
(
(
m_Flags
&
IS_DRAGGED
)
&&
aDC
->
IsKindOf
(
wxCLASSINFO
(
wxPaintDC
)))
return
;
return
;
#endif
#endif
...
@@ -1319,7 +1319,7 @@ TRACK* TRACK::GetTrack( TRACK* aStartTrace, TRACK* aEndTrace, ENDPOINT_T aEndPoi
...
@@ -1319,7 +1319,7 @@ TRACK* TRACK::GetTrack( TRACK* aStartTrace, TRACK* aEndTrace, ENDPOINT_T aEndPoi
if
(
nextSegment
)
if
(
nextSegment
)
{
{
if
(
(
nextSegment
!=
this
)
&&
if
(
(
nextSegment
!=
this
)
&&
!
nextSegment
->
GetState
(
BUSY
|
IS_DELETED
)
&&
!
nextSegment
->
GetState
(
BUSY
|
IS_DELETED
)
&&
(
refLayers
&
nextSegment
->
GetLayerMask
())
)
(
refLayers
&
nextSegment
->
GetLayerMask
())
)
{
{
...
...
pcbnew/dialogs/dialog_plot_base.cpp
View file @
563502b8
...
@@ -347,7 +347,6 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
...
@@ -347,7 +347,6 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
sbSizerMsg
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Messages:"
)
),
wxVERTICAL
);
sbSizerMsg
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Messages:"
)
),
wxVERTICAL
);
m_messagesBox
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
wxTE_MULTILINE
|
wxTE_READONLY
);
m_messagesBox
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
wxTE_MULTILINE
|
wxTE_READONLY
);
m_messagesBox
->
SetMaxLength
(
0
);
m_messagesBox
->
SetMinSize
(
wxSize
(
-
1
,
70
)
);
m_messagesBox
->
SetMinSize
(
wxSize
(
-
1
,
70
)
);
sbSizerMsg
->
Add
(
m_messagesBox
,
1
,
wxEXPAND
,
5
);
sbSizerMsg
->
Add
(
m_messagesBox
,
1
,
wxEXPAND
,
5
);
...
...
pcbnew/dialogs/dialog_plot_base.fbp
View file @
563502b8
...
@@ -3982,7 +3982,7 @@
...
@@ -3982,7 +3982,7 @@
<property
name=
"max_size"
></property>
<property
name=
"max_size"
></property>
<property
name=
"maximize_button"
>
0
</property>
<property
name=
"maximize_button"
>
0
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"maximum_size"
></property>
<property
name=
"maxlength"
>
0
</property>
<property
name=
"maxlength"
></property>
<property
name=
"min_size"
></property>
<property
name=
"min_size"
></property>
<property
name=
"minimize_button"
>
0
</property>
<property
name=
"minimize_button"
>
0
</property>
<property
name=
"minimum_size"
>
-1,70
</property>
<property
name=
"minimum_size"
>
-1,70
</property>
...
...
pcbnew/pcbframe.cpp
View file @
563502b8
...
@@ -605,7 +605,7 @@ void PCB_EDIT_FRAME::OnCloseWindow( wxCloseEvent& Event )
...
@@ -605,7 +605,7 @@ void PCB_EDIT_FRAME::OnCloseWindow( wxCloseEvent& Event )
{
{
m_canvas
->
SetAbortRequest
(
true
);
m_canvas
->
SetAbortRequest
(
true
);
if
(
GetScreen
()
->
IsModify
()
)
if
(
GetScreen
()
->
IsModify
()
&&
!
GetBoard
()
->
IsEmpty
()
)
{
{
wxString
msg
;
wxString
msg
;
msg
.
Printf
(
_
(
"Save the changes in
\n
<%s>
\n
before closing?"
),
msg
.
Printf
(
_
(
"Save the changes in
\n
<%s>
\n
before closing?"
),
...
...
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