Work on streams of all sorts. More to come.

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 63abe6c8d12c8761da6ca1ea7016c2910a76b32d..78d36bd9205897be89d58126f13a34a408bbb384 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -100,12 +100,15 @@ enum wxStockCursor
     wxCURSOR_WAIT,
     wxCURSOR_WATCH,
     wxCURSOR_BLANK,
+#ifdef __WXGTK__
+    wxCURSOR_DEFAULT, // standard X11 cursor
+#endif
 #ifdef __X__
     // Not yet implemented for Windows
     wxCURSOR_CROSS_REVERSE,
     wxCURSOR_DOUBLE_ARROW,
     wxCURSOR_BASED_ARROW_UP,
-    wxCURSOR_BASED_ARROW_DOWN
+    wxCURSOR_BASED_ARROW_DOWN,
 #endif // X11
 
     wxCURSOR_MAX
@@ -149,7 +152,9 @@ enum wxStockCursor
 class WXDLLEXPORT wxSize
 {
 public:
-    // members are public for compatibility
+    // members are public for compatibility (don't use them directly,
+    // especially that there names were chosen very unfortunately - they should
+    // have been called width and height)
     long x;
     long y;
 
@@ -158,15 +163,21 @@ public:
     wxSize(long xx, long yy) { Set(xx, yy); }
 
     // no copy ctor or assignment operator - the defaults are ok
-
     bool operator==(const wxSize& sz) const { return x == sz.x && y == sz.y; }
 
     // FIXME are these really useful? If they're, we should have += &c as well
     wxSize operator+(const wxSize& sz) { return wxSize(x + sz.x, y + sz.y); }
     wxSize operator-(const wxSize& sz) { return wxSize(x - sz.x, y - sz.y); }
 
+    // accessors
     void Set(long xx, long yy) { x = xx; y = yy; }
+    void SetWidth(long w) { x = w; }
+    void SetHeight(long h) { y = h; }
 
+    long GetWidth() const { return x; }
+    long GetHeight() const { return y; }
+
+    // compatibility
     long GetX() const { return x; }
     long GetY() const { return y; }
 };
@@ -174,6 +185,7 @@ public:
 // ---------------------------------------------------------------------------
 // Point classes: with real or integer coordinates
 // ---------------------------------------------------------------------------
+
 class WXDLLEXPORT wxRealPoint
 {
 public:
@@ -205,10 +217,16 @@ public:
 
     // no copy ctor or assignment operator - the defaults are ok
 
-    bool operator==(const wxPoint& pt) const { return x == pt.x && y == pt.y; }
+    // comparison
+    bool operator==(const wxPoint& p) const { return x == p.x && y == p.y; }
+    bool operator!=(const wxPoint& p) const { return !(*this == p); }
 
-    wxPoint operator + (const wxPoint& pt) { return wxPoint(x + pt.x, y + pt.y); }
-    wxPoint operator - (const wxPoint& pt) { return wxPoint(x - pt.x, y - pt.y); }
+    // arithmetic operations (component wise)
+    wxPoint operator+(const wxPoint& p) { return wxPoint(x + p.x, y + p.y); }
+    wxPoint operator-(const wxPoint& p) { return wxPoint(x - p.x, y - p.y); }
+
+    wxPoint& operator+=(const wxPoint& p) { x += p.x; y += p.y; return *this; }
+    wxPoint& operator-=(const wxPoint& p) { x -= p.x; y -= p.y; return *this; }
 };
 
 #if WXWIN_COMPATIBILITY
@@ -223,11 +241,13 @@ public:
 class WXDLLEXPORT wxRect
 {
 public:
-    wxRect();
-    wxRect(long x, long y, long w, long h);
+    wxRect() { x = y = width = height = 0; }
+    wxRect(long xx, long yy, long ww, long hh)
+        { x = xx; y = yy; width = ww; height = hh; }
     wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRect(const wxPoint& pos, const wxSize& size);
-    wxRect(const wxRect& rect);
+
+    // default copy ctor and assignment operators ok
 
     long GetX() const { return x; }
     void SetX(long xx) { x = xx; }
@@ -241,18 +261,22 @@ public:
     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; }
 
-    wxRect& operator = (const wxRect& rect);
-    bool operator == (const wxRect& rect);
-    bool operator != (const wxRect& 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;
 };