X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..62d3ee70e51f335188a788372a3e66acbcd0bb63:/src/mac/dcscreen.cpp?ds=sidebyside

diff --git a/src/mac/dcscreen.cpp b/src/mac/dcscreen.cpp
index 1d802afba4..faef265b43 100644
--- a/src/mac/dcscreen.cpp
+++ b/src/mac/dcscreen.cpp
@@ -14,15 +14,46 @@
 #endif
 
 #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 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() ;
-	MacSetupPort() ;
+	m_macLocalOrigin.x = 0 ;
+	m_macLocalOrigin.y = 0 ;
+#endif
  	m_ok = TRUE ;
+	BitMap screenBits;
+	GetQDGlobalsScreenBits( &screenBits );
+ 	m_minX = screenBits.bounds.left ;
+ #if TARGET_CARBON
+ 	SInt16 height ;
+ 	GetThemeMenuBarHeight( &height ) ;
+ 	m_minY = screenBits.bounds.top + height ;
+ #else
+ 	m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
+ #endif
+	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_macLocalOrigin.x , m_macLocalOrigin.y ) ;
+	CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
 }
 
 wxScreenDC::~wxScreenDC()