X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8673a125052b480c4a79772c310586e5eff05bf8..aad035b2f51cc206edc0b888695dfb5c8d53687a:/docs/latex/wx/rect.tex

diff --git a/docs/latex/wx/rect.tex b/docs/latex/wx/rect.tex
index 44239884dd..a6c97fd2cc 100644
--- a/docs/latex/wx/rect.tex
+++ b/docs/latex/wx/rect.tex
@@ -68,10 +68,40 @@ Width member.
 Height member.
 
 
+\membersection{wxRect::CentreIn}\label{wxrectcentrein}
+
+\constfunc{wxRect}{CentreIn}{\param{const wxRect\& }{r}, \param{int }{dir = wxBOTH}}
+
+\constfunc{wxRect}{CenterIn}{\param{const wxRect\& }{r}, \param{int }{dir = wxBOTH}}
+
+Returns the rectangle having the same size as this one but centered relatively
+to the given rectangle \arg{r}. By default, rectangle is centred in both
+directions but if \arg{dir} includes only \texttt{wxVERTICAL} or only 
+\texttt{wxHORIZONTAL} flag, then it is only centered in this direction while
+the other component of its position remains unchanged.
+
+
+\membersection{wxRect::Contains}\label{wxrectcontains}
+
+\constfunc{bool}{Contains}{\param{int }{x}, \param{int }{y}}
+
+\constfunc{bool}{Contains}{\param{const wxPoint\& }{pt}}
+
+Returns {\tt true} if the given point is inside the rectangle (or on its
+boundary) and {\tt false} otherwise.
+
+\constfunc{bool}{Contains}{\param{const wxRect\& }{rect}}
+
+Returns \true if the given rectangle is completely inside this rectangle
+(or touches its boundary) and \false otherwise.
+
+
 \membersection{wxRect::Deflate}\label{wxrectdeflate}
 
 \func{void}{Deflate}{\param{wxCoord }{dx}, \param{wxCoord }{dy}}
 
+\func{void}{Deflate}{\param{const wxSize\& }{diff}}
+
 \func{void}{Deflate}{\param{wxCoord }{diff}}
 
 \constfunc{wxRect}{Deflate}{\param{wxCoord }{dx}, \param{wxCoord }{dy}}
@@ -119,14 +149,29 @@ Gets the position.
 
 \constfunc{wxPoint}{GetTopLeft}{\void}
 
-Gets the topleft position of the rectangle. (Same as GetPosition).
+Gets the position of the top left corner of the rectangle, same as 
+\helpref{GetPosition}{wxrectgetposition}.
+
+
+\membersection{wxRect::GetTopRight}\label{wxrectgettopright}
+
+\constfunc{wxPoint}{GetTopRight}{\void}
+
+Gets the position of the top right corner.
+
+
+\membersection{wxRect::GetBottomLeft}\label{wxrectgetbottomleft}
+
+\constfunc{wxPoint}{GetBottomLeft}{\void}
+
+Gets the position of the bottom left corner.
 
 
 \membersection{wxRect::GetBottomRight}\label{wxrectgetbottomright}
 
 \constfunc{wxPoint}{GetBottomRight}{\void}
 
-Gets the the bottom right position. Returns the bottom right point inside the rectangle.
+Gets the position of the bottom right corner.
 
 
 \membersection{wxRect::GetRight}\label{wxrectgetright}
@@ -142,6 +187,10 @@ Gets the right point of the rectangle.
 
 Gets the size.
 
+\wxheading{See also}
+
+\helpref{wxRect::SetSize}{wxrectsetsize}
+
 
 \membersection{wxRect::GetTop}\label{wxrectgettop}
 
@@ -175,6 +224,8 @@ Gets the y member.
 
 \func{void}{Inflate}{\param{wxCoord }{dx}, \param{wxCoord }{dy}}
 
+\func{void}{Inflate}{\param{const wxSize\& }{diff}}
+
 \func{void}{Inflate}{\param{wxCoord }{diff}}
 
 \constfunc{wxRect}{Inflate}{\param{wxCoord }{dx}, \param{wxCoord }{dy}}
@@ -217,22 +268,20 @@ means:
 \helpref{Deflate}{wxrectdeflate}
 
 
-\membersection{wxRect::Inside}\label{wxrectinside}
+\membersection{wxRect::Intersects}\label{wxrectintersects}
 
-\constfunc{bool}{Inside}{\param{int }{x}, \param{int }{y}}
+\constfunc{bool}{Intersects}{\param{const wxRect\& }{rect}}
 
-\constfunc{bool}{Inside}{\param{const wxPoint\& }{pt}}
+Returns {\tt true} if this rectangle has a non-empty intersection with the
+rectangle {\it rect} and {\tt false} otherwise.
 
-Returns {\tt true} if the given point is inside the rectangle (or on its
-boundary) and {\tt false} otherwise.
 
+\membersection{wxRect::IsEmpty}\label{wxrectisempty}
 
-\membersection{wxRect::Intersects}\label{wxrectintersects}
+\constfunc{bool}{IsEmpty}{}
 
-\constfunc{bool}{Intersects}{\param{const wxRect\& }{rect}}
-
-Returns {\tt true} if this rectangle has a non empty intersection with the
-rectangle {\it rect} and {\tt false} otherwise.
+Returns {\tt true} if this rectangle has a width or height less than or equal to 
+0 and {\tt false} otherwise.
 
 
 \membersection{wxRect::Offset}\label{wxrectoffset}
@@ -253,6 +302,17 @@ bottom, otherwise it is moved to the left or top respectively.
 Sets the height.
 
 
+\membersection{wxRect::SetSize}\label{wxrectsetsize}
+
+\func{void}{SetSize}{\param{const wxSize\&}{ s}}
+
+Sets the size.
+
+\wxheading{See also}
+
+\helpref{wxRect::GetSize}{wxrectgetsize}
+
+
 \membersection{wxRect::SetWidth}\label{wxrectsetwidth}
 
 \func{void}{SetWidth}{\param{int}{ width}}