From b42e4b3e5a186e88535a107550a11abae5d4057c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 May 2012 13:04:26 +0000 Subject: [PATCH] Compilation fix for wxRichTextCtrl. Don't use wxDEFAULT, there is no match for wxFont ctor taking wxSize and it, use wxFONTFAMILY_DEFAULT instead. Also remove the unnecessary .c_str() from the same wxFont ctor call, there is really no reason at all to have it there. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index fb1bdc5472..248781b2fb 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -11588,7 +11588,7 @@ wxFont wxRichTextFontTableData::FindFont(const wxRichTextAttr& fontSpec, double { if (fontSpec.HasFontPixelSize() && !fontSpec.HasFontPointSize()) { - wxFont font(wxSize(0, fontSize), wxDEFAULT, fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), fontSpec.GetFontUnderlined(), facename.c_str()); + wxFont font(wxSize(0, fontSize), wxFONTFAMILY_DEFAULT, fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), fontSpec.GetFontUnderlined(), facename); if (fontSpec.HasFontStrikethrough() && fontSpec.GetFontStrikethrough()) font.SetStrikethrough(true); m_hashMap[spec] = font;