pen.h depends from brush.h in compat mode

[wxWidgets.git] / src / mac / carbon / overlay.cpp

diff --git a/src/mac/carbon/overlay.cpp b/src/mac/carbon/overlay.cpp
index c33c96e8e7ac4211324107a64fb8af5295978a8b..7031ebf5969d7e1af2eff951cc6487aff20cd868 100644 (file)
--- a/src/mac/carbon/overlay.cpp
+++ b/src/mac/carbon/overlay.cpp
@@ -105,7 +105,7 @@ OSStatus wxOverlayImpl::CreateOverlayWindow()
     return err;
 }
 
-void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height )
+void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height )
 {
     wxASSERT_MSG( !IsOk() , _("You cannot Init an overlay twice") );
 
@@ -132,29 +132,28 @@ void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height
     wxASSERT_MSG(  err == noErr , _("Couldn't init the context on the overlay window") );
 }
 
-void wxOverlayImpl::BeginDrawing( wxWindowDC* dc)
+void wxOverlayImpl::BeginDrawing( wxDC* dc)
 {
     wxDCImpl *impl = dc->GetImpl();
-    wxWindowDCImpl *win_impl = wxDynamicCast(impl,wxWindowDCImpl);
+    wxGCDCImpl *win_impl = wxDynamicCast(impl,wxGCDCImpl);
     if (win_impl)
     {
         win_impl->SetGraphicsContext( wxGraphicsContext::CreateFromNative( m_overlayContext ) );
-        wxSize size = dc->GetSize() ;
-        dc->SetClippingRegion( 0 , 0 , size.x , size.y ) ;
+        dc->SetClippingRegion( m_x , m_y , m_width , m_height ) ;
     }
 }
 
-void wxOverlayImpl::EndDrawing( wxWindowDC* dc)
+void wxOverlayImpl::EndDrawing( wxDC* dc)
 {
     wxDCImpl *impl = dc->GetImpl();
-    wxWindowDCImpl *win_impl = wxDynamicCast(impl,wxWindowDCImpl);
+    wxGCDCImpl *win_impl = wxDynamicCast(impl,wxGCDCImpl);
     if (win_impl)
         win_impl->SetGraphicsContext(NULL);
         
     CGContextFlush( m_overlayContext );
 }
 
-void wxOverlayImpl::Clear(wxWindowDC* WXUNUSED(dc))
+void wxOverlayImpl::Clear(wxDC* WXUNUSED(dc))
 {
     wxASSERT_MSG( IsOk() , _("You cannot Clear an overlay that is not inited") );
     CGRect box  = CGRectMake( m_x - 1, m_y - 1 , m_width + 2 , m_height + 2 );