X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f79f1604a026283f47df6a231c4348ac0f44f552..24aab8e81a8627802e4111d9c99a50ece8d0026e:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 512fa5e23e..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" @@ -26,11 +27,14 @@ #include "wx/icon.h" #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/bitmap.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(),