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

Always use native task dialog for wxProgressDialog under MSW if supported.

Browse Source 
Use task dialogs even for the dialogs with wxPD_AUTO_HIDE style flag and
without wxPD_CAN_ABORT one. Generic fallback was used in this case as native
task dialog doesn't support dialogs without buttons but it is finally better
to create a dummy button and use the native dialog nevertheless. We already
have a mostly disabled "Close" button for the dialogs without wxPD_AUTO_HIDE
style so it seems logical to also have it (but just never enable it at all)
when this style is used.

Closes #12462.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-09-20 13:11:03 +00:00
parent edc0f733a7
commit 76c4b1491e
2 changed files with 24 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/progdlg.h
View File

@ -48,10 +48,6 @@ public:
virtual void Update() { wxGenericProgressDialog::Update(); }
private:
// Returns true if the task dialog is available. If not, all the methods of
// this class simply fall back to wxGenericProgressDialog versions.
bool HasNativeProgressDialog() const;
// Performs common routines to Update() and Pulse(). Requires the
// shared object to have been entered.
bool DoNativeBeforeUpdate(bool *skip);

71
src/msw/progdlg.cpp
View File

@ -151,14 +151,6 @@ protected:
// Helper functions
// ============================================================================
// This function returns true if the progress dialog with the given style
// (combination of wxPD_XXX constants) needs the "Close" button and this button
// only, i.e. not a "Cancel" one.
bool UsesCloseButtonOnly(long style)
{
return !(style & (wxPD_CAN_ABORT | wxPD_AUTO_HIDE));
}
BOOL CALLBACK DisplayCloseButton(HWND hwnd, LPARAM lParam)
{
wxProgressDialogSharedData *sharedData =
@ -307,7 +299,7 @@ wxProgressDialog::wxProgressDialog( const wxString& title,
m_title(title)
{
#ifdef wxHAS_MSW_TASKDIALOG
if ( HasNativeProgressDialog() )
if ( HasNativeTaskDialog() )
{
SetMaximum(maximum);
@ -347,7 +339,7 @@ wxProgressDialog::~wxProgressDialog()
bool wxProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
{
#ifdef wxHAS_MSW_TASKDIALOG
if ( HasNativeProgressDialog() )
if ( HasNativeTaskDialog() )
{
{
wxCriticalSectionLocker locker(m_sharedData->m_cs);
@ -417,7 +409,7 @@ bool wxProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
bool wxProgressDialog::Pulse(const wxString& newmsg, bool *skip)
{
#ifdef wxHAS_MSW_TASKDIALOG
if ( HasNativeProgressDialog() )
if ( HasNativeTaskDialog() )
{
wxCriticalSectionLocker locker(m_sharedData->m_cs);
@ -452,7 +444,7 @@ bool wxProgressDialog::Pulse(const wxString& newmsg, bool *skip)
bool wxProgressDialog::DoNativeBeforeUpdate(bool *skip)
{
#ifdef wxHAS_MSW_TASKDIALOG
if ( HasNativeProgressDialog() )
if ( HasNativeTaskDialog() )
{
if ( m_sharedData->m_skipped )
{
@ -482,7 +474,7 @@ void wxProgressDialog::Resume()
wxGenericProgressDialog::Resume();
#ifdef wxHAS_MSW_TASKDIALOG
if ( HasNativeProgressDialog() )
if ( HasNativeTaskDialog() )
{
HWND hwnd;
@ -494,7 +486,8 @@ void wxProgressDialog::Resume()
// it now.
m_sharedData->m_notifications |= wxSPDD_ENABLE_SKIP;
if ( !UsesCloseButtonOnly(GetPDStyle()) )
// Also re-enable "Cancel" itself
if ( HasPDFlag(wxPD_CAN_ABORT) )
m_sharedData->m_notifications |= wxSPDD_ENABLE_ABORT;
hwnd = m_sharedData->m_hwnd;
@ -518,7 +511,7 @@ void wxProgressDialog::Resume()
int wxProgressDialog::GetValue() const
{
#ifdef wxHAS_MSW_TASKDIALOG
if ( HasNativeProgressDialog() )
if ( HasNativeTaskDialog() )
{
wxCriticalSectionLocker locker(m_sharedData->m_cs);
return m_sharedData->m_value;
@ -531,7 +524,7 @@ int wxProgressDialog::GetValue() const
wxString wxProgressDialog::GetMessage() const
{
#ifdef wxHAS_MSW_TASKDIALOG
if ( HasNativeProgressDialog() )
if ( HasNativeTaskDialog() )
return m_message;
#endif // wxHAS_MSW_TASKDIALOG
@ -541,7 +534,7 @@ wxString wxProgressDialog::GetMessage() const
void wxProgressDialog::SetRange(int maximum)
{
#ifdef wxHAS_MSW_TASKDIALOG
if ( HasNativeProgressDialog() )
if ( HasNativeTaskDialog() )
{
SetMaximum(maximum);
@ -560,7 +553,7 @@ void wxProgressDialog::SetRange(int maximum)
bool wxProgressDialog::WasSkipped() const
{
#ifdef wxHAS_MSW_TASKDIALOG
if ( HasNativeProgressDialog() )
if ( HasNativeTaskDialog() )
{
if ( !m_sharedData )
{
@ -579,7 +572,7 @@ bool wxProgressDialog::WasSkipped() const
bool wxProgressDialog::WasCancelled() const
{
#ifdef wxHAS_MSW_TASKDIALOG
if ( HasNativeProgressDialog() )
if ( HasNativeTaskDialog() )
{
wxCriticalSectionLocker locker(m_sharedData->m_cs);
return m_sharedData->m_state == Canceled;
@ -592,7 +585,7 @@ bool wxProgressDialog::WasCancelled() const
void wxProgressDialog::SetTitle(const wxString& title)
{
#ifdef wxHAS_MSW_TASKDIALOG
if ( HasNativeProgressDialog() )
if ( HasNativeTaskDialog() )
{
m_title = title;
@ -611,7 +604,7 @@ void wxProgressDialog::SetTitle(const wxString& title)
wxString wxProgressDialog::GetTitle() const
{
#ifdef wxHAS_MSW_TASKDIALOG
if ( HasNativeProgressDialog() )
if ( HasNativeTaskDialog() )
return m_title;
#endif // wxHAS_MSW_TASKDIALOG
@ -621,7 +614,7 @@ wxString wxProgressDialog::GetTitle() const
bool wxProgressDialog::Show(bool show)
{
#ifdef wxHAS_MSW_TASKDIALOG
if ( HasNativeProgressDialog() )
if ( HasNativeTaskDialog() )
{
// The dialog can't be hidden at all and showing it again after it had
// been shown before doesn't do anything.
@ -645,8 +638,10 @@ bool wxProgressDialog::Show(bool show)
m_sharedData->m_state = Continue;
m_sharedData->m_labelCancel = _("Cancel");
}
else if ( !HasPDFlag(wxPD_AUTO_HIDE) )
else // Dialog can't be cancelled.
{
// We still must have at least a single button in the dialog so
// just don't call it "Cancel" in this case.
m_sharedData->m_labelCancel = _("Close");
}
@ -679,22 +674,6 @@ bool wxProgressDialog::Show(bool show)
return wxGenericProgressDialog::Show( show );
}
bool wxProgressDialog::HasNativeProgressDialog() const
{
#ifdef wxHAS_MSW_TASKDIALOG
// Native task dialog, if available, can't be used without any buttons so
// we fall back to the generic one if none of "Skip", "Cancel" and "Close"
// buttons is used.
return HasNativeTaskDialog()
&& (HasPDFlag(wxPD_CAN_SKIP | wxPD_CAN_ABORT) ||
!HasPDFlag(wxPD_AUTO_HIDE));
#else // !wxHAS_MSW_TASKDIALOG
// This shouldn't be even called in !wxHAS_MSW_TASKDIALOG case but as we
// still must define the function as returning something, return false.
return false;
#endif // wxHAS_MSW_TASKDIALOG/!wxHAS_MSW_TASKDIALOG
}
void wxProgressDialog::UpdateExpandedInformation(int value)
{
#ifdef wxHAS_MSW_TASKDIALOG
@ -786,12 +765,8 @@ void* wxProgressDialogTaskRunner::Entry()
// Use a Cancel button when requested or use a Close button when
// the dialog does not automatically hide.
if ( (m_sharedData.m_style & wxPD_CAN_ABORT)
|| !(m_sharedData.m_style & wxPD_AUTO_HIDE) )
{
wxTdc.AddTaskDialogButton( tdc, IDCANCEL, 0,
m_sharedData.m_labelCancel );
}
wxTdc.AddTaskDialogButton( tdc, IDCANCEL, 0,
m_sharedData.m_labelCancel );
tdc.dwFlags |= TDF_CALLBACK_TIMER | TDF_SHOW_PROGRESS_BAR;
@ -846,7 +821,9 @@ wxProgressDialogTaskRunner::TaskDialogCallbackProc
0,
MAKELPARAM(0, sharedData->m_range) );
if ( UsesCloseButtonOnly(sharedData->m_style) )
// If we can't be aborted, the "Close" button will only be enabled
// when the progress ends (and not even then with wxPD_AUTO_HIDE).
if ( !(sharedData->m_style & wxPD_CAN_ABORT) )
::SendMessage( hwnd, TDM_ENABLE_BUTTON, IDCANCEL, FALSE );
break;
@ -872,7 +849,7 @@ wxProgressDialogTaskRunner::TaskDialogCallbackProc
// Close button on the window triggers an IDCANCEL press,
// don't allow it when it should only be possible to close
// a finished dialog.
if ( !UsesCloseButtonOnly(sharedData->m_style) )
if ( sharedData->m_style & wxPD_CAN_ABORT )
{
wxCHECK_MSG
(