crash upon hide fix

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

diff --git a/src/mac/dcscreen.cpp b/src/mac/dcscreen.cpp
index 1ea12f3d29c45024a2ef8e5d73f94163ebfbf70c..faef265b431dfde40a507d90d76c27726c1d1c90 100644 (file)
--- a/src/mac/dcscreen.cpp
+++ b/src/mac/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,37 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 // 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()