Apply patch [ 1554746 ] wxXmlNode::InsertChild fix

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 6d3faf11f71f5fc4cc4b715e0f23bc966a2b99ae..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"
@@ -26,12 +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"
-#include "wx/hashmap.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
+
 
 WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
 WXDLLIMPEXP_DATA_CORE(wxFontList*)  wxTheFontList;
@@ -50,8 +53,6 @@ WXDLLIMPEXP_DATA_CORE(wxPen)     wxNullPen;
 WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette;
 #endif
 
-WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap);
-
 const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
 const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);
 
@@ -190,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(),