[Pythoncard-cvs] PythonCard/components calendar.py,1.19,1.20

[Kevin A. <ka...@us...>]

Update of /cvsroot/pythoncard/PythonCard/components
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30601/components

Modified Files:
	calendar.py 
Log Message:
started adding support for wxPython 2.5.2.9 datetime


Index: calendar.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/components/calendar.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** calendar.py	8 Aug 2004 15:20:38 -0000	1.19
--- calendar.py	11 Sep 2004 06:34:08 -0000	1.20
***************
*** 5,8 ****
--- 5,9 ----
  """
  
+ import datetime
  import wx
  from wx import calendar
***************
*** 12,16 ****
      def decorate(self, aWxEvent, source):
          aWxEvent = event.Event.decorate(self, aWxEvent, source)
!         aWxEvent.date = aWxEvent.GetDate()
          return aWxEvent
      
--- 13,20 ----
      def decorate(self, aWxEvent, source):
          aWxEvent = event.Event.decorate(self, aWxEvent, source)
!         if wx.VERSION >= (2,5,2,9):
!             aWxEvent.date = aWxEvent.PyGetDate()
!         else:
!             aWxEvent.date = aWxEvent.GetDate()
          return aWxEvent
      
***************
*** 93,100 ****
          self._bindEvents(event.WIDGET_EVENTS + CalendarEvents)
  
!     # KEA 2002-07-09
!     # use same name as wxPython calendar module
!     def SetNow(self):
!         self.SetDate(wx.DateTime_Now())
  
  
--- 97,111 ----
          self._bindEvents(event.WIDGET_EVENTS + CalendarEvents)
  
!     if wx.VERSION >= (2,5,2,9):        
!         def SetNow(self):
!             self.PySetDate(datetime.date.today())
!         
!         date = property(calendar.CalendarCtrl.PyGetDate, calendar.CalendarCtrl.PySetDate)
!             
!     else:
!         # KEA 2002-07-09
!         # use same name as wxPython calendar module
!         def SetNow(self):
!             self.SetDate(wx.DateTime_Now())