Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix X11 build after wxDC changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-12-15 14:07:32 +00:00
parent b733a0174a
commit f95b06a67c
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/x11/dcclient.cpp
View File

@@ -2208,7 +2208,7 @@ void wxWindowDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, w
wxCoord xx, yy, ww, hh; wxCoord xx, yy, ww, hh;
m_currentClippingRegion.GetBox( xx, yy, ww, hh ); m_currentClippingRegion.GetBox( xx, yy, ww, hh );
wxDCImpl::DoSetClippingRegion( xx, yy, ww, hh ); wxX11DCImpl::DoSetClippingRegion( xx, yy, ww, hh );
XSetRegion( (Display*) m_display, (GC) m_penGC, (Region) m_currentClippingRegion.GetX11Region() ); XSetRegion( (Display*) m_display, (GC) m_penGC, (Region) m_currentClippingRegion.GetX11Region() );
XSetRegion( (Display*) m_display, (GC) m_brushGC, (Region) m_currentClippingRegion.GetX11Region() ); XSetRegion( (Display*) m_display, (GC) m_brushGC, (Region) m_currentClippingRegion.GetX11Region() );
@@ -2240,7 +2240,7 @@ void wxWindowDCImpl::DoSetClippingRegionAsRegion( const wxRegion& region )
wxCoord xx, yy, ww, hh; wxCoord xx, yy, ww, hh;
m_currentClippingRegion.GetBox( xx, yy, ww, hh ); m_currentClippingRegion.GetBox( xx, yy, ww, hh );
wxDCImpl::DoSetClippingRegion( xx, yy, ww, hh ); wxX11DCImpl::DoSetClippingRegion( xx, yy, ww, hh );
XSetRegion( (Display*) m_display, (GC) m_penGC, (Region) m_currentClippingRegion.GetX11Region() ); XSetRegion( (Display*) m_display, (GC) m_penGC, (Region) m_currentClippingRegion.GetX11Region() );
XSetRegion( (Display*) m_display, (GC) m_brushGC, (Region) m_currentClippingRegion.GetX11Region() ); XSetRegion( (Display*) m_display, (GC) m_brushGC, (Region) m_currentClippingRegion.GetX11Region() );

8
src/x11/dcscreen.cpp
View File

@@ -32,8 +32,8 @@
IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl,wxPaintDCImpl) IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl,wxPaintDCImpl)
wxScreenDCImpl::wxScreenDCImpl( wxDC* owner ) : wxScreenDCImpl::wxScreenDCImpl( wxDC* owner )
wxPaintDCImpl( owner ) : wxPaintDCImpl( owner )
{ {
m_ok = false; m_ok = false;
@@ -67,3 +67,7 @@ wxScreenDCImpl::~wxScreenDCImpl()
XSetSubwindowMode( (Display*) m_display, (GC) m_bgGC, ClipByChildren ); XSetSubwindowMode( (Display*) m_display, (GC) m_bgGC, ClipByChildren );
} }
void wxScreenDCImpl::DoGetSize(int *width, int *height) const
{
wxDisplaySize(width, height);
}