X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d0430ee2bab2a2c12485f64f003b2d4573a946e8..54aa3821fc7c1df012efc5e5dd4a09ab5ed8d90d:/include/wx/geometry.h diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 1dedc55fc5..2aa92a80f9 100644 --- a/include/wx/geometry.h +++ b/include/wx/geometry.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 08/05/99 -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) 1999 Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,10 +12,6 @@ #ifndef _WX_GEOMETRY_H_ #define _WX_GEOMETRY_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "geometry.h" -#endif - #include "wx/defs.h" #if wxUSE_GEOMETRY @@ -24,14 +20,6 @@ #include "wx/gdicmn.h" #include "wx/math.h" -#ifdef __WXMSW__ - #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c ) -#elif defined( __WXMAC__ ) - #define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) ) -#else - #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c)))) -#endif - class WXDLLIMPEXP_BASE wxDataInputStream; class WXDLLIMPEXP_BASE wxDataOutputStream; @@ -453,12 +441,12 @@ inline wxPoint2DDouble& wxPoint2DDouble::operator/=(const wxPoint2DDouble& pt) inline bool wxPoint2DDouble::operator==(const wxPoint2DDouble& pt) const { - return m_x == pt.m_x && m_y == pt.m_y; + return wxIsSameDouble(m_x, pt.m_x) && wxIsSameDouble(m_y, pt.m_y); } inline bool wxPoint2DDouble::operator!=(const wxPoint2DDouble& pt) const { - return m_x != pt.m_x || m_y != pt.m_y; + return !(*this == pt); } inline wxPoint2DDouble operator+(const wxPoint2DDouble& pt1 , const wxPoint2DDouble& pt2) @@ -594,9 +582,9 @@ public: { return ( ( ( m_x <= rect.m_x ) && ( rect.m_x + rect.m_width <= m_x + m_width ) ) && ( ( m_y <= rect.m_y ) && ( rect.m_y + rect.m_height <= m_y + m_height ) ) ); } inline bool IsEmpty() const - { return ( m_width <= 0 || m_height <= 0 ); } + { return m_width <= 0 || m_height <= 0; } inline bool HaveEqualSize( const wxRect2DDouble &rect ) const - { return ( rect.m_width == m_width && rect.m_height == m_height ); } + { return wxIsSameDouble(rect.m_width, m_width) && wxIsSameDouble(rect.m_height, m_height); } inline void Inset( wxDouble x , wxDouble y ) { m_x += x; m_y += y; m_width -= 2 * x; m_height -= 2 * y; } @@ -631,9 +619,9 @@ public: m_width *= ((wxDouble)num)/((wxDouble)denum); m_height *= ((wxDouble)num)/((wxDouble)denum);} wxRect2DDouble& operator = (const wxRect2DDouble& rect); - inline bool operator == (const wxRect2DDouble& rect) - { return (m_x==rect.m_x && m_y==rect.m_y && m_width==rect.m_width && m_height==rect.m_height); } - inline bool operator != (const wxRect2DDouble& rect) + inline bool operator == (const wxRect2DDouble& rect) const + { return wxIsSameDouble(m_x, rect.m_x) && wxIsSameDouble(m_y, rect.m_y) && HaveEqualSize(rect); } + inline bool operator != (const wxRect2DDouble& rect) const { return !(*this == rect); } wxDouble m_x; @@ -785,6 +773,7 @@ inline bool wxRect2DInt::operator != (const wxRect2DInt& rect) const class wxTransform2D { public : + virtual ~wxTransform2D() { } virtual void Transform( wxPoint2DInt* pt )const = 0; virtual void Transform( wxRect2DInt* r ) const; virtual wxPoint2DInt Transform( const wxPoint2DInt &pt ) const;