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
This commit is contained in:
@@ -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}}
|
||||
|
||||
|
Reference in New Issue
Block a user