X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..423d529ccb0dc5f8d8b41598581723159f07bb52:/src/common/geometry.cpp diff --git a/src/common/geometry.cpp b/src/common/geometry.cpp index 83948c28d7..db4ff7c671 100644 --- a/src/common/geometry.cpp +++ b/src/common/geometry.cpp @@ -6,13 +6,9 @@ // Created: 08/05/99 // RCS-ID: // Copyright: (c) 1999 Stefan Csomor -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "geometry.cpp" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -29,11 +25,6 @@ #include "wx/geometry.h" #include "wx/datstrm.h" -// normally this is defined in -#ifndef M_PI - #define M_PI 3.14159265358979323846 -#endif - // // wxPoint2D // @@ -57,9 +48,9 @@ bool wxRect2DDouble::Intersects( const wxRect2DDouble &rect ) const if ( left < right && top < bottom ) { - return TRUE; + return true; } - return FALSE; + return false; } void wxRect2DDouble::Intersect( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest ) @@ -211,14 +202,14 @@ void wxPoint2DInt::SetVectorAngle( wxDouble degrees ) wxDouble wxPoint2DDouble::GetVectorAngle() const { - if ( m_x == 0 ) + if ( wxIsNullDouble(m_x) ) { if ( m_y >= 0 ) return 90; else return 270; } - if ( m_y == 0 ) + if ( wxIsNullDouble(m_y) ) { if ( m_x >= 0 ) return 0; @@ -252,9 +243,9 @@ bool wxRect2DInt::Intersects( const wxRect2DInt &rect ) const if ( left < right && top < bottom ) { - return TRUE; + return true; } - return FALSE; + return false; } void wxRect2DInt::Intersect( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest )