From f95b06a67c05b1ee51a2ac73a119647a1e6ba1d0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 15 Dec 2007 14:07:32 +0000 Subject: [PATCH] fix X11 build after wxDC changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/x11/dcclient.cpp | 4 ++-- src/x11/dcscreen.cpp | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp index b3969a1a32..8475d387d0 100644 --- a/src/x11/dcclient.cpp +++ b/src/x11/dcclient.cpp @@ -2208,7 +2208,7 @@ void wxWindowDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, w wxCoord 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_brushGC, (Region) m_currentClippingRegion.GetX11Region() ); @@ -2240,7 +2240,7 @@ void wxWindowDCImpl::DoSetClippingRegionAsRegion( const wxRegion& region ) wxCoord 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_brushGC, (Region) m_currentClippingRegion.GetX11Region() ); diff --git a/src/x11/dcscreen.cpp b/src/x11/dcscreen.cpp index 1683688160..7eff9560cd 100644 --- a/src/x11/dcscreen.cpp +++ b/src/x11/dcscreen.cpp @@ -32,8 +32,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl,wxPaintDCImpl) -wxScreenDCImpl::wxScreenDCImpl( wxDC* owner ) : - wxPaintDCImpl( owner ) +wxScreenDCImpl::wxScreenDCImpl( wxDC* owner ) + : wxPaintDCImpl( owner ) { m_ok = false; @@ -67,3 +67,7 @@ wxScreenDCImpl::~wxScreenDCImpl() XSetSubwindowMode( (Display*) m_display, (GC) m_bgGC, ClipByChildren ); } +void wxScreenDCImpl::DoGetSize(int *width, int *height) const +{ + wxDisplaySize(width, height); +}