Skip to content

K
kicad-source-mirror
Commit 9f69193a authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files
Options

formatting and compiler warnings

parent 9bf1f390
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 28 deletions
3d-viewer/3d_canvas.cpp
View file @ 9f69193a
...@@ -336,69 +336,58 @@ void EDA_3D_CANVAS::OnRightClick( wxMouseEvent& event ) ...@@ -336,69 +336,58 @@ void EDA_3D_CANVAS::OnRightClick( wxMouseEvent& event )
wxPoint pos; wxPoint pos;
wxMenu PopUpMenu; wxMenu PopUpMenu;
pos.x = event.GetX(); pos.y = event.GetY(); pos.x = event.GetX();
wxMenuItem* item = new wxMenuItem( &PopUpMenu, ID_POPUP_ZOOMIN, pos.y = event.GetY();
_( "Zoom +" ) );
wxMenuItem* item = new wxMenuItem( &PopUpMenu, ID_POPUP_ZOOMIN, _( "Zoom +" ) );
item->SetBitmap( KiBitmap( zoom_in_xpm )); item->SetBitmap( KiBitmap( zoom_in_xpm ));
PopUpMenu.Append( item ); PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_ZOOMOUT, item = new wxMenuItem( &PopUpMenu, ID_POPUP_ZOOMOUT, _( "Zoom -" ) );
_( "Zoom -" ) );
item->SetBitmap( KiBitmap( zoom_out_xpm )); item->SetBitmap( KiBitmap( zoom_out_xpm ));
PopUpMenu.Append( item ); PopUpMenu.Append( item );
PopUpMenu.AppendSeparator(); PopUpMenu.AppendSeparator();
item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZPOS, item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZPOS, _( "Top View" ) );
_( "Top View" ) );
item->SetBitmap( KiBitmap( axis3d_top_xpm )); item->SetBitmap( KiBitmap( axis3d_top_xpm ));
PopUpMenu.Append( item ); PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZNEG, item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZNEG, _( "Bottom View" ) );
_( "Bottom View" ) );
item->SetBitmap( KiBitmap( axis3d_bottom_xpm )); item->SetBitmap( KiBitmap( axis3d_bottom_xpm ));
PopUpMenu.Append( item ); PopUpMenu.Append( item );
PopUpMenu.AppendSeparator(); PopUpMenu.AppendSeparator();
item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_XPOS, item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_XPOS, _( "Right View" ) );
_( "Right View" ) );
item->SetBitmap( KiBitmap( axis3d_right_xpm )); item->SetBitmap( KiBitmap( axis3d_right_xpm ));
PopUpMenu.Append( item ); PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_XNEG, item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_XNEG, _( "Left View" ) );
_( "Left View" ) );
item->SetBitmap( KiBitmap( axis3d_left_xpm )); item->SetBitmap( KiBitmap( axis3d_left_xpm ));
PopUpMenu.Append( item ); PopUpMenu.Append( item );
PopUpMenu.AppendSeparator(); PopUpMenu.AppendSeparator();
item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_YPOS, item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_YPOS, _( "Front View" ) );
_( "Front View" ) );
item->SetBitmap( KiBitmap( axis3d_front_xpm )); item->SetBitmap( KiBitmap( axis3d_front_xpm ));
PopUpMenu.Append( item ); PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_YNEG, item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_YNEG, _( "Back View" ) );
_( "Back View" ) );
item->SetBitmap( KiBitmap( axis3d_back_xpm )); item->SetBitmap( KiBitmap( axis3d_back_xpm ));
PopUpMenu.Append( item ); PopUpMenu.Append( item );
PopUpMenu.AppendSeparator(); PopUpMenu.AppendSeparator();
item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_LEFT, item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_LEFT, _( "Move left <-" ) );
_( "Move left <-" ) );
item->SetBitmap( KiBitmap( left_xpm )); item->SetBitmap( KiBitmap( left_xpm ));
PopUpMenu.Append( item ); PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_RIGHT, item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_RIGHT, _( "Move right ->" ) );
_( "Move right ->" ) );
item->SetBitmap( KiBitmap( right_xpm )); item->SetBitmap( KiBitmap( right_xpm ));
PopUpMenu.Append( item ); PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_UP, item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_UP, _( "Move Up ^" ) );
_( "Move Up ^" ) );
item->SetBitmap( KiBitmap( up_xpm )); item->SetBitmap( KiBitmap( up_xpm ));
PopUpMenu.Append( item ); PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_DOWN, item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_DOWN, _( "Move Down" ) );
_( "Move Down" ) );
item->SetBitmap( KiBitmap( down_xpm )); item->SetBitmap( KiBitmap( down_xpm ));
PopUpMenu.Append( item ); PopUpMenu.Append( item );
......
bitmap2component/bitmap2component.cpp
View file @ 9f69193a
...@@ -315,7 +315,7 @@ void BITMAPCONV_INFO::OuputOnePolygon( KPolygon & aPolygon ) ...@@ -315,7 +315,7 @@ void BITMAPCONV_INFO::OuputOnePolygon( KPolygon & aPolygon )
int width = 1; int width = 1;
fprintf( m_Outfile, "DP %d %d %d %d %d %d %d\n", fprintf( m_Outfile, "DP %d %d %d %d %d %d %d\n",
0, 0, 0, 0, 0, 0, 0, 0,
aPolygon.size() + 1, width, layer ); (int) aPolygon.size() + 1, width, layer );
for( ii = 0; ii < aPolygon.size(); ii++ ) for( ii = 0; ii < aPolygon.size(); ii++ )
{ {
...@@ -331,7 +331,7 @@ void BITMAPCONV_INFO::OuputOnePolygon( KPolygon & aPolygon ) ...@@ -331,7 +331,7 @@ void BITMAPCONV_INFO::OuputOnePolygon( KPolygon & aPolygon )
break; break;
case EESCHEMA_FMT: case EESCHEMA_FMT:
fprintf( m_Outfile, "P %d 0 0 1", aPolygon.size() + 1 ); fprintf( m_Outfile, "P %d 0 0 1", (int) aPolygon.size() + 1 );
for( ii = 0; ii < aPolygon.size(); ii++ ) for( ii = 0; ii < aPolygon.size(); ii++ )
{ {
currpoint = *(aPolygon.begin() + ii); currpoint = *(aPolygon.begin() + ii);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment