graphics context additions and merging graphics bitmap additions from Kevin O.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/overlay.cpp b/src/mac/carbon/overlay.cpp
index 1a03d6e1a8d548b50ff2af6695cffed891a76222..7031ebf5969d7e1af2eff951cc6487aff20cd868 100644 (file)
--- a/src/mac/carbon/overlay.cpp
+++ b/src/mac/carbon/overlay.cpp
@@ -135,19 +135,18 @@ void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height )
 void wxOverlayImpl::BeginDrawing( wxDC* dc)
 {
     wxDCImpl *impl = dc->GetImpl();
 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 ) );
     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( wxDC* dc)
 {
     wxDCImpl *impl = dc->GetImpl();
     }
 }
 
 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);
         
     if (win_impl)
         win_impl->SetGraphicsContext(NULL);