avoid undefined behavior from token paste resulting in more than one token

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

diff --git a/src/common/geometry.cpp b/src/common/geometry.cpp
index 1eb3d7b26f1e27ae795edc854fcd8eed5bdd8137..362b1aee50b23d31a337340a09edf6071792247e 100644 (file)
--- a/src/common/geometry.cpp
+++ b/src/common/geometry.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/geometry.cpp
+// Name:        src/common/geometry.cpp

 // Purpose:     Common Geometry Classes
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     Common Geometry Classes
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,24 +9,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "geometry.h"
-#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"
 

-

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_GEOMETRY
 
 #endif
 
 #if wxUSE_GEOMETRY
 

-#include "wx/log.h"
+#include "wx/geometry.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+

 #include <string.h>
 
 #include <string.h>
 

-#include "wx/geometry.h"

 #include "wx/datstrm.h"
 
 //
 #include "wx/datstrm.h"
 
 //


@@ -206,14 +205,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;