More _T() in asserts...

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index e65874604560321c832f72555337d9c62421dba8..b2554b00fd0de55c0e8258490ecd097f77872740 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -89,16 +89,14 @@ bool wxRect::operator==(const wxRect& rect) const
           (height == rect.height));
 }
 
           (height == rect.height));
 }
 

-// this doesn't compile
-#if 0

 const wxRect& wxRect::operator += (const wxRect& rect)
 const wxRect& wxRect::operator += (const wxRect& rect)

-{ 
-       *this = (*this + rect); 
+{
+       *this = (*this + rect);

        return ( *this ) ;
 }
 
 wxRect wxRect::operator + (const wxRect& rect) const
        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 x1 = wxMin(this->x, rect.x);
        int y1 = wxMin(this->y, rect.y);
        int y2 = wxMax(y+height, rect.height+rect.y);


@@ -113,7 +111,6 @@ bool wxRect::Inside(int cx, int cy) const
                  && ((cx - x) < width)
                  );
 }
                  && ((cx - x) < width)
                  );
 }

-#endif

 
 wxColourDatabase::wxColourDatabase (int type) : wxList (type)
 {
 
 wxColourDatabase::wxColourDatabase (int type) : wxList (type)
 {


@@ -598,7 +595,12 @@ wxFont *wxFontList::
           //#if defined(__X__)
           //          each_font->GetFontId () == FamilyOrFontId) /* New font system */
           //#else
           //#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;
           ((each_font->GetFaceName() == _T("")) || each_font->GetFaceName() == Face))
         //#endif
         return each_font;