define wxNO_(THREADS|RTTI|EXCEPTIONS) if the corresponding feature is disabled

[wxWidgets.git] / docs / latex / wx / region.tex

diff --git a/docs/latex/wx/region.tex b/docs/latex/wx/region.tex
index 1f26deea5dbd78077d58f673e5f5824d05fa0c95..696a66fa921a9ada4fe65add986241bf3dcd6005 100644 (file)
--- a/docs/latex/wx/region.tex
+++ b/docs/latex/wx/region.tex
@@ -18,7 +18,7 @@ reference counting, so copying and assignment operations are fast.
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 

-\membersection{wxRegion::wxRegion}\label{wxregionconstr}
+\membersection{wxRegion::wxRegion}\label{wxregionctor}

 
 \func{}{wxRegion}{\void}
 
 
 \func{}{wxRegion}{\void}
 


@@ -46,17 +46,19 @@ Constructs a region corresponding to the polygon made of {\it n} points in the
 provided array. {\it fillStyle} parameter may have values
 {\tt wxWINDING\_RULE} or {\tt wxODDEVEN\_RULE}.
 
 provided array. {\it fillStyle} parameter may have values
 {\tt wxWINDING\_RULE} or {\tt wxODDEVEN\_RULE}.
 

-{\bf NB:} This constructor is only implemented for Win32 and GTK+ wxWindows ports.
+{\bf NB:} This constructor is only implemented for Win32 and GTK+ wxWidgets ports.

 
 

-\func{}{wxRegion}{\param{const wxBitmap&}{ bmp},
-                  \param{const wxColour&}{ transColour = wxNullColour},
+\func{}{wxRegion}{\param{const wxBitmap\&}{ bmp}}
+
+\func{}{wxRegion}{\param{const wxBitmap\&}{ bmp},
+                  \param{const wxColour\&}{ transColour},

                  \param{int}{ tolerance = 0}}
 
 Constructs a region using the non-transparent pixels of a bitmap.  See
 \helpref{Union}{wxregionunion} for more details.
 
 
                  \param{int}{ tolerance = 0}}
 
 Constructs a region using the non-transparent pixels of a bitmap.  See
 \helpref{Union}{wxregionunion} for more details.
 
 

-\membersection{wxRegion::\destruct{wxRegion}}
+\membersection{wxRegion::\destruct{wxRegion}}\label{wxregiondtor}

 
 \func{}{\destruct{wxRegion}}{\void}
 
 
 \func{}{\destruct{wxRegion}}{\void}
 


@@ -97,12 +99,12 @@ all or some part of the region is contained in this region.
 
 \constfunc{wxBitmap}{ConvertToBitmap}{}
 
 
 \constfunc{wxBitmap}{ConvertToBitmap}{}
 

-Convert the region to a black and white bitmap with the black pixels
+Convert the region to a black and white bitmap with the white pixels

 being inside the region.
 
 \membersection{wxRegion::GetBox}\label{wxregiongetbox}
 
 being inside the region.
 
 \membersection{wxRegion::GetBox}\label{wxregiongetbox}
 

-\constfunc{void}{GetBox}{\param{long\& }{x}, \param{long\& }{y}, \param{long\& }{width}, \param{long\& }{height}}
+\constfunc{void}{GetBox}{\param{wxCoord\& }{x}, \param{wxCoord\& }{y}, \param{wxCoord\& }{width}, \param{wxCoord\& }{height}}

 
 Returns the outer bounds of the region.
 
 
 Returns the outer bounds of the region.
 


@@ -139,7 +141,7 @@ is stored in this region.
 
 Returns {\tt true} if the region is empty, {\tt false} otherwise.
 
 
 Returns {\tt true} if the region is empty, {\tt false} otherwise.
 

-\membersection{wxRegion::Subtract}\label{wxregionsubstract}
+\membersection{wxRegion::Subtract}\label{wxregionsubtract}

 
 \func{bool}{Subtract}{\param{const wxRect\&}{ rect}}
 
 
 \func{bool}{Subtract}{\param{const wxRect\&}{ rect}}
 


@@ -183,13 +185,19 @@ Finds the union of this region and another, rectangular region.
 
 Finds the union of this region and another region.
 
 
 Finds the union of this region and another region.
 

-\func{bool}{Union}{\param{const wxBitmap&}{ bmp},
-                  \param{const wxColour&}{ transColour = wxNullColour},
+\func{bool}{Union}{\param{const wxBitmap\&}{ bmp}}
+
+Finds the union of this region and the the non-transparent pixels of a
+bitmap. Bitmap's mask is used to determine transparency. If the bitmap doesn't
+have a mask, solid rectangle of bitmap's dimensions is used.
+
+\func{bool}{Union}{\param{const wxBitmap\&}{ bmp},
+                  \param{const wxColour\&}{ transColour},

                  \param{int}{ tolerance = 0}}
 
 Finds the union of this region and the the non-transparent pixels of a
                  \param{int}{ tolerance = 0}}
 
 Finds the union of this region and the the non-transparent pixels of a

-bitmap.  If the bitmap has a mask then it will be used, otherwise the
-colour to be treated as transparent may be specified, along with an
+bitmap. Colour to be treated as transparent is specified in the
+\arg{transColour} argument, along with an

 optional colour tolerance value.
 
 \wxheading{Return value}
 optional colour tolerance value.
 
 \wxheading{Return value}


@@ -254,7 +262,7 @@ See \helpref{wxPaintEvent}{wxpaintevent} for an example of use.
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 

-\membersection{wxRegionIterator::wxRegionIterator}
+\membersection{wxRegionIterator::wxRegionIterator}\label{wxregioniteratorctor}

 
 \func{}{wxRegionIterator}{\void}
 
 
 \func{}{wxRegionIterator}{\void}
 


@@ -264,55 +272,55 @@ Default constructor.
 
 Creates an iterator object given a region.
 
 
 Creates an iterator object given a region.
 

-\membersection{wxRegionIterator::GetX}
+\membersection{wxRegionIterator::GetX}\label{wxregioniteratorgetx}

 
 \constfunc{wxCoord}{GetX}{\void}
 
 Returns the x value for the current region.
 
 
 \constfunc{wxCoord}{GetX}{\void}
 
 Returns the x value for the current region.
 

-\membersection{wxRegionIterator::GetY}
+\membersection{wxRegionIterator::GetY}\label{wxregioniteratorgety}

 
 \constfunc{wxCoord}{GetY}{\void}
 
 Returns the y value for the current region.
 
 
 \constfunc{wxCoord}{GetY}{\void}
 
 Returns the y value for the current region.
 

-\membersection{wxRegionIterator::GetW}
+\membersection{wxRegionIterator::GetW}\label{wxregioniteratorgetw}

 
 \constfunc{wxCoord}{GetW}{\void}
 
 An alias for GetWidth.
 
 
 \constfunc{wxCoord}{GetW}{\void}
 
 An alias for GetWidth.
 

-\membersection{wxRegionIterator::GetWidth}
+\membersection{wxRegionIterator::GetHeight}\label{wxregioniteratorgetheight}

 
 

-\constfunc{wxCoord}{GetWidth}{\void}
+\constfunc{wxCoord}{GetHeight}{\void}

 
 

-Returns the width value for the current region.
+Returns the height value for the current region.

 
 

-\membersection{wxRegionIterator::GetH}
+\membersection{wxRegionIterator::GetH}\label{wxregioniteratorgeth}

 
 \constfunc{wxCoord}{GetH}{\void}
 
 An alias for GetHeight.
 
 
 \constfunc{wxCoord}{GetH}{\void}
 
 An alias for GetHeight.
 

-\membersection{wxRegionIterator::GetHeight}
+\membersection{wxRegionIterator::GetRect}\label{wxregioniteratorgetrect}

 
 

-\constfunc{wxCoord}{GetWidth}{\void}
+\constfunc{wxRect}{GetRect}{\void}

 
 

-Returns the width value for the current region.
+Returns the current rectangle.

 
 

-\membersection{wxRegionIterator::GetRect}
+\membersection{wxRegionIterator::GetWidth}\label{wxregioniteratorgetwidth}

 
 

-\constfunc{wxRect}{GetRect}{\void}
+\constfunc{wxCoord}{GetWidth}{\void}

 
 

-Returns the current rectangle.
+Returns the width value for the current region.

 
 

-\membersection{wxRegionIterator::HaveRects}
+\membersection{wxRegionIterator::HaveRects}\label{wxregioniteratorhaverects}

 
 \constfunc{bool}{HaveRects}{\void}
 
 Returns {\tt true} if there are still some rectangles; otherwise returns {\tt false}.
 
 
 \constfunc{bool}{HaveRects}{\void}
 
 Returns {\tt true} if there are still some rectangles; otherwise returns {\tt false}.
 

-\membersection{wxRegionIterator::Reset}
+\membersection{wxRegionIterator::Reset}\label{wxregioniteratorreset}

 
 \func{void}{Reset}{\void}
 
 
 \func{void}{Reset}{\void}
 


@@ -322,7 +330,7 @@ Resets the iterator to the beginning of the rectangles.
 
 Resets the iterator to the given region.
 
 
 Resets the iterator to the given region.
 

-\membersection{wxRegionIterator::operator $++$}
+\membersection{wxRegionIterator::operator $++$}\label{wxregioniteratorinc}

 
 \func{void}{operator $++$}{\void}
 
 
 \func{void}{operator $++$}{\void}
 


@@ -330,7 +338,7 @@ Increment operator. Increments the iterator to the next region.
 
 \pythonnote{A wxPython alias for this operator is called {\tt Next}.}
 
 
 \pythonnote{A wxPython alias for this operator is called {\tt Next}.}
 

-\membersection{wxRegionIterator::operator bool}
+\membersection{wxRegionIterator::operator bool}\label{wxregioniteratorbool}

 
 \constfunc{}{operator bool}{\void}
 
 
 \constfunc{}{operator bool}{\void}