merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -322,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);
    }