fixed wxScreenDC for X

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 1b83a9348a20fc8191f079a6f540f02738af884d..faef265b431dfde40a507d90d76c27726c1d1c90 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -25,8 +25,18 @@ wxScreenDC::wxScreenDC()
 {
 #if TARGET_CARBON
        m_macPort = GetQDGlobalsThePort() ;
 {
 #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() ;
 #else
        m_macPort = LMGetWMgrPort() ;

+       m_macLocalOrigin.x = 0 ;
+       m_macLocalOrigin.y = 0 ;

 #endif
        m_ok = TRUE ;
        BitMap screenBits;
 #endif
        m_ok = TRUE ;
        BitMap screenBits;


@@ -40,7 +50,10 @@ wxScreenDC::wxScreenDC()
        m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
  #endif
        m_maxX = screenBits.bounds.right  ;
        m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
  #endif
        m_maxX = screenBits.bounds.right  ;

-       m_maxY = screenBits.bounds.bottom ; 
+       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()
 }
 
 wxScreenDC::~wxScreenDC()

diff --git a/src/mac/dcscreen.cpp b/src/mac/dcscreen.cpp
index 1b83a9348a20fc8191f079a6f540f02738af884d..faef265b431dfde40a507d90d76c27726c1d1c90 100644 (file)
--- a/src/mac/dcscreen.cpp
+++ b/src/mac/dcscreen.cpp
@@ -25,8 +25,18 @@ wxScreenDC::wxScreenDC()
 {
 #if TARGET_CARBON
        m_macPort = GetQDGlobalsThePort() ;
 {
 #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() ;
 #else
        m_macPort = LMGetWMgrPort() ;

+       m_macLocalOrigin.x = 0 ;
+       m_macLocalOrigin.y = 0 ;

 #endif
        m_ok = TRUE ;
        BitMap screenBits;
 #endif
        m_ok = TRUE ;
        BitMap screenBits;


@@ -40,7 +50,10 @@ wxScreenDC::wxScreenDC()
        m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
  #endif
        m_maxX = screenBits.bounds.right  ;
        m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
  #endif
        m_maxX = screenBits.bounds.right  ;

-       m_maxY = screenBits.bounds.bottom ; 
+       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()
 }
 
 wxScreenDC::~wxScreenDC()