X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1181ee3f2d466ef964633830f90951dcd2f61dac..8c981ec64d9a86e9bad5f4ef16f496513bce31f6:/src/mac/carbon/dcscreen.cpp diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp index 85ca733a5e..b321bfcfb1 100644 --- a/src/mac/carbon/dcscreen.cpp +++ b/src/mac/carbon/dcscreen.cpp @@ -1,26 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcscreen.cpp +// Name: src/mac/carbon/dcscreen.cpp // Purpose: wxScreenDC class // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#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" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) -#endif // Create a DC representing the whole screen wxScreenDC::wxScreenDC() @@ -30,12 +25,13 @@ wxScreenDC::wxScreenDC() GetPort( &port ) ; SetPort( (GrafPtr) m_macPort ) ; Point pt = { 0,0 } ; - LocalToGlobal( &pt ) ; + LocalToGlobal( &pt ) ; 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 ; @@ -48,17 +44,17 @@ wxScreenDC::wxScreenDC() m_maxY = screenBits.bounds.bottom ; #if wxMAC_USE_CORE_GRAPHICS - m_graphicContext = new wxMacCGContext( port ) ; + 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 ; + m_ok = true ; } wxScreenDC::~wxScreenDC() -{ +{ #if wxMAC_USE_CORE_GRAPHICS delete m_graphicContext ; m_graphicContext = NULL ; @@ -67,4 +63,3 @@ wxScreenDC::~wxScreenDC() if ( m_macPort ) DisposePort( (CGrafPtr) m_macPort ) ; } -