X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c349adb6e419aa8007e2c6c323e80ee39bcd4e2..22fb32d5071b4a234cb600e50e59f971dd78d04a:/src/generic/progdlgg.cpp?ds=sidebyside diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index 4b5dcd7e75..2730fb4d4a 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -126,7 +126,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title, 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); @@ -221,16 +221,17 @@ wxProgressDialog::wxProgressDialog(wxString const &title, #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); Layout(); @@ -342,33 +343,40 @@ 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 close button to give the user a way to close the dlg + { + EnableCloseButton(TRUE); + } #endif // __WXMSW__ - 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; + if ( !newmsg ) + { + // also provide the finishing message if the application didn't + m_msg->SetLabel(_("Done.")); + } - wxYield(); + wxYield(); - (void)ShowModal(); + (void)ShowModal(); + } + else + { + Hide(); + ReenableOtherWindows(); + } } else {