From 9edd688dd333101cc9e427918d7530eb0906838b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 15 Dec 2011 00:22:48 +0000 Subject: [PATCH] Ensure that wxPropertyGrid::m_tlp is initialized early enough. This member variable could be used before it was initialized as OnTLPChanging() was called from Create() before Init2(), where m_tlp was assigned NULL, was called. Closes #13552. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/propgrid/propgrid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index 77a3209a50..4904e10936 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -348,6 +348,7 @@ void wxPropertyGrid::Init1() m_eventObject = this; m_curFocused = NULL; m_processedEvent = NULL; + m_tlp = NULL; m_sortFunction = NULL; m_inDoPropertyChanged = false; m_inCommitChangesFromEditor = false; @@ -465,7 +466,6 @@ void wxPropertyGrid::Init2() SetBackgroundStyle( wxBG_STYLE_CUSTOM ); // Hook the top-level parent - m_tlp = NULL; m_tlpClosed = NULL; m_tlpClosedTime = 0; -- 2.50.0