Skip to content

K
kicad-source-mirror
Commit 81b3fdf1 authored by Marco Serantoni's avatar Marco Serantoni
Browse files
Options

Mac: OVERLAY FIXES for WX2.8 and Enhancements

parent e5e21a24
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
common/gr_basic.cpp
View file @ 81b3fdf1
...@@ -689,6 +689,10 @@ void GRSetDrawMode( wxDC* DC, int draw_mode ) ...@@ -689,6 +689,10 @@ void GRSetDrawMode( wxDC* DC, int draw_mode )
#endif #endif
else else
DC->SetLogicalFunction( wxCOPY ); DC->SetLogicalFunction( wxCOPY );
#ifdef USE_WX_OVERLAY
DC->SetLogicalFunction( wxCOPY );
#endif
} }
......
pcbnew/controle.cpp
View file @ 81b3fdf1
...@@ -363,7 +363,7 @@ void WinEDA_PcbFrame::GeneralControle( wxDC* DC, wxPoint Mouse ) ...@@ -363,7 +363,7 @@ void WinEDA_PcbFrame::GeneralControle( wxDC* DC, wxPoint Mouse )
if( DrawPanel->ManageCurseur ) if( DrawPanel->ManageCurseur )
{ {
#ifdef USE_WX_OVERLAY #ifdef USE_WX_OVERLAY
wxDCOverlay oDC( DrawPanel->m_overlay, DC ); wxDCOverlay oDC( DrawPanel->m_overlay, (wxWindowDC*)DC );
oDC.Clear(); oDC.Clear();
DrawPanel->ManageCurseur( DrawPanel, DC, FALSE ); DrawPanel->ManageCurseur( DrawPanel, DC, FALSE );
#else #else
......
pcbnew/tracepcb.cpp
View file @ 81b3fdf1
...@@ -58,7 +58,7 @@ void WinEDA_ModuleEditFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg ) ...@@ -58,7 +58,7 @@ void WinEDA_ModuleEditFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
if(IsShown()) if(IsShown())
{ {
DrawPanel->m_overlay.Reset(); DrawPanel->m_overlay.Reset();
wxDCOverlay overlaydc( DrawPanel->m_overlay, DC ); wxDCOverlay overlaydc( DrawPanel->m_overlay, (wxWindowDC*)DC );
overlaydc.Clear(); overlaydc.Clear();
} }
#endif #endif
...@@ -97,7 +97,7 @@ void WinEDA_PcbFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg ) ...@@ -97,7 +97,7 @@ void WinEDA_PcbFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
if(IsShown()) if(IsShown())
{ {
DrawPanel->m_overlay.Reset(); DrawPanel->m_overlay.Reset();
wxDCOverlay overlaydc( DrawPanel->m_overlay, DC ); wxDCOverlay overlaydc( DrawPanel->m_overlay, (wxWindowDC*)DC );
overlaydc.Clear(); overlaydc.Clear();
} }
#endif #endif
......
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