X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7a49742ec6b4effe012dc7204db307e1267bf6a..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/msw/font.cpp?ds=sidebyside diff --git a/src/msw/font.cpp b/src/msw/font.cpp index b0e73148cb..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) @@ -841,7 +841,7 @@ bool wxFont::DoCreate(int pointSize, // wxDEFAULT is a valid value for the font size too so we must treat it // specially here (otherwise the size would be 70 == wxDEFAULT value) - if ( pointSize == wxDEFAULT ) + if ( pointSize == wxDEFAULT || pointSize == -1 ) { pointSize = wxNORMAL_FONT->GetPointSize(); }