new DC API fix

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

diff --git a/wxPython/src/calendar.i b/wxPython/src/calendar.i
index 7194270cc2b59482524cb24e87d271cee56612d9..d513513e44295aaf58748a8ff30d8917732b3c3c 100644 (file)
--- a/wxPython/src/calendar.i
+++ b/wxPython/src/calendar.i
@@ -109,6 +109,8 @@ public:
     wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type);
 
     const wxDateTime& GetDate() const;
+    void SetDate(const wxDateTime &date);
+    void SetWeekDay(const wxDateTime::WeekDay wd);
     wxDateTime::WeekDay GetWeekDay() const;
 
 };
@@ -134,9 +136,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
 
 //---------------------------------------------------------------------------
 
-%{
-    DECLARE_DEF_STRING(CalendarNameStr);
-%}
+MAKE_CONST_WXSTRING(CalendarNameStr);
 
 
 
@@ -190,13 +190,13 @@ public:
     // should be used instead for them
 
     // corresponds to wxCAL_NO_YEAR_CHANGE bit
-    void EnableYearChange(bool enable = TRUE);
+    void EnableYearChange(bool enable = True);
 
     // corresponds to wxCAL_NO_MONTH_CHANGE bit
-    void EnableMonthChange(bool enable = TRUE);
+    void EnableMonthChange(bool enable = True);
 
     // corresponds to wxCAL_SHOW_HOLIDAYS bit
-    void EnableHolidayDisplay(bool display = TRUE);
+    void EnableHolidayDisplay(bool display = True);
 
     // customization
     // -------------
@@ -238,9 +238,12 @@ public:
                                     wxDateTime::WeekDay *wd = NULL);
 
 
-    bool Enable(bool enable = TRUE);
-    bool Show(bool show = TRUE);
+    bool Enable(bool enable = True);
+    bool Show(bool show = True);
 
+    // get the currently shown control for month/year
+    wxControl *GetMonthControl() const;
+    wxControl *GetYearControl() const;
 };