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

must delcare methods as inline if we are going to actually inline them after the declarations or else some compilers will error in a linkage mismatch.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-06-12 18:57:26 +00:00
parent 716cd4107b
commit f91de7da18
1 changed files with 289 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
include/wx/geometry.h
View File

@@ -60,42 +60,42 @@ enum wxOutCode
class WXDLLEXPORT wxPoint2DDouble class WXDLLEXPORT wxPoint2DDouble
{ {
public : public :
wxPoint2DDouble(); inline wxPoint2DDouble();
wxPoint2DDouble( wxDouble x , wxDouble y ) ; inline wxPoint2DDouble( wxDouble x , wxDouble y ) ;
wxPoint2DDouble( const wxPoint2DDouble &pt ) ; inline wxPoint2DDouble( const wxPoint2DDouble &pt ) ;
// two different conversions to integers, floor and rounding // two different conversions to integers, floor and rounding
void GetFloor( wxInt32 *x , wxInt32 *y ) ; inline void GetFloor( wxInt32 *x , wxInt32 *y ) ;
void GetRounded( wxInt32 *x , wxInt32 *y ) ; inline void GetRounded( wxInt32 *x , wxInt32 *y ) ;
wxDouble GetVectorLength() ; inline wxDouble GetVectorLength() ;
wxDouble GetVectorAngle() ; inline wxDouble GetVectorAngle() ;
void SetVectorLength( wxDouble length ) ; void SetVectorLength( wxDouble length ) ;
void SetVectorAngle( wxDouble degrees ) ; void SetVectorAngle( wxDouble degrees ) ;
void SetPolarCoordinates( wxDouble angle , wxDouble length ) ; void SetPolarCoordinates( wxDouble angle , wxDouble length ) ;
// set the vector length to 1.0, preserving the angle // set the vector length to 1.0, preserving the angle
void Normalize() ; void Normalize() ;
wxDouble GetDistance( const wxPoint2DDouble &pt ) ; inline wxDouble GetDistance( const wxPoint2DDouble &pt ) ;
wxDouble GetDistanceSquare( const wxPoint2DDouble &pt ) ; inline wxDouble GetDistanceSquare( const wxPoint2DDouble &pt ) ;
wxDouble GetDotProduct( const wxPoint2DDouble &vec ) ; inline wxDouble GetDotProduct( const wxPoint2DDouble &vec ) ;
wxDouble GetCrossProduct( const wxPoint2DDouble &vec ) ; inline wxDouble GetCrossProduct( const wxPoint2DDouble &vec ) ;
// the reflection of this point // the reflection of this point
wxPoint2DDouble operator-() ; inline wxPoint2DDouble operator-() ;
wxPoint2DDouble& operator=(const wxPoint2DDouble& pt) ; inline wxPoint2DDouble& operator=(const wxPoint2DDouble& pt) ;
wxPoint2DDouble& operator+=(const wxPoint2DDouble& pt) ; inline wxPoint2DDouble& operator+=(const wxPoint2DDouble& pt) ;
wxPoint2DDouble& operator-=(const wxPoint2DDouble& pt) ; inline wxPoint2DDouble& operator-=(const wxPoint2DDouble& pt) ;
wxPoint2DDouble& operator*=(const wxPoint2DDouble& pt) ; inline wxPoint2DDouble& operator*=(const wxPoint2DDouble& pt) ;
wxPoint2DDouble& operator*=(wxDouble n) ; inline wxPoint2DDouble& operator*=(wxDouble n) ;
wxPoint2DDouble& operator*=(wxInt32 n) ; inline wxPoint2DDouble& operator*=(wxInt32 n) ;
wxPoint2DDouble& operator/=(const wxPoint2DDouble& pt) ; inline wxPoint2DDouble& operator/=(const wxPoint2DDouble& pt) ;
wxPoint2DDouble& operator/=(wxDouble n) ; inline wxPoint2DDouble& operator/=(wxDouble n) ;
wxPoint2DDouble& operator/=(wxInt32 n) ; inline wxPoint2DDouble& operator/=(wxInt32 n) ;
bool operator==(const wxPoint2DDouble& pt) const ; inline bool operator==(const wxPoint2DDouble& pt) const ;
bool operator!=(const wxPoint2DDouble& pt) const ; inline bool operator!=(const wxPoint2DDouble& pt) const ;
wxDouble m_x ; wxDouble m_x ;
wxDouble m_y ; wxDouble m_y ;
@@ -394,43 +394,43 @@ public:
class WXDLLEXPORT wxPoint2DInt class WXDLLEXPORT wxPoint2DInt
{ {
public : public :
wxPoint2DInt(); inline wxPoint2DInt();
wxPoint2DInt( wxInt32 x , wxInt32 y ) ; inline wxPoint2DInt( wxInt32 x , wxInt32 y ) ;
wxPoint2DInt( const wxPoint2DInt &pt ) ; inline wxPoint2DInt( const wxPoint2DInt &pt ) ;
wxPoint2DInt( const wxPoint &pt ) ; inline wxPoint2DInt( const wxPoint &pt ) ;
// two different conversions to integers, floor and rounding // two different conversions to integers, floor and rounding
void GetFloor( wxInt32 *x , wxInt32 *y ) ; inline void GetFloor( wxInt32 *x , wxInt32 *y ) ;
void GetRounded( wxInt32 *x , wxInt32 *y ) ; inline void GetRounded( wxInt32 *x , wxInt32 *y ) ;
wxDouble GetVectorLength() ; inline wxDouble GetVectorLength() ;
wxDouble GetVectorAngle() ; wxDouble GetVectorAngle() ;
void SetVectorLength( wxDouble length ) ; inline void SetVectorLength( wxDouble length ) ;
void SetVectorAngle( wxDouble degrees ) ; void SetVectorAngle( wxDouble degrees ) ;
void SetPolarCoordinates( wxInt32 angle , wxInt32 length ) ; void SetPolarCoordinates( wxInt32 angle , wxInt32 length ) ;
// set the vector length to 1.0, preserving the angle // set the vector length to 1.0, preserving the angle
void Normalize() ; inline void Normalize() ;
wxDouble GetDistance( const wxPoint2DInt &pt ) const ; inline wxDouble GetDistance( const wxPoint2DInt &pt ) const ;
wxDouble GetDistanceSquare( const wxPoint2DInt &pt ) const; inline wxDouble GetDistanceSquare( const wxPoint2DInt &pt ) const;
wxInt32 GetDotProduct( const wxPoint2DInt &vec ) const; inline wxInt32 GetDotProduct( const wxPoint2DInt &vec ) const;
wxInt32 GetCrossProduct( const wxPoint2DInt &vec ) const; inline wxInt32 GetCrossProduct( const wxPoint2DInt &vec ) const;
// the reflection of this point // the reflection of this point
wxPoint2DInt operator-() ; inline wxPoint2DInt operator-() ;
wxPoint2DInt& operator=(const wxPoint2DInt& pt) ; inline wxPoint2DInt& operator=(const wxPoint2DInt& pt) ;
wxPoint2DInt& operator+=(const wxPoint2DInt& pt) ; inline wxPoint2DInt& operator+=(const wxPoint2DInt& pt) ;
wxPoint2DInt& operator-=(const wxPoint2DInt& pt) ; inline wxPoint2DInt& operator-=(const wxPoint2DInt& pt) ;
wxPoint2DInt& operator*=(const wxPoint2DInt& pt) ; inline wxPoint2DInt& operator*=(const wxPoint2DInt& pt) ;
wxPoint2DInt& operator*=(wxDouble n) ; inline wxPoint2DInt& operator*=(wxDouble n) ;
wxPoint2DInt& operator*=(wxInt32 n) ; inline wxPoint2DInt& operator*=(wxInt32 n) ;
wxPoint2DInt& operator/=(const wxPoint2DInt& pt) ; inline wxPoint2DInt& operator/=(const wxPoint2DInt& pt) ;
wxPoint2DInt& operator/=(wxDouble n) ; inline wxPoint2DInt& operator/=(wxDouble n) ;
wxPoint2DInt& operator/=(wxInt32 n) ; inline wxPoint2DInt& operator/=(wxInt32 n) ;
operator wxPoint() const ; inline operator wxPoint() const ;
bool operator==(const wxPoint2DInt& pt) const ; inline bool operator==(const wxPoint2DInt& pt) const ;
bool operator!=(const wxPoint2DInt& pt) const ; inline bool operator!=(const wxPoint2DInt& pt) const ;
void WriteTo( wxDataOutputStream &stream ) const ; void WriteTo( wxDataOutputStream &stream ) const ;
void ReadFrom( wxDataInputStream &stream ) ; void ReadFrom( wxDataInputStream &stream ) ;
@@ -639,8 +639,8 @@ public:
wxRect2DInt() { m_x = m_y = m_width = m_height = 0 ; } wxRect2DInt() { m_x = m_y = m_width = m_height = 0 ; }
wxRect2DInt(wxInt32 x, wxInt32 y, wxInt32 w, wxInt32 h) { m_x = x ; m_y = y ; m_width = w ; m_height = h ; } wxRect2DInt(wxInt32 x, wxInt32 y, wxInt32 w, wxInt32 h) { m_x = x ; m_y = y ; m_width = w ; m_height = h ; }
wxRect2DInt(const wxPoint2DInt& topLeft, const wxPoint2DInt& bottomRight); wxRect2DInt(const wxPoint2DInt& topLeft, const wxPoint2DInt& bottomRight);
wxRect2DInt(const wxPoint2DInt& pos, const wxSize& size); inline wxRect2DInt(const wxPoint2DInt& pos, const wxSize& size);
wxRect2DInt(const wxRect2DInt& rect); inline wxRect2DInt(const wxRect2DInt& rect);
// single attribute accessors // single attribute accessors