X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..d21d2e5adf7a5acf3b496a9c4e87eab220bd75d8:/src/common/fontcmn.cpp diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index c6b9720509..1a8b50c376 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__) && !defined(__WXMGL__) +#if !defined(__WXGTK__) && !defined(__WXMSW__) 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__) && !defined(__WXMGL__) +#if !defined(__WXGTK__) && !defined(__WXMSW__) SetPointSize(info.pointSize); SetFamily(info.family); SetStyle(info.style); @@ -140,6 +140,7 @@ bool wxFontBase::operator==(const wxFont& font) const GetPointSize() == font.GetPointSize() && GetFamily() == font.GetFamily() && GetStyle() == font.GetStyle() && + GetWeight() == font.GetWeight() && GetUnderlined() == font.GetUnderlined() && GetFaceName() == font.GetFaceName() && GetEncoding() == font.GetEncoding() @@ -193,7 +194,7 @@ wxString wxFontBase::GetWeightString() const } } -#if !defined(__WXGTK__) && !defined(__WXMSW__) && !defined(__WXMGL__) +#if !defined(__WXGTK__) && !defined(__WXMSW__) // ---------------------------------------------------------------------------- // wxNativeFontInfo