// Author: Stefan Csomor
// Modified by:
// Created: 08/05/99
-// RCS-ID:
+// RCS-ID: $Id$
// Copyright: (c) 1999 Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_GEOMETRY_H_
#define _WX_GEOMETRY_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "geometry.cpp"
-#endif
-
#include "wx/defs.h"
-#ifndef wxUSE_GEOMETRY
- #define wxUSE_GEOMETRY 0
-#endif
-
#if wxUSE_GEOMETRY
#include "wx/utils.h"
#include "wx/gdicmn.h"
-#include <math.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
wxOutBottom = 0x04
};
-class WXDLLEXPORT wxPoint2DInt
+class WXDLLIMPEXP_CORE wxPoint2DInt
{
public :
inline wxPoint2DInt();
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()
{
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;
}
// wxPoint2Ds represent a point or a vector in a 2d coordinate system
-class WXDLLEXPORT wxPoint2DDouble
+class WXDLLIMPEXP_CORE wxPoint2DDouble
{
public :
inline wxPoint2DDouble();
m_y = (m_y * length / before) ;
}
+inline void wxPoint2DDouble::Normalize()
+{
+ SetVectorLength( 1 );
+}
+
inline wxDouble wxPoint2DDouble::GetDistance( const wxPoint2DDouble &pt ) const
{
return sqrt( GetDistanceSquare( pt ) );
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;
}
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)
// 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()
*/
// 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; }
{ 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; }
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;
// 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; }
// 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; }
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;
projects / wxWidgets.git / blobdiff