Minor header cleaning.

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index a81555a5cc105b8c7afb3a67fcb02eca8772a798..a4b09c94938c0f7874a2a5c881f3aef3f12d2fa2 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

+#include "wx/gdiobj.h"

 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"


@@ -28,9 +29,12 @@
     #include "wx/settings.h"
     #include "wx/bitmap.h"
     #include "wx/colour.h"
     #include "wx/settings.h"
     #include "wx/bitmap.h"
     #include "wx/colour.h"

+    #include "wx/font.h"

 #endif
 
 #endif
 

-#include "wx/font.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
+

 
 WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
 WXDLLIMPEXP_DATA_CORE(wxFontList*)  wxTheFontList;
 
 WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
 WXDLLIMPEXP_DATA_CORE(wxFontList*)  wxTheFontList;


@@ -179,7 +183,7 @@ wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy)
     return *this;
 }
 
     return *this;
 }
 

-bool wxRect::Inside(int cx, int cy) const
+bool wxRect::Contains(int cx, int cy) const

 {
     return ( (cx >= x) && (cy >= y)
           && ((cy - y) < height)
 {
     return ( (cx >= x) && (cy >= y)
           && ((cy - y) < height)


@@ -187,6 +191,11 @@ bool wxRect::Inside(int cx, int cy) const
           );
 }
 
           );
 }
 

+bool wxRect::Contains(const wxRect& rect) const
+{
+    return Contains(rect.GetTopLeft()) && Contains(rect.GetBottomRight());
+}
+

 wxRect& wxRect::Intersect(const wxRect& rect)
 {
     int x2 = GetRight(),
 wxRect& wxRect::Intersect(const wxRect& rect)
 {
     int x2 = GetRight(),


@@ -318,7 +327,7 @@ void wxColourDatabase::Initialize()
         {wxT("ORANGE RED"), 255, 0, 127},
         {wxT("ORCHID"), 219, 112, 219},
         {wxT("PALE GREEN"), 143, 188, 143},
         {wxT("ORANGE RED"), 255, 0, 127},
         {wxT("ORCHID"), 219, 112, 219},
         {wxT("PALE GREEN"), 143, 188, 143},

-        {wxT("PINK"), 188, 143, 234},
+        {wxT("PINK"), 255, 192, 203},

         {wxT("PLUM"), 234, 173, 234},
         {wxT("PURPLE"), 176, 0, 255},
         {wxT("RED"), 255, 0, 0},
         {wxT("PLUM"), 234, 173, 234},
         {wxT("PURPLE"), 176, 0, 255},
         {wxT("RED"), 255, 0, 0},