Fixes MSVC compile errors.
This commit is contained in:
parent
f0afa23066
commit
e557b388a7
|
@ -353,8 +353,8 @@ void EDA_DRAW_PANEL::OnScroll( wxScrollWinEvent& event )
|
|||
}
|
||||
|
||||
wxLogTrace( KICAD_TRACE_COORDS,
|
||||
wxT( "Setting scroll bars ppuX=%d, ppuY=%d, unitsX=%d, unitsY=%d," \
|
||||
"posX=%d, posY=%d" ), ppux, ppuy, unitsX, unitsY, x, y );
|
||||
wxT( "Setting scroll bars ppuX=%d, ppuY=%d, unitsX=%d, unitsY=%d, posX=%d, posY=%d" ),
|
||||
ppux, ppuy, unitsX, unitsY, x, y );
|
||||
|
||||
Scroll( x/ppux, y/ppuy );
|
||||
event.Skip();
|
||||
|
|
|
@ -458,7 +458,8 @@ void AM_PRIMITIVE::ConvertShapeToPolygon( GERBER_DRAW_ITEM* aParent,
|
|||
aBuffer.push_back( currpt );
|
||||
|
||||
// Rotate rectangle and move it to the actual start point
|
||||
int angle = wxRound( atan2( delta.y, delta.x ) * 1800.0 / M_PI );
|
||||
int angle = wxRound( atan2( (double) delta.y, (double) delta.x ) * 1800.0 / M_PI );
|
||||
|
||||
for( unsigned ii = 0; ii < 4; ii++ )
|
||||
{
|
||||
RotatePoint( &aBuffer[ii], -angle );
|
||||
|
|
|
@ -66,7 +66,7 @@ enum APERTURE_DEF_HOLETYPE {
|
|||
#define LAST_DCODE 999
|
||||
#define TOOLS_MAX_COUNT (LAST_DCODE + 1)
|
||||
|
||||
class APERTURE_MACRO;
|
||||
struct APERTURE_MACRO;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -211,7 +211,11 @@ void WinEDA_PcbFrame::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb )
|
|||
if( PlaceModulesHorsPcb && edgesExists )
|
||||
{
|
||||
if( GetScreen()->GetCrossHairPosition().y < (GetBoard()->m_BoundaryBox.GetBottom() + 2000) )
|
||||
GetScreen()->GetCrossHairPosition().y = GetBoard()->m_BoundaryBox.GetBottom() + 2000;
|
||||
{
|
||||
wxPoint pos = GetScreen()->GetCrossHairPosition();
|
||||
pos.y = GetBoard()->m_BoundaryBox.GetBottom() + 2000;
|
||||
GetScreen()->SetCrossHairPosition( pos );
|
||||
}
|
||||
}
|
||||
|
||||
/* calculate the area needed by footprints */
|
||||
|
|
Loading…
Reference in New Issue