X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bf30fe9b0b40d1a6f54608588121212c2c4e037..24a7a1980f309763c349541daffa46f1a5fd16b2:/src/common/fontcmn.cpp?ds=sidebyside diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index 44cca93b72..c6b9720509 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -77,7 +77,7 @@ wxFont *wxFontBase::New(const wxString& strNativeFontDesc) wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const { -#if !defined(__WXGTK__) && !defined(__WXMSW__) +#if !defined(__WXGTK__) && !defined(__WXMSW__) && !defined(__WXMGL__) wxNativeFontInfo *fontInfo = new wxNativeFontInfo; fontInfo->pointSize = GetPointSize(); @@ -96,7 +96,7 @@ wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info) { -#if !defined(__WXGTK__) && !defined(__WXMSW__) +#if !defined(__WXGTK__) && !defined(__WXMSW__) && !defined(__WXMGL__) SetPointSize(info.pointSize); SetFamily(info.family); SetStyle(info.style); @@ -104,6 +104,8 @@ void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info) SetUnderlined(info.underlined); SetFaceName(info.faceName); SetEncoding(info.encoding); +#else + (void)info; #endif } @@ -191,7 +193,7 @@ wxString wxFontBase::GetWeightString() const } } -#if !defined(__WXGTK__) && !defined(__WXMSW__) +#if !defined(__WXGTK__) && !defined(__WXMSW__) && !defined(__WXMGL__) // ---------------------------------------------------------------------------- // wxNativeFontInfo @@ -212,7 +214,7 @@ bool wxNativeFontInfo::FromString(const wxString& s) // // Ignore the version for now // - + token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) return FALSE;