X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bca03736369e836cce9297509505c5972e775dd..5713b34914d8216e1af3dce0373d10566a6d7ea3:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index bd0a76b366..d7314afc0c 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -17,6 +17,7 @@ #endif #include "wx/gdicmn.h" +#include "wx/gdiobj.h" #ifndef WX_PRECOMP #include "wx/log.h" @@ -27,10 +28,13 @@ #include "wx/cursor.h" #include "wx/settings.h" #include "wx/bitmap.h" + #include "wx/colour.h" + #include "wx/font.h" #endif -#include "wx/colour.h" -#include "wx/font.h" + +IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) + WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList; @@ -187,6 +191,11 @@ bool wxRect::Inside(int cx, int cy) const ); } +bool wxRect::Inside(const wxRect& rect) const +{ + return Inside(rect.GetTopLeft()) && Inside(rect.GetBottomRight()); +} + wxRect& wxRect::Intersect(const wxRect& rect) { int x2 = GetRight(),