From 3e4f133a43e6333e59543aa20a77ddb6d884e508 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 10 Sep 2010 17:26:11 +0000 Subject: [PATCH] Initialize wxGenericProgressDialog button members in Init() too. wxGenericProgressDialog::m_btn{Abort,Skip} were not initialized neither which resulted in crashes inside EnableAbort() which was called if the "Cancel" button was pressed in a native MSW dialog but the dialog wasn't cancelled (and hence the button needed to be reenabled). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/progdlgg.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index b1bb1c6e3e..dcecbc62e8 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -114,6 +114,11 @@ void wxGenericProgressDialog::Init(wxWindow *parent, int style) m_skip = false; +#if !defined(__SMARTPHONE__) + m_btnAbort = + m_btnSkip = NULL; +#endif + m_display_estimated = m_last_timeupdate = m_ctdelay = 0;