adding measuring contexts, streamlining printing code

[wxWidgets.git] / include / wx / mgl / dc.h

diff --git a/include/wx/mgl/dc.h b/include/wx/mgl/dc.h
index a838fcd724491e5a52844665a909a6ba1df39447..eafae450541d68ff897e19ec389119b2cc16bc1d 100644 (file)
--- a/include/wx/mgl/dc.h
+++ b/include/wx/mgl/dc.h
@@ -101,35 +101,35 @@ public:
 
     wxCoord XDEV2LOG(wxCoord x) const
     {
 
     wxCoord XDEV2LOG(wxCoord x) const
     {

-        return wxCoordRound((double)(x - m_deviceOriginX) / m_scaleX) * m_signX + m_logicalOriginX;
+        return wxRound((double)(x - m_deviceOriginX) / m_scaleX) * m_signX + m_logicalOriginX;

     }
     wxCoord XDEV2LOGREL(wxCoord x) const
     {
     }
     wxCoord XDEV2LOGREL(wxCoord x) const
     {

-        return wxCoordRound((double)(x) / m_scaleX);
+        return wxRound((double)(x) / m_scaleX);

     }
     wxCoord YDEV2LOG(wxCoord y) const
     {
     }
     wxCoord YDEV2LOG(wxCoord y) const
     {

-        return wxCoordRound((double)(y - m_deviceOriginY) / m_scaleY) * m_signY + m_logicalOriginY;
+        return wxRound((double)(y - m_deviceOriginY) / m_scaleY) * m_signY + m_logicalOriginY;

     }
     wxCoord YDEV2LOGREL(wxCoord y) const
     {
     }
     wxCoord YDEV2LOGREL(wxCoord y) const
     {

-        return wCoordRound((double)(y) / m_scaleY);
+        return wxRound((double)(y) / m_scaleY);

     }
     wxCoord XLOG2DEV(wxCoord x) const
     {
     }
     wxCoord XLOG2DEV(wxCoord x) const
     {

-        return wxCoordRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX;
+        return wxRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX;

     }
     wxCoord XLOG2DEVREL(wxCoord x) const
     {
     }
     wxCoord XLOG2DEVREL(wxCoord x) const
     {

-        return wxCoordRound((double)(x) * m_scaleX);
+        return wxRound((double)(x) * m_scaleX);

     }
     wxCoord YLOG2DEV(wxCoord y) const
     {
     }
     wxCoord YLOG2DEV(wxCoord y) const
     {

-        return wxCoordRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY;
+        return wxRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY;

     }
     wxCoord YLOG2DEVREL(wxCoord y) const
     {
     }
     wxCoord YLOG2DEVREL(wxCoord y) const
     {

-        return wxCoordRound((double)(y) * m_scaleY);
+        return wxRound((double)(y) * m_scaleY);

     }
 
     MGLDevCtx *GetMGLDC() const { return m_MGLDC; }
     }
 
     MGLDevCtx *GetMGLDC() const { return m_MGLDC; }