From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 10 Sep 2010 11:44:40 +0000 (+0000)
Subject: Initialize wxGenericProgressDialog::m_winDisabler properly.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/79e58a409e58ab69a04a00f82e7debfb27035dac

Initialize wxGenericProgressDialog::m_winDisabler properly.

This field wasn't initialized by Init() which might have been harmless
considering the current code structure but still untidy, do set it to NULL
there.

Also move the forward declaration of wxWindowDisabler class in
wx/generic/progdlgg.h to the top of the file for consistency with the other
forward declarations.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index cca4526f6c..c8585ed15c 100644
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -17,6 +17,7 @@
 class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxGauge;
 class WXDLLIMPEXP_FWD_CORE wxStaticText;
+class WXDLLIMPEXP_FWD_CORE wxWindowDisabler;
 
 /*
     Progress dialog which shows a moving progress bar.
@@ -194,7 +195,7 @@ private:
          m_hasSkipButton;
 
     // for wxPD_APP_MODAL case
-    class WXDLLIMPEXP_FWD_CORE wxWindowDisabler *m_winDisabler;
+    wxWindowDisabler *m_winDisabler;
 
     DECLARE_EVENT_TABLE()
     wxDECLARE_NO_COPY_CLASS(wxGenericProgressDialog);
diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 9cb3d3451f..fbfb8a8e32 100644
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -125,6 +125,8 @@ void wxGenericProgressDialog::Init(wxWindow *parent, int maximum, int style)
 
     m_hasAbortButton =
     m_hasSkipButton = false;
+
+    m_winDisabler = NULL;
 }
 
 wxGenericProgressDialog::wxGenericProgressDialog(wxWindow *parent,