changed wxImage::Rescale() to return wxImage& and not void

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

diff --git a/docs/latex/wx/image.tex b/docs/latex/wx/image.tex
index bb30df8ff87b383e53450fe3d2c314fa93446692..f1b4eb26376d0429c985a1a46fb092556a87505b 100644 (file)
--- a/docs/latex/wx/image.tex
+++ b/docs/latex/wx/image.tex
@@ -451,11 +451,13 @@ mimetype to the named file}
 
 \membersection{wxImage::Rescale}\label{wximagerescale}
 
 
 \membersection{wxImage::Rescale}\label{wximagerescale}
 

-\func{wxImage}{Rescale}{\param{int}{ width}, \param{int}{ height}}
+\func{wxImage \&}{Rescale}{\param{int}{ width}, \param{int}{ height}}

 
 Changes the size of the image in-place: after a call to this function, the
 image will have the given width and height.
 
 
 Changes the size of the image in-place: after a call to this function, the
 image will have the given width and height.
 

+Returns the (modified) image itself.
+

 \wxheading{See also}
 
 \helpref{Scale}{wximagescale}
 \wxheading{See also}
 
 \helpref{Scale}{wximagescale}

diff --git a/include/wx/image.h b/include/wx/image.h
index 93d16b3778fdbc887b86ffbaf0d34d8506367017..bbe0f2e6f9b0b9ab0f4a4b132decb2170858ee91 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -255,7 +255,7 @@ public:
   wxImage Scale( int width, int height ) const;
 
   // rescales the image in place
   wxImage Scale( int width, int height ) const;
 
   // rescales the image in place

-  void Rescale( int width, int height ) { *this = Scale(width, height); }
+  wxImage& Rescale( int width, int height ) { return *this = Scale(width, height); }

 
   // these routines are slow but safe
   void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );
 
   // these routines are slow but safe
   void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );