Commit 814f4e43 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Code cleaning. Also fix gcc 4.5 compil warnings.

parents 4451dd3a f01653fc

common/eda_doc.cpp

+2 −2
Original line number Diff line number Diff line
@@ -54,14 +54,14 @@ static const wxFileTypeInfo EDAfallbacks[] = 
                    wxT( "wxhtml %s" ),

                    wxT( "html document (from Kicad)" ),

                    wxT( "htm" ),

                    wxT( "html" ),NULL ),

                    wxT( "html" ),wxNullPtr ),



    wxFileTypeInfo( wxT( "application/sch" ),

                    wxT( "eeschema %s" ),

                    wxT( "eeschema -p %s" ),

                    wxT( "sch document (from Kicad)" ),

                    wxT( "sch" ),

                    wxT( "SCH" ), NULL ),

                    wxT( "SCH" ), wxNullPtr ),



    // must terminate the table with this!

    wxFileTypeInfo()

eeschema/class_libentry.cpp

+2 −2
Original line number Diff line number Diff line
@@ -318,12 +318,12 @@ void LIB_COMPONENT::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDc, const wxPoint& aO 


            if( drawItem.Type() == COMPONENT_FIELD_DRAW_TYPE )

            {

                drawItem.Draw( aPanel, aDc, aOffset, aColor, aDrawMode, NULL, aTransform );

                drawItem.Draw( aPanel, aDc, aOffset, aColor, aDrawMode, (void*) NULL, aTransform );

            }



            // Now, draw only the background for items with

            // m_Fill == FILLED_WITH_BG_BODYCOLOR:

            drawItem.Draw( aPanel, aDc, aOffset, aColor, aDrawMode, false, aTransform );

            drawItem.Draw( aPanel, aDc, aOffset, aColor, aDrawMode, (void*) false, aTransform );

        }

    }

eeschema/sch_field.cpp

+1 −2
Original line number Diff line number Diff line
@@ -151,8 +151,7 @@ void SCH_FIELD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, 
        DrawGraphicText( panel, DC, textpos, color, fulltext,

                         orient,

                         m_Size, hjustify, vjustify,

                         LineWidth, m_Italic,

                         m_Bold, false );

                         LineWidth, m_Italic, m_Bold );

    }



    /* Enable this to draw the bounding box around the text field to validate

eeschema/sch_sheet.cpp

+2 −2
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ void SCH_SHEET::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, 
                     (EDA_Colors) txtcolor, Text, name_orientation,

                     wxSize( m_SheetNameSize, m_SheetNameSize ),

                     GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_BOTTOM, LineWidth,

                     false, false, false );

                     false, false );



    /* Draw text : FileName */

    if( aColor >= 0 )
@@ -596,7 +596,7 @@ void SCH_SHEET::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, 
                     (EDA_Colors) txtcolor, Text, name_orientation,

                     wxSize( m_FileNameSize, m_FileNameSize ),

                     GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_TOP, LineWidth,

                     false, false, false );

                     false, false );





    /* Draw text : SheetLabel */

gerbview/draw_gerber_screen.cpp

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ void Show_Items_DCode_Value( WinEDA_DrawPanel* aPanel, wxDC* aDC, BOARD* aPcb, i 
                         pos, (EDA_Colors) color, Line,

                         orient, wxSize( width, width ),

                         GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,

                         0, false, false, false );

                         0, false, false );

    }

}