Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxCoordRound -> wxRound.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-10-29 17:55:09 +00:00
parent 2ac9bfa9b0
commit 0e1ea39668
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/mac/carbon/dc.h
View File

@@ -158,45 +158,45 @@ public:
public: 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);
} }
wxCoord XLOG2DEVMAC(wxCoord x) const wxCoord XLOG2DEVMAC(wxCoord x) const
{ {
return wxCoordRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX + m_macLocalOrigin.x; return wxRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX + m_macLocalOrigin.x;
} }
wxCoord YLOG2DEVMAC(wxCoord y) const wxCoord YLOG2DEVMAC(wxCoord y) const
{ {
return wxCoordRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY + m_macLocalOrigin.y; return wxRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY + m_macLocalOrigin.y;
} }
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS

20
include/wx/mac/classic/dc.h
View File

@@ -105,45 +105,45 @@ class WXDLLEXPORT wxDC: public wxDCBase
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);
} }
wxCoord XLOG2DEVMAC(wxCoord x) const wxCoord XLOG2DEVMAC(wxCoord x) const
{ {
return wxCoordRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX + m_macLocalOrigin.x; return wxRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX + m_macLocalOrigin.x;
} }
wxCoord YLOG2DEVMAC(wxCoord y) const wxCoord YLOG2DEVMAC(wxCoord y) const
{ {
return wxCoordRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY + m_macLocalOrigin.y; return wxRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY + m_macLocalOrigin.y;
} }
WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn ; } WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn ; }