X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b93d0c64029048cb3f0e3db00b454dd0ae82a7ef..aa994705c74d3eed1e5a4b5d98bd3f295ff19301:/src/common/gdicmn.cpp?ds=sidebyside

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 53a1a34117..b2554b00fd 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -90,13 +90,13 @@ bool wxRect::operator==(const wxRect& rect) const
 }
 
 const wxRect& wxRect::operator += (const wxRect& rect)
-{ 
-	*this = (*this + 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);
@@ -595,7 +595,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;