Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes to progressdialog and its use in printing framework

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-06-21 14:11:45 +00:00
parent ab31bbc2ad
commit ffdaed2fc3
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/generic/printps.cpp
View File

@@ -178,7 +178,8 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
printout->GetTitle(), printout->GetTitle(),
_("Printing..."), _("Printing..."),
totalPages, totalPages,
parent ); parent,
wxPD_CAN_ABORT|wxPD_AUTO_HIDE|wxPD_APP_MODAL);
printout->OnBeginPrinting(); printout->OnBeginPrinting();

3
src/generic/progdlgg.cpp
View File

@@ -131,7 +131,6 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
m_gauge->SetValue(value + 1); m_gauge->SetValue(value + 1);
if( !newmsg.IsEmpty() ) if( !newmsg.IsEmpty() )
m_msg->SetLabel(newmsg); m_msg->SetLabel(newmsg);
wxYield();
if ( (value == m_maximum - 1) && !(GetWindowStyleFlag() & wxPD_AUTO_HIDE) ) if ( (value == m_maximum - 1) && !(GetWindowStyleFlag() & wxPD_AUTO_HIDE) )
{ {
@@ -148,8 +147,6 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
} }
m_state = Finished; m_state = Finished;
while ( m_state != Canceled ) // set from OnClose()
wxYield();
// so that we return TRUE below // so that we return TRUE below
m_state = Finished; m_state = Finished;