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

Fix gcc 4.5 warnings compil.

This commit is contained in:
jean-pierre charras 2010-11-20 20:53:00 +01:00
parent f930894d9f
commit f01653fc56
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/eda_doc.cpp
View File

@ -54,14 +54,14 @@ static const wxFileTypeInfo EDAfallbacks[] =
wxT( "wxhtml %s" ), wxT( "wxhtml %s" ),
wxT( "html document (from Kicad)" ), wxT( "html document (from Kicad)" ),
wxT( "htm" ), wxT( "htm" ),
wxT( "html" ),NULL ), wxT( "html" ),wxNullPtr ),
wxFileTypeInfo( wxT( "application/sch" ), wxFileTypeInfo( wxT( "application/sch" ),
wxT( "eeschema %s" ), wxT( "eeschema %s" ),
wxT( "eeschema -p %s" ), wxT( "eeschema -p %s" ),
wxT( "sch document (from Kicad)" ), wxT( "sch document (from Kicad)" ),
wxT( "sch" ), wxT( "sch" ),
wxT( "SCH" ), NULL ), wxT( "SCH" ), wxNullPtr ),
// must terminate the table with this! // must terminate the table with this!
wxFileTypeInfo() wxFileTypeInfo()

4
eeschema/class_libentry.cpp
View File

@ -318,12 +318,12 @@ void LIB_COMPONENT::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDc, const wxPoint& aO
if( drawItem.Type() == COMPONENT_FIELD_DRAW_TYPE ) 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 // Now, draw only the background for items with
// m_Fill == FILLED_WITH_BG_BODYCOLOR: // 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 );
} }
} }

3
eeschema/sch_field.cpp
View File

@ -151,8 +151,7 @@ void SCH_FIELD::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
DrawGraphicText( panel, DC, textpos, color, fulltext, DrawGraphicText( panel, DC, textpos, color, fulltext,
orient, orient,
m_Size, hjustify, vjustify, m_Size, hjustify, vjustify,
LineWidth, m_Italic, LineWidth, m_Italic, m_Bold );
m_Bold, false );
} }
/* Enable this to draw the bounding box around the text field to validate /* Enable this to draw the bounding box around the text field to validate

4
eeschema/sch_sheet.cpp
View File

@ -584,7 +584,7 @@ void SCH_SHEET::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
(EDA_Colors) txtcolor, Text, name_orientation, (EDA_Colors) txtcolor, Text, name_orientation,
wxSize( m_SheetNameSize, m_SheetNameSize ), wxSize( m_SheetNameSize, m_SheetNameSize ),
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_BOTTOM, LineWidth, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_BOTTOM, LineWidth,
false, false, false ); false, false );
/* Draw text : FileName */ /* Draw text : FileName */
if( aColor >= 0 ) if( aColor >= 0 )
@ -596,7 +596,7 @@ void SCH_SHEET::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
(EDA_Colors) txtcolor, Text, name_orientation, (EDA_Colors) txtcolor, Text, name_orientation,
wxSize( m_FileNameSize, m_FileNameSize ), wxSize( m_FileNameSize, m_FileNameSize ),
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_TOP, LineWidth, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_TOP, LineWidth,
false, false, false ); false, false );
/* Draw text : SheetLabel */ /* Draw text : SheetLabel */

2
gerbview/draw_gerber_screen.cpp
View File

@ -205,7 +205,7 @@ void Show_Items_DCode_Value( WinEDA_DrawPanel* aPanel, wxDC* aDC, BOARD* aPcb, i
pos, (EDA_Colors) color, Line, pos, (EDA_Colors) color, Line,
orient, wxSize( width, width ), orient, wxSize( width, width ),
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
0, false, false, false ); 0, false, false );
} }
} }

3
pcbnew/class_pad_draw_functions.cpp
View File

@ -590,8 +590,7 @@ void D_PAD::DrawShape( EDA_Rect* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo )
tsize = (int) ( tsize * 0.8 ); tsize = (int) ( tsize * 0.8 );
DrawGraphicText( aDrawInfo.m_DrawPanel, aDC, tpos, WHITE, buffer, t_angle, DrawGraphicText( aDrawInfo.m_DrawPanel, aDC, tpos, WHITE, buffer, t_angle,
wxSize( tsize, tsize ), GR_TEXT_HJUSTIFY_CENTER, wxSize( tsize, tsize ), GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_CENTER, tsize / 7, false, false, GR_TEXT_VJUSTIFY_CENTER, tsize / 7, false, false );
false );
} }
} }