From 81b3fdf157242551d751c32878286c70712930bb Mon Sep 17 00:00:00 2001
From: Marco Serantoni <marco.serantoni@gmail.com>
Date: Fri, 17 Dec 2010 23:57:09 +0100
Subject: [PATCH] Mac: OVERLAY FIXES for WX2.8 and Enhancements

---
 common/gr_basic.cpp | 4 ++++
 pcbnew/controle.cpp | 2 +-
 pcbnew/tracepcb.cpp | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/gr_basic.cpp b/common/gr_basic.cpp
index ce58badd04..c6c7122cbe 100644
--- a/common/gr_basic.cpp
+++ b/common/gr_basic.cpp
@@ -689,6 +689,10 @@ void GRSetDrawMode( wxDC* DC, int draw_mode )
 #endif
     else
         DC->SetLogicalFunction( wxCOPY );
+
+#ifdef USE_WX_OVERLAY
+    DC->SetLogicalFunction( wxCOPY );
+#endif
 }
 
 
diff --git a/pcbnew/controle.cpp b/pcbnew/controle.cpp
index d830df5007..d3866a15d4 100644
--- a/pcbnew/controle.cpp
+++ b/pcbnew/controle.cpp
@@ -363,7 +363,7 @@ void WinEDA_PcbFrame::GeneralControle( wxDC* DC, wxPoint Mouse )
         if( DrawPanel->ManageCurseur )
         {
 #ifdef USE_WX_OVERLAY
-            wxDCOverlay oDC( DrawPanel->m_overlay, DC ); 
+            wxDCOverlay oDC( DrawPanel->m_overlay, (wxWindowDC*)DC ); 
             oDC.Clear(); 
             DrawPanel->ManageCurseur( DrawPanel, DC, FALSE );
 #else
diff --git a/pcbnew/tracepcb.cpp b/pcbnew/tracepcb.cpp
index e73c7b89bd..954f83be0d 100644
--- a/pcbnew/tracepcb.cpp
+++ b/pcbnew/tracepcb.cpp
@@ -58,7 +58,7 @@ void WinEDA_ModuleEditFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
     if(IsShown())
     {
         DrawPanel->m_overlay.Reset(); 
-        wxDCOverlay overlaydc( DrawPanel->m_overlay, DC ); 
+        wxDCOverlay overlaydc( DrawPanel->m_overlay, (wxWindowDC*)DC ); 
         overlaydc.Clear();
     }
 #endif
@@ -97,7 +97,7 @@ void WinEDA_PcbFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
     if(IsShown())
     {
         DrawPanel->m_overlay.Reset(); 
-        wxDCOverlay overlaydc( DrawPanel->m_overlay, DC ); 
+        wxDCOverlay overlaydc( DrawPanel->m_overlay, (wxWindowDC*)DC ); 
         overlaydc.Clear();
     }
 #endif