X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff095200f79b459f1159f59d031b1c50c0b3194b..969096ef37381d4f107da86e72bee3d125a2b085:/src/generic/progdlgg.cpp diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index ee3323037a..39bb6d1ef8 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -269,11 +269,6 @@ wxProgressDialog::wxProgressDialog(wxString const &title, // Update the display (especially on X, GTK) wxYield(); - // FIXME: shouldn't be needed -#ifdef __WXX11__ - wxYield(); -#endif - #ifdef __WXMAC__ MacUpdateImmediately(); #endif @@ -327,7 +322,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg) wxASSERT_MSG( value <= m_maximum, wxT("invalid progress value") ); - if ( m_gauge ) + if ( m_gauge && value < m_maximum ) { m_gauge->SetValue(value + 1); } @@ -337,11 +332,6 @@ wxProgressDialog::Update(int value, const wxString& newmsg) m_msg->SetLabel(newmsg); wxYield(); - - // FIXME: shouldn't be needed -#ifdef __WXX11__ - wxYield(); -#endif } if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) ) @@ -382,11 +372,6 @@ wxProgressDialog::Update(int value, const wxString& newmsg) wxYield(); - // FIXME: shouldn't be needed -#ifdef __WXX11__ - wxYield(); -#endif - (void)ShowModal(); } else // auto hide @@ -403,11 +388,6 @@ wxProgressDialog::Update(int value, const wxString& newmsg) { // update the display wxYield(); - - // FIXME: shouldn't be needed -#ifdef __WXX11__ - wxYield(); -#endif } #ifdef __WXMAC__