X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2d6d210991fb1d29570a46e0f26c7a4b9cf89ff..8cb1060f1e2f2cbbcaebcc668dccefdd79804662:/src/mac/carbon/dcscreen.cpp?ds=inline diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp index 2468ce77db..07e8218b4b 100644 --- a/src/mac/carbon/dcscreen.cpp +++ b/src/mac/carbon/dcscreen.cpp @@ -14,6 +14,7 @@ #include "wx/dcscreen.h" #include "wx/mac/uma.h" +#include "wx/graphics.h" IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) @@ -42,8 +43,8 @@ wxScreenDC::wxScreenDC() Point pt = { 0,0 } ; LocalToGlobal( &pt ) ; SetPort( port ) ; - m_macLocalOrigin.x = -pt.h ; - m_macLocalOrigin.y = -pt.v ; + m_deviceLocalOriginX = -pt.h ; + m_deviceLocalOriginY = -pt.v ; BitMap screenBits; GetQDGlobalsScreenBits( &screenBits ); @@ -57,7 +58,7 @@ wxScreenDC::wxScreenDC() m_maxY = screenBits.bounds.bottom ; MacSetRectRgn( (RgnHandle) m_macBoundaryClipRgn , m_minX , m_minY , m_maxX , m_maxY ) ; - OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; + OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_deviceLocalOriginX , m_deviceLocalOriginY ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; #endif m_ok = true ;