wxTinderbox build fix.

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

diff --git a/wxPython/demo/CalendarCtrl.py b/wxPython/demo/CalendarCtrl.py
index f8e5ba78c1bf724f1bc21a8a9df15db235e70fe4..bfe0e706d52e64d14dc63e7485307575a81bc4a7 100644 (file)
--- a/wxPython/demo/CalendarCtrl.py
+++ b/wxPython/demo/CalendarCtrl.py
@@ -14,32 +14,35 @@ class TestPanel(wx.Panel):
                              | wx.calendar.CAL_SUNDAY_FIRST
                              | wx.calendar.CAL_SEQUENTIAL_MONTH_SELECTION
                              )
                              | wx.calendar.CAL_SUNDAY_FIRST
                              | wx.calendar.CAL_SEQUENTIAL_MONTH_SELECTION
                              )

-
-        self.Bind(wx.calendar.EVT_CALENDAR, self.OnCalSelected, id=cal.GetId())
-
-        b = wx.Button(self, -1, "Destroy the Calendar", pos = (250, 50))
-        self.Bind(wx.EVT_BUTTON, self.OnButton, id= b.GetId())

         self.cal = cal
         self.cal = cal

+        self.Bind(wx.calendar.EVT_CALENDAR, self.OnCalSelected, id=cal.GetId())

 
         # Set up control to display a set of holidays:
         self.Bind(wx.calendar.EVT_CALENDAR_MONTH, self.OnChangeMonth, cal)
         self.holidays = [(1,1), (10,31), (12,25) ]    # (these don't move around)
         self.OnChangeMonth()
 
 
         # Set up control to display a set of holidays:
         self.Bind(wx.calendar.EVT_CALENDAR_MONTH, self.OnChangeMonth, cal)
         self.holidays = [(1,1), (10,31), (12,25) ]    # (these don't move around)
         self.OnChangeMonth()
 

-    def OnButton(self, evt):
-        self.cal.Destroy()
-        self.cal = None
+        cal2 = wx.calendar.CalendarCtrl(self, -1, wx.DateTime_Now(), pos = (325,50))
+        self.Bind(wx.calendar.EVT_CALENDAR_SEL_CHANGED,
+                  self.OnCalSelChanged, cal2)

 
     def OnCalSelected(self, evt):
         self.log.write('OnCalSelected: %s\n' % evt.GetDate())
 
     def OnChangeMonth(self, evt=None):
         cur_month = self.cal.GetDate().GetMonth() + 1   # convert wxDateTime 0-11 => 1-12
 
     def OnCalSelected(self, evt):
         self.log.write('OnCalSelected: %s\n' % evt.GetDate())
 
     def OnChangeMonth(self, evt=None):
         cur_month = self.cal.GetDate().GetMonth() + 1   # convert wxDateTime 0-11 => 1-12

-

         for month, day in self.holidays:
             if month == cur_month:
                 self.cal.SetHoliday(day)
 
         for month, day in self.holidays:
             if month == cur_month:
                 self.cal.SetHoliday(day)
 

+    def OnCalSelChanged(self, evt):
+        cal = evt.GetEventObject()
+        self.log.write("OnCalSelChanged:\n\t%s: %s\n\t%s: %s\n\t%s: %s\n\t" %
+                       ("EventObject", cal,
+                        "Date       ", cal.GetDate(),
+                        "Ticks      ", cal.GetDate().GetTicks(),
+                        ))
+

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


@@ -63,5 +66,5 @@ so I think both will stay in wxPython.
 if __name__ == '__main__':
     import sys,os
     import run
 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:])