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 cca4526f6c173ff241a72f0243ae399bf98d8f08..c8585ed15c912c51557174a51950e6449a0da2c9 100644 (file)
--- 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 9cb3d3451fc617b3a158a2421b83a726fecabbfa..fbfb8a8e329ee24fc86bce0a44f857ac6e5938e5 100644 (file)
--- 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,