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

wxWidgets 2.8 compatibility fix. 

Scripting engine build fix.
This commit is contained in:
Maciej Suminski 2013-07-08 17:14:16 +02:00
parent 89637b89b8
commit b7747bc224
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/drawframe.cpp
View File

@ -396,7 +396,7 @@ void EDA_DRAW_FRAME::OnSelectGrid( wxCommandEvent& event )
if( m_galCanvasActive ) if( m_galCanvasActive )
{ {
KiGfx::GAL* gal = m_galCanvas->GetGAL(); KiGfx::GAL* gal = m_galCanvas->GetGAL();
gal->SetGridSize( VECTOR2D( screen->GetGrid().m_Size ) ); gal->SetGridSize( VECTOR2D( screen->GetGrid().m_Size.x, screen->GetGrid().m_Size.y ) );
} }
Refresh(); Refresh();
@ -990,7 +990,7 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
// Default grid color - dark cyan does not look good // Default grid color - dark cyan does not look good
//gal->SetGridColor( KiGfx::COLOR4D( GetGridColor() ) ); //gal->SetGridColor( KiGfx::COLOR4D( GetGridColor() ) );
gal->SetGridColor( KiGfx::COLOR4D( 0.1, 0.1, 0.1, 1.0 ) ); gal->SetGridColor( KiGfx::COLOR4D( 0.1, 0.1, 0.1, 1.0 ) );
gal->SetGridSize( VECTOR2D( screen->GetGridSize() ) ); gal->SetGridSize( VECTOR2D( screen->GetGridSize().x, screen->GetGridSize().y ) );
gal->SetGridOrigin( VECTOR2D( screen->GetGridOrigin() ) ); gal->SetGridOrigin( VECTOR2D( screen->GetGridOrigin() ) );
gal->SetGridOriginMarkerSize( 15 ); gal->SetGridOriginMarkerSize( 15 );
gal->SetGridDrawThreshold( 10 ); gal->SetGridDrawThreshold( 10 );

3
pcbnew/CMakeLists.txt
View File

@ -326,6 +326,9 @@ if (KICAD_SCRIPTING_MODULES)
pcad2kicadpcb pcad2kicadpcb
polygon polygon
bitmaps bitmaps
gal
${GLEW_LIBRARIES}
${CAIRO_LIBRARIES}
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}