From 7dc85fe2be1be197ce59a0e316d81e08efcc38d4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 2 Mar 2003 23:44:56 +0000 Subject: [PATCH] added wxRect2DDouble == != = operators (patch 684616) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/geometry.h | 8 ++++---- src/common/geometry.cpp | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 8a7e9323c8..3e18b6b025 100644 --- a/include/wx/geometry.h +++ b/include/wx/geometry.h @@ -634,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);} -/* 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; diff --git a/src/common/geometry.cpp b/src/common/geometry.cpp index 6c171e73a5..a01c529651 100644 --- a/src/common/geometry.cpp +++ b/src/common/geometry.cpp @@ -145,6 +145,15 @@ void wxRect2DDouble::ConstrainTo( const wxRect2DDouble &rect ) 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