Added a const for CW compilation

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

diff --git a/include/wx/geometry.h b/include/wx/geometry.h
index 80016c0a096a0fac7c6499b2093948d84fe0fdb4..3e18b6b02557993c33dc090e7b9fe4455030a609 100644 (file)
--- a/include/wx/geometry.h
+++ b/include/wx/geometry.h
@@ -91,8 +91,10 @@ public :
     inline bool operator==(const wxPoint2DInt& pt) const;
     inline bool operator!=(const wxPoint2DInt& pt) const;
 
     inline bool operator==(const wxPoint2DInt& pt) const;
     inline bool operator!=(const wxPoint2DInt& pt) const;
 

+#if wxUSE_STREAMS

     void WriteTo( wxDataOutputStream &stream ) const;
     void ReadFrom( wxDataInputStream &stream );
     void WriteTo( wxDataOutputStream &stream ) const;
     void ReadFrom( wxDataInputStream &stream );

+#endif // wxUSE_STREAMS

 
     wxInt32 m_x;
     wxInt32 m_y;
 
     wxInt32 m_x;
     wxInt32 m_y;


@@ -632,11 +634,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;


@@ -738,8 +740,10 @@ public:
        bool operator == (const wxRect2DInt& rect) const;
        bool operator != (const wxRect2DInt& rect) const;
 
        bool operator == (const wxRect2DInt& rect) const;
        bool operator != (const wxRect2DInt& rect) const;
 

+#if wxUSE_STREAMS

        void WriteTo( wxDataOutputStream &stream ) const;
        void ReadFrom( wxDataInputStream &stream );
        void WriteTo( wxDataOutputStream &stream ) const;
        void ReadFrom( wxDataInputStream &stream );

+#endif // wxUSE_STREAMS

 
        wxInt32 m_x;
        wxInt32 m_y;
 
        wxInt32 m_x;
        wxInt32 m_y;