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

fix compiler warnings with gcc 4.6.3 on x86_64 linux

This commit is contained in:
Dick Hollenbeck 2013-01-23 10:13:42 -06:00
parent 03ffc93786
commit 017fe9c4d4
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/class_layer_box_selector.cpp
View File

@ -78,7 +78,7 @@ int LAYER_BOX_SELECTOR::SetLayerSelection( int layer )
for( int i = 0; i < elements; i++ )
{
if( GetClientData( i ) == (void*) layer )
if( GetClientData( i ) == (void*)(intptr_t) layer )
{
if( GetSelection() != i ) // Element (i) is not selected
{

8
gerbview/class_gbr_layer_box_selector.cpp
View File

@ -48,8 +48,8 @@ void GBR_LAYER_BOX_SELECTOR::Resync()
for( int layerid = 0; layerid < LAYER_COUNT; layerid++ )
{
wxBitmap layerbmp( 14, 14 );
wxString layername;
wxBitmap layerbmp( 14, 14 );
wxString layername;
if( !IsLayerEnabled( layerid ) )
continue;
@ -59,10 +59,11 @@ void GBR_LAYER_BOX_SELECTOR::Resync()
layername = GetLayerName( layerid );
Append( layername, layerbmp, (void*) layerid );
Append( layername, layerbmp, (void*)(intptr_t) layerid );
}
}
// Returns a color index from the layer id
EDA_COLOR_T GBR_LAYER_BOX_SELECTOR::GetLayerColor( int aLayerIndex ) const
{
@ -71,6 +72,7 @@ EDA_COLOR_T GBR_LAYER_BOX_SELECTOR::GetLayerColor( int aLayerIndex ) const
return frame->GetLayerColor( aLayerIndex );
}
// Returns the name of the layer id
wxString GBR_LAYER_BOX_SELECTOR::GetLayerName( int aLayerIndex ) const
{

5
pcbnew/class_pcb_layer_box_selector.cpp
View File

@ -77,10 +77,11 @@ void PCB_LAYER_BOX_SELECTOR::Resync()
if( m_layerhotkeys && m_hotkeys != NULL )
layername = AddHotkeyName( layername, m_hotkeys, layerhk[layerid], IS_COMMENT );
Append( layername, layerbmp, (void*) layerid );
Append( layername, layerbmp, (void*)(intptr_t) layerid );
}
}
// Returns true if the layer id is enabled (i.e. is it should be displayed)
bool PCB_LAYER_BOX_SELECTOR::IsLayerEnabled( int aLayerIndex ) const
{
@ -91,6 +92,7 @@ bool PCB_LAYER_BOX_SELECTOR::IsLayerEnabled( int aLayerIndex ) const
return board->IsLayerEnabled( aLayerIndex );
}
// Returns a color index from the layer id
EDA_COLOR_T PCB_LAYER_BOX_SELECTOR::GetLayerColor( int aLayerIndex ) const
{
@ -101,6 +103,7 @@ EDA_COLOR_T PCB_LAYER_BOX_SELECTOR::GetLayerColor( int aLayerIndex ) const
return board->GetLayerColor( aLayerIndex );
}
// Returns the name of the layer id
wxString PCB_LAYER_BOX_SELECTOR::GetLayerName( int aLayerIndex ) const
{

2
pcbnew/printout_controler.cpp
View File

@ -319,6 +319,7 @@ void BOARD_PRINTOUT_CONTROLLER::DrawPage()
wxLogTrace( tracePrinting, wxT( "Logical origin: x=%d, y=%d" ),
offset.x, offset.y );
#if defined(DEBUG)
wxRect paperRect = GetPaperRectPixels();
wxLogTrace( tracePrinting, wxT( "Paper rectangle: left=%d, top=%d, "
"right=%d, bottom=%d" ),
@ -332,6 +333,7 @@ void BOARD_PRINTOUT_CONTROLLER::DrawPage()
wxLogTrace( tracePrinting, wxT( "Final device rectangle: left=%d, top=%d, "
"right=%d, bottom=%d\n" ),
devLeft, devTop, devRight, devBottom );
#endif
g_DrawBgColor = WHITE;