From 3cf279b8617f6c436848fb16237ec29768b61ed7 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 1 May 2007 22:20:56 +0000 Subject: [PATCH] Renamed wxDCBase::LogicalTo ... to wxDC::.. here, too. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/dccg.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp index 353e7c10f8..ed3296bac4 100755 --- a/src/mac/carbon/dccg.cpp +++ b/src/mac/carbon/dccg.cpp @@ -2298,42 +2298,42 @@ void wxDC::Clear(void) return (wxCoord)((double)new_y * m_scaleY - 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y; } */ // TODO -wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const +wxCoord wxDC::DeviceToLogicalX(wxCoord x) const { return wxRound((double)(x - m_deviceOriginX) / m_scaleX) * m_signX + m_logicalOriginX; } -wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const +wxCoord wxDC::DeviceToLogicalY(wxCoord y) const { return wxRound((double)(y - m_deviceOriginY) / m_scaleY) * m_signY + m_logicalOriginY; } -wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const +wxCoord wxDC::DeviceToLogicalXRel(wxCoord x) const { return wxRound((double)(x) / m_scaleX); } -wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const +wxCoord wxDC::DeviceToLogicalYRel(wxCoord y) const { return wxRound((double)(y) / m_scaleY); } -wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const +wxCoord wxDC::LogicalToDeviceX(wxCoord x) const { return wxRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX; } -wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const +wxCoord wxDC::LogicalToDeviceY(wxCoord y) const { return wxRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY; } -wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const +wxCoord wxDC::LogicalToDeviceXRel(wxCoord x) const { return wxRound((double)(x) * m_scaleX); } -wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const +wxCoord wxDC::LogicalToDeviceYRel(wxCoord y) const { return wxRound((double)(y) * m_scaleY); } -- 2.45.2