Commit 017fe9c4 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

fix compiler warnings with gcc 4.6.3 on x86_64 linux

parent 03ffc937

common/class_layer_box_selector.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ int LAYER_BOX_SELECTOR::SetLayerSelection( int layer ) 




    for( int i = 0; i < elements; i++ )

    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

            if( GetSelection() != i )   // Element (i) is not selected

            {

            {

gerbview/class_gbr_layer_box_selector.cpp

+5 −3
Original line number Original line Diff line number Diff line
@@ -59,10 +59,11 @@ void GBR_LAYER_BOX_SELECTOR::Resync() 




        layername = GetLayerName( layerid );

        layername = GetLayerName( layerid );





        Append( layername, layerbmp, (void*) layerid );

        Append( layername, layerbmp, (void*)(intptr_t) layerid );

    }

    }

}

}







// Returns a color index from the layer id

// Returns a color index from the layer id

EDA_COLOR_T GBR_LAYER_BOX_SELECTOR::GetLayerColor( int aLayerIndex ) const

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 );

    return frame->GetLayerColor( aLayerIndex );

}

}







// Returns the name of the layer id

// Returns the name of the layer id

wxString GBR_LAYER_BOX_SELECTOR::GetLayerName( int aLayerIndex ) const

wxString GBR_LAYER_BOX_SELECTOR::GetLayerName( int aLayerIndex ) const

{

{

pcbnew/class_pcb_layer_box_selector.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -77,10 +77,11 @@ void PCB_LAYER_BOX_SELECTOR::Resync() 
        if( m_layerhotkeys && m_hotkeys != NULL )

        if( m_layerhotkeys && m_hotkeys != NULL )

            layername = AddHotkeyName( layername, m_hotkeys, layerhk[layerid], IS_COMMENT );

            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)

// Returns true if the layer id is enabled (i.e. is it should be displayed)

bool PCB_LAYER_BOX_SELECTOR::IsLayerEnabled( int aLayerIndex ) const

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 );

    return board->IsLayerEnabled( aLayerIndex );

}

}







// Returns a color index from the layer id

// Returns a color index from the layer id

EDA_COLOR_T PCB_LAYER_BOX_SELECTOR::GetLayerColor( int aLayerIndex ) const

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 );

    return board->GetLayerColor( aLayerIndex );

}

}







// Returns the name of the layer id

// Returns the name of the layer id

wxString PCB_LAYER_BOX_SELECTOR::GetLayerName( int aLayerIndex ) const

wxString PCB_LAYER_BOX_SELECTOR::GetLayerName( int aLayerIndex ) const

{

{

pcbnew/printout_controler.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -319,6 +319,7 @@ void BOARD_PRINTOUT_CONTROLLER::DrawPage() 
    wxLogTrace( tracePrinting, wxT( "Logical origin:                   x=%d, y=%d" ),

    wxLogTrace( tracePrinting, wxT( "Logical origin:                   x=%d, y=%d" ),

                offset.x, offset.y );

                offset.x, offset.y );





#if defined(DEBUG)

    wxRect paperRect = GetPaperRectPixels();

    wxRect paperRect = GetPaperRectPixels();

    wxLogTrace( tracePrinting, wxT( "Paper rectangle:                  left=%d, top=%d, "

    wxLogTrace( tracePrinting, wxT( "Paper rectangle:                  left=%d, top=%d, "

                                    "right=%d, bottom=%d" ),

                                    "right=%d, bottom=%d" ),
@@ -332,6 +333,7 @@ void BOARD_PRINTOUT_CONTROLLER::DrawPage() 
    wxLogTrace( tracePrinting, wxT( "Final device rectangle:           left=%d, top=%d, "

    wxLogTrace( tracePrinting, wxT( "Final device rectangle:           left=%d, top=%d, "

                                    "right=%d, bottom=%d\n" ),

                                    "right=%d, bottom=%d\n" ),

                devLeft, devTop, devRight, devBottom );

                devLeft, devTop, devRight, devBottom );

#endif





    g_DrawBgColor = WHITE;

    g_DrawBgColor = WHITE;