define WS_XXX constants missing in (some) CE SDKs

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

diff --git a/include/wx/geometry.h b/include/wx/geometry.h
index 8a7e9323c890600c133b5a516928bd8eb752078c..18fa889e1b65a17ddf0d2a1256640dd3101558a1 100644 (file)
--- a/include/wx/geometry.h
+++ b/include/wx/geometry.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GEOMETRY_H_
 #define _WX_GEOMETRY_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "geometry.cpp"
 #endif
 
@@ -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;
@@ -767,6 +767,14 @@ inline wxRect2DInt::wxRect2DInt( const wxPoint2DInt &a , const wxPoint2DInt &b)
     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
 { 
     return (m_x==rect.m_x && m_y==rect.m_y &&