add support for sorting to grid columns

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

diff --git a/include/wx/geometry.h b/include/wx/geometry.h
index 2aa92a80f9c1d0b4a669e6457834b5781b814cd1..80ab7d9bd20b7affdb6df255136e0e12c2cea098 100644 (file)
--- a/include/wx/geometry.h
+++ b/include/wx/geometry.h
@@ -20,8 +20,8 @@
 #include "wx/gdicmn.h"
 #include "wx/math.h"
 
 #include "wx/gdicmn.h"
 #include "wx/math.h"
 

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

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


@@ -34,7 +34,7 @@ enum wxOutCode
     wxOutBottom = 0x04
 };
 
     wxOutBottom = 0x04
 };
 

-class WXDLLEXPORT wxPoint2DInt
+class WXDLLIMPEXP_CORE wxPoint2DInt

 {
 public :
     inline wxPoint2DInt();
 {
 public :
     inline wxPoint2DInt();


@@ -278,7 +278,7 @@ inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxDouble n)
 
 // wxPoint2Ds represent a point or a vector in a 2d coordinate system
 
 
 // wxPoint2Ds represent a point or a vector in a 2d coordinate system
 

-class WXDLLEXPORT wxPoint2DDouble
+class WXDLLIMPEXP_CORE wxPoint2DDouble

 {
 public :
     inline wxPoint2DDouble();
 {
 public :
     inline wxPoint2DDouble();


@@ -379,6 +379,11 @@ inline void wxPoint2DDouble::SetVectorLength( wxDouble length )
     m_y = (m_y * length / before) ;
 }
 
     m_y = (m_y * length / before) ;
 }
 

+inline void wxPoint2DDouble::Normalize()
+{
+    SetVectorLength( 1 );
+}
+

 inline wxDouble wxPoint2DDouble::GetDistance( const wxPoint2DDouble &pt ) const
 {
     return sqrt( GetDistanceSquare( pt ) );
 inline wxDouble wxPoint2DDouble::GetDistance( const wxPoint2DDouble &pt ) const
 {
     return sqrt( GetDistanceSquare( pt ) );


@@ -504,7 +509,7 @@ inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt , wxInt32 n)
 // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if
 // left <= x < right  and top <= m_y < bottom , thus it is a half open interval.
 
 // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if
 // left <= x < right  and top <= m_y < bottom , thus it is a half open interval.
 

-class WXDLLEXPORT wxRect2DDouble
+class WXDLLIMPEXP_CORE wxRect2DDouble

 {
 public:
     wxRect2DDouble()
 {
 public:
     wxRect2DDouble()


@@ -635,7 +640,7 @@ public:
 // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if
 // left <= x < right  and top <= m_y < bottom , thus it is a half open interval.
 
 // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if
 // left <= x < right  and top <= m_y < bottom , thus it is a half open interval.
 

-class WXDLLEXPORT wxRect2DInt
+class WXDLLIMPEXP_CORE wxRect2DInt

 {
 public:
        wxRect2DInt() { m_x = m_y = m_width = m_height = 0; }
 {
 public:
        wxRect2DInt() { m_x = m_y = m_width = m_height = 0; }