X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa9666fbe69e76f57042b46ba2c8ad5b18a527b6..7890a36c9c34b5626ceada90956d0c69941a56af:/src/mac/carbon/dcscreen.cpp

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 6ed78b6353..6f7d714228 100644
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dcscreen.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/dcscreen.h"
 #include "wx/mac/uma.h"
 
@@ -23,7 +25,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()
 {
-#if TARGET_CARBON
     m_macPort = CreateNewPort() ;
     GrafPtr port ;
     GetPort( &port ) ;
@@ -33,31 +34,38 @@ wxScreenDC::wxScreenDC()
     SetPort( port ) ;
     m_macLocalOrigin.x = -pt.h ;
     m_macLocalOrigin.y = -pt.v ;
-#else
-    m_macPort = LMGetWMgrPort() ;
-    m_macLocalOrigin.x = 0 ;
-    m_macLocalOrigin.y = 0 ;
+#if wxMAC_USE_CORE_GRAPHICS
+    m_macLocalOriginInPort = m_macLocalOrigin ;
 #endif
-     m_ok = TRUE ;
     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );
-     m_minX = screenBits.bounds.left ;
- #if TARGET_CARBON
-     SInt16 height ;
-     GetThemeMenuBarHeight( &height ) ;
-     m_minY = screenBits.bounds.top + height ;
- #else
-     m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
- #endif
+    m_minX = screenBits.bounds.left ;
+
+    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()
 {   
-    DisposePort( (CGrafPtr) m_macPort ) ;
+#if wxMAC_USE_CORE_GRAPHICS
+    delete m_graphicContext ;
+    m_graphicContext = NULL ;
+#endif
+
+    if ( m_macPort )
+        DisposePort( (CGrafPtr) m_macPort ) ;
 }