]> git.saurik.com Git - wxWidgets.git/commitdiff
Initialize wxGenericProgressDialog button members in Init() too.
authorVadim Zeitlin <vadim@wxwidgets.org>
Fri, 10 Sep 2010 17:26:11 +0000 (17:26 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Fri, 10 Sep 2010 17:26:11 +0000 (17:26 +0000)
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

index b1bb1c6e3e27bba6e52a0b122478bd656f19a6f3..dcecbc62e8e92ad893e9a6336cc7aa3be85195af 100644 (file)
@@ -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;