From ea436444f2f72dd6b8e5e0e8876c5552e40a753a Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Mon, 8 Jul 2013 17:14:16 +0200 Subject: [PATCH] wxWidgets 2.8 compatibility fix. Scripting engine build fix. --- common/drawframe.cpp | 4 ++-- pcbnew/CMakeLists.txt | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/drawframe.cpp b/common/drawframe.cpp index fd0b8d5ee1..5681ceac03 100644 --- a/common/drawframe.cpp +++ b/common/drawframe.cpp @@ -396,7 +396,7 @@ void EDA_DRAW_FRAME::OnSelectGrid( wxCommandEvent& event ) if( m_galCanvasActive ) { 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(); @@ -990,7 +990,7 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable ) // Default grid color - dark cyan does not look good //gal->SetGridColor( KiGfx::COLOR4D( GetGridColor() ) ); 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->SetGridOriginMarkerSize( 15 ); gal->SetGridDrawThreshold( 10 ); diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index c0b82cc8cd..fa681e4faf 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -326,6 +326,9 @@ if (KICAD_SCRIPTING_MODULES) pcad2kicadpcb polygon bitmaps + gal + ${GLEW_LIBRARIES} + ${CAIRO_LIBRARIES} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${GDI_PLUS_LIBRARIES}