From f67db8c0021849f0911d96f7fb77c6d0e141676c Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 1 Jun 2003 17:15:38 +0000 Subject: [PATCH] Removed AlignIn after further thought git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/rect.tex | 8 -------- include/wx/gdicmn.h | 12 ------------ 2 files changed, 20 deletions(-) diff --git a/docs/latex/wx/rect.tex b/docs/latex/wx/rect.tex index 8d86603975..63216a5bbf 100644 --- a/docs/latex/wx/rect.tex +++ b/docs/latex/wx/rect.tex @@ -176,14 +176,6 @@ boundary) and {\tt false} otherwise. Returns {\tt true} if this rectangle has a non empty intersection with the rectangle {\it rect} and {\tt false} otherwise. -\membersection{wxRect::AlignIn}\label{wxrectalignin} - -\func{void}{AlignIn}{\param{const wxRect\& }{rect}, \param{int }{align}} - -Aligns the rectangle in another rectangle, according to the alignment flags. -Supports combinations of horizontal and vertical centering, plus left, right, -top and bottom justification. - \membersection{wxRect::Offset}\label{wxrectoffset} \func{void}{Offset}{\param{wxCoord }{dx}, \param{wxCoord }{dy}} diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index fbbe12fa96..2df4124c47 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -365,18 +365,6 @@ public: // return TRUE if the rectangles have a non empty intersection bool Intersects(const wxRect& rect) const; - // align in another rectangle according to WX alignment flags. - void AlignIn(const wxRect& rect, int align) - { - if (align & wxALIGN_CENTER_HORIZONTAL) x = rect.x + (rect.width-width)/2; - else if (align & wxALIGN_RIGHT) x = rect.x+rect.width - width; - else x = rect.x; - - if (align & wxALIGN_CENTER_VERTICAL) y = rect.y + (rect.height-height)/2; - else if (align & wxALIGN_BOTTOM) y = rect.y+rect.height - height; - else y = rect.y; - } - public: int x, y, width, height; }; -- 2.50.0