This commit was manufactured by cvs2svn to create tag 'WX_2_8_4'.

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

wxPython/samples/doodle/setup.py

@@ -21,5 +21,10 @@ setup( name = "superdoodle",
        #console = ["superdoodle.py"]
        windows = ["superdoodle.py"],
        #data_files = DATA,
+       options = {"py2exe" : { "compressed": 0,
+                               "optimize": 2,
+                               "bundle_files": 1,
+                               }},
+       zipfile = None
        )
 

wxPython/samples/wxPIA_book/Chapter-09/progress_box.py

@@ -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()