X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96becbd8fa93b89e47b71e1a6081fb909fd8baae..ab473127c64c9e20c3401bd8f0e173953c049d45:/src/generic/progdlgg.cpp?ds=sidebyside diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index dd0765d2ed..e6cfc0231c 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -6,7 +6,7 @@ // Created: 09.05.1999 // RCS-ID: $Id$ // Copyright: (c) Karsten Ballüder -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "progdlgg.h" #endif @@ -65,18 +65,19 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label); // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog) - EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel) - EVT_CLOSE(wxProgressDialog::OnClose) + EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel) + + EVT_CLOSE(wxProgressDialog::OnClose) END_EVENT_TABLE() IMPLEMENT_CLASS(wxProgressDialog, wxDialog) // ============================================================================ -// implementation +// wxProgressDialog implementation // ============================================================================ // ---------------------------------------------------------------------------- -// wxProgressDialog +// wxProgressDialog creation // ---------------------------------------------------------------------------- wxProgressDialog::wxProgressDialog(wxString const &title, @@ -84,35 +85,46 @@ wxProgressDialog::wxProgressDialog(wxString const &title, int maximum, wxWindow *parent, int style) - : wxDialog(parent, -1, title) + : wxDialog(parent, wxID_ANY, title) { + // we may disappear at any moment, let the others know about it + SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT); + m_windowStyle |= style; bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0; - m_state = hasAbortButton ? Continue : Uncancelable; - m_maximum = maximum; - m_parentTop = parent; - while ( m_parentTop && m_parentTop->GetParent() ) +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) + // we have to remove the "Close" button from the title bar then as it is + // confusing to have it - it doesn't work anyhow + // + // FIXME: should probably have a (extended?) window style for this + if ( !hasAbortButton ) { - m_parentTop = m_parentTop->GetParent(); + EnableCloseButton(false); } +#endif // wxMSW + + m_state = hasAbortButton ? Continue : Uncancelable; + m_maximum = maximum; + +#if defined(__WXMSW__) || defined(__WXPM__) + // we can't have values > 65,536 in the progress control under Windows, so + // scale everything down + m_factor = m_maximum / 65536 + 1; + m_maximum /= m_factor; +#endif // __WXMSW__ + + m_parentTop = wxGetTopLevelParent(parent); wxLayoutConstraints *c; wxClientDC dc(this); - dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + dc.SetFont(wxSystemSettings::GetFont(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); + m_msg = new wxStaticText(this, wxID_ANY, message); c = new wxLayoutConstraints; c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN); c->top.SameAs(this, wxTop, 2*LAYOUT_Y_MARGIN); @@ -120,16 +132,21 @@ wxProgressDialog::wxProgressDialog(wxString const &title, c->height.AsIs(); m_msg->SetConstraints(c); - wxSize sizeDlg, sizeLabel = m_msg->GetSize(); + wxSize sizeDlg, + sizeLabel = m_msg->GetSize(); sizeDlg.y = 2*LAYOUT_Y_MARGIN + sizeLabel.y; wxWindow *lastWindow = m_msg; if ( maximum > 0 ) { - m_gauge = new wxGauge(this, -1, maximum, - wxDefaultPosition, wxDefaultSize, - wxGA_HORIZONTAL | wxRAISED_BORDER | (style & wxGA_SMOOTH)); + // note that we can't use wxGA_SMOOTH because it happens to + // cause the dialog to be modal. Have an extra + // style argument to wxProgressDialog, perhaps. + m_gauge = new wxGauge(this, wxID_ANY, m_maximum, + wxDefaultPosition, wxDefaultSize, + wxGA_HORIZONTAL); + c = new wxLayoutConstraints; c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN); c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN); @@ -148,11 +165,17 @@ wxProgressDialog::wxProgressDialog(wxString const &title, // create the estimated/remaining/total time zones if requested m_elapsed = m_estimated = m_remaining = (wxStaticText*)NULL; - int nTimeLabels = 0; + // if we are going to have at least one label, remmeber it in this var + wxStaticText *label = NULL; + + // also count how many labels we really have + size_t nTimeLabels = 0; + if ( style & wxPD_ELAPSED_TIME ) { nTimeLabels++; + label = m_elapsed = CreateLabel(_("Elapsed time : "), &lastWindow); } @@ -160,6 +183,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title, { nTimeLabels++; + label = m_estimated = CreateLabel(_("Estimated time : "), &lastWindow); } @@ -167,6 +191,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title, { nTimeLabels++; + label = m_remaining = CreateLabel(_("Remaining time : "), &lastWindow); } @@ -174,7 +199,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title, { // set it to the current time m_timeStart = wxGetCurrentTime(); - sizeDlg.y += nTimeLabels * (sizeLabel.y + LAYOUT_Y_MARGIN); + sizeDlg.y += nTimeLabels * (label->GetSize().y + LAYOUT_Y_MARGIN); } if ( hasAbortButton ) @@ -183,25 +208,26 @@ wxProgressDialog::wxProgressDialog(wxString const &title, c = new wxLayoutConstraints; // Windows dialogs usually have buttons in the lower right corner -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN); #else // !MSW c->centreX.SameAs(this, wxCentreX); #endif // MSW/!MSW c->bottom.SameAs(this, wxBottom, 2*LAYOUT_Y_MARGIN); - wxSize sizeBtn = wxButton::GetDefaultSize(); - c->width.Absolute(sizeBtn.x); - c->height.Absolute(sizeBtn.y); + c->width.AsIs(); + c->height.AsIs(); m_btnAbort->SetConstraints(c); - sizeDlg.y += 2*LAYOUT_Y_MARGIN + sizeBtn.y; + sizeDlg.y += 2*LAYOUT_Y_MARGIN + wxButton::GetDefaultSize().y; } - else + else // no "Cancel" button + { m_btnAbort = (wxButton *)NULL; + } - SetAutoLayout(TRUE); + SetAutoLayout(true); Layout(); sizeDlg.y += 2*LAYOUT_Y_MARGIN; @@ -214,25 +240,29 @@ wxProgressDialog::wxProgressDialog(wxString const &title, Centre(wxCENTER_FRAME | wxBOTH); - if ( !(style & wxPD_APP_MODAL) ) + if ( style & wxPD_APP_MODAL ) { - if ( m_parentTop ) - m_parentTop->Enable(FALSE); + m_winDisabler = new wxWindowDisabler(this); } else { - wxEnableTopLevelWindows(FALSE); + if ( m_parentTop ) + m_parentTop->Disable(); + m_winDisabler = NULL; } - Show(TRUE); - Enable(TRUE); // enable this window + Show(); + Enable(); - // Update the display (especially on X, GTK) - wxYield(); + // this one can be initialized even if the others are unknown for now + // + // NB: do it after calling Layout() to keep the labels correctly aligned + if ( m_elapsed ) + { + SetTimeLabel(0, m_elapsed); + } -#ifdef __WXMAC__ - MacUpdateImmediately(); -#endif + Update(); } wxStaticText *wxProgressDialog::CreateLabel(const wxString& text, @@ -240,12 +270,12 @@ wxStaticText *wxProgressDialog::CreateLabel(const wxString& text, { wxLayoutConstraints *c; - wxStaticText *label = new wxStaticText(this, -1, _("unknown")); + wxStaticText *label = new wxStaticText(this, wxID_ANY, _("unknown")); c = new wxLayoutConstraints; // VZ: I like the labels be centered - if the others don't mind, you may // remove "#ifdef __WXMSW__" and use it for all ports -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__) c->left.SameAs(this, wxCentreX, LAYOUT_X_MARGIN); #else // !MSW c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN); @@ -255,7 +285,7 @@ wxStaticText *wxProgressDialog::CreateLabel(const wxString& text, c->height.AsIs(); label->SetConstraints(c); - wxStaticText *dummy = new wxStaticText(this, -1, text); + wxStaticText *dummy = new wxStaticText(this, wxID_ANY, text); c = new wxLayoutConstraints; c->right.LeftOf(label); c->top.SameAs(label, wxTop, 0); @@ -268,32 +298,39 @@ wxStaticText *wxProgressDialog::CreateLabel(const wxString& text, return label; } +// ---------------------------------------------------------------------------- +// wxProgressDialog operations +// ---------------------------------------------------------------------------- + bool wxProgressDialog::Update(int value, const wxString& newmsg) { wxASSERT_MSG( value == -1 || m_gauge, wxT("cannot update non existent dialog") ); + +#ifdef __WXMSW__ + value /= m_factor; +#endif // __WXMSW__ + wxASSERT_MSG( value <= m_maximum, wxT("invalid progress value") ); - if ( m_gauge ) - m_gauge->SetValue(value + 1); + // fill up the gauge if value == maximum because this means that the dialog + // is going to close and the gauge shouldn't be partly empty in this case + if ( m_gauge && value <= m_maximum ) + { + m_gauge->SetValue(value == m_maximum ? value : 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(); + wxYieldIfNeeded() ; } if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) ) { unsigned long elapsed = wxGetCurrentTime() - m_timeStart; - unsigned long estimated = elapsed * m_maximum / value; + unsigned long estimated = (unsigned long)(( (double) elapsed * m_maximum ) / ((double)value)) ; unsigned long remaining = estimated - elapsed; SetTimeLabel(elapsed, m_elapsed); @@ -301,41 +338,78 @@ wxProgressDialog::Update(int value, const wxString& newmsg) SetTimeLabel(remaining, m_remaining); } - if ( (value == m_maximum ) && !(GetWindowStyle() & wxPD_AUTO_HIDE) ) + if ( value == m_maximum ) { - if ( m_btnAbort ) + // so that we return true below and that out [Cancel] handler knew what + // to do + m_state = Finished; + if( !(GetWindowStyle() & wxPD_AUTO_HIDE) ) { - // tell the user what he should do... - m_btnAbort->SetLabel(_("Close")); + if ( m_btnAbort ) + { + // tell the user what he should do... + m_btnAbort->SetLabel(_("Close")); + } +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) + else // enable the button to give the user a way to close the dlg + { + EnableCloseButton(); + } +#endif // __WXMSW__ + + if ( !newmsg ) + { + // also provide the finishing message if the application didn't + m_msg->SetLabel(_("Done.")); + } + + wxYieldIfNeeded() ; + + (void)ShowModal(); } - - if ( !newmsg ) + else // auto hide { - // also provide the finishing message if the application didn't - m_msg->SetLabel(_("Done.")); - } + // reenable other windows before hiding this one because otherwise + // Windows wouldn't give the focus back to the window which had + // been previously focused because it would still be disabled + ReenableOtherWindows(); - // so that we return TRUE below and that out [Cancel] handler knew what - // to do - m_state = Finished; - - wxYield(); - - (void)ShowModal(); + Hide(); + } } else { - // update the display - wxYield(); + // we have to yield because not only we want to update the display but + // also to process the clicks on the cancel button + wxYieldIfNeeded() ; } -#ifdef __WXMAC__ - MacUpdateImmediately(); -#endif + // update the display in case yielding above didn't do it + Update(); return m_state != Canceled; } +void wxProgressDialog::Resume() +{ + m_state = Continue; + + // it may have been disabled by OnCancel(), so enable it back to let the + // user interrupt us again if needed + m_btnAbort->Enable(); +} + +bool wxProgressDialog::Show( bool show ) +{ + // reenable other windows before hiding this one because otherwise + // Windows wouldn't give the focus back to the window which had + // been previously focused because it would still be disabled + if(!show) + ReenableOtherWindows(); + + return wxDialog::Show(show); +} + // ---------------------------------------------------------------------------- // event handlers // ---------------------------------------------------------------------------- @@ -365,7 +439,7 @@ void wxProgressDialog::OnClose(wxCloseEvent& event) if ( m_state == Uncancelable ) { // can't close this dialog - event.Veto(TRUE); + event.Veto(); } else if ( m_state == Finished ) { @@ -385,14 +459,21 @@ void wxProgressDialog::OnClose(wxCloseEvent& event) wxProgressDialog::~wxProgressDialog() { - if ( !(GetWindowStyle() & wxPD_APP_MODAL) ) + // normally this should have been already done, but just in case + ReenableOtherWindows(); +} + +void wxProgressDialog::ReenableOtherWindows() +{ + if ( GetWindowStyle() & wxPD_APP_MODAL ) { - if ( m_parentTop ) - m_parentTop->Enable(TRUE); + delete m_winDisabler; + m_winDisabler = (wxWindowDisabler *)NULL; } else { - wxEnableTopLevelWindows(TRUE); + if ( m_parentTop ) + m_parentTop->Enable(); } }