Forward port recent changes on the 2.8 branch to HEAD

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-05-16 23:39:42 +00:00
parent f6342fb5e6
commit 0b0849b5a5
87 changed files with 3807 additions and 1586 deletions

View File

@@ -19,7 +19,10 @@ class Frame(wx.Frame):
| wx.PD_REMAINING_TIME)
self.count += 1
keepGoing = self.dialog.Update(self.count)
if wx.VERSION < (2,7,1,1):
keepGoing = self.dialog.Update(self.count)
else:
(keepGoing, skip) = self.dialog.Update(self.count)
if not keepGoing or self.count == self.progressMax:
self.dialog.Destroy()
self.timer.Stop()