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

Increase interoperability between wxPoint and wxRealPoint introducing constructors which convert between the two classes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2010-06-09 18:03:27 +00:00
parent 6f32f3cea2
commit a5664fd6ef
3 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
interface/wx/gdicmn.h
View File

@@ -136,7 +136,49 @@ public:
Initializes the point with the given coordinates.
*/
wxRealPoint(double x, double y);
/**
Converts the given wxPoint (with integer coordinates) to a wxRealPoint.
*/
wxRealPoint(const wxPoint& pt);
/**
@name Miscellaneous operators
Note that these operators are documented as class members
(to make them easier to find) but, as their prototype shows,
they are implemented as global operators; note that this is
transparent to the user but it helps to understand why the
following functions are documented to take the wxPoint they
operate on as an explicit argument.
*/
//@{
wxRealPoint& operator=(const wxRealPoint& pt);
bool operator ==(const wxRealPoint& p1, const wxRealPoint& p2);
bool operator !=(const wxRealPoint& p1, const wxRealPoint& p2);
wxRealPoint operator +(const wxRealPoint& p1, const wxRealPoint& p2);
wxRealPoint operator -(const wxRealPoint& p1, const wxRealPoint& p2);
wxRealPoint& operator +=(const wxRealPoint& pt);
wxRealPoint& operator -=(const wxRealPoint& pt);
wxRealPoint operator +(const wxRealPoint& pt, const wxSize& sz);
wxRealPoint operator -(const wxRealPoint& pt, const wxSize& sz);
wxRealPoint operator +(const wxSize& sz, const wxRealPoint& pt);
wxRealPoint operator -(const wxSize& sz, const wxRealPoint& pt);
wxRealPoint& operator +=(const wxSize& sz);
wxRealPoint& operator -=(const wxSize& sz);
wxSize operator /(const wxRealPoint& sz, int factor);
wxSize operator *(const wxRealPoint& sz, int factor);
wxSize operator *(int factor, const wxSize& sz);
wxSize& operator /=(int factor);
wxSize& operator *=(int factor);
//@}
/**
X coordinate of this point.
*/
@@ -497,6 +539,12 @@ public:
Initializes the point object with the given @a x and @a y coordinates.
*/
wxPoint(int x, int y);
/**
Converts the given wxRealPoint (with floating point coordinates) to a
wxPoint instance.
*/
wxPoint(const wxRealPoint& pt);
/**
@name Miscellaneous operators