Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. bug fixes in wxCaret

Browse Source 
2. wxPoint now has += and -=
3. Validate() takes "wxWindow *" (and not wxWindowBase) again


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-05-24 21:12:37 +00:00
parent 587ce561e1
commit 764a3a4906
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/gdicmn.h
View File

@@ -174,6 +174,7 @@ public:
// ---------------------------------------------------------------------------
// Point classes: with real or integer coordinates
// ---------------------------------------------------------------------------
class WXDLLEXPORT wxRealPoint
{
public:
@@ -205,10 +206,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
@@ -251,8 +258,8 @@ public:
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); }
public:
long x, y, width, height;