glibc's vswprintf doesn't nul terminate on truncation.

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 617a8d344baef341cfa985fdaf16147284a9e7d7..d7314afc0c2129bce117823e17a9029245240152 100644 (file)
--- 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(),