From b0eca3bdde4984d41183f498e34d4c616c23f4d2 Mon Sep 17 00:00:00 2001 From: Graham Dawes Date: Mon, 17 Dec 2018 15:22:38 +0000 Subject: [PATCH] Fix some more uninitialised wxCairoContext fields in wxQt Closes https://github.com/wxWidgets/wxWidgets/pull/1084 --- src/generic/graphicc.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index d98e68756a..a8876075ef 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -2234,6 +2234,11 @@ wxCairoContext::wxCairoContext(wxGraphicsRenderer* renderer, HWND hWnd) wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context ) : wxGraphicsContext(renderer) { +#ifdef __WXQT__ + m_qtPainter = NULL; + m_qtImage = NULL; + m_qtSurface = NULL; +#endif #ifdef __WXMSW__ m_mswSurface = NULL; m_mswStateSavedDC = 0; @@ -2288,6 +2293,11 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window) wxCairoContext::wxCairoContext(wxGraphicsRenderer* renderer) : wxGraphicsContext(renderer) { +#ifdef __WXQT__ + m_qtPainter = NULL; + m_qtImage = NULL; + m_qtSurface = NULL; +#endif #ifdef __WXMSW__ m_mswSurface = NULL; m_mswStateSavedDC = 0;