added wx/defs.h include to correct compilation issues under Mac OS X

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 44cca93b72ba2254feb4fb44232735958674d962..1a8b50c376d30baa812e624dec511c5efa8880f4 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -104,6 +104,8 @@ void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info)
     SetUnderlined(info.underlined);
     SetFaceName(info.faceName);
     SetEncoding(info.encoding);
     SetUnderlined(info.underlined);
     SetFaceName(info.faceName);
     SetEncoding(info.encoding);

+#else
+    (void)info;

 #endif
 }
 
 #endif
 }
 


@@ -138,6 +140,7 @@ bool wxFontBase::operator==(const wxFont& font) const
             GetPointSize() == font.GetPointSize() &&
             GetFamily() == font.GetFamily() &&
             GetStyle() == font.GetStyle() &&
             GetPointSize() == font.GetPointSize() &&
             GetFamily() == font.GetFamily() &&
             GetStyle() == font.GetStyle() &&

+            GetWeight() == font.GetWeight() &&

             GetUnderlined() == font.GetUnderlined() &&
             GetFaceName() == font.GetFaceName() &&
             GetEncoding() == font.GetEncoding()
             GetUnderlined() == font.GetUnderlined() &&
             GetFaceName() == font.GetFaceName() &&
             GetEncoding() == font.GetEncoding()


@@ -212,7 +215,7 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     //
     //  Ignore the version for now
     //
     //
     //  Ignore the version for now
     //

-    
+

     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;