X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ca3b64f1474b759653105ab741c97f64ee4bc3b..824fd93d761e1e697be19a4ca582c5259e12c8ea:/src/generic/progdlgg.cpp diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index 53ec12dda5..9d4c252751 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -130,8 +130,6 @@ wxProgressDialog::wxProgressDialog(wxString const &title, sizeLabel = m_msg->GetSize(); sizeDlg.y = 2*LAYOUT_MARGIN + sizeLabel.y; - wxWindow *lastWindow = m_msg; - if ( maximum > 0 ) { // note that we can't use wxGA_SMOOTH because it happens to @@ -143,7 +141,6 @@ wxProgressDialog::wxProgressDialog(wxString const &title, sizer->Add(m_gauge, 0, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, 2*LAYOUT_MARGIN); m_gauge->SetValue(0); - lastWindow = m_gauge; wxSize sizeGauge = m_gauge->GetSize(); sizeDlg.y += 2*LAYOUT_MARGIN + sizeGauge.y; @@ -193,7 +190,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title, if ( hasAbortButton ) { - m_btnAbort = new wxButton(this, wxID_CANCEL, _("Cancel")); + m_btnAbort = new wxButton(this, wxID_CANCEL, wxSTOCK_CANCEL); // Windows dialogs usually have buttons in the lower right corner #if defined(__WXMSW__) || defined(__WXPM__)