wxGTK now chooses the best visual X offers,

[wxWidgets.git] / src / generic / progdlgg.cpp

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index b3b74cc634189693e12e2d304d68da7c02492bf0..949ef76a25adb829cdd12fb277b5c2b39c1fd0a2 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -66,7 +66,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
       height += 35;
    wxFrame::Create(m_parent, -1, title,
                    wxPoint(0, 0), wxSize(220, height),
-                   wxDEFAULT_DIALOG_STYLE);
+                   wxDEFAULT_DIALOG_STYLE | style );
 
    wxLayoutConstraints *c;
 
@@ -127,11 +127,12 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
    wxASSERT_MSG( value == -1 || m_gauge, _T("can't update non existent dialog") );
    wxASSERT_MSG( value < m_maximum, _T("invalid progress value") );
 
+
    if( m_gauge )
       m_gauge->SetValue(value + 1);
+      
    if( !newmsg.IsEmpty() )
       m_msg->SetLabel(newmsg);
-   wxYield();
 
    if ( (value == m_maximum - 1) && !(GetWindowStyleFlag() & wxPD_AUTO_HIDE) )
    {
@@ -148,9 +149,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
        }
 
        m_state = Finished;
-       while ( m_state != Canceled ) // set from OnClose()
-           wxYield();
-
+       
        // so that we return TRUE below
        m_state = Finished;
    }