Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxRect::Inflate()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-02-17 14:06:00 +00:00
parent 19a9df0980
commit 45816ddded
3 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs/latex/wx/rect.tex
View File

@@ -118,6 +118,18 @@ Gets the x member.
Gets the y member. Gets the y member.
\membersection{wxRect::Inflate}\label{wxrectinflate}
\func{void}{Inflate}{\param{wxCoord }{dx}, \param{wxCoord }{dy}}
\func{void}{Inflate}{\param{wxCoord }{diff}}
Increase the rectangle size by {\it dx} in x direction and {\it dy} in y
direction. Both (or one of) parameters may be negative to decrease the
rectngle size.
The second form uses the same {\it diff} for both {\it dx} and {\it dy}.
\membersection{wxRect::SetHeight}\label{wxrectsetheight} \membersection{wxRect::SetHeight}\label{wxrectsetheight}
\func{void}{SetHeight}{\param{int}{ height}} \func{void}{SetHeight}{\param{int}{ height}}

16
include/wx/gdicmn.h
View File

@@ -285,8 +285,6 @@ public:
wxPoint GetPosition() const { return wxPoint(x, y); } wxPoint GetPosition() const { return wxPoint(x, y); }
wxSize GetSize() const { return wxSize(width, height); } wxSize GetSize() const { return wxSize(width, height); }
// MFC-like functions
int GetLeft() const { return x; } int GetLeft() const { return x; }
int GetTop() const { return y; } int GetTop() const { return y; }
int GetBottom() const { return y + height - 1; } int GetBottom() const { return y + height - 1; }
@@ -297,12 +295,22 @@ public:
void SetTop(int top) { y = top; } void SetTop(int top) { y = top; }
void SetBottom(int bottom) { height = bottom - y + 1; } void SetBottom(int bottom) { height = bottom - y + 1; }
void Inflate(wxCoord dx, wxCoord dy)
{
x -= dx;
y -= dy;
width += 2*dx;
height += 2*dy;
}
void Inflate(wxCoord d) { Inflate(d, d); }
bool operator==(const wxRect& rect) const; bool operator==(const wxRect& rect) const;
bool operator!=(const wxRect& rect) const { return !(*this == rect); } bool operator!=(const wxRect& rect) const { return !(*this == rect); }
bool Inside(int cx, int cy) const; bool Inside(int cx, int cy) const;
wxRect operator + (const wxRect& rect) const; wxRect operator+(const wxRect& rect) const;
const wxRect& operator += (const wxRect& rect); wxRect& operator+=(const wxRect& rect);
public: public:
int x, y, width, height; int x, y, width, height;

38
src/common/gdicmn.cpp
View File

@@ -50,14 +50,14 @@
#endif #endif
#endif #endif
IMPLEMENT_CLASS(wxColourDatabase, wxList) IMPLEMENT_CLASS(wxColourDatabase, wxList)
IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList) IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList) IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList) IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList) IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList) IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight) wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
{ {
@@ -93,27 +93,27 @@ bool wxRect::operator==(const wxRect& rect) const
(height == rect.height)); (height == rect.height));
} }
const wxRect& wxRect::operator += (const wxRect& rect) wxRect& wxRect::operator += (const wxRect& rect)
{ {
*this = (*this + rect); *this = (*this + rect);
return ( *this ) ; return ( *this ) ;
} }
wxRect wxRect::operator + (const wxRect& rect) const wxRect wxRect::operator + (const wxRect& rect) const
{ {
int x1 = wxMin(this->x, rect.x); int x1 = wxMin(this->x, rect.x);
int y1 = wxMin(this->y, rect.y); int y1 = wxMin(this->y, rect.y);
int y2 = wxMax(y+height, rect.height+rect.y); int y2 = wxMax(y+height, rect.height+rect.y);
int x2 = wxMax(x+width, rect.width+rect.x); int x2 = wxMax(x+width, rect.width+rect.x);
return wxRect(x1, y1, x2-x1, y2-y1); return wxRect(x1, y1, x2-x1, y2-y1);
} }
bool wxRect::Inside(int cx, int cy) const bool wxRect::Inside(int cx, int cy) const
{ {
return ( (cx >= x) && (cy >= y) return ( (cx >= x) && (cy >= y)
&& ((cy - y) < height) && ((cy - y) < height)
&& ((cx - x) < width) && ((cx - x) < width)
); );
} }
wxColourDatabase::wxColourDatabase (int type) : wxList (type) wxColourDatabase::wxColourDatabase (int type) : wxList (type)