X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8eca4fef106b8327e2e55636de3f68a511a4c392..b4eecebd423df0c6efe86d7658cd3df818d67ed8:/wxPython/demo/CalendarCtrl.py?ds=sidebyside

diff --git a/wxPython/demo/CalendarCtrl.py b/wxPython/demo/CalendarCtrl.py
index 89a0ba0471..ee5586608b 100644
--- a/wxPython/demo/CalendarCtrl.py
+++ b/wxPython/demo/CalendarCtrl.py
@@ -14,32 +14,40 @@ class TestPanel(wx.Panel):
                              | 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.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()
 
-    def OnButton(self, evt):
-        if self.cal is not None:
-            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
-
         for month, day in self.holidays:
             if month == cur_month:
                 self.cal.SetHoliday(day)
+        if cur_month == 8:
+            attr = wx.calendar.CalendarDateAttr(border=wx.calendar.CAL_BORDER_SQUARE,
+                                                colBorder="blue")
+            self.cal.SetAttr(14, attr)
+        else:
+            self.cal.ResetAttr(14)
+
+    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(),
+                        ))
 
 #----------------------------------------------------------------------