X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/888dde65f43d5f57e8fb2028b27191cca1741403..7379e47609b16a9fef59e1d2a6b2e47f216dd85c:/src/common/dcgraph.cpp

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 4e1fdfed7f..d6e6112d96 100644
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -52,19 +52,23 @@ static inline double DegToRad(double deg)
 
 IMPLEMENT_DYNAMIC_CLASS(wxGCDC, wxDC)
 
-wxGCDC::wxGCDC(const wxWindowDC& dc)
+wxGCDC::wxGCDC(const wxWindowDC& dc) :
+  wxDC( new wxGCDCImpl( this, dc ) )
 {
-    m_pimpl = new wxGCDCImpl( this, dc );
 }
 
-wxGCDC::wxGCDC( const wxMemoryDC& dc)
+wxGCDC::wxGCDC( const wxMemoryDC& dc) :
+  wxDC( new wxGCDCImpl( this, dc ) )
 {
-    m_pimpl = new wxGCDCImpl( this, dc );
 }
 
-wxGCDC::wxGCDC()
+wxGCDC::wxGCDC() :
+  wxDC( new wxGCDCImpl( this ) )
+{
+}
+
+wxGCDC::~wxGCDC()
 {
-    m_pimpl = new wxGCDCImpl( this );
 }
 
 wxGraphicsContext* wxGCDC::GetGraphicsContext()
@@ -326,44 +330,6 @@ void wxGCDCImpl::SetMapMode( int mode )
     ComputeScaleAndOrigin();
 }
 
-void wxGCDCImpl::SetUserScale( double x, double y )
-{
-    // allow negative ? -> no
-
-    m_userScaleX = x;
-    m_userScaleY = y;
-    ComputeScaleAndOrigin();
-}
-
-void wxGCDCImpl::SetLogicalScale( double x, double y )
-{
-    // allow negative ?
-    m_logicalScaleX = x;
-    m_logicalScaleY = y;
-    ComputeScaleAndOrigin();
-}
-
-void wxGCDCImpl::SetLogicalOrigin( wxCoord x, wxCoord y )
-{
-    m_logicalOriginX = x * m_signX;   // is this still correct ?
-    m_logicalOriginY = y * m_signY;
-    ComputeScaleAndOrigin();
-}
-
-void wxGCDCImpl::SetDeviceOrigin( wxCoord x, wxCoord y )
-{
-    m_deviceOriginX = x;
-    m_deviceOriginY = y;
-    ComputeScaleAndOrigin();
-}
-
-void wxGCDCImpl::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
-{
-    m_signX = (xLeftRight ?  1 : -1);
-    m_signY = (yBottomUp ? -1 :  1);
-    ComputeScaleAndOrigin();
-}
-
 wxSize wxGCDCImpl::GetPPI() const
 {
     return wxSize(72, 72);
@@ -375,9 +341,8 @@ int wxGCDCImpl::GetDepth() const
 }
 
 void wxGCDCImpl::ComputeScaleAndOrigin()
-{
-    m_scaleX = m_logicalScaleX * m_userScaleX;
-    m_scaleY = m_logicalScaleY * m_userScaleY;
+{    
+    wxDCImpl::ComputeScaleAndOrigin();
 
     if ( m_graphicContext )
     {