X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c77a67962c2f50a872491869fcf1a6c082fdc6c6..77c8efc8c37da6d6a5e2e8022d21d1cd7d76371d:/include/wx/geometry.h diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 92c2bcbc0d..63d120b20e 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 ///////////////////////////////////////////////////////////////////////////// @@ -20,16 +20,8 @@ #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; +class WXDLLIMPEXP_FWD_BASE wxDataInputStream; +class WXDLLIMPEXP_FWD_BASE wxDataOutputStream; // clipping from Cohen-Sutherland @@ -42,7 +34,7 @@ enum wxOutCode wxOutBottom = 0x04 }; -class WXDLLEXPORT wxPoint2DInt +class WXDLLIMPEXP_CORE wxPoint2DInt { public : inline wxPoint2DInt(); @@ -96,12 +88,9 @@ inline wxPoint2DInt operator+(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2) inline wxPoint2DInt operator-(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); inline wxPoint2DInt operator*(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt); -inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt); -inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n); inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n); inline wxPoint2DInt operator/(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n); -inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n); inline wxPoint2DInt::wxPoint2DInt() { @@ -190,8 +179,11 @@ inline wxPoint2DInt wxPoint2DInt::operator-() inline wxPoint2DInt& wxPoint2DInt::operator=(const wxPoint2DInt& pt) { - m_x = pt.m_x; - m_y = pt.m_y; + if (this != &pt) + { + m_x = pt.m_x; + m_y = pt.m_y; + } return *this; } @@ -286,7 +278,7 @@ inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxDouble n) // wxPoint2Ds represent a point or a vector in a 2d coordinate system -class WXDLLEXPORT wxPoint2DDouble +class WXDLLIMPEXP_CORE wxPoint2DDouble { public : inline wxPoint2DDouble(); @@ -387,6 +379,11 @@ inline void wxPoint2DDouble::SetVectorLength( wxDouble length ) m_y = (m_y * length / before) ; } +inline void wxPoint2DDouble::Normalize() +{ + SetVectorLength( 1 ); +} + inline wxDouble wxPoint2DDouble::GetDistance( const wxPoint2DDouble &pt ) const { return sqrt( GetDistanceSquare( pt ) ); @@ -414,8 +411,11 @@ inline wxPoint2DDouble wxPoint2DDouble::operator-() inline wxPoint2DDouble& wxPoint2DDouble::operator=(const wxPoint2DDouble& pt) { - m_x = pt.m_x; - m_y = pt.m_y; + if (this != &pt) + { + m_x = pt.m_x; + m_y = pt.m_y; + } return *this; } @@ -512,7 +512,7 @@ inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt , wxInt32 n) // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if // left <= x < right and top <= m_y < bottom , thus it is a half open interval. -class WXDLLEXPORT wxRect2DDouble +class WXDLLIMPEXP_CORE wxRect2DDouble { public: wxRect2DDouble() @@ -526,13 +526,13 @@ public: */ // single attribute accessors - inline wxPoint2DDouble GetPosition() + wxPoint2DDouble GetPosition() const { return wxPoint2DDouble(m_x, m_y); } - inline wxSize GetSize() + wxSize GetSize() const { return wxSize((int) m_width, (int) m_height); } - // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their - // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately + // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their + // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately inline wxDouble GetLeft() const { return m_x; } inline void SetLeft( wxDouble n ) { m_width += m_x - n; m_x = n; } @@ -643,7 +643,7 @@ public: // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if // left <= x < right and top <= m_y < bottom , thus it is a half open interval. -class WXDLLEXPORT wxRect2DInt +class WXDLLIMPEXP_CORE wxRect2DInt { public: wxRect2DInt() { m_x = m_y = m_width = m_height = 0; } @@ -655,11 +655,11 @@ public: // single attribute accessors - inline wxPoint2DInt GetPosition() { return wxPoint2DInt(m_x, m_y); } - inline wxSize GetSize() { return wxSize(m_width, m_height); } + wxPoint2DInt GetPosition() const { return wxPoint2DInt(m_x, m_y); } + wxSize GetSize() const { return wxSize(m_width, m_height); } - // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their - // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately + // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their + // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately inline wxInt32 GetLeft() const { return m_x; } inline void SetLeft( wxInt32 n ) { m_width += m_x - n; m_x = n; }