From aa4d51d57945cefac0d1b33324f9a2d82795fe43 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 9 Dec 2017 16:31:28 +0100 Subject: [PATCH] Fix font creation using font flags in Cairo wxGraphicsContext Don't crash trying to use an uninitialized font in GetPartialTextExtents() later if the font was created using CreateFont(sizeInPixels, facename, flags) overload. Closes #18021. --- src/generic/graphicc.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index 69c407acd3..bb30529579 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -1013,6 +1013,10 @@ wxCairoFontData::wxCairoFontData(wxGraphicsRenderer* renderer, int flags, const wxColour& col) : wxGraphicsObjectRefData(renderer) +#ifdef __WXGTK__ + , m_wxfont(wxFontInfo(wxSize(sizeInPixels, sizeInPixels)) + .AllFlags(flags).FaceName(facename)) +#endif { InitColour(col);