From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 15 Feb 2005 06:08:17 +0000 (+0000)
Subject: slowly approaching dcscreen...
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cc44c7102fbab987280ad2dca7eb1e85ac70a9f6

slowly approaching dcscreen...


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

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 451f2d7989..302e73a643 100644
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -25,8 +25,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()
 {
-#if wxMAC_USE_CORE_GRAPHICS
-#else
     m_macPort = CreateNewPort() ;
     GrafPtr port ;
     GetPort( &port ) ;
@@ -37,28 +35,35 @@ wxScreenDC::wxScreenDC()
     m_macLocalOrigin.x = -pt.h ;
     m_macLocalOrigin.y = -pt.v ;
 
-     m_ok = TRUE ;
     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );
-     m_minX = screenBits.bounds.left ;
+    m_minX = screenBits.bounds.left ;
 
-     SInt16 height ;
-     GetThemeMenuBarHeight( &height ) ;
-     m_minY = screenBits.bounds.top + height ;
+    SInt16 height ;
+    GetThemeMenuBarHeight( &height ) ;
+    m_minY = screenBits.bounds.top + height ;
 
     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 ;    
 }
 
 wxScreenDC::~wxScreenDC()
 {   
 #if wxMAC_USE_CORE_GRAPHICS
-#else
-    DisposePort( (CGrafPtr) m_macPort ) ;
+    delete m_graphicContext ;
+    m_graphicContext = NULL ;
 #endif
+
+    if ( m_macPort )
+        DisposePort( (CGrafPtr) m_macPort ) ;
 }