X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20b6985553b4e01e7960847e3211d940aeff8742..5f7348ce627157e21bec507623ebd31c1e9dc762:/src/mac/carbon/dcscreen.cpp?ds=inline diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp index 451f2d7989..3ad0142409 100644 --- a/src/mac/carbon/dcscreen.cpp +++ b/src/mac/carbon/dcscreen.cpp @@ -18,15 +18,11 @@ #include "wx/dcscreen.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) -#endif // Create a DC representing the whole screen wxScreenDC::wxScreenDC() { -#if wxMAC_USE_CORE_GRAPHICS -#else m_macPort = CreateNewPort() ; GrafPtr port ; GetPort( &port ) ; @@ -36,29 +32,38 @@ wxScreenDC::wxScreenDC() SetPort( port ) ; m_macLocalOrigin.x = -pt.h ; m_macLocalOrigin.y = -pt.v ; - - m_ok = TRUE ; +#if wxMAC_USE_CORE_GRAPHICS + m_macLocalOriginInPort = m_macLocalOrigin ; +#endif 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 ) ; }