X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..ba8a4f660ae54de211a5869d7ea2c86cfd47cfeb:/src/mac/carbon/dcscreen.cpp

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 1ea12f3d29..03d769a05b 100644
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcscreen.cpp
 // Purpose:     wxScreenDC class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -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()
 {
-	m_macPort = LMGetWMgrPort() ;
-	MacSetupPort() ;
- 	m_ok = TRUE ;
+#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
+     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()