X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6239ee05567eac71754f56c2a154222d10b57ff1..115563867dac8edf57b6d2c6ae95910c7f277d77:/src/mac/carbon/dcscreen.cpp?ds=sidebyside diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp index 95bfe9dc35..1de302dade 100644 --- a/src/mac/carbon/dcscreen.cpp +++ b/src/mac/carbon/dcscreen.cpp @@ -25,7 +25,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) // Create a DC representing the whole screen wxScreenDC::wxScreenDC() { -#if wxMAC_USE_CORE_GRAPHICS CGRect cgbounds ; cgbounds = CGDisplayBounds(CGMainDisplayID()); Rect bounds; @@ -39,43 +38,12 @@ wxScreenDC::wxScreenDC() 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 ) ; - SetPort( (GrafPtr) m_macPort ) ; - Point pt = { 0,0 } ; - LocalToGlobal( &pt ) ; - SetPort( port ) ; - m_deviceLocalOriginX = -pt.h ; - m_deviceLocalOriginY = -pt.v ; - - BitMap screenBits; - GetQDGlobalsScreenBits( &screenBits ); - 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 ; - - MacSetRectRgn( (RgnHandle) m_macBoundaryClipRgn , m_minX , m_minY , m_maxX , m_maxY ) ; - OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_deviceLocalOriginX , m_deviceLocalOriginY ) ; - CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; -#endif m_ok = true ; } wxScreenDC::~wxScreenDC() { -#if wxMAC_USE_CORE_GRAPHICS delete m_graphicContext; m_graphicContext = NULL; DisposeWindow((WindowRef) m_overlayWindow ); -#else - if ( m_macPort ) - DisposePort( (CGrafPtr) m_macPort ) ; -#endif }