Updates to reflect recent changes in wxWindows

[wxWidgets.git] / wxPython / src / calendar.i

diff --git a/wxPython/src/calendar.i b/wxPython/src/calendar.i
index 80eb674984d02121a9c95bb177068567966b282b..c86759672171dbc5e9e56ed54d6b8e25ec187c93 100644 (file)
--- a/wxPython/src/calendar.i
+++ b/wxPython/src/calendar.i
@@ -108,7 +108,9 @@ class wxCalendarEvent : public wxCommandEvent
 public:
     wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type);
 
-    const wxDateTime& GetDate() const;
+    const wxDateTime GetDate() const;
+    void SetDate(const wxDateTime &date);
+    void SetWeekDay(const wxDateTime::WeekDay wd);
     wxDateTime::WeekDay GetWeekDay() const;
 
 };
@@ -134,17 +136,15 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
 
 //---------------------------------------------------------------------------
 
-%{
-    DECLARE_DEF_STRING(CalendarNameStr);
-%}
+MAKE_CONST_WXSTRING(CalendarNameStr);
 
 
 
 class wxCalendarCtrl : public wxControl
 {
 public:
-    %addtofunc wxCalendarCtrl      "self._setOORInfo(self)"
-    %addtofunc wxCalendarCtrl()    ""
+    %pythonAppend wxCalendarCtrl      "self._setOORInfo(self)"
+    %pythonAppend wxCalendarCtrl()    ""
 
     wxCalendarCtrl(wxWindow *parent,
                    wxWindowID id,
@@ -241,6 +241,9 @@ public:
     bool Enable(bool enable = True);
     bool Show(bool show = True);
 
+    // get the currently shown control for month/year
+    wxControl *GetMonthControl() const;
+    wxControl *GetYearControl() const;
 };