wxProgressDialg works again.

  Did I do "update" in testconf?

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index fb6ff1c2adc907617573ef712080563ced03bc86..4df2c078f729aebaaf49301f7d8959f6f57c8e3f 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -776,6 +776,7 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
         {
             cont = dialog.Update(i);
         }
         {
             cont = dialog.Update(i);
         }

+       wxYield();

     }
 
     if ( !cont )
     }
 
     if ( !cont )

diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index be4cbae7b6e81370c0a5e96f537e1183fb810942..dcaf5394c51a0ff88ef85e66e3ff9c8c825c8da3 100644 (file)
--- a/src/generic/printps.cpp
+++ b/src/generic/printps.cpp
@@ -222,6 +222,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
                   keepGoing = false;
                }
             }
                   keepGoing = false;
                }
             }

+           wxYield();

         }
         printout->OnEndDocument();
     }
         }
         printout->OnEndDocument();
     }

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index b4bd92686f52c71a58a7127e8428cbf372dbcb41..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),
       height += 35;
    wxFrame::Create(m_parent, -1, title,
                    wxPoint(0, 0), wxSize(220, height),

-                   wxDEFAULT_DIALOG_STYLE);
+                   wxDEFAULT_DIALOG_STYLE | style );

 
    wxLayoutConstraints *c;
 
 
    wxLayoutConstraints *c;
 


@@ -127,8 +127,10 @@ 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") );
 
    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( m_gauge )
       m_gauge->SetValue(value + 1);

+      

    if( !newmsg.IsEmpty() )
       m_msg->SetLabel(newmsg);
 
    if( !newmsg.IsEmpty() )
       m_msg->SetLabel(newmsg);