Commit of merge

[wxWidgets.git] / src / motif / dc.cpp

diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp
index ef06e450a4f95c1c2f4151a728d5d70e16d5972d..cc5c5359a40be7d4cef5683d2b29c5bc72abf11f 100644 (file)
--- a/src/motif/dc.cpp
+++ b/src/motif/dc.cpp
@@ -15,10 +15,9 @@
 
 #include "wx/dc.h"
 #include "wx/dcmemory.h"
+#include "wx/defs.h"
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-#endif
 
 //-----------------------------------------------------------------------------
 // constants
@@ -47,7 +46,7 @@ wxDC::wxDC()
     m_isInteractive = FALSE;
 }
 
-void wxDC::DoDrawIcon( const wxIcon &icon, long x, long y)
+void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y)
 {
     wxCHECK_RET( Ok(), "invalid dc" );
     wxCHECK_RET( icon.Ok(), "invalid icon" );
@@ -55,7 +54,7 @@ void wxDC::DoDrawIcon( const wxIcon &icon, long x, long y)
     DoDrawBitmap(icon, x, y, TRUE);
 }
 
-void wxDC::DoDrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask )
+void wxDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
 {
     wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
 
@@ -79,7 +78,7 @@ void wxDC::DoDrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask )
     memDC.SelectObject(wxNullBitmap);
 }
 
-void wxDC::DoSetClippingRegion( long x, long y, long width, long height )
+void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
     m_clipping = TRUE;
     m_clipX1 = x;
@@ -149,43 +148,35 @@ void wxDC::SetMapMode( int mode )
 
 void wxDC::SetUserScale( double x, double y )
 {
-    wxDCBase::SetUserScale(x, y);
+    // allow negative ? -> no
+    m_userScaleX = x;
+    m_userScaleY = y;
     ComputeScaleAndOrigin();
 }
 
 void wxDC::SetLogicalScale( double x, double y )
 {
-    wxDCBase::SetLogicalScale(x, y);
+    // allow negative ?
+    m_logicalScaleX = x;
+    m_logicalScaleY = y;
     ComputeScaleAndOrigin();
 }
 
-void wxDC::SetLogicalOrigin( long x, long y )
+void wxDC::SetLogicalOrigin( wxCoord x, wxCoord y )
 {
     m_logicalOriginX = x * m_signX;   // is this still correct ?
     m_logicalOriginY = y * m_signY;
     ComputeScaleAndOrigin();
 }
 
-void wxDC::SetDeviceOrigin( long x, long y )
+void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y )
 {
-    m_externalDeviceOriginX = x;
-    m_externalDeviceOriginY = y;
+    // only wxPostScripDC has m_signX = -1, we override SetDeviceOrigin there
+    m_deviceOriginX = x;
+    m_deviceOriginY = y;
     ComputeScaleAndOrigin();
 }
 
-void wxDC::SetInternalDeviceOrigin( long x, long y )
-{
-    m_internalDeviceOriginX = x;
-    m_internalDeviceOriginY = y;
-    ComputeScaleAndOrigin();
-}
-
-void wxDC::GetInternalDeviceOrigin( long *x, long *y )
-{
-    if (x) *x = m_internalDeviceOriginX;
-    if (y) *y = m_internalDeviceOriginY;
-}
-
 void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 {
     m_signX = xLeftRight ?  1 : -1;
@@ -193,67 +184,49 @@ void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
     ComputeScaleAndOrigin();
 }
 
-long wxDCBase::DeviceToLogicalX(long x) const
+wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
 {
   return ((wxDC *)this)->XDEV2LOG(x);
 }
 
-long wxDCBase::DeviceToLogicalY(long y) const
+wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
 {
   return ((wxDC *)this)->YDEV2LOG(y);
 }
 
-long wxDCBase::DeviceToLogicalXRel(long x) const
+wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
 {
   return ((wxDC *)this)->XDEV2LOGREL(x);
 }
 
-long wxDCBase::DeviceToLogicalYRel(long y) const
+wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
 {
   return ((wxDC *)this)->YDEV2LOGREL(y);
 }
 
-long wxDCBase::LogicalToDeviceX(long x) const
+wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
 {
   return ((wxDC *)this)->XLOG2DEV(x);
 }
 
-long wxDCBase::LogicalToDeviceY(long y) const
+wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
 {
   return ((wxDC *)this)->YLOG2DEV(y);
 }
 
-long wxDCBase::LogicalToDeviceXRel(long x) const
+wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
 {
   return ((wxDC *)this)->XLOG2DEVREL(x);
 }
 
-long wxDCBase::LogicalToDeviceYRel(long y) const
+wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
 {
   return ((wxDC *)this)->YLOG2DEVREL(y);
 }
 
 void wxDC::ComputeScaleAndOrigin()
 {
-    // CMB: copy scale to see if it changes
-    double origScaleX = m_scaleX;
-    double origScaleY = m_scaleY;
-
     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;
-
-    m_deviceOriginX = m_internalDeviceOriginX + m_externalDeviceOriginX;
-    m_deviceOriginY = m_internalDeviceOriginY + m_externalDeviceOriginY;
-
-    // CMB: if scale has changed call SetPen to recalulate the line width
-    if (m_scaleX != origScaleX || m_scaleY != origScaleY)
-    {
-        // this is a bit artificial, but we need to force wxDC to think
-        // the pen has changed
-        wxPen* pen = & GetPen();
-        wxPen tempPen;
-        m_pen = tempPen;
-        SetPen(* pen);
-    }
 }