AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Initialize wxGenericProgressDialog::m_winDisabler properly.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin 2010-09-10 11:44:40 +00:00
parent 395da337e9
commit 79e58a409e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/generic/progdlgg.h
View File

@ -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);

2
src/generic/progdlgg.cpp
View File

@ -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,