add Inflate(wxSize) overload

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

diff --git a/docs/latex/wx/rect.tex b/docs/latex/wx/rect.tex
index 3a45afaa27d05a1c5dad61bbbc0263a935052e0f..a6c97fd2cc31a7462451e7b42a2cc51e06957a0b 100644 (file)
--- a/docs/latex/wx/rect.tex
+++ b/docs/latex/wx/rect.tex
@@ -100,6 +100,8 @@ Returns \true if the given rectangle is completely inside this rectangle
 
 \func{void}{Deflate}{\param{wxCoord }{dx}, \param{wxCoord }{dy}}
 
 
 \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}}
 \func{void}{Deflate}{\param{wxCoord }{diff}}
 
 \constfunc{wxRect}{Deflate}{\param{wxCoord }{dx}, \param{wxCoord }{dy}}


@@ -222,6 +224,8 @@ Gets the y member.
 
 \func{void}{Inflate}{\param{wxCoord }{dx}, \param{wxCoord }{dy}}
 
 
 \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}}
 \func{void}{Inflate}{\param{wxCoord }{diff}}
 
 \constfunc{wxRect}{Inflate}{\param{wxCoord }{dx}, \param{wxCoord }{dy}}

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 242e0f9ea8805640f6bde619ffdcf382b748ecbc..8a9d5df8225ac67fba732f189d7d661b14a2d914 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -386,6 +386,7 @@ public:
 
     // operations with rect
     wxRect& Inflate(wxCoord dx, wxCoord dy);
 
     // operations with rect
     wxRect& Inflate(wxCoord dx, wxCoord dy);

+    wxRect& Inflate(const wxSize& d) { return Inflate(d.x, d.y); }

     wxRect& Inflate(wxCoord d) { return Inflate(d, d); }
     wxRect Inflate(wxCoord dx, wxCoord dy) const
     {
     wxRect& Inflate(wxCoord d) { return Inflate(d, d); }
     wxRect Inflate(wxCoord dx, wxCoord dy) const
     {


@@ -395,6 +396,7 @@ public:
     }
 
     wxRect& Deflate(wxCoord dx, wxCoord dy) { return Inflate(-dx, -dy); }
     }
 
     wxRect& Deflate(wxCoord dx, wxCoord dy) { return Inflate(-dx, -dy); }

+    wxRect& Deflate(const wxSize& d) { return Inflate(-d.x, -d.y); }

     wxRect& Deflate(wxCoord d) { return Inflate(-d); }
     wxRect Deflate(wxCoord dx, wxCoord dy) const
     {
     wxRect& Deflate(wxCoord d) { return Inflate(-d); }
     wxRect Deflate(wxCoord dx, wxCoord dy) const
     {