X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1415824cc6ef5c78e805122ac00c84ce140e4a6..601c163b1c7aa7713b9b7b8d2980fa8857131d54:/src/generic/progdlgg.cpp diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index 2a7eb07918..90436f9340 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -64,14 +64,12 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label); // event tables // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog) - EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel) - EVT_CLOSE(wxProgressDialog::OnClose) - END_EVENT_TABLE() +BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog) + EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel) + EVT_CLOSE(wxProgressDialog::OnClose) +END_EVENT_TABLE() - IMPLEMENT_CLASS(wxProgressDialog, wxDialog) -#endif +IMPLEMENT_CLASS(wxProgressDialog, wxDialog) // ============================================================================ // implementation @@ -88,26 +86,24 @@ wxProgressDialog::wxProgressDialog(wxString const &title, int style) : wxDialog(parent, -1, title) { + m_windowStyle |= style; + bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0; m_state = hasAbortButton ? Continue : Uncancelable; - m_disableParentOnly = (style & wxPD_APP_MODAL) == 0; - m_AutoHide = (style & wxPD_AUTO_HIDE) != 0; - m_parent = parent; m_maximum = maximum; + m_parentTop = parent; + while ( m_parentTop && m_parentTop->GetParent() ) + { + m_parentTop = m_parentTop->GetParent(); + } + wxLayoutConstraints *c; wxClientDC dc(this); dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); long widthText; -#if defined(__VISAGECPP__) -// have two versions of this in wxWindowDC tp avoid function hiding -// since there are two of these in wxDCBase, and in turn in wxDC. -// VA cannot resolve this so: dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL); -#else - dc.GetTextExtent(message, &widthText, (long*)NULL); -#endif m_msg = new wxStaticText(this, -1, message); c = new wxLayoutConstraints; @@ -127,6 +123,10 @@ wxProgressDialog::wxProgressDialog(wxString const &title, m_gauge = new wxGauge(this, -1, maximum, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL | wxRAISED_BORDER); +// Sorry, but wxGA_SMOOTH happens to also mean wxDIALOG_MODAL and will +// cause the dialog to be modal. Have an extra style argument to wxProgressDialog, +// perhaps. +// wxGA_HORIZONTAL | wxRAISED_BORDER | (style & wxGA_SMOOTH)); c = new wxLayoutConstraints; c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN); c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN); @@ -150,28 +150,27 @@ wxProgressDialog::wxProgressDialog(wxString const &title, { nTimeLabels++; - m_elapsed = CreateLabel(_T("Elapsed time : "), &lastWindow); + m_elapsed = CreateLabel(_("Elapsed time : "), &lastWindow); } if ( style & wxPD_ESTIMATED_TIME ) { nTimeLabels++; - m_estimated = CreateLabel(_T("Estimated time : "), &lastWindow); + m_estimated = CreateLabel(_("Estimated time : "), &lastWindow); } if ( style & wxPD_REMAINING_TIME ) { nTimeLabels++; - m_remaining = CreateLabel(_T("Remaining time : "), &lastWindow); + m_remaining = CreateLabel(_("Remaining time : "), &lastWindow); } if ( nTimeLabels > 0 ) { // set it to the current time m_timeStart = wxGetCurrentTime(); - sizeDlg.y += nTimeLabels * (sizeLabel.y + LAYOUT_Y_MARGIN); } @@ -205,21 +204,22 @@ wxProgressDialog::wxProgressDialog(wxString const &title, sizeDlg.y += 2*LAYOUT_Y_MARGIN; // try to make the dialog not square but rectangular of reasonabel width - sizeDlg.x = wxMax(widthText, 4*sizeDlg.y/3); + sizeDlg.x = (wxCoord)wxMax(widthText, 4*sizeDlg.y/3); sizeDlg.x *= 3; sizeDlg.x /= 2; SetClientSize(sizeDlg); Centre(wxCENTER_FRAME | wxBOTH); - if (m_disableParentOnly ) + if ( style & wxPD_APP_MODAL ) { - if ( m_parent ) - m_parent->Enable(FALSE); + m_winDisabler = new wxWindowDisabler(this); } else { - wxEnableTopLevelWindows(FALSE); + if ( m_parentTop ) + m_parentTop->Enable(FALSE); + m_winDisabler = NULL; } Show(TRUE); @@ -227,6 +227,10 @@ wxProgressDialog::wxProgressDialog(wxString const &title, // Update the display (especially on X, GTK) wxYield(); + +#ifdef __WXMAC__ + MacUpdateImmediately(); +#endif } wxStaticText *wxProgressDialog::CreateLabel(const wxString& text, @@ -234,7 +238,7 @@ wxStaticText *wxProgressDialog::CreateLabel(const wxString& text, { wxLayoutConstraints *c; - wxStaticText *label = new wxStaticText(this, -1, _T("unknown")); + wxStaticText *label = new wxStaticText(this, -1, _("unknown")); c = new wxLayoutConstraints; // VZ: I like the labels be centered - if the others don't mind, you may @@ -265,56 +269,69 @@ wxStaticText *wxProgressDialog::CreateLabel(const wxString& text, bool wxProgressDialog::Update(int value, const wxString& newmsg) { - wxASSERT_MSG( value == -1 || m_gauge, _T("cannot update non existent dialog") ); - wxASSERT_MSG( value <= m_maximum, _T("invalid progress value") ); - - - if( m_gauge ) - m_gauge->SetValue(value + 1); - - if( !newmsg.IsEmpty() ) - m_msg->SetLabel(newmsg); - - if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) ) - { - unsigned long elapsed = wxGetCurrentTime() - m_timeStart; - unsigned long estimated = elapsed * m_maximum / value; - unsigned long remaining = estimated - elapsed; - - SetTimeLabel(elapsed, m_elapsed); - SetTimeLabel(estimated, m_estimated); - SetTimeLabel(remaining, m_remaining); - } - - if ( (value == m_maximum ) && !m_AutoHide ) - { - if ( m_btnAbort ) - { - // tell the user what he should do... - m_btnAbort->SetLabel(_("Close")); - } - - if ( !newmsg ) - { - // also provide the finishing message if the application didn't - m_msg->SetLabel(_("Done.")); - } - - // so that we return TRUE below and that out [Cancel] handler knew what - // to do - m_state = Finished; - - wxYield(); - - (void)ShowModal(); - } - else - { - // update the display - wxYield(); - } - - return m_state != Canceled; + wxASSERT_MSG( value == -1 || m_gauge, wxT("cannot update non existent dialog") ); + wxASSERT_MSG( value <= m_maximum, wxT("invalid progress value") ); + + if ( m_gauge ) + m_gauge->SetValue(value + 1); + + if ( !newmsg.IsEmpty() ) + { +#ifdef __WXMSW__ + // this seems to be necessary or garbage is left when the new label is + // longer than the old one + m_msg->SetLabel(wxEmptyString); +#endif // MSW + + m_msg->SetLabel(newmsg); + + wxYield(); + } + + if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) ) + { + unsigned long elapsed = wxGetCurrentTime() - m_timeStart; + unsigned long estimated = elapsed * m_maximum / value; + unsigned long remaining = estimated - elapsed; + + SetTimeLabel(elapsed, m_elapsed); + SetTimeLabel(estimated, m_estimated); + SetTimeLabel(remaining, m_remaining); + } + + if ( (value == m_maximum ) && !(GetWindowStyle() & wxPD_AUTO_HIDE) ) + { + if ( m_btnAbort ) + { + // tell the user what he should do... + m_btnAbort->SetLabel(_("Close")); + } + + if ( !newmsg ) + { + // also provide the finishing message if the application didn't + m_msg->SetLabel(_("Done.")); + } + + // so that we return TRUE below and that out [Cancel] handler knew what + // to do + m_state = Finished; + + wxYield(); + + (void)ShowModal(); + } + else + { + // update the display + wxYield(); + } + +#ifdef __WXMAC__ + MacUpdateImmediately(); +#endif + + return m_state != Canceled; } // ---------------------------------------------------------------------------- @@ -334,15 +351,30 @@ void wxProgressDialog::OnCancel(wxCommandEvent& event) // request to cancel was received, the next time Update() is called we // will handle it m_state = Canceled; + + // update the button state immediately so that the user knows that the + // request has been noticed + m_btnAbort->Disable(); } } void wxProgressDialog::OnClose(wxCloseEvent& event) { if ( m_state == Uncancelable ) + { + // can't close this dialog event.Veto(TRUE); + } + else if ( m_state == Finished ) + { + // let the default handler close the window as we already terminated + event.Skip(); + } else + { + // next Update() will notice it m_state = Canceled; + } } // ---------------------------------------------------------------------------- @@ -351,14 +383,14 @@ void wxProgressDialog::OnClose(wxCloseEvent& event) wxProgressDialog::~wxProgressDialog() { - if ( m_disableParentOnly ) + if ( GetWindowStyle() & wxPD_APP_MODAL ) { - if ( m_parent ) - m_parent->Enable(TRUE); + delete m_winDisabler; } else { - wxEnableTopLevelWindows(TRUE); + if ( m_parentTop ) + m_parentTop->Enable(TRUE); } } @@ -374,7 +406,7 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label) unsigned long hours = val / 3600; unsigned long minutes = (val % 3600) / 60; unsigned long seconds = val % 60; - s.Printf(_T("%lu:%02lu:%02lu"), hours, minutes, seconds); + s.Printf(wxT("%lu:%02lu:%02lu"), hours, minutes, seconds); if ( s != label->GetLabel() ) label->SetLabel(s);