More parameter variable names fixed to make them more readable by replacing abbreviat...

[wxWidgets.git] / include / wx / geometry.h

diff --git a/include/wx/geometry.h b/include/wx/geometry.h
index 8a7e9323c890600c133b5a516928bd8eb752078c..1dedc55fc5c0df2bd5c1a7c92bcfe694dec8fb67 100644 (file)
--- a/include/wx/geometry.h
+++ b/include/wx/geometry.h
@@ -12,21 +12,17 @@
 #ifndef _WX_GEOMETRY_H_
 #define _WX_GEOMETRY_H_
 
 #ifndef _WX_GEOMETRY_H_
 #define _WX_GEOMETRY_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "geometry.cpp"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "geometry.h"

 #endif
 
 #include "wx/defs.h"
 
 #endif
 
 #include "wx/defs.h"
 

-#ifndef wxUSE_GEOMETRY
-    #define wxUSE_GEOMETRY 0
-#endif
-

 #if wxUSE_GEOMETRY
 
 #include "wx/utils.h"
 #include "wx/gdicmn.h"
 #if wxUSE_GEOMETRY
 
 #include "wx/utils.h"
 #include "wx/gdicmn.h"

-#include <math.h>
+#include "wx/math.h"

 
 #ifdef __WXMSW__
     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
 
 #ifdef __WXMSW__
     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )


@@ -36,8 +32,8 @@
     #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c))))
 #endif
 
     #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c))))
 #endif
 

-class wxDataInputStream;
-class wxDataOutputStream;
+class WXDLLIMPEXP_BASE wxDataInputStream;
+class WXDLLIMPEXP_BASE wxDataOutputStream;

 
 // clipping from Cohen-Sutherland
 
 
 // clipping from Cohen-Sutherland
 


@@ -300,10 +296,10 @@ public :
     inline wxPoint2DDouble();
     inline wxPoint2DDouble( wxDouble x , wxDouble y );
     inline wxPoint2DDouble( const wxPoint2DDouble &pt );
     inline wxPoint2DDouble();
     inline wxPoint2DDouble( wxDouble x , wxDouble y );
     inline wxPoint2DDouble( const wxPoint2DDouble &pt );

-    wxPoint2DDouble( const wxPoint2DInt &pt ) 
-               {       m_x = (wxDouble) pt.m_x ; m_y = (wxDouble) pt.m_y ; }
-       wxPoint2DDouble( const wxPoint &pt ) 
-               {       m_x = (wxDouble) pt.x ; m_y = (wxDouble) pt.y ; }
+    wxPoint2DDouble( const wxPoint2DInt &pt )
+        { m_x = (wxDouble) pt.m_x ; m_y = (wxDouble) pt.m_y ; }
+    wxPoint2DDouble( const wxPoint &pt )
+        { m_x = (wxDouble) pt.x ; m_y = (wxDouble) pt.y ; }

 
     // two different conversions to integers, floor and rounding
     inline void GetFloor( wxInt32 *x , wxInt32 *y ) const;
 
     // two different conversions to integers, floor and rounding
     inline void GetFloor( wxInt32 *x , wxInt32 *y ) const;


@@ -388,7 +384,7 @@ inline wxDouble wxPoint2DDouble::GetVectorLength() const
     return sqrt( (m_x)*(m_x) + (m_y)*(m_y) ) ;
 }
 
     return sqrt( (m_x)*(m_x) + (m_y)*(m_y) ) ;
 }
 

-inline void wxPoint2DDouble::SetVectorLength( wxDouble length ) 
+inline void wxPoint2DDouble::SetVectorLength( wxDouble length )

 {
     wxDouble before = GetVectorLength() ;
     m_x = (m_x * length / before) ;
 {
     wxDouble before = GetVectorLength() ;
     m_x = (m_x * length / before) ;


@@ -590,8 +586,8 @@ public:
                      ( ( pt.m_x > m_x + m_width ) ? wxOutRight : 0 ) +
                      ( ( pt.m_y < m_y ) ? wxOutTop : 0 )  +
                      ( ( pt.m_y > m_y + m_height ) ? wxOutBottom : 0 )); }
                      ( ( pt.m_x > m_x + m_width ) ? wxOutRight : 0 ) +
                      ( ( pt.m_y < m_y ) ? wxOutTop : 0 )  +
                      ( ( pt.m_y > m_y + m_height ) ? wxOutBottom : 0 )); }

-       inline wxOutCode GetOutcode(const wxPoint2DDouble &pt) const
-               { return GetOutCode(pt) ; }
+    inline wxOutCode GetOutcode(const wxPoint2DDouble &pt) const
+        { return GetOutCode(pt) ; }

     inline bool Contains( const wxPoint2DDouble &pt ) const
         { return  GetOutCode( pt ) == wxInside; }
     inline bool Contains( const wxRect2DDouble &rect ) const
     inline bool Contains( const wxPoint2DDouble &pt ) const
         { return  GetOutCode( pt ) == wxInside; }
     inline bool Contains( const wxRect2DDouble &rect ) const


@@ -634,11 +630,11 @@ public:
         { m_x *= ((wxDouble)num)/((wxDouble)denum); m_y *= ((wxDouble)num)/((wxDouble)denum);
                 m_width *= ((wxDouble)num)/((wxDouble)denum); m_height *= ((wxDouble)num)/((wxDouble)denum);}
 
         { m_x *= ((wxDouble)num)/((wxDouble)denum); m_y *= ((wxDouble)num)/((wxDouble)denum);
                 m_width *= ((wxDouble)num)/((wxDouble)denum); m_height *= ((wxDouble)num)/((wxDouble)denum);}
 

-/*

     wxRect2DDouble& operator = (const wxRect2DDouble& rect);
     wxRect2DDouble& operator = (const wxRect2DDouble& rect);

-    bool operator == (const wxRect2DDouble& rect);
-    bool operator != (const wxRect2DDouble& rect);
-*/
+    inline bool operator == (const wxRect2DDouble& rect)
+        { return (m_x==rect.m_x && m_y==rect.m_y && m_width==rect.m_width && m_height==rect.m_height); }
+    inline bool operator != (const wxRect2DDouble& rect)
+        { return !(*this == rect); }

 
     wxDouble  m_x;
     wxDouble  m_y;
 
     wxDouble  m_x;
     wxDouble  m_y;


@@ -702,8 +698,8 @@ public:
                      ( ( pt.m_x >= m_x + m_width ) ? wxOutRight : 0 ) +
                      ( ( pt.m_y < m_y ) ? wxOutTop : 0 )  +
                      ( ( pt.m_y >= m_y + m_height ) ? wxOutBottom : 0 )); }
                      ( ( pt.m_x >= m_x + m_width ) ? wxOutRight : 0 ) +
                      ( ( pt.m_y < m_y ) ? wxOutTop : 0 )  +
                      ( ( pt.m_y >= m_y + m_height ) ? wxOutBottom : 0 )); }

-               inline wxOutCode GetOutcode( const wxPoint2DInt &pt ) const
-                       { return GetOutCode( pt ) ; }
+        inline wxOutCode GetOutcode( const wxPoint2DInt &pt ) const
+            { return GetOutCode( pt ) ; }

         inline bool Contains( const wxPoint2DInt &pt ) const
             { return  GetOutCode( pt ) == wxInside; }
         inline bool Contains( const wxRect2DInt &rect ) const
         inline bool Contains( const wxPoint2DInt &pt ) const
             { return  GetOutCode( pt ) == wxInside; }
         inline bool Contains( const wxRect2DInt &rect ) const


@@ -767,9 +763,17 @@ inline wxRect2DInt::wxRect2DInt( const wxPoint2DInt &a , const wxPoint2DInt &b)
     m_height = abs( a.m_y - b.m_y );
 }
 
     m_height = abs( a.m_y - b.m_y );
 }
 

+inline wxRect2DInt::wxRect2DInt( const wxPoint2DInt& pos, const wxSize& size)
+{
+    m_x = pos.m_x;
+    m_y = pos.m_y;
+    m_width = size.x;
+    m_height = size.y;
+}
+

 inline bool wxRect2DInt::operator == (const wxRect2DInt& rect) const
 inline bool wxRect2DInt::operator == (const wxRect2DInt& rect) const

-{ 
-    return (m_x==rect.m_x && m_y==rect.m_y && 
+{
+    return (m_x==rect.m_x && m_y==rect.m_y &&

             m_width==rect.m_width && m_height==rect.m_height);
 }
 
             m_width==rect.m_width && m_height==rect.m_height);
 }