X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04ab8b6ddfa26fbabeadad36966a21a42fe649b1..71a09c3579dd5cb4cd8fa7fdc143561cbff74e12:/src/x11/dc.cpp?ds=sidebyside diff --git a/src/x11/dc.cpp b/src/x11/dc.cpp index 1433d94f4a..25a110715f 100644 --- a/src/x11/dc.cpp +++ b/src/x11/dc.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -13,18 +12,20 @@ #include "wx/wxprec.h" #include "wx/dc.h" +#include "wx/x11/dc.h" #ifndef WX_PRECOMP #include "wx/dcmemory.h" #endif -IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxX11DCImpl, wxDCImpl) //----------------------------------------------------------------------------- // wxDC //----------------------------------------------------------------------------- -wxDC::wxDC() +wxX11DCImpl::wxX11DCImpl( wxDC *owner ) : + wxDCImpl( owner ) { m_ok = false; @@ -35,7 +36,7 @@ wxDC::wxDC() m_backgroundMode = wxTRANSPARENT; } -void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) +void wxX11DCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { m_clipping = true; m_clipX1 = x; @@ -44,10 +45,10 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei m_clipY2 = y + height; } -void wxDC::DoGetSizeMM( int* width, int* height ) const +void wxX11DCImpl::DoGetSizeMM( int* width, int* height ) const { int w, h; - GetSize( &w, &h ); + DoGetSize( &w, &h ); if ( width ) *width = int( double(w) / (m_scaleX*m_mm_to_pix_x) ); @@ -56,7 +57,7 @@ void wxDC::DoGetSizeMM( int* width, int* height ) const } // Resolution in pixels per logical inch -wxSize wxDC::GetPPI() const +wxSize wxX11DCImpl::GetPPI() const { // TODO (should probably be pure virtual) return wxSize(0, 0);