Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't create an unnecessary extra button in wxMSW wxProgressDialog.

Browse Source 
MSWCommonTaskDialogInit() now (probably since r67620) always creates a
IDCANCEL button so don't create another one in wxProgressDialog code, just
ensure that the one created by that function has the correct label (either
"Cancel" or "Close").

Closes #13358.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-07-23 11:59:43 +00:00
parent 4877e9bf90
commit 04a00346c6
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/msw/progdlg.cpp
View File

@@ -761,6 +761,11 @@ void* wxProgressDialogTaskRunner::Entry()
wxTdc.caption = m_sharedData.m_title.wx_str();
wxTdc.message = m_sharedData.m_message.wx_str();
// MSWCommonTaskDialogInit() will add an IDCANCEL button but we need to
// give it the correct label.
wxTdc.btnOKLabel = m_sharedData.m_labelCancel;
wxTdc.useCustomLabels = true;
wxTdc.MSWCommonTaskDialogInit( tdc );
tdc.pfCallback = TaskDialogCallbackProc;
tdc.lpCallbackData = (LONG_PTR) &m_sharedData;
@@ -769,16 +774,9 @@ void* wxProgressDialogTaskRunner::Entry()
tdc.dwFlags &= ~TDF_EXPAND_FOOTER_AREA; // Expand in content area.
tdc.dwCommonButtons = 0; // Don't use common buttons.
wxTdc.useCustomLabels = true;
if ( m_sharedData.m_style & wxPD_CAN_SKIP )
wxTdc.AddTaskDialogButton( tdc, Id_SkipBtn, 0, _("Skip") );
// Use a Cancel button when requested or use a Close button when
// the dialog does not automatically hide.
wxTdc.AddTaskDialogButton( tdc, IDCANCEL, 0,
m_sharedData.m_labelCancel );
tdc.dwFlags |= TDF_CALLBACK_TIMER | TDF_SHOW_PROGRESS_BAR;
if ( !m_sharedData.m_expandedInformation.empty() )