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 fb4804d288c3d1b6b9823f52beb3a89b36102905..7031ebf5969d7e1af2eff951cc6487aff20cd868 100644 (file)
--- a/src/mac/carbon/overlay.cpp
+++ b/src/mac/carbon/overlay.cpp
@@ -65,8 +65,8 @@ void wxOverlayImpl::MacGetBounds( Rect *bounds )
     Point localwhere = { y, x };
     wxMacLocalToGlobal( window, &localwhere ) ;
 
     Point localwhere = { y, x };
     wxMacLocalToGlobal( window, &localwhere ) ;
 

-    bounds->top = localwhere.v;
-    bounds->left = localwhere.h;
+    bounds->top = localwhere.v+m_y;
+    bounds->left = localwhere.h+m_x;

     bounds->bottom = localwhere.v+m_y+m_height;
     bounds->right = localwhere.h+m_x+m_width;
 }
     bounds->bottom = localwhere.v+m_y+m_height;
     bounds->right = localwhere.h+m_x+m_width;
 }


@@ -95,17 +95,17 @@ OSStatus wxOverlayImpl::CreateOverlayWindow()
         CGRect cgbounds ;
         cgbounds = CGDisplayBounds(CGMainDisplayID());
         Rect bounds;
         CGRect cgbounds ;
         cgbounds = CGDisplayBounds(CGMainDisplayID());
         Rect bounds;

-        bounds.top = cgbounds.origin.y;
-        bounds.left = cgbounds.origin.x;
-        bounds.bottom = bounds.top + cgbounds.size.height;
-        bounds.right = bounds.left  + cgbounds.size.width;
+        bounds.top = (short)cgbounds.origin.y;
+        bounds.left = (short)cgbounds.origin.x;
+        bounds.bottom = (short)(bounds.top + cgbounds.size.height);
+        bounds.right = (short)(bounds.left  + cgbounds.size.width);

         err  = CreateNewWindow( kOverlayWindowClass, overlayAttributes, &bounds, &m_overlayWindow );
     }
     ShowWindow(m_overlayWindow);
     return err;
 }
 
         err  = CreateNewWindow( kOverlayWindowClass, overlayAttributes, &bounds, &m_overlayWindow );
     }
     ShowWindow(m_overlayWindow);
     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") );
 
 {
     wxASSERT_MSG( !IsOk() , _("You cannot Init an overlay twice") );
 


@@ -115,7 +115,7 @@ void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height
     if ( dc->IsKindOf( CLASSINFO( wxClientDC ) ))
     {
         wxPoint origin = m_window->GetClientAreaOrigin();
     if ( dc->IsKindOf( CLASSINFO( wxClientDC ) ))
     {
         wxPoint origin = m_window->GetClientAreaOrigin();

-        m_x += origin.x; 
+        m_x += origin.x;

         m_y += origin.y;
     }
     m_width = width ;
         m_y += origin.y;
     }
     m_width = width ;


@@ -126,28 +126,34 @@ void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height
 #ifndef __LP64__
     err = QDBeginCGContext(GetWindowPort(m_overlayWindow), &m_overlayContext);
 #endif
 #ifndef __LP64__
     err = QDBeginCGContext(GetWindowPort(m_overlayWindow), &m_overlayContext);
 #endif

-    CGContextTranslateCTM( m_overlayContext, 0, m_height+m_y );
+    CGContextTranslateCTM( m_overlayContext, 0, m_height );

     CGContextScaleCTM( m_overlayContext, 1, -1 );
     CGContextScaleCTM( m_overlayContext, 1, -1 );

+    CGContextTranslateCTM( m_overlayContext, -m_x , -m_y );

     wxASSERT_MSG(  err == noErr , _("Couldn't init the context on the overlay window") );
 }
 
     wxASSERT_MSG(  err == noErr , _("Couldn't init the context on the overlay window") );
 }
 

-void wxOverlayImpl::BeginDrawing( wxWindowDC* dc)
+void wxOverlayImpl::BeginDrawing( wxDC* dc)

 {
 {

-// TODO CS
-    dc->SetGraphicsContext( wxGraphicsContext::CreateFromNative( m_overlayContext ) );
-    // triggers an application of the already set device origins to the native context
-    dc->SetUserScale(1,1);
-    wxSize size = dc->GetSize() ;
-    dc->SetClippingRegion( 0 , 0 , size.x , size.y ) ;
+    wxDCImpl *impl = dc->GetImpl();
+    wxGCDCImpl *win_impl = wxDynamicCast(impl,wxGCDCImpl);
+    if (win_impl)
+    {
+        win_impl->SetGraphicsContext( wxGraphicsContext::CreateFromNative( m_overlayContext ) );
+        dc->SetClippingRegion( m_x , m_y , m_width , m_height ) ;
+    }

 }
 
 }
 

-void wxOverlayImpl::EndDrawing( wxWindowDC* dc)
+void wxOverlayImpl::EndDrawing( wxDC* dc)

 {
 {

-    dc->SetGraphicsContext(NULL);
-    CGContextSynchronize( m_overlayContext );
+    wxDCImpl *impl = dc->GetImpl();
+    wxGCDCImpl *win_impl = wxDynamicCast(impl,wxGCDCImpl);
+    if (win_impl)
+        win_impl->SetGraphicsContext(NULL);
+        
+    CGContextFlush( m_overlayContext );

 }
 
 }
 

-void wxOverlayImpl::Clear(wxWindowDC* 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 );
 {
     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 );