fixes to progressdialog and its use in printing framework
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ab31bbc2ad
commit
ffdaed2fc3
@ -178,7 +178,8 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
|
||||
printout->GetTitle(),
|
||||
_("Printing..."),
|
||||
totalPages,
|
||||
parent );
|
||||
parent,
|
||||
wxPD_CAN_ABORT|wxPD_AUTO_HIDE|wxPD_APP_MODAL);
|
||||
|
||||
printout->OnBeginPrinting();
|
||||
|
||||
|
@ -131,7 +131,6 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
|
||||
m_gauge->SetValue(value + 1);
|
||||
if( !newmsg.IsEmpty() )
|
||||
m_msg->SetLabel(newmsg);
|
||||
wxYield();
|
||||
|
||||
if ( (value == m_maximum - 1) && !(GetWindowStyleFlag() & wxPD_AUTO_HIDE) )
|
||||
{
|
||||
@ -148,9 +147,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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user