#if around deprecated macros

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

diff --git a/wxPython/demo/Threads.py b/wxPython/demo/Threads.py
index 05883731b9d21a5690c06357ee7eb5df6a33e0af..25440e5106a18ba75363c0804cc96f3b5d57bf25 100644 (file)
--- a/wxPython/demo/Threads.py
+++ b/wxPython/demo/Threads.py
@@ -1,5 +1,6 @@
 
 from wxPython.wx import *
+from wxPython.lib import newevent
 
 import thread
 import time
@@ -7,18 +8,8 @@ from   whrandom import random
 
 #----------------------------------------------------------------------
 
-wxEVT_UPDATE_BARGRAPH = wxNewEventType()
-
-def EVT_UPDATE_BARGRAPH(win, func):
-    win.Connect(-1, -1, wxEVT_UPDATE_BARGRAPH, func)
-
-
-class UpdateBarEvent(wxPyEvent):
-    def __init__(self, barNum, value):
-        wxPyEvent.__init__(self)
-        self.SetEventType(wxEVT_UPDATE_BARGRAPH)
-        self.barNum = barNum
-        self.value = value
+# This creates a new Event class and a EVT binder function
+UpdateBarEvent, EVT_UPDATE_BARGRAPH = newevent.NewEvent()
 
 
 #----------------------------------------------------------------------
@@ -41,7 +32,7 @@ class CalcBarThread:
 
     def Run(self):
         while self.keepGoing:
-            evt = UpdateBarEvent(self.barNum, int(self.val))
+            evt = UpdateBarEvent(barNum = self.barNum, value = int(self.val))
             wxPostEvent(self.win, evt)
             #del evt
 
@@ -232,7 +223,7 @@ so any cross platform GUI Toolkit and applications written with it
 need to take that into account.
 
 The solution is to only allow interaction with the GUI from a single
-thread, but this often severly limits what can be done in an
+thread, but this often severely limits what can be done in an
 application and makes it difficult to use additional threads at all.
 
 Since wxPython already makes extensive use of event handlers, it is a