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 e8ccf9807ac1318b3255d5c346fde618b776477e..4c985b910fbe0b01f09be400e8e7ba78ffde1d0a 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -14,13 +14,28 @@
 #include "wx/dcscreen.h"
 
 #include "wx/mac/uma.h"
+#include "wx/graphics.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()
 {
-#ifndef __LP64__
+#if wxMAC_USE_CORE_GRAPHICS
+    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 ;
     GetPort( &port ) ;
@@ -30,9 +45,7 @@ wxScreenDC::wxScreenDC()
     SetPort( port ) ;
     m_macLocalOrigin.x = -pt.h ;
     m_macLocalOrigin.y = -pt.v ;
-#if wxMAC_USE_CORE_GRAPHICS
-    m_macLocalOriginInPort = m_macLocalOrigin ;
-#endif
+
     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );
     m_minX = screenBits.bounds.left ;
@@ -44,25 +57,20 @@ wxScreenDC::wxScreenDC()
     m_maxX = screenBits.bounds.right  ;
     m_maxY = screenBits.bounds.bottom ;
 
-#if wxMAC_USE_CORE_GRAPHICS
-    m_graphicContext = new wxMacCGContext( port ) ;
-#else
     MacSetRectRgn( (RgnHandle) m_macBoundaryClipRgn , m_minX , m_minY , m_maxX , m_maxY ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
 #endif
     m_ok = true ;
-#endif
 }
 
 wxScreenDC::~wxScreenDC()
 {
 #if wxMAC_USE_CORE_GRAPHICS
-    delete m_graphicContext ;
-    m_graphicContext = NULL ;
-#endif
-
-#ifndef __LP64__
+    delete m_graphicContext;
+    m_graphicContext = NULL;
+    DisposeWindow((WindowRef) m_overlayWindow );
+#else
     if ( m_macPort )
         DisposePort( (CGrafPtr) m_macPort ) ;
 #endif