X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5819f832e6fc616ea3e365376ce71ed3c69e023a..1cb311851d96ed4fb5290c65455075c6989f7142:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index d7314afc0c..a4b09c9493 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -183,7 +183,7 @@ wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy) 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) @@ -191,9 +191,9 @@ bool wxRect::Inside(int cx, int cy) const ); } -bool wxRect::Inside(const wxRect& rect) const +bool wxRect::Contains(const wxRect& rect) const { - return Inside(rect.GetTopLeft()) && Inside(rect.GetBottomRight()); + return Contains(rect.GetTopLeft()) && Contains(rect.GetBottomRight()); } wxRect& wxRect::Intersect(const wxRect& rect) @@ -327,7 +327,7 @@ void wxColourDatabase::Initialize() {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},