X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c349adb6e419aa8007e2c6c323e80ee39bcd4e2..f938940e0935f835ccf38c242ad1469aeb800048:/src/generic/progdlgg.cpp diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index 4b5dcd7e75..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 @@ -67,19 +67,17 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label); BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog) EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel) - EVT_SHOW(wxProgressDialog::OnShow) - EVT_CLOSE(wxProgressDialog::OnClose) END_EVENT_TABLE() IMPLEMENT_CLASS(wxProgressDialog, wxDialog) // ============================================================================ -// implementation +// wxProgressDialog implementation // ============================================================================ // ---------------------------------------------------------------------------- -// wxProgressDialog +// wxProgressDialog creation // ---------------------------------------------------------------------------- wxProgressDialog::wxProgressDialog(wxString const &title, @@ -87,7 +85,7 @@ 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); @@ -103,34 +101,30 @@ wxProgressDialog::wxProgressDialog(wxString const &title, // FIXME: should probably have a (extended?) window style for this if ( !hasAbortButton ) { - EnableCloseButton(FALSE); + EnableCloseButton(false); } #endif // wxMSW m_state = hasAbortButton ? Continue : Uncancelable; m_maximum = maximum; -#ifdef __WXMSW__ +#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 = parent; - while ( m_parentTop && m_parentTop->GetParent() ) - { - m_parentTop = m_parentTop->GetParent(); - } + 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; dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL); - 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); @@ -146,10 +140,10 @@ wxProgressDialog::wxProgressDialog(wxString const &title, if ( maximum > 0 ) { - // note that we can't use wxGA_SMOOTH because it happens to also mean - // wxDIALOG_MODAL and will cause the dialog to be modal. Have an extra + // 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, -1, m_maximum, + m_gauge = new wxGauge(this, wxID_ANY, m_maximum, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL); @@ -214,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; @@ -252,12 +247,12 @@ wxProgressDialog::wxProgressDialog(wxString const &title, else { if ( m_parentTop ) - m_parentTop->Enable(FALSE); + m_parentTop->Disable(); m_winDisabler = NULL; } - Show(TRUE); - Enable(TRUE); // enable this window + Show(); + Enable(); // this one can be initialized even if the others are unknown for now // @@ -267,12 +262,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title, SetTimeLabel(0, m_elapsed); } - // Update the display (especially on X, GTK) - wxYield(); - -#ifdef __WXMAC__ - MacUpdateImmediately(); -#endif + Update(); } wxStaticText *wxProgressDialog::CreateLabel(const wxString& text, @@ -280,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); @@ -295,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); @@ -308,6 +298,10 @@ wxStaticText *wxProgressDialog::CreateLabel(const wxString& text, return label; } +// ---------------------------------------------------------------------------- +// wxProgressDialog operations +// ---------------------------------------------------------------------------- + bool wxProgressDialog::Update(int value, const wxString& newmsg) { @@ -319,22 +313,24 @@ wxProgressDialog::Update(int value, const wxString& newmsg) wxASSERT_MSG( value <= m_maximum, wxT("invalid progress value") ); - if ( m_gauge ) + // 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 + 1); + m_gauge->SetValue(value == m_maximum ? value : value + 1); } if ( !newmsg.IsEmpty() ) { 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); @@ -342,47 +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 close button to give the user a way to close the dlg - { - EnableCloseButton(TRUE); - } + 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.")); - } + 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; + wxYieldIfNeeded() ; - wxYield(); + (void)ShowModal(); + } + else // auto hide + { + // 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(); - (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 // ---------------------------------------------------------------------------- @@ -412,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 ) { @@ -426,16 +453,6 @@ void wxProgressDialog::OnClose(wxCloseEvent& event) } } -void wxProgressDialog::OnShow(wxShowEvent& event) -{ - // if the dialog is being hidden, it was closed, so reenable other windows - // now - if ( event.GetShow() ) - { - ReenableOtherWindows(); - } -} - // ---------------------------------------------------------------------------- // destruction // ---------------------------------------------------------------------------- @@ -456,7 +473,7 @@ void wxProgressDialog::ReenableOtherWindows() else { if ( m_parentTop ) - m_parentTop->Enable(TRUE); + m_parentTop->Enable(); } }