X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd6685b30768d78c58f594c4d9f04fd514e16c95..976f924083419b6a7feb1ff7d597c746a70abf1a:/src/os2/font.cpp diff --git a/src/os2/font.cpp b/src/os2/font.cpp index 52e3ec4d2e..517053a915 100644 --- a/src/os2/font.cpp +++ b/src/os2/font.cpp @@ -376,8 +376,6 @@ bool wxFontRefData::Alloc( wxString sFaceName; long flId = m_hFont; long lRc; - short nIndex = 0; - PFONTMETRICS pFM = NULL; ERRORID vError; wxString sError; @@ -1140,11 +1138,10 @@ wxFontEncoding wxFont::GetEncoding() const return M_FONTDATA->GetEncoding(); } // end of wxFont::GetEncoding -wxNativeFontInfo* wxFont::GetNativeFontInfo() const +const wxNativeFontInfo* wxFont::GetNativeFontInfo() const { - if (M_FONTDATA->HasNativeFontInfo()) - return new wxNativeFontInfo(M_FONTDATA->GetNativeFontInfo()); - return 0; + return M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo()) + : NULL; } // end of wxFont::GetNativeFontInfo //