make sure we always restore the passed in cg in a paint event

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

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 10f209b4b0b68cd46375c301eb57fffcbe5ea69f..4c985b910fbe0b01f09be400e8e7ba78ffde1d0a 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -14,6 +14,7 @@
 #include "wx/dcscreen.h"
 
 #include "wx/mac/uma.h"
 #include "wx/dcscreen.h"
 
 #include "wx/mac/uma.h"

+#include "wx/graphics.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 


@@ -21,26 +22,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 wxScreenDC::wxScreenDC()
 {
 #if wxMAC_USE_CORE_GRAPHICS
 wxScreenDC::wxScreenDC()
 {
 #if wxMAC_USE_CORE_GRAPHICS

-       CGDirectDisplayID display = CGMainDisplayID();
-       m_displayId = (UInt32) display;
-       CGError err = CGDisplayCaptureWithOptions(display,kCGCaptureNoFill);
-       wxASSERT( err == kCGErrorSuccess ); 
-       CGContextRef cg = CGDisplayGetDrawingContext(display);
-       CGRect bounds ;
-    bounds = CGDisplayBounds(display);
-       /*
-    m_macLocalOrigin.x = 0;
-    m_macLocalOrigin.y = 0;
-       */ // TODO
-    SInt16 height;
-    GetThemeMenuBarHeight( &height );
-    m_minY = height;
-       m_minX = 0;
-    m_maxX = bounds.size.width;
-    m_maxY = bounds.size.height - height;
-    SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) );
-       m_width = bounds.size.width;
-       m_height = bounds.size.height - height;
+    CGRect cgbounds ;
+    cgbounds = CGDisplayBounds(CGMainDisplayID());
+    Rect bounds;
+    bounds.top = (short)cgbounds.origin.y;
+    bounds.left = (short)cgbounds.origin.x;
+    bounds.bottom = bounds.top + (short)cgbounds.size.height;
+    bounds.right = bounds.left  + (short)cgbounds.size.width;
+    WindowAttributes overlayAttributes  = kWindowIgnoreClicksAttribute;
+    CreateNewWindow( kOverlayWindowClass, overlayAttributes, &bounds, (WindowRef*) &m_overlayWindow );
+    ShowWindow((WindowRef)m_overlayWindow);
+    SetGraphicsContext( wxGraphicsContext::CreateFromNativeWindow( m_overlayWindow ) );
+    m_width = (wxCoord)cgbounds.size.width;
+    m_height = (wxCoord)cgbounds.size.height;

 #else
     m_macPort = CreateNewPort() ;
     GrafPtr port ;
 #else
     m_macPort = CreateNewPort() ;
     GrafPtr port ;


@@ -67,7 +61,7 @@ wxScreenDC::wxScreenDC()
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
 #endif
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
 #endif

-       m_ok = true ;
+    m_ok = true ;

 }
 
 wxScreenDC::~wxScreenDC()
 }
 
 wxScreenDC::~wxScreenDC()


@@ -75,8 +69,7 @@ wxScreenDC::~wxScreenDC()
 #if wxMAC_USE_CORE_GRAPHICS
     delete m_graphicContext;
     m_graphicContext = NULL;
 #if wxMAC_USE_CORE_GRAPHICS
     delete m_graphicContext;
     m_graphicContext = NULL;

-       CGDirectDisplayID display = (CGDirectDisplayID) m_displayId;
-       CGDisplayRelease( display );
+    DisposeWindow((WindowRef) m_overlayWindow );

 #else
     if ( m_macPort )
         DisposePort( (CGrafPtr) m_macPort ) ;
 #else
     if ( m_macPort )
         DisposePort( (CGrafPtr) m_macPort ) ;