X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..d99937cdd8f235561c1f5358478878111826a317:/src/mac/carbon/dcscreen.cpp

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index c47126248e..faef265b43 100644
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -25,10 +25,19 @@ wxScreenDC::wxScreenDC()
 {
 #if TARGET_CARBON
 	m_macPort = GetQDGlobalsThePort() ;
+	GrafPtr port ;
+	GetPort( &port ) ;
+	SetPort( (GrafPtr) m_macPort ) ;
+	Point pt = { 0,0 } ;
+    LocalToGlobal( &pt ) ; 	
+	SetPort( port ) ;
+	m_macLocalOrigin.x = -pt.h ;
+	m_macLocalOrigin.y = -pt.v ;
 #else
 	m_macPort = LMGetWMgrPort() ;
+	m_macLocalOrigin.x = 0 ;
+	m_macLocalOrigin.y = 0 ;
 #endif
-	MacSetupPort() ;
  	m_ok = TRUE ;
 	BitMap screenBits;
 	GetQDGlobalsScreenBits( &screenBits );
@@ -41,7 +50,10 @@ wxScreenDC::wxScreenDC()
  	m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
  #endif
 	m_maxX = screenBits.bounds.right  ;
-	m_maxY = screenBits.bounds.bottom ; 
+	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 ) ;
+	CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
 }
 
 wxScreenDC::~wxScreenDC()