]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/demo/CalendarCtrl.py
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
'[1219035] cleanup: miscellaneous' and minor source cleaning.
[wxWidgets.git] / wxPython / demo / CalendarCtrl.py
diff --git a/wxPython/demo/CalendarCtrl.py b/wxPython/demo/CalendarCtrl.py
index 03fc569b4d611605e524ae2c5f05550f15f758b0..b795ba5dc45db99b7704eb12ffb0ca474d4388e5 100644 (file)
--- a/wxPython/demo/CalendarCtrl.py
+++ b/wxPython/demo/CalendarCtrl.py
@@ -1,10 +1,6 @@
-# 11/15/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 
 
 import  wx
 
 import  wx
-import  wx.lib.calendar as calendar
+import  wx.calendar
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 
@@ -13,33 +9,27 @@ class TestPanel(wx.Panel):
         wx.Panel.__init__(self, parent, ID)
         self.log = log
 
         wx.Panel.__init__(self, parent, ID)
         self.log = log
 
-        cal = calendar.CalendarCtrl(self, -1, wx.DateTime_Now(), pos = (25,50),
-                             style = calendar.CAL_SHOW_HOLIDAYS
-                             | calendar.CAL_SUNDAY_FIRST
-                             | calendar.CAL_SEQUENTIAL_MONTH_SELECTION
+        cal = wx.calendar.CalendarCtrl(self, -1, wx.DateTime_Now(), pos = (25,50),
+                             style = wx.calendar.CAL_SHOW_HOLIDAYS
+                             | wx.calendar.CAL_SUNDAY_FIRST
+                             | wx.calendar.CAL_SEQUENTIAL_MONTH_SELECTION
                              )
                              )
-
-        self.Bind(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:
 
         # Set up control to display a set of holidays:
-        self.Bind(calendar.EVT_CALENDAR_MONTH, self.OnChangeMonth, id=cal.GetId())
+        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()
 
         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))
+
 
     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)
@@ -55,7 +45,7 @@ def runTest(frame, nb, log):
 
 overview = """\
 <html><body>
 
 overview = """\
 <html><body>
-<h2>wxCalendarCtrl</h2>
+<h2>CalendarCtrl</h2>
 
 Yet <i>another</i> calendar control.  This one is a wrapper around the C++
 version described in the docs.  This one will probably be a bit more efficient
 
 Yet <i>another</i> calendar control.  This one is a wrapper around the C++
 version described in the docs.  This one will probably be a bit more efficient
@@ -64,10 +54,8 @@ 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:])
 
 
wxWidgets (Impactor)