X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48a1108eb87970373e1b1d5debeeaedd8d1916ea..fa6a837300efb9d295b889a8308b74537c9d8677:/src/common/gdicmn.cpp?ds=sidebyside diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 617a8d344b..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" @@ -31,6 +32,10 @@ #include "wx/font.h" #endif + +IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) + + WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList; WXDLLIMPEXP_DATA_CORE(wxPenList*) wxThePenList; @@ -186,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(),