projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add safe wxStrlcpy() function and replaced all wxStrncpy() calls by it
[wxWidgets.git]
/
src
/
common
/
geometry.cpp
diff --git
a/src/common/geometry.cpp
b/src/common/geometry.cpp
index da7506b768599dd1374bf03a7198109fc5e2af62..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,31
+9,25
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #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"
-
#ifdef __BORLANDC__
#ifdef __BORLANDC__
-#pragma hdrstop
+
#pragma hdrstop
#endif
#if wxUSE_GEOMETRY
#endif
#if wxUSE_GEOMETRY
-#include "wx/log.h"
-#include <string.h>
-
#include "wx/geometry.h"
#include "wx/geometry.h"
-#include "wx/datstrm.h"
-// normally this is defined in <math.h>
-#ifndef M_PI
- #define M_PI 3.14159265358979323846
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
#endif
#endif
+#include <string.h>
+
+#include "wx/datstrm.h"
+
//
// wxPoint2D
//
//
// wxPoint2D
//
@@
-57,9
+51,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 )
@@
-145,6
+139,15
@@
void wxRect2DDouble::ConstrainTo( const wxRect2DDouble &rect )
SetTop( rect.GetTop() );
}
SetTop( rect.GetTop() );
}
+wxRect2DDouble& wxRect2DDouble::operator=( const wxRect2DDouble &r )
+{
+ m_x = r.m_x;
+ m_y = r.m_y;
+ m_width = r.m_width;
+ m_height = r.m_height;
+ return *this;
+}
+
// integer version
// for the following calculations always remember
// integer version
// for the following calculations always remember
@@
-152,6
+155,7
@@
void wxRect2DDouble::ConstrainTo( const wxRect2DDouble &rect )
// wxPoint2D
// wxPoint2D
+#if wxUSE_STREAMS
void wxPoint2DInt::WriteTo( wxDataOutputStream &stream ) const
{
stream.Write32( m_x );
void wxPoint2DInt::WriteTo( wxDataOutputStream &stream ) const
{
stream.Write32( m_x );
@@
-163,8
+167,9
@@
void wxPoint2DInt::ReadFrom( wxDataInputStream &stream )
m_x = stream.Read32();
m_y = stream.Read32();
}
m_x = stream.Read32();
m_y = stream.Read32();
}
+#endif // wxUSE_STREAMS
-wxDouble wxPoint2DInt::GetVectorAngle()
+wxDouble wxPoint2DInt::GetVectorAngle()
const
{
if ( m_x == 0 )
{
{
if ( m_x == 0 )
{
@@
-200,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;
@@
-241,9
+246,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 )
@@
-338,6
+343,7
@@
wxRect2DInt& wxRect2DInt::operator=( const wxRect2DInt &r )
return *this;
}
return *this;
}
+#if wxUSE_STREAMS
void wxRect2DInt::WriteTo( wxDataOutputStream &stream ) const
{
stream.Write32( m_x );
void wxRect2DInt::WriteTo( wxDataOutputStream &stream ) const
{
stream.Write32( m_x );
@@
-353,5
+359,6
@@
void wxRect2DInt::ReadFrom( wxDataInputStream &stream )
m_width = stream.Read32();
m_height = stream.Read32();
}
m_width = stream.Read32();
m_height = stream.Read32();
}
+#endif // wxUSE_STREAMS
#endif // wxUSE_GEOMETRY
#endif // wxUSE_GEOMETRY