warning fix

[wxWidgets.git] / wxPython / demo / CalendarCtrl.py
diff --git a/wxPython/demo/CalendarCtrl.py b/wxPython/demo/CalendarCtrl.py

index 03fc569b4d611605e524ae2c5f05550f15f758b0..798b155cc18a9eefd2a2d790a36ba6d3884abade 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.lib.calendar as calendar
+import  wx.calendar
  
  #----------------------------------------------------------------------
  
@@ -13,26 +9,27 @@ class TestPanel(wx.Panel):
          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())
+        self.Bind(wx.calendar.EVT_CALENDAR, self.OnCalSelected, id=cal.GetId())
  
-        b = wx.Button(self, -1, "Destroy the Calendar", pos = (250, 50))
+        b = wx.Button(self, -1, "Destroy the Calendar", pos = (275, 50))
          self.Bind(wx.EVT_BUTTON, self.OnButton, id= b.GetId())
          self.cal = cal
  
          # 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()
  
      def OnButton(self, evt):
-        self.cal.Destroy()
-        self.cal = None
+        if self.cal is not None:
+            self.cal.Destroy()
+            self.cal = None
  
      def OnCalSelected(self, evt):
          self.log.write('OnCalSelected: %s\n' % evt.GetDate())
@@ -55,7 +52,7 @@ def runTest(frame, nb, log):
  
  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
@@ -64,10 +61,8 @@ so I think both will stay in wxPython.
  """
  
  
-
-
  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:])