unload msimg32.dll earlier (before static cleanup time) to avoid lockups when wx...

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

diff --git a/src/mac/carbon/overlay.cpp b/src/mac/carbon/overlay.cpp
index b2786c75da5a62e131f099cdbc850477005c284d..933aa8bf01d51d62624d8ef95220f0c34cd86daa 100644 (file)
--- a/src/mac/carbon/overlay.cpp
+++ b/src/mac/carbon/overlay.cpp
@@ -57,12 +57,18 @@ bool wxOverlayImpl::IsOk()
 
 void wxOverlayImpl::MacGetBounds( Rect *bounds )
 {
 
 void wxOverlayImpl::MacGetBounds( Rect *bounds )
 {

-    wxPoint origin(0,0);
-    origin = m_window->ClientToScreen( origin );
-    bounds->top = origin.y;
-    bounds->left = origin.x;
-    bounds->bottom = origin.y+m_y+m_height;
-    bounds->right = origin.x+m_x+m_width;
+    int x, y;
+    x=y=0;
+    m_window->MacWindowToRootWindow( &x , &y ) ;
+    WindowRef window = (WindowRef) m_window->MacGetTopLevelWindowRef() ;
+
+    Point localwhere = { y, x };
+    wxMacLocalToGlobal( window, &localwhere ) ;
+
+    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;

 }
 
 OSStatus wxOverlayImpl::CreateOverlayWindow()
 }
 
 OSStatus wxOverlayImpl::CreateOverlayWindow()


@@ -89,10 +95,10 @@ 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);
         err  = CreateNewWindow( kOverlayWindowClass, overlayAttributes, &bounds, &m_overlayWindow );
     }
     ShowWindow(m_overlayWindow);


@@ -106,6 +112,12 @@ void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height
     m_window = dc->GetWindow();
     m_x = x ;
     m_y = y ;
     m_window = dc->GetWindow();
     m_x = x ;
     m_y = y ;

+    if ( dc->IsKindOf( CLASSINFO( wxClientDC ) ))
+    {
+        wxPoint origin = m_window->GetClientAreaOrigin();
+        m_x += origin.x;
+        m_y += origin.y;
+    }

     m_width = width ;
     m_height = height ;
 
     m_width = width ;
     m_height = height ;
 


@@ -114,24 +126,15 @@ 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") );
 }
 
 void wxOverlayImpl::BeginDrawing( wxWindowDC* dc)
 {
     wxASSERT_MSG(  err == noErr , _("Couldn't init the context on the overlay window") );
 }
 
 void wxOverlayImpl::BeginDrawing( wxWindowDC* dc)
 {

-// TODO CS

     dc->SetGraphicsContext( wxGraphicsContext::CreateFromNative( m_overlayContext ) );
     dc->SetGraphicsContext( wxGraphicsContext::CreateFromNative( m_overlayContext ) );

-/*
-    delete dc->m_graphicContext ;
-    dc->m_graphicContext = new wxMacCGContext( m_overlayContext );
-    // we are right now startin at 0,0 not at the wxWindow's origin, so most of the calculations
-    // int dc are already corect
-    // just to make sure :
-    dc->m_macLocalOrigin.x = 0 ;
-    dc->m_macLocalOrigin.y = 0 ;
-*/

     wxSize size = dc->GetSize() ;
     dc->SetClippingRegion( 0 , 0 , size.x , size.y ) ;
 }
     wxSize size = dc->GetSize() ;
     dc->SetClippingRegion( 0 , 0 , size.x , size.y ) ;
 }


@@ -139,10 +142,10 @@ void wxOverlayImpl::BeginDrawing( wxWindowDC* dc)
 void wxOverlayImpl::EndDrawing( wxWindowDC* dc)
 {
     dc->SetGraphicsContext(NULL);
 void wxOverlayImpl::EndDrawing( wxWindowDC* dc)
 {
     dc->SetGraphicsContext(NULL);

-    CGContextSynchronize( m_overlayContext );
+    CGContextFlush( m_overlayContext );

 }
 
 }
 

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