X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..6ba636000f13b4bf7d3e7dcfad429713085f6700:/src/mac/carbon/dcscreen.cpp?ds=sidebyside

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 1ea12f3d29..c47126248e 100644
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/dcscreen.h"
+#include "wx/mac/uma.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
@@ -22,9 +23,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()
 {
+#if TARGET_CARBON
+	m_macPort = GetQDGlobalsThePort() ;
+#else
 	m_macPort = LMGetWMgrPort() ;
+#endif
 	MacSetupPort() ;
  	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 ; 
 }
 
 wxScreenDC::~wxScreenDC()