fixed wxScreenDC for X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -25,8 +25,18 @@ wxScreenDC::wxScreenDC()
|
|||||||
{
|
{
|
||||||
#if TARGET_CARBON
|
#if TARGET_CARBON
|
||||||
m_macPort = GetQDGlobalsThePort() ;
|
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
|
#else
|
||||||
m_macPort = LMGetWMgrPort() ;
|
m_macPort = LMGetWMgrPort() ;
|
||||||
|
m_macLocalOrigin.x = 0 ;
|
||||||
|
m_macLocalOrigin.y = 0 ;
|
||||||
#endif
|
#endif
|
||||||
m_ok = TRUE ;
|
m_ok = TRUE ;
|
||||||
BitMap screenBits;
|
BitMap screenBits;
|
||||||
@@ -40,7 +50,10 @@ wxScreenDC::wxScreenDC()
|
|||||||
m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
|
m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
|
||||||
#endif
|
#endif
|
||||||
m_maxX = screenBits.bounds.right ;
|
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()
|
||||||
|
@@ -25,8 +25,18 @@ wxScreenDC::wxScreenDC()
|
|||||||
{
|
{
|
||||||
#if TARGET_CARBON
|
#if TARGET_CARBON
|
||||||
m_macPort = GetQDGlobalsThePort() ;
|
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
|
#else
|
||||||
m_macPort = LMGetWMgrPort() ;
|
m_macPort = LMGetWMgrPort() ;
|
||||||
|
m_macLocalOrigin.x = 0 ;
|
||||||
|
m_macLocalOrigin.y = 0 ;
|
||||||
#endif
|
#endif
|
||||||
m_ok = TRUE ;
|
m_ok = TRUE ;
|
||||||
BitMap screenBits;
|
BitMap screenBits;
|
||||||
@@ -40,7 +50,10 @@ wxScreenDC::wxScreenDC()
|
|||||||
m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
|
m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
|
||||||
#endif
|
#endif
|
||||||
m_maxX = screenBits.bounds.right ;
|
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()
|
||||||
|
Reference in New Issue
Block a user