new VC++ project files with both dll and lib in one project

[wxWidgets.git] / wxPython / demo / Threads.py

diff --git a/wxPython/demo/Threads.py b/wxPython/demo/Threads.py
index 015a6f9b7d3095497684aefb0c118ac4d75d50c0..05883731b9d21a5690c06357ee7eb5df6a33e0af 100644 (file)
--- a/wxPython/demo/Threads.py
+++ b/wxPython/demo/Threads.py
@@ -7,7 +7,7 @@ from   whrandom import random
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 

-wxEVT_UPDATE_BARGRAPH = 25015
+wxEVT_UPDATE_BARGRAPH = wxNewEventType()

 
 def EVT_UPDATE_BARGRAPH(win, func):
     win.Connect(-1, -1, wxEVT_UPDATE_BARGRAPH, func)
 
 def EVT_UPDATE_BARGRAPH(win, func):
     win.Connect(-1, -1, wxEVT_UPDATE_BARGRAPH, func)


@@ -30,11 +30,11 @@ class CalcBarThread:
         self.val = val
 
     def Start(self):
         self.val = val
 
     def Start(self):

-        self.keepGoing = self.running = true
+        self.keepGoing = self.running = True

         thread.start_new_thread(self.Run, ())
 
     def Stop(self):
         thread.start_new_thread(self.Run, ())
 
     def Stop(self):

-        self.keepGoing = false
+        self.keepGoing = False

 
     def IsRunning(self):
         return self.running
 
     def IsRunning(self):
         return self.running


@@ -43,11 +43,10 @@ class CalcBarThread:
         while self.keepGoing:
             evt = UpdateBarEvent(self.barNum, int(self.val))
             wxPostEvent(self.win, evt)
         while self.keepGoing:
             evt = UpdateBarEvent(self.barNum, int(self.val))
             wxPostEvent(self.win, evt)

-            del evt
+            #del evt

 
             sleeptime = (random() * 2) + 0.5
 
             sleeptime = (random() * 2) + 0.5

-            #print self.barNum, 'sleeping for', sleeptime
-            time.sleep(sleeptime)
+            time.sleep(sleeptime/4)

 
             sleeptime = sleeptime * 5
             if int(random() * 2):
 
             sleeptime = sleeptime * 5
             if int(random() * 2):


@@ -58,7 +57,7 @@ class CalcBarThread:
             if self.val < 0: self.val = 0
             if self.val > 300: self.val = 300
 
             if self.val < 0: self.val = 0
             if self.val > 300: self.val = 300
 

-        self.running = false
+        self.running = False

 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 


@@ -160,7 +159,8 @@ class TestFrame(wxFrame):
         panel.SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD))
         wxStaticText(panel, -1,
                      "This demo shows multiple threads interacting with this\n"
         panel.SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD))
         wxStaticText(panel, -1,
                      "This demo shows multiple threads interacting with this\n"

-                     "window by sending events to it.", wxPoint(5,5))
+                     "window by sending events to it, one thread for each bar.",
+                     wxPoint(5,5))

         panel.Fit()
 
         self.graph = GraphWindow(self, ['Zero', 'One', 'Two', 'Three', 'Four',
         panel.Fit()
 
         self.graph = GraphWindow(self, ['Zero', 'One', 'Two', 'Three', 'Four',


@@ -172,7 +172,7 @@ class TestFrame(wxFrame):
         sizer.Add(self.graph, 1, wxEXPAND)
 
         self.SetSizer(sizer)
         sizer.Add(self.graph, 1, wxEXPAND)
 
         self.SetSizer(sizer)

-        self.SetAutoLayout(true)
+        self.SetAutoLayout(True)

         sizer.Fit(self)
 
         EVT_UPDATE_BARGRAPH(self, self.OnUpdate)
         sizer.Fit(self)
 
         EVT_UPDATE_BARGRAPH(self, self.OnUpdate)


@@ -194,7 +194,7 @@ class TestFrame(wxFrame):
 
     def OnUpdate(self, evt):
         self.graph.SetValue(evt.barNum, evt.value)
 
     def OnUpdate(self, evt):
         self.graph.SetValue(evt.barNum, evt.value)

-        self.graph.Refresh(false)
+        self.graph.Refresh(False)

 
 
     def OnCloseWindow(self, evt):
 
 
     def OnCloseWindow(self, evt):


@@ -217,7 +217,7 @@ class TestFrame(wxFrame):
 def runTest(frame, nb, log):
     win = TestFrame(frame, log)
     frame.otherWin = win
 def runTest(frame, nb, log):
     win = TestFrame(frame, log)
     frame.otherWin = win

-    win.Show(true)
+    win.Show(True)

     return None
 
 #----------------------------------------------------------------------
     return None
 
 #----------------------------------------------------------------------


@@ -244,3 +244,11 @@ ProcessEvent does, it processes it later from the context of the GUI
 thread.
 
 """
 thread.
 
 """

+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+