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

add operator* taking doubles to wxSize

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-31 21:22:37 +00:00
parent 2e7a6b030c
commit 9174364320
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/gdicmn.h
View File

@@ -240,6 +240,8 @@ public:
wxSize& operator-=(const wxSize& sz) { x -= sz.x; y -= sz.y; return *this; } wxSize& operator-=(const wxSize& sz) { x -= sz.x; y -= sz.y; return *this; }
wxSize& operator/=(int i) { x /= i; y /= i; return *this; } wxSize& operator/=(int i) { x /= i; y /= i; return *this; }
wxSize& operator*=(int i) { x *= i; y *= i; return *this; } wxSize& operator*=(int i) { x *= i; y *= i; return *this; }
wxSize& operator/=(double i) { x /= i; y /= i; return *this; }
wxSize& operator*=(double i) { x *= i; y *= i; return *this; }
void IncTo(const wxSize& sz) void IncTo(const wxSize& sz)
{ if ( sz.x > x ) x = sz.x; if ( sz.y > y ) y = sz.y; } { if ( sz.x > x ) x = sz.x; if ( sz.y > y ) y = sz.y; }
@@ -283,7 +285,6 @@ public:
int GetY() const { return y; } int GetY() const { return y; }
}; };
inline bool operator==(const wxSize& s1, const wxSize& s2) inline bool operator==(const wxSize& s1, const wxSize& s2)
{ {
return s1.x == s2.x && s1.y == s2.y; return s1.x == s2.x && s1.y == s2.y;
@@ -294,36 +295,40 @@ inline bool operator!=(const wxSize& s1, const wxSize& s2)
return s1.x != s2.x || s1.y != s2.y; return s1.x != s2.x || s1.y != s2.y;
} }
inline wxSize operator+(const wxSize& s1, const wxSize& s2) inline wxSize operator+(const wxSize& s1, const wxSize& s2)
{ {
return wxSize(s1.x + s2.x, s1.y + s2.y); return wxSize(s1.x + s2.x, s1.y + s2.y);
} }
inline wxSize operator-(const wxSize& s1, const wxSize& s2) inline wxSize operator-(const wxSize& s1, const wxSize& s2)
{ {
return wxSize(s1.x - s2.x, s1.y - s2.y); return wxSize(s1.x - s2.x, s1.y - s2.y);
} }
inline wxSize operator/(const wxSize& s, int i) inline wxSize operator/(const wxSize& s, int i)
{ {
return wxSize(s.x / i, s.y / i); return wxSize(s.x / i, s.y / i);
} }
inline wxSize operator*(const wxSize& s, int i) inline wxSize operator*(const wxSize& s, int i)
{ {
return wxSize(s.x * i, s.y * i); return wxSize(s.x * i, s.y * i);
} }
inline wxSize operator*(int i, const wxSize& s) inline wxSize operator*(int i, const wxSize& s)
{ {
return wxSize(s.x * i, s.y * i); return wxSize(s.x * i, s.y * i);
} }
inline wxSize operator*(const wxSize& s, double i)
{
return wxSize(s.x * i, s.y * i);
}
inline wxSize operator*(double i, const wxSize& s)
{
return wxSize(s.x * i, s.y * i);
}