fixed crash with '\' on the end of the last line

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

diff --git a/include/wx/geometry.h b/include/wx/geometry.h
index c14279c9711a4de9b464b0a595819cec8032a8a3..2a8a8fb396898a078ddeb0b5e24c052e7d492eb8 100644 (file)
--- a/include/wx/geometry.h
+++ b/include/wx/geometry.h
@@ -18,6 +18,10 @@
 
 #include "wx/defs.h"
 
+#ifndef wxUSE_GEOMETRY
+    #define wxUSE_GEOMETRY 0
+#endif
+
 #if wxUSE_GEOMETRY
 
 #include "wx/utils.h"
@@ -182,15 +186,15 @@ inline wxPoint2DDouble& wxPoint2DDouble::operator-=(const wxPoint2DDouble& pt)
 
 inline wxPoint2DDouble& wxPoint2DDouble::operator*=(const wxPoint2DDouble& pt) 
 { 
-    m_x = m_x + pt.m_x ; 
-    m_y = m_y + pt.m_y; 
+    m_x = m_x * pt.m_x ; 
+    m_y = m_y * pt.m_y; 
     return *this ;
 }
 
 inline wxPoint2DDouble& wxPoint2DDouble::operator/=(const wxPoint2DDouble& pt) 
 { 
-    m_x = m_x - pt.m_x ; 
-    m_y = m_y - pt.m_y;
+    m_x = m_x / pt.m_x ; 
+    m_y = m_y / pt.m_y;
     return *this ;
 }
 
@@ -276,7 +280,7 @@ public:
     inline wxPoint2DDouble GetPosition() 
         { return wxPoint2DDouble(m_x, m_y); }
     inline wxSize GetSize()
-        { return wxSize(m_width, m_height); }
+        { return wxSize((int) m_width, (int) m_height); }
 
     // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their
         // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately
@@ -593,7 +597,7 @@ inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt)
 
 inline wxPoint2DInt operator*(wxDouble n , const wxPoint2DInt& pt) 
 {
-    return wxPoint2DInt( pt.m_x * n , pt.m_y * n ) ;
+    return wxPoint2DInt( (int) (pt.m_x * n) , (int) (pt.m_y * n) ) ;
 }
 
 inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n) 
@@ -603,7 +607,7 @@ inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n)
 
 inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxDouble n) 
 {
-    return wxPoint2DInt( pt.m_x * n , pt.m_y * n ) ;
+    return wxPoint2DInt( (int) (pt.m_x * n) , (int) (pt.m_y * n) ) ;
 }
 
 inline wxPoint2DInt operator/(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2) 
@@ -618,7 +622,7 @@ inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n)
 
 inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxDouble n) 
 {
-    return wxPoint2DInt( pt.m_x / n , pt.m_y / n ) ;
+    return wxPoint2DInt( (int) (pt.m_x / n) , (int) (pt.m_y / n) ) ;
 }
 
 // wxRect2Ds are a axis-aligned rectangles, each side of the rect is parallel to the x- or m_y- axis. The rectangle is either defined by the