X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c77a67962c2f50a872491869fcf1a6c082fdc6c6..500659a8972ef0dff3fadf553e3b3dc189e964f7:/include/wx/geometry.h diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 92c2bcbc0d..237f84dca5 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 @@ -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 ) );