added wxRect::operator+() and *() (union and intersection); also made other operators friends instead of members (patch 1589175)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/changes.txt

@@ -115,6 +115,7 @@ All (GUI):
 - Add support for <data> tags to wxrc
 - Support wxAPPLY and wxCLOSE in CreateStdDialogButtonSizer() (Marcin Wojdyr)
 - Show standard options in wxCmdLineParser usage message (Francesco Montorsi)
+- Added wxRect::operator+ (union) and * (intersection) (bdonner)
 
 wxGTK:
 

docs/latex/wx/point.tex

@@ -56,13 +56,13 @@ y member.
 Assignment operator.
 
 
-\func{bool}{operator $==$}{\param{const wxPoint\& }{pt}}
+\func{bool}{operator $==$}{\param{const wxPoint\& }{p1}, \param{const wxPoint\& }{p2}}
 
-\func{bool}{operator $!=$}{\param{const wxPoint\& }{pt}}
+\func{bool}{operator $!=$}{\param{const wxPoint\& }{p1}, \param{const wxPoint\& }{p2}}
 
-\func{wxPoint}{operator $+$}{\param{const wxPoint\& }{pt}}
+\func{wxPoint}{operator $+$}{\param{const wxPoint\& }{p1}, \param{const wxPoint\& }{p2}}
 
-\func{wxPoint}{operator $-$}{\param{const wxPoint\& }{pt}}
+\func{wxPoint}{operator $-$}{\param{const wxPoint\& }{p1}, \param{const wxPoint\& }{p2}}
 
 \func{wxPoint\&}{operator $+=$}{\param{const wxPoint\& }{pt}}
 
@@ -71,14 +71,18 @@ Assignment operator.
 Operators for comparison, sum and subtraction between \helpref{wxPoint}{wxpoint} objects.
 
 
-\func{wxPoint}{operator $+$}{\param{const wxSize\& }{sz}}
+\func{wxPoint}{operator $+$}{\param{const wxPoint\& }{pt}, \param{const wxSize\& }{sz}}
 
-\func{wxPoint}{operator $-$}{\param{const wxSize\& }{sz}}
+\func{wxPoint}{operator $-$}{\param{const wxPoint\& }{pt}, \param{const wxSize\& }{sz}}
+
+\func{wxPoint}{operator $+$}{\param{const wxSize\& }{sz}, \param{const wxPoint\& }{pt}}
+
+\func{wxPoint}{operator $-$}{\param{const wxSize\& }{sz}, \param{const wxPoint\& }{pt}}
 
 \func{wxPoint\&}{operator $+=$}{\param{const wxSize\& }{sz}}
 
 \func{wxPoint\&}{operator $-=$}{\param{const wxSize\& }{sz}}
- 
+
 Operators for sum and subtraction between a \helpref{wxPoint}{wxpoint} object and a
 \helpref{wxSize}{wxsize} object.
 

docs/latex/wx/rect.tex

@@ -354,14 +354,32 @@ Assignment operator.
 
 \membersection{wxRect::operator $==$}\label{wxrectequal}
 
-\func{bool}{operator $==$}{\param{const wxRect\& }{rect}}
+\func{bool}{operator $==$}{\param{const wxRect\& }{r1}, \param{const wxRect\& }{r2}}
 
 Equality operator.
 
 
 \membersection{wxRect::operator $!=$}\label{wxrectnotequal}
 
-\func{bool}{operator $!=$}{\param{const wxRect\& }{rect}}
+\func{bool}{operator $!=$}{\param{const wxRect\& }{r1}, \param{const wxRect\& }{r2}}
 
 Inequality operator.
 
+
+\func{wxRect}{operator $+$}{\param{const wxRect\& }{r1}, \param{const wxRect\& }{r2}}
+
+\func{wxRect\&}{operator $+=$}{\param{const wxRect\& }{r}}
+
+Like \helpref{Union}{wxrectunion} but don't treat empty rectangles specially.
+
+\wxheading{See also}
+
+\helpref{wxRect::Union}{wxrectunion}
+
+
+\func{wxRect}{operator $*$}{\param{const wxRect\& }{r1}, \param{const wxRect\& }{r2}}
+
+\func{wxRect\&}{operator $*=$}{\param{const wxRect\& }{r}}
+
+Returns the intersection of two rectangles (which may be empty).
+

docs/latex/wx/size.tex

@@ -198,13 +198,13 @@ Sets the width.
 Assignment operator.
 
 
-\constfunc{bool}{operator $==$}{\param{const wxSize\& }{sz}}
+\func{bool}{operator $==$}{\param{const wxSize\& }{s1}, \param{const wxSize\& }{s2}}
 
-\constfunc{bool}{operator $!=$}{\param{const wxSize\& }{sz}}
+\func{bool}{operator $!=$}{\param{const wxSize\& }{s1}, \param{const wxSize\& }{s2}}
 
-\func{wxSize}{operator $+$}{\param{const wxSize\& }{sz}}
+\func{wxSize}{operator $+$}{\param{const wxSize\& }{s1}, \param{const wxSize\& }{s2}}
 
-\func{wxSize}{operator $-$}{\param{const wxSize\& }{sz}}
+\func{wxSize}{operator $-$}{\param{const wxSize\& }{s1}, \param{const wxSize\& }{s2}}
 
 \func{wxSize\&}{operator $+=$}{\param{const wxSize\& }{sz}}
 
@@ -213,9 +213,11 @@ Assignment operator.
 Operators for comparison, sum and subtraction between \helpref{wxSize}{wxsize} objects.
 
 
-\func{wxSize}{operator $/$}{\param{int }{factor}}
+\func{wxSize}{operator $/$}{\param{const wxSize\& }{sz}, \param{int }{factor}}
 
-\func{wxSize}{operator $*$}{\param{int }{factor}}
+\func{wxSize}{operator $*$}{\param{const wxSize\& }{sz}, \param{int }{factor}}
+
+\func{wxSize}{operator $*$}{\param{int }{factor}, \param{const wxSize\& }{sz}}
 
 \func{wxSize\&}{operator $/=$}{\param{int }{factor}}