diff --git a/etg/calctrl.py b/etg/calctrl.py
index 29b96e3e..69454351 100644
--- a/etg/calctrl.py
+++ b/etg/calctrl.py
@@ -70,8 +70,14 @@ def run():
         c.find('HitTest.wd').out = True
         c.find('SetAttr.attr').transfer = True
 
+        c.addPyMethod('PyGetDate', '(self)',
+            doc="Return the date as a Python datetime.date object.",
+            body="return wx.wxdate2pydate(self.GetDate())",
+            deprecated="Use GetDate instead.")
+
+        # We have convertFromPyObject mapping in place for parameters, so we
+        # don't need a full wrapper method for these.
         c.addPyCode("""\
-            {name}.PyGetDate = wx.deprecated({name}.GetDate, 'Use GetDate instead.')
             {name}.PySetDate = wx.deprecated({name}.SetDate, 'Use SetDate instead.')
             {name}.PySetDateRange = wx.deprecated({name}.SetDateRange, 'Use SetDateRange instead.')
             """.format(name=c.name[2:]))
diff --git a/etg/dateevt.py b/etg/dateevt.py
index 88925cdb..b3a22b9b 100644
--- a/etg/dateevt.py
+++ b/etg/dateevt.py
@@ -42,8 +42,12 @@ def run():
         EVT_TIME_CHANGED = wx.PyEventBinder( wxEVT_TIME_CHANGED, 1 )
         """)
 
+    c.addPyMethod('PyGetDate', '(self)',
+        doc="Return the date as a Python datetime.date object.",
+        body="return wx.wxdate2pydate(self.GetDate())",
+        deprecated="Use GetDate instead.")
+
     c.addPyCode("""\
-        DateEvent.PyGetDate = wx.deprecated(DateEvent.GetDate, 'Use GetDate instead.')
         DateEvent.PySetDate = wx.deprecated(DateEvent.SetDate, 'Use SetDate instead.')
         """)
 
diff --git a/unittests/test_calctrl.py b/unittests/test_calctrl.py
index 4b7ce3d5..074cc18e 100644
--- a/unittests/test_calctrl.py
+++ b/unittests/test_calctrl.py
@@ -2,6 +2,7 @@ import unittest
 from unittests import wtc
 import wx
 import wx.adv
+import datetime
 
 #---------------------------------------------------------------------------
 
@@ -42,6 +43,13 @@ class calctrl_Tests(wtc.WidgetTestCase):
         cal.Create(self.frame, date=wx.DateTime.Today())
 
 
+    def test_calctrl4(self):
+        cal = wx.adv.CalendarCtrl(self.frame, date=wx.DateTime.Today())
+        d = cal.PyGetDate()
+        assert isinstance(d, datetime.datetime)
+
+
+
     def test_genericcalctrl2(self):
         cal = wx.adv.GenericCalendarCtrl(self.frame, date=wx.DateTime.Today())
 
@@ -51,6 +59,19 @@ class calctrl_Tests(wtc.WidgetTestCase):
         cal.Create(self.frame, date=wx.DateTime.Today())
 
 
+    def test_genericcalctrl4(self):
+        cal = wx.adv.GenericCalendarCtrl(self.frame, date=wx.DateTime.Today())
+        d = cal.PyGetDate()
+        assert isinstance(d, datetime.datetime)
+
+
+
+    def test_calevt(self):
+        evt = wx.adv.CalendarEvent()
+        evt.SetDate(wx.DateTime.Today())
+        d = evt.PyGetDate()
+        assert isinstance(d, datetime.datetime)
+
 
 #---------------------------------------------------------------------------