swigged code update for wxMac

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

diff --git a/wxPython/demo/wxTimer.py b/wxPython/demo/wxTimer.py
index a6430ebaad4bfdd722e205787798ff54f6b00ea8..b58a628a1d48f8e255f0259bd84392a6c28d33f8 100644 (file)
--- a/wxPython/demo/wxTimer.py
+++ b/wxPython/demo/wxTimer.py
@@ -16,9 +16,10 @@ import time
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

-ID_Start = wxNewId()
-ID_Stop  = wxNewId()
-ID_Timer = wxNewId()
+ID_Start  = wxNewId()
+ID_Stop   = wxNewId()
+ID_Timer  = wxNewId()
+ID_Timer2 = wxNewId()

 
 class TestTimerWin(wxPanel):
     def __init__(self, parent, log):
 
 class TestTimerWin(wxPanel):
     def __init__(self, parent, log):


@@ -34,22 +35,32 @@ class TestTimerWin(wxPanel):
         self.timer = wxTimer(self,      # object to send the event to
                              ID_Timer)  # event id to use
 
         self.timer = wxTimer(self,      # object to send the event to
                              ID_Timer)  # event id to use
 

+        self.timer2 = wxTimer(self,      # object to send the event to
+                             ID_Timer2)  # event id to use
+

         EVT_BUTTON(self, ID_Start, self.OnStart)
         EVT_BUTTON(self, ID_Stop,  self.OnStop)
         EVT_TIMER(self,  ID_Timer, self.OnTimer)
         EVT_BUTTON(self, ID_Start, self.OnStart)
         EVT_BUTTON(self, ID_Stop,  self.OnStop)
         EVT_TIMER(self,  ID_Timer, self.OnTimer)

-
+        EVT_TIMER(self,  ID_Timer2, self.OnTimer2)

 
     def OnStart(self, event):
         self.timer.Start(1000)
 
     def OnStart(self, event):
         self.timer.Start(1000)

+        self.timer2.Start(1500)

 
     def OnStop(self, event):
         self.timer.Stop()
 
     def OnStop(self, event):
         self.timer.Stop()

+        self.timer2.Stop()

 
     def OnTimer(self, event):
         wxBell()
         if self.log:
             self.log.WriteText('beep!\n')
 
 
     def OnTimer(self, event):
         wxBell()
         if self.log:
             self.log.WriteText('beep!\n')
 

+    def OnTimer2(self, event):
+        wxBell()
+        if self.log:
+            self.log.WriteText('beep 2!\n')
+

 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):