X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0e0d66151c930ea402f96925d8d4dc9bb514c09..b70ababc146a97e9f1b2afc0193f92fa6c202dd9:/src/common/gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 81c83a8e70..7755f181e1 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -31,6 +31,7 @@
 #include "wx/palette.h"
 #include "wx/app.h"
 #include "wx/dc.h"
+#include "wx/utils.h"
 
 #include "wx/log.h"
 #include <string.h>
@@ -88,6 +89,29 @@ bool wxRect::operator==(const wxRect& rect) const
           (height == rect.height));
 }
 
+const wxRect& wxRect::operator += (const wxRect& rect)
+{
+	*this = (*this + rect);
+	return ( *this ) ;
+}
+
+wxRect wxRect::operator + (const wxRect& rect) const
+{
+	int x1 = wxMin(this->x, rect.x);
+	int y1 = wxMin(this->y, rect.y);
+	int y2 = wxMax(y+height, rect.height+rect.y);
+	int x2 = wxMax(x+width, rect.width+rect.x);
+	return wxRect(x1, y1, x2-x1, y2-y1);
+}
+
+bool wxRect::Inside(int cx, int cy) const
+{
+	return ( (cx >= x) && (cy >= y)
+		  && ((cy - y) < height)
+		  && ((cx - x) < width)
+		  );
+}
+
 wxColourDatabase::wxColourDatabase (int type) : wxList (type)
 {
 }
@@ -232,6 +256,9 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 #ifdef __WXMSW__
   else return NULL;
 #endif
+#ifdef __WXPM__
+  else return NULL;
+#endif
 
 // TODO for other implementations. This should really go into
 // platform-specific directories.
@@ -571,7 +598,12 @@ wxFont *wxFontList::
           //#if defined(__X__)
           //          each_font->GetFontId () == FamilyOrFontId) /* New font system */
           //#else
-          each_font->GetFamily () == FamilyOrFontId &&
+#if defined(__WXGTK__)
+          (each_font->GetFamily() == FamilyOrFontId ||
+           (each_font->GetFamily() == wxSWISS && FamilyOrFontId == wxDEFAULT)) &&
+#else
+          each_font->GetFamily() == FamilyOrFontId &&
+#endif
           ((each_font->GetFaceName() == _T("")) || each_font->GetFaceName() == Face))
         //#endif
         return each_font;