Don't do the wx cleanup if wxPython didn't do the initialization.

[wxWidgets.git] / src / mac / carbon / dcscreen.cpp

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 1ea12f3d29c45024a2ef8e5d73f94163ebfbf70c..1b83a9348a20fc8191f079a6f540f02738af884d 100644 (file)
--- 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,24 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()
 {
+#if TARGET_CARBON
+       m_macPort = GetQDGlobalsThePort() ;
+#else
        m_macPort = LMGetWMgrPort() ;
-       MacSetupPort() ;
+#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 ; 
 }
 
 wxScreenDC::~wxScreenDC()