X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4f1aaad5db4fc94a19d5aef92c45b33ccbf5f18..30e24d9dd5a5abf1c9a375ea259eb239b122b7f7:/wxPython/demo/ProgressDialog.py?ds=sidebyside

diff --git a/wxPython/demo/ProgressDialog.py b/wxPython/demo/ProgressDialog.py
index ce4220191b..5e120a4600 100644
--- a/wxPython/demo/ProgressDialog.py
+++ b/wxPython/demo/ProgressDialog.py
@@ -12,30 +12,50 @@ import  wx
 
 #---------------------------------------------------------------------------
 
-def runTest(frame, nb, log):
-    max = 20
-    
-    dlg = wx.ProgressDialog("Progress dialog example",
-                           "An informative message",
-                           maximum = max,
-                           parent=frame,
-                           style = wx.PD_CAN_ABORT | wx.PD_APP_MODAL)
+class TestPanel(wx.Panel):
+    def __init__(self, parent, log):
+        self.log = log
+        wx.Panel.__init__(self, parent, -1)
+
+        b = wx.Button(self, -1, "Create and Show a ProgressDialog", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+
+
+    def OnButton(self, evt):
+        max = 80
+
+        dlg = wx.ProgressDialog("Progress dialog example",
+                               "An informative message",
+                               maximum = max,
+                               parent=self,
+                               style = wx.PD_CAN_ABORT
+                                | wx.PD_APP_MODAL
+                                | wx.PD_ELAPSED_TIME
+                                #| wx.PD_ESTIMATED_TIME
+                                | wx.PD_REMAINING_TIME
+                                )
 
-    keepGoing = True
-    count = 0
+        keepGoing = True
+        count = 0
 
-    while keepGoing and count < max:
-        count = count + 1
-        #print count
-        wx.Sleep(1)
+        while keepGoing and count < max:
+            count += 1
+            wx.MilliSleep(250)
 
-        if count == max / 2:
-            keepGoing = dlg.Update(count, "Half-time!")
-        else:
-            keepGoing = dlg.Update(count)
+            if count >= max / 2:
+                (keepGoing, skip) = dlg.Update(count, "Half-time!")
+            else:
+                (keepGoing, skip) = dlg.Update(count)
 
-    dlg.Destroy()
+                
+        dlg.Destroy()
 
+#---------------------------------------------------------------------------
+
+
+def runTest(frame, nb, log):
+    win = TestPanel(nb, log)
+    return win
 
 #---------------------------------------------------------------------------
 
@@ -59,4 +79,4 @@ If not then you may progress blissfully onward.
 if __name__ == '__main__':
     import sys,os
     import run
-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])