WINE is so fine.

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index b742531d92bea07400641ab23de6902b3b95bda1..32569e0a49a166b0b0a997a4c3ce65f87ffb7a6e 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -250,17 +250,22 @@ public:
     long GetHeight() const { return height; }
     void SetHeight(long h) { height = h; }
 
     long GetHeight() const { return height; }
     void SetHeight(long h) { height = h; }
 

-    wxPoint GetPosition() { return wxPoint(x, y); }
-    wxSize GetSize() { return wxSize(width, height); }
+    wxPoint GetPosition() const { return wxPoint(x, y); }
+    wxSize GetSize() const { return wxSize(width, height); }

 
     long GetLeft()   const { return x; }
     long GetTop()    const { return y; }
     long GetBottom() const { return y + height; }
     long GetRight()  const { return x + width; }
 
 
     long GetLeft()   const { return x; }
     long GetTop()    const { return y; }
     long GetBottom() const { return y + height; }
     long GetRight()  const { return x + width; }
 

+

     bool operator==(const wxRect& rect) const;
     bool operator!=(const wxRect& rect) const { return !(*this == rect); }
 
     bool operator==(const wxRect& rect) const;
     bool operator!=(const wxRect& rect) const { return !(*this == rect); }
 

+    bool Inside(int cx, int cy) const;
+    wxRect operator + (const wxRect& rect) const;
+    const wxRect& operator += (const wxRect& rect);
+    

 public:
     long x, y, width, height;
 };
 public:
     long x, y, width, height;
 };