added support for <bg> tag for toolbars in XRC

[wxWidgets.git] / src / common / geometry.cpp

diff --git a/src/common/geometry.cpp b/src/common/geometry.cpp
index 51fe2842eeeea6c62744a5424b5fde20328f406e..db4ff7c671ab5e0215769b5f01bf34643de01452 100644 (file)
--- a/src/common/geometry.cpp
+++ b/src/common/geometry.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -29,11 +25,6 @@
 #include "wx/geometry.h"
 #include "wx/datstrm.h"
 
 #include "wx/geometry.h"
 #include "wx/datstrm.h"
 

-// normally this is defined in <math.h>
-#ifndef M_PI
-    #define M_PI 3.14159265358979323846
-#endif
-

 //
 // wxPoint2D
 //
 //
 // wxPoint2D
 //


@@ -57,9 +48,9 @@ bool wxRect2DDouble::Intersects( const wxRect2DDouble &rect ) const
 
     if ( left < right && top < bottom )
     {
 
     if ( left < right && top < bottom )
     {

-        return TRUE;
+        return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 void wxRect2DDouble::Intersect( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest )
 }
 
 void wxRect2DDouble::Intersect( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest )


@@ -211,14 +202,14 @@ void wxPoint2DInt::SetVectorAngle( wxDouble degrees )
 
 wxDouble wxPoint2DDouble::GetVectorAngle() const
 {
 
 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 )
             return 90;
         else
             return 270;
     }

-    if ( m_y == 0 )
+    if ( wxIsNullDouble(m_y) )

     {
         if ( m_x >= 0 )
             return 0;
     {
         if ( m_x >= 0 )
             return 0;


@@ -252,9 +243,9 @@ bool wxRect2DInt::Intersects( const wxRect2DInt &rect ) const
 
     if ( left < right && top < bottom )
     {
 
     if ( left < right && top < bottom )
     {

-        return TRUE;
+        return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 void wxRect2DInt::Intersect( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest )
 }
 
 void wxRect2DInt::Intersect( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest )