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

fix some warnings in Debug mode under wx 2.9.x

This commit is contained in:
Dick Hollenbeck 2012-02-10 16:26:42 -06:00
parent 72605c343b
commit 2082fbba4f
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/sch_component.cpp
View File

@ -522,8 +522,8 @@ void SCH_COMPONENT::SetTimeStamp( long aNewTimeStamp )
{ {
wxString string_timestamp, string_oldtimestamp; wxString string_timestamp, string_oldtimestamp;
string_timestamp.Printf( wxT( "%8.8X" ), aNewTimeStamp ); string_timestamp.Printf( wxT( "%08lX" ), aNewTimeStamp );
string_oldtimestamp.Printf( wxT( "%8.8X" ), m_TimeStamp ); string_oldtimestamp.Printf( wxT( "%08lX" ), m_TimeStamp );
EDA_ITEM::SetTimeStamp( aNewTimeStamp ); EDA_ITEM::SetTimeStamp( aNewTimeStamp );
for( unsigned ii = 0; ii < m_PathsAndReferences.GetCount(); ii++ ) for( unsigned ii = 0; ii < m_PathsAndReferences.GetCount(); ii++ )

2
pcbnew/class_track.cpp
View File

@ -164,7 +164,7 @@ wxString SEGZONE::GetSelectMenuText() const
NETINFO_ITEM* net; NETINFO_ITEM* net;
BOARD* board = GetBoard(); BOARD* board = GetBoard();
text << _( "Zone" ) << wxT( " " ) << wxString::Format( wxT( "(%8.8X)" ), m_TimeStamp ); text << _( "Zone" ) << wxT( " " ) << wxString::Format( wxT( "(%08lX)" ), m_TimeStamp );
if( board ) if( board )
{ {

8
pcbnew/class_zone.cpp
View File

@ -697,7 +697,7 @@ void ZONE_CONTAINER::DisplayInfo( EDA_DRAW_FRAME* frame )
msg = board->GetLayerName( m_Layer ); msg = board->GetLayerName( m_Layer );
frame->AppendMsgPanel( _( "Layer" ), msg, BROWN ); frame->AppendMsgPanel( _( "Layer" ), msg, BROWN );
msg.Printf( wxT( "%d" ), m_Poly->corner.size() ); msg.Printf( wxT( "%d" ), (int) m_Poly->corner.size() );
frame->AppendMsgPanel( _( "Corners" ), msg, BLUE ); frame->AppendMsgPanel( _( "Corners" ), msg, BLUE );
if( m_FillMode ) if( m_FillMode )
@ -708,12 +708,12 @@ void ZONE_CONTAINER::DisplayInfo( EDA_DRAW_FRAME* frame )
frame->AppendMsgPanel( _( "Fill mode" ), msg, BROWN ); frame->AppendMsgPanel( _( "Fill mode" ), msg, BROWN );
// Useful for statistics : // Useful for statistics :
msg.Printf( wxT( "%d" ), m_Poly->m_HatchLines.size() ); msg.Printf( wxT( "%d" ), (int) m_Poly->m_HatchLines.size() );
frame->AppendMsgPanel( _( "Hatch lines" ), msg, BLUE ); frame->AppendMsgPanel( _( "Hatch lines" ), msg, BLUE );
if( m_FilledPolysList.size() ) if( m_FilledPolysList.size() )
{ {
msg.Printf( wxT( "%d" ), m_FilledPolysList.size() ); msg.Printf( wxT( "%d" ), (int) m_FilledPolysList.size() );
frame->AppendMsgPanel( _( "Corners in DrawList" ), msg, BLUE ); frame->AppendMsgPanel( _( "Corners in DrawList" ), msg, BLUE );
} }
} }
@ -897,7 +897,7 @@ wxString ZONE_CONTAINER::GetSelectMenuText() const
text << wxT( " " ) << _( "(Cutout)" ); text << wxT( " " ) << _( "(Cutout)" );
text << wxT( " " ); text << wxT( " " );
text << wxString::Format( wxT( "(%8.8X)" ), m_TimeStamp ); text << wxString::Format( wxT( "(%08lX)" ), m_TimeStamp );
if ( !IsOnCopperLayer() ) if ( !IsOnCopperLayer() )
{ {

4
pcbnew/zones_test_and_combine_areas.cpp
View File

@ -281,7 +281,7 @@ int BOARD::ClipAreaPolygon( PICKED_ITEMS_LIST * aNewZonesList,
if( bMessageBoxArc && bDontShowSelfIntersectionArcsWarning == false ) if( bMessageBoxArc && bDontShowSelfIntersectionArcsWarning == false )
{ {
wxString str; wxString str;
str.Printf( wxT( "Area %8.8X of net \"%s\" has arcs intersecting other sides.\n" ), str.Printf( wxT( "Area %08lX of net \"%s\" has arcs intersecting other sides.\n" ),
aCurrArea->GetTimeStamp(), GetChars( aCurrArea->m_Netname ) ); aCurrArea->GetTimeStamp(), GetChars( aCurrArea->m_Netname ) );
str += wxT( "This may cause problems with other editing operations,\n" ); str += wxT( "This may cause problems with other editing operations,\n" );
str += wxT( "such as adding cutouts. It can't be fixed automatically.\n" ); str += wxT( "such as adding cutouts. It can't be fixed automatically.\n" );
@ -304,7 +304,7 @@ int BOARD::ClipAreaPolygon( PICKED_ITEMS_LIST * aNewZonesList,
if( bMessageBoxInt && bDontShowSelfIntersectionWarning == false ) if( bMessageBoxInt && bDontShowSelfIntersectionWarning == false )
{ {
wxString str; wxString str;
str.Printf( wxT( "Area %8.8X of net \"%s\" is self-intersecting and will be clipped.\n" ), str.Printf( wxT( "Area %08lX of net \"%s\" is self-intersecting and will be clipped.\n" ),
aCurrArea->GetTimeStamp(), GetChars( aCurrArea->m_Netname ) ); aCurrArea->GetTimeStamp(), GetChars( aCurrArea->m_Netname ) );
str += wxT( "This may result in splitting the area.\n" ); str += wxT( "This may result in splitting the area.\n" );
str += wxT( "If the area is complex, this may take a few seconds." ); str += wxT( "If the area is complex, this may take a few seconds." );