ec679be512
Apply the same workaround as was applied in r67771 to wxMessageDialog to wxRichMessageDialog and map IDCANCEL returned from it to IDOK if "Cancel" is the only button in the dialog -- as in this case it's really just a renamed (for convenience of allowing the user to use "Esc" to close it) "OK". Closes #16153. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
96 lines
2.9 KiB
C++
96 lines
2.9 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/msw/richmsgdlg.cpp
|
|
// Purpose: wxRichMessageDialog
|
|
// Author: Rickard Westerlund
|
|
// Created: 2010-07-04
|
|
// Copyright: (c) 2010 wxWidgets team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#if wxUSE_RICHMSGDLG
|
|
|
|
#include "wx/richmsgdlg.h"
|
|
#include "wx/modalhook.h"
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include "wx/msw/private.h"
|
|
#endif
|
|
|
|
// This will define wxHAS_MSW_TASKDIALOG if we have support for it in the
|
|
// headers we use.
|
|
#include "wx/msw/private/msgdlg.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxRichMessageDialog
|
|
// ----------------------------------------------------------------------------
|
|
|
|
int wxRichMessageDialog::ShowModal()
|
|
{
|
|
WX_HOOK_MODAL_DIALOG();
|
|
|
|
#ifdef wxHAS_MSW_TASKDIALOG
|
|
using namespace wxMSWMessageDialog;
|
|
|
|
if ( HasNativeTaskDialog() )
|
|
{
|
|
// create a task dialog
|
|
WinStruct<TASKDIALOGCONFIG> tdc;
|
|
wxMSWTaskDialogConfig wxTdc(*this);
|
|
|
|
wxTdc.MSWCommonTaskDialogInit( tdc );
|
|
|
|
// add a checkbox
|
|
if ( !m_checkBoxText.empty() )
|
|
{
|
|
tdc.pszVerificationText = m_checkBoxText.t_str();
|
|
if ( m_checkBoxValue )
|
|
tdc.dwFlags |= TDF_VERIFICATION_FLAG_CHECKED;
|
|
}
|
|
|
|
// add collapsible footer
|
|
if ( !m_detailedText.empty() )
|
|
tdc.pszExpandedInformation = m_detailedText.t_str();
|
|
|
|
TaskDialogIndirect_t taskDialogIndirect = GetTaskDialogIndirectFunc();
|
|
if ( !taskDialogIndirect )
|
|
return wxID_CANCEL;
|
|
|
|
// create the task dialog, process the answer and return it.
|
|
BOOL checkBoxChecked;
|
|
int msAns;
|
|
HRESULT hr = taskDialogIndirect( &tdc, &msAns, NULL, &checkBoxChecked );
|
|
if ( FAILED(hr) )
|
|
{
|
|
wxLogApiError( "TaskDialogIndirect", hr );
|
|
return wxID_CANCEL;
|
|
}
|
|
m_checkBoxValue = checkBoxChecked != FALSE;
|
|
|
|
// In case only an "OK" button was specified we actually created a
|
|
// "Cancel" button (see comment in MSWCommonTaskDialogInit). This
|
|
// results in msAns being IDCANCEL while we want IDOK (just like
|
|
// how the native MessageBox function does with only an "OK" button).
|
|
if ( (msAns == IDCANCEL)
|
|
&& !(GetMessageDialogStyle() & (wxYES_NO|wxCANCEL)) )
|
|
{
|
|
msAns = IDOK;
|
|
}
|
|
|
|
return MSWTranslateReturnCode( msAns );
|
|
}
|
|
#endif // wxHAS_MSW_TASKDIALOG
|
|
|
|
// use the generic version when task dialog is't available at either
|
|
// compile or run-time.
|
|
return wxGenericRichMessageDialog::ShowModal();
|
|
}
|
|
|
|
#endif // wxUSE_RICHMSGDLG
|