X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d180df5c431d4dc9e788141794fd51fe1f39ad3e..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/msw/font.cpp diff --git a/src/msw/font.cpp b/src/msw/font.cpp index 060139df72..ddeef61886 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -804,18 +804,18 @@ wxFont::wxFont(const wxString& fontdesc) (void)Create(info); } -wxFont::wxFont(int pointSize, - wxFontFamily family, - int flags, - const wxString& face, - wxFontEncoding encoding) +wxFont::wxFont(const wxFontInfo& info) { - m_refData = new wxFontRefData(pointSize, wxDefaultSize, false, - family, - GetStyleFromFlags(flags), - GetWeightFromFlags(flags), - GetUnderlinedFromFlags(flags), - false, face, encoding); + m_refData = new wxFontRefData(info.GetPointSize(), + info.GetPixelSize(), + info.IsUsingSizeInPixels(), + info.GetFamily(), + info.GetStyle(), + info.GetWeight(), + info.IsUnderlined(), + info.IsStrikethrough(), + info.GetFaceName(), + info.GetEncoding()); } bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)