X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a2a9da2c234078f32cf6827bbca0d31abd8a85c..019fd9d3793f9a56f80fa72589a6b7eb53885ff8:/wxPython/src/msw/calendar.py

diff --git a/wxPython/src/msw/calendar.py b/wxPython/src/msw/calendar.py
index 6dab932b4d..ec9e4a42a5 100644
--- a/wxPython/src/msw/calendar.py
+++ b/wxPython/src/msw/calendar.py
@@ -1,285 +1,439 @@
 # This file was created automatically by SWIG.
-import calendarc
+# Don't modify this file, modify the SWIG interface instead.
+
+import _calendar
+
+import _misc
+import _core
+wx = _core 
+__docfilter__ = wx.__docfilter__ 
+CAL_SUNDAY_FIRST = _calendar.CAL_SUNDAY_FIRST
+CAL_MONDAY_FIRST = _calendar.CAL_MONDAY_FIRST
+CAL_SHOW_HOLIDAYS = _calendar.CAL_SHOW_HOLIDAYS
+CAL_NO_YEAR_CHANGE = _calendar.CAL_NO_YEAR_CHANGE
+CAL_NO_MONTH_CHANGE = _calendar.CAL_NO_MONTH_CHANGE
+CAL_SEQUENTIAL_MONTH_SELECTION = _calendar.CAL_SEQUENTIAL_MONTH_SELECTION
+CAL_SHOW_SURROUNDING_WEEKS = _calendar.CAL_SHOW_SURROUNDING_WEEKS
+CAL_HITTEST_NOWHERE = _calendar.CAL_HITTEST_NOWHERE
+CAL_HITTEST_HEADER = _calendar.CAL_HITTEST_HEADER
+CAL_HITTEST_DAY = _calendar.CAL_HITTEST_DAY
+CAL_HITTEST_INCMONTH = _calendar.CAL_HITTEST_INCMONTH
+CAL_HITTEST_DECMONTH = _calendar.CAL_HITTEST_DECMONTH
+CAL_HITTEST_SURROUNDING_WEEK = _calendar.CAL_HITTEST_SURROUNDING_WEEK
+CAL_BORDER_NONE = _calendar.CAL_BORDER_NONE
+CAL_BORDER_SQUARE = _calendar.CAL_BORDER_SQUARE
+CAL_BORDER_ROUND = _calendar.CAL_BORDER_ROUND
+class CalendarDateAttr(object):
+    """
+    A set of customization attributes for a calendar date, which can be used to
+    control the look of the Calendar object.
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCalendarDateAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, Colour colText=wxNullColour, Colour colBack=wxNullColour, 
+            Colour colBorder=wxNullColour, Font font=wxNullFont, 
+            int border=CAL_BORDER_NONE) -> CalendarDateAttr
+
+        Create a CalendarDateAttr.
+        """
+        newobj = _calendar.new_CalendarDateAttr(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(self, Colour colText)"""
+        return _calendar.CalendarDateAttr_SetTextColour(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(self, Colour colBack)"""
+        return _calendar.CalendarDateAttr_SetBackgroundColour(*args, **kwargs)
 
-from misc import *
+    def SetBorderColour(*args, **kwargs):
+        """SetBorderColour(self, Colour col)"""
+        return _calendar.CalendarDateAttr_SetBorderColour(*args, **kwargs)
 
-from windows import *
+    def SetFont(*args, **kwargs):
+        """SetFont(self, Font font)"""
+        return _calendar.CalendarDateAttr_SetFont(*args, **kwargs)
 
-from gdi import *
+    def SetBorder(*args, **kwargs):
+        """SetBorder(self, int border)"""
+        return _calendar.CalendarDateAttr_SetBorder(*args, **kwargs)
 
-from fonts import *
+    def SetHoliday(*args, **kwargs):
+        """SetHoliday(self, bool holiday)"""
+        return _calendar.CalendarDateAttr_SetHoliday(*args, **kwargs)
 
-from clip_dnd import *
+    def HasTextColour(*args, **kwargs):
+        """HasTextColour(self) -> bool"""
+        return _calendar.CalendarDateAttr_HasTextColour(*args, **kwargs)
 
-from controls import *
+    def HasBackgroundColour(*args, **kwargs):
+        """HasBackgroundColour(self) -> bool"""
+        return _calendar.CalendarDateAttr_HasBackgroundColour(*args, **kwargs)
 
-from events import *
+    def HasBorderColour(*args, **kwargs):
+        """HasBorderColour(self) -> bool"""
+        return _calendar.CalendarDateAttr_HasBorderColour(*args, **kwargs)
 
-from utils import *
-import wx
+    def HasFont(*args, **kwargs):
+        """HasFont(self) -> bool"""
+        return _calendar.CalendarDateAttr_HasFont(*args, **kwargs)
 
-def EVT_CALENDAR(win, id, fn):
-    win.Connect(id, -1, wxEVT_CALENDAR_DOUBLECLICKED, fn)
+    def HasBorder(*args, **kwargs):
+        """HasBorder(self) -> bool"""
+        return _calendar.CalendarDateAttr_HasBorder(*args, **kwargs)
 
-def EVT_CALENDAR_SEL_CHANGED(win, id, fn):
-    win.Connect(id, -1, wxEVT_CALENDAR_SEL_CHANGED, fn)
+    def IsHoliday(*args, **kwargs):
+        """IsHoliday(self) -> bool"""
+        return _calendar.CalendarDateAttr_IsHoliday(*args, **kwargs)
 
-def EVT_CALENDAR_DAY(win, id, fn):
-    win.Connect(id, -1, wxEVT_CALENDAR_DAY_CHANGED, fn)
+    def GetTextColour(*args, **kwargs):
+        """GetTextColour(self) -> Colour"""
+        return _calendar.CalendarDateAttr_GetTextColour(*args, **kwargs)
 
-def EVT_CALENDAR_MONTH(win, id, fn):
-    win.Connect(id, -1, wxEVT_CALENDAR_MONTH_CHANGED, fn)
+    def GetBackgroundColour(*args, **kwargs):
+        """GetBackgroundColour(self) -> Colour"""
+        return _calendar.CalendarDateAttr_GetBackgroundColour(*args, **kwargs)
 
-def EVT_CALENDAR_YEAR(win, id, fn):
-    win.Connect(id, -1, wxEVT_CALENDAR_YEAR_CHANGED, fn)
+    def GetBorderColour(*args, **kwargs):
+        """GetBorderColour(self) -> Colour"""
+        return _calendar.CalendarDateAttr_GetBorderColour(*args, **kwargs)
 
-def EVT_CALENDAR_WEEKDAY_CLICKED(win, id, fn):
-    win.Connect(id, -1, wxEVT_CALENDAR_WEEKDAY_CLICKED, fn)
+    def GetFont(*args, **kwargs):
+        """GetFont(self) -> Font"""
+        return _calendar.CalendarDateAttr_GetFont(*args, **kwargs)
 
+    def GetBorder(*args, **kwargs):
+        """GetBorder(self) -> int"""
+        return _calendar.CalendarDateAttr_GetBorder(*args, **kwargs)
 
-class wxCalendarDateAttrPtr :
-    def __init__(self,this):
+
+class CalendarDateAttrPtr(CalendarDateAttr):
+    def __init__(self, this):
         self.this = this
-        self.thisown = 0
-    def SetTextColour(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_SetTextColour(self, *_args, **_kwargs)
-        return val
-    def SetBackgroundColour(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_SetBackgroundColour(self, *_args, **_kwargs)
-        return val
-    def SetBorderColour(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_SetBorderColour(self, *_args, **_kwargs)
-        return val
-    def SetFont(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_SetFont(self, *_args, **_kwargs)
-        return val
-    def SetBorder(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_SetBorder(self, *_args, **_kwargs)
-        return val
-    def SetHoliday(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_SetHoliday(self, *_args, **_kwargs)
-        return val
-    def HasTextColour(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_HasTextColour(self, *_args, **_kwargs)
-        return val
-    def HasBackgroundColour(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_HasBackgroundColour(self, *_args, **_kwargs)
-        return val
-    def HasBorderColour(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_HasBorderColour(self, *_args, **_kwargs)
-        return val
-    def HasFont(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_HasFont(self, *_args, **_kwargs)
-        return val
-    def HasBorder(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_HasBorder(self, *_args, **_kwargs)
-        return val
-    def IsHoliday(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_IsHoliday(self, *_args, **_kwargs)
-        return val
-    def GetTextColour(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_GetTextColour(self, *_args, **_kwargs)
-        if val: val = wxColourPtr(val) ; val.thisown = 1
-        return val
-    def GetBackgroundColour(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_GetBackgroundColour(self, *_args, **_kwargs)
-        if val: val = wxColourPtr(val) ; val.thisown = 1
-        return val
-    def GetBorderColour(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_GetBorderColour(self, *_args, **_kwargs)
-        if val: val = wxColourPtr(val) ; val.thisown = 1
-        return val
-    def GetFont(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_GetFont(self, *_args, **_kwargs)
-        if val: val = wxFontPtr(val) ; val.thisown = 1
-        return val
-    def GetBorder(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarDateAttr_GetBorder(self, *_args, **_kwargs)
-        return val
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = CalendarDateAttr
+_calendar.CalendarDateAttr_swigregister(CalendarDateAttrPtr)
+
+class CalendarEvent(_core.CommandEvent):
     def __repr__(self):
-        return "<%s.%s instance; proxy of C++ wxCalendarDateAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
-class wxCalendarDateAttr(wxCalendarDateAttrPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = calendarc.new_wxCalendarDateAttr(*_args,**_kwargs)
+        return "<%s.%s; proxy of C++ wxCalendarEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(self, CalendarCtrl cal, wxEventType type) -> CalendarEvent"""
+        newobj = _calendar.new_CalendarEvent(*args, **kwargs)
+        self.this = newobj.this
         self.thisown = 1
+        del newobj.thisown
+    def GetDate(*args, **kwargs):
+        """GetDate(self) -> DateTime"""
+        return _calendar.CalendarEvent_GetDate(*args, **kwargs)
 
+    def SetDate(*args, **kwargs):
+        """SetDate(self, DateTime date)"""
+        return _calendar.CalendarEvent_SetDate(*args, **kwargs)
 
+    def SetWeekDay(*args, **kwargs):
+        """SetWeekDay(self, int wd)"""
+        return _calendar.CalendarEvent_SetWeekDay(*args, **kwargs)
 
-def wxCalendarDateAttrBorder(*_args,**_kwargs):
-    val = wxCalendarDateAttrPtr(calendarc.new_wxCalendarDateAttrBorder(*_args,**_kwargs))
-    val.thisown = 1
-    return val
+    def GetWeekDay(*args, **kwargs):
+        """GetWeekDay(self) -> int"""
+        return _calendar.CalendarEvent_GetWeekDay(*args, **kwargs)
 
 
-class wxCalendarEventPtr(wxCommandEventPtr):
-    def __init__(self,this):
+class CalendarEventPtr(CalendarEvent):
+    def __init__(self, this):
         self.this = this
-        self.thisown = 0
-    def GetDate(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarEvent_GetDate(self, *_args, **_kwargs)
-        if val: val = wxDateTimePtr(val) 
-        return val
-    def GetWeekDay(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarEvent_GetWeekDay(self, *_args, **_kwargs)
-        return val
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = CalendarEvent
+_calendar.CalendarEvent_swigregister(CalendarEventPtr)
+
+wxEVT_CALENDAR_DOUBLECLICKED = _calendar.wxEVT_CALENDAR_DOUBLECLICKED
+wxEVT_CALENDAR_SEL_CHANGED = _calendar.wxEVT_CALENDAR_SEL_CHANGED
+wxEVT_CALENDAR_DAY_CHANGED = _calendar.wxEVT_CALENDAR_DAY_CHANGED
+wxEVT_CALENDAR_MONTH_CHANGED = _calendar.wxEVT_CALENDAR_MONTH_CHANGED
+wxEVT_CALENDAR_YEAR_CHANGED = _calendar.wxEVT_CALENDAR_YEAR_CHANGED
+wxEVT_CALENDAR_WEEKDAY_CLICKED = _calendar.wxEVT_CALENDAR_WEEKDAY_CLICKED
+EVT_CALENDAR =                 wx.PyEventBinder( wxEVT_CALENDAR_DOUBLECLICKED, 1)
+EVT_CALENDAR_SEL_CHANGED =     wx.PyEventBinder( wxEVT_CALENDAR_SEL_CHANGED, 1)
+EVT_CALENDAR_DAY =             wx.PyEventBinder( wxEVT_CALENDAR_DAY_CHANGED, 1)
+EVT_CALENDAR_MONTH =           wx.PyEventBinder( wxEVT_CALENDAR_MONTH_CHANGED, 1)
+EVT_CALENDAR_YEAR =            wx.PyEventBinder( wxEVT_CALENDAR_YEAR_CHANGED, 1)
+EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED, 1)
+
+class CalendarCtrl(_core.Control):
+    """The calendar control allows the user to pick a date interactively."""
     def __repr__(self):
-        return "<%s.%s instance; proxy of C++ wxCalendarEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
-class wxCalendarEvent(wxCalendarEventPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = calendarc.new_wxCalendarEvent(*_args,**_kwargs)
+        return "<%s.%s; proxy of C++ wxCalendarCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, Window parent, int id=-1, DateTime date=DefaultDateTime, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
+            String name=CalendarNameStr) -> CalendarCtrl
+
+        Create and show a calendar control.
+        """
+        newobj = _calendar.new_CalendarCtrl(*args, **kwargs)
+        self.this = newobj.this
         self.thisown = 1
+        del newobj.thisown
+        self._setOORInfo(self)
 
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id, DateTime date=DefaultDateTime, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
+            String name=CalendarNameStr) -> bool
+
+        Acutally create the GUI portion of the CalendarCtrl for 2-phase creation.
+        """
+        return _calendar.CalendarCtrl_Create(*args, **kwargs)
+
+    def SetDate(*args, **kwargs):
+        """
+        SetDate(self, DateTime date)
+
+        Sets the current date.
+        """
+        return _calendar.CalendarCtrl_SetDate(*args, **kwargs)
+
+    def GetDate(*args, **kwargs):
+        """
+        GetDate(self) -> DateTime
+
+        Gets the currently selected date.
+        """
+        return _calendar.CalendarCtrl_GetDate(*args, **kwargs)
+
+    def SetLowerDateLimit(*args, **kwargs):
+        """
+        SetLowerDateLimit(self, DateTime date=DefaultDateTime) -> bool
+
+        set the range in which selection can occur
+        """
+        return _calendar.CalendarCtrl_SetLowerDateLimit(*args, **kwargs)
+
+    def SetUpperDateLimit(*args, **kwargs):
+        """
+        SetUpperDateLimit(self, DateTime date=DefaultDateTime) -> bool
+
+        set the range in which selection can occur
+        """
+        return _calendar.CalendarCtrl_SetUpperDateLimit(*args, **kwargs)
+
+    def GetLowerDateLimit(*args, **kwargs):
+        """
+        GetLowerDateLimit(self) -> DateTime
+
+        get the range in which selection can occur
+        """
+        return _calendar.CalendarCtrl_GetLowerDateLimit(*args, **kwargs)
+
+    def GetUpperDateLimit(*args, **kwargs):
+        """
+        GetUpperDateLimit(self) -> DateTime
+
+        get the range in which selection can occur
+        """
+        return _calendar.CalendarCtrl_GetUpperDateLimit(*args, **kwargs)
+
+    def SetDateRange(*args, **kwargs):
+        """
+        SetDateRange(self, DateTime lowerdate=DefaultDateTime, DateTime upperdate=DefaultDateTime) -> bool
+
+        set the range in which selection can occur
+        """
+        return _calendar.CalendarCtrl_SetDateRange(*args, **kwargs)
+
+    def EnableYearChange(*args, **kwargs):
+        """
+        EnableYearChange(self, bool enable=True)
+
+        This function should be used instead of changing CAL_NO_YEAR_CHANGE
+        style bit directly. It allows or disallows the user to change the year
+        interactively.
+        """
+        return _calendar.CalendarCtrl_EnableYearChange(*args, **kwargs)
+
+    def EnableMonthChange(*args, **kwargs):
+        """
+        EnableMonthChange(self, bool enable=True)
+
+        This function should be used instead of changing CAL_NO_MONTH_CHANGE style
+        bit. It allows or disallows the user to change the month interactively. Note
+        that if the month can not be changed, the year can not be changed either.
+        """
+        return _calendar.CalendarCtrl_EnableMonthChange(*args, **kwargs)
+
+    def EnableHolidayDisplay(*args, **kwargs):
+        """
+        EnableHolidayDisplay(self, bool display=True)
+
+        This function should be used instead of changing CAL_SHOW_HOLIDAYS style
+        bit directly. It enables or disables the special highlighting of the holidays.
+        """
+        return _calendar.CalendarCtrl_EnableHolidayDisplay(*args, **kwargs)
+
+    def SetHeaderColours(*args, **kwargs):
+        """
+        SetHeaderColours(self, Colour colFg, Colour colBg)
+
+        header colours are used for painting the weekdays at the top
+        """
+        return _calendar.CalendarCtrl_SetHeaderColours(*args, **kwargs)
+
+    def GetHeaderColourFg(*args, **kwargs):
+        """
+        GetHeaderColourFg(self) -> Colour
+
+        header colours are used for painting the weekdays at the top
+        """
+        return _calendar.CalendarCtrl_GetHeaderColourFg(*args, **kwargs)
+
+    def GetHeaderColourBg(*args, **kwargs):
+        """
+        GetHeaderColourBg(self) -> Colour
+
+        header colours are used for painting the weekdays at the top
+        """
+        return _calendar.CalendarCtrl_GetHeaderColourBg(*args, **kwargs)
+
+    def SetHighlightColours(*args, **kwargs):
+        """
+        SetHighlightColours(self, Colour colFg, Colour colBg)
+
+        highlight colour is used for the currently selected date
+        """
+        return _calendar.CalendarCtrl_SetHighlightColours(*args, **kwargs)
+
+    def GetHighlightColourFg(*args, **kwargs):
+        """
+        GetHighlightColourFg(self) -> Colour
+
+        highlight colour is used for the currently selected date
+        """
+        return _calendar.CalendarCtrl_GetHighlightColourFg(*args, **kwargs)
+
+    def GetHighlightColourBg(*args, **kwargs):
+        """
+        GetHighlightColourBg(self) -> Colour
+
+        highlight colour is used for the currently selected date
+        """
+        return _calendar.CalendarCtrl_GetHighlightColourBg(*args, **kwargs)
+
+    def SetHolidayColours(*args, **kwargs):
+        """
+        SetHolidayColours(self, Colour colFg, Colour colBg)
+
+        holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is used)
+        """
+        return _calendar.CalendarCtrl_SetHolidayColours(*args, **kwargs)
+
+    def GetHolidayColourFg(*args, **kwargs):
+        """
+        GetHolidayColourFg(self) -> Colour
+
+        holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is used)
+        """
+        return _calendar.CalendarCtrl_GetHolidayColourFg(*args, **kwargs)
+
+    def GetHolidayColourBg(*args, **kwargs):
+        """
+        GetHolidayColourBg(self) -> Colour
+
+        holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is used)
+        """
+        return _calendar.CalendarCtrl_GetHolidayColourBg(*args, **kwargs)
+
+    def GetAttr(*args, **kwargs):
+        """
+        GetAttr(self, size_t day) -> CalendarDateAttr
+
+        Returns the attribute for the given date (should be in the range 1...31).
+        The returned value may be None
+        """
+        return _calendar.CalendarCtrl_GetAttr(*args, **kwargs)
 
+    def SetAttr(*args, **kwargs):
+        """
+        SetAttr(self, size_t day, CalendarDateAttr attr)
 
+        Associates the attribute with the specified date (in the range 1...31).
+        If the attribute passed is None, the items attribute is cleared.
+        """
+        return _calendar.CalendarCtrl_SetAttr(*args, **kwargs)
 
-class wxCalendarCtrlPtr(wxControlPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def Create(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_Create(self, *_args, **_kwargs)
-        return val
-    def SetDate(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_SetDate(self, *_args, **_kwargs)
-        return val
-    def GetDate(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_GetDate(self, *_args, **_kwargs)
-        if val: val = wxDateTimePtr(val) 
-        return val
-    def SetLowerDateLimit(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_SetLowerDateLimit(self, *_args, **_kwargs)
-        return val
-    def GetLowerDateLimit(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_GetLowerDateLimit(self, *_args, **_kwargs)
-        if val: val = wxDateTimePtr(val) 
-        return val
-    def SetUpperDateLimit(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_SetUpperDateLimit(self, *_args, **_kwargs)
-        return val
-    def GetUpperDateLimit(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_GetUpperDateLimit(self, *_args, **_kwargs)
-        if val: val = wxDateTimePtr(val) 
-        return val
-    def SetDateRange(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_SetDateRange(self, *_args, **_kwargs)
-        return val
-    def EnableYearChange(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_EnableYearChange(self, *_args, **_kwargs)
-        return val
-    def EnableMonthChange(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_EnableMonthChange(self, *_args, **_kwargs)
-        return val
-    def EnableHolidayDisplay(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_EnableHolidayDisplay(self, *_args, **_kwargs)
-        return val
-    def SetHeaderColours(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_SetHeaderColours(self, *_args, **_kwargs)
-        return val
-    def GetHeaderColourFg(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_GetHeaderColourFg(self, *_args, **_kwargs)
-        if val: val = wxColourPtr(val) ; val.thisown = 1
-        return val
-    def GetHeaderColourBg(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_GetHeaderColourBg(self, *_args, **_kwargs)
-        if val: val = wxColourPtr(val) ; val.thisown = 1
-        return val
-    def SetHighlightColours(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_SetHighlightColours(self, *_args, **_kwargs)
-        return val
-    def GetHighlightColourFg(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_GetHighlightColourFg(self, *_args, **_kwargs)
-        if val: val = wxColourPtr(val) ; val.thisown = 1
-        return val
-    def GetHighlightColourBg(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_GetHighlightColourBg(self, *_args, **_kwargs)
-        if val: val = wxColourPtr(val) ; val.thisown = 1
-        return val
-    def SetHolidayColours(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_SetHolidayColours(self, *_args, **_kwargs)
-        return val
-    def GetHolidayColourFg(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_GetHolidayColourFg(self, *_args, **_kwargs)
-        if val: val = wxColourPtr(val) ; val.thisown = 1
-        return val
-    def GetHolidayColourBg(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_GetHolidayColourBg(self, *_args, **_kwargs)
-        if val: val = wxColourPtr(val) ; val.thisown = 1
-        return val
-    def GetAttr(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_GetAttr(self, *_args, **_kwargs)
-        if val: val = wxCalendarDateAttrPtr(val) 
-        return val
-    def SetAttr(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_SetAttr(self, *_args, **_kwargs)
-        return val
-    def SetHoliday(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_SetHoliday(self, *_args, **_kwargs)
-        return val
-    def ResetAttr(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_ResetAttr(self, *_args, **_kwargs)
-        return val
-    def HitTest(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_HitTest(self, *_args, **_kwargs)
-        return val
-    def Enable(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_Enable(self, *_args, **_kwargs)
-        return val
-    def Show(self, *_args, **_kwargs):
-        val = calendarc.wxCalendarCtrl_Show(self, *_args, **_kwargs)
-        return val
-    def __repr__(self):
-        return "<%s.%s instance; proxy of C++ wxCalendarCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
-class wxCalendarCtrl(wxCalendarCtrlPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = calendarc.new_wxCalendarCtrl(*_args,**_kwargs)
-        self.thisown = 1
-        self._setOORInfo(self)
-
+    def SetHoliday(*args, **kwargs):
+        """
+        SetHoliday(self, size_t day)
 
+        Marks the specified day as being a holiday in the current month.
+        """
+        return _calendar.CalendarCtrl_SetHoliday(*args, **kwargs)
 
-def wxPreCalendarCtrl(*_args,**_kwargs):
-    val = wxCalendarCtrlPtr(calendarc.new_wxPreCalendarCtrl(*_args,**_kwargs))
-    val.thisown = 1
-    val._setOORInfo(val)
-    return val
+    def ResetAttr(*args, **kwargs):
+        """
+        ResetAttr(self, size_t day)
 
+        Clears any attributes associated with the given day (in the range 1...31).
+        """
+        return _calendar.CalendarCtrl_ResetAttr(*args, **kwargs)
 
+    def HitTest(*args, **kwargs):
+        """
+        HitTest(Point pos) -> (result, date, weekday)
 
+        Returns 3-tuple with information about the given position on the calendar
+        control.  The first value of the tuple is a result code and determines the
+        validity of the remaining two values.  The result codes are:
 
-#-------------- FUNCTION WRAPPERS ------------------
+            CAL_HITTEST_NOWHERE:    hit outside of anything
+            CAL_HITTEST_HEADER:     hit on the header, weekday is valid
+            CAL_HITTEST_DAY:        hit on a day in the calendar, date is set.
 
+        """
+        return _calendar.CalendarCtrl_HitTest(*args, **kwargs)
 
+    def GetMonthControl(*args, **kwargs):
+        """
+        GetMonthControl(self) -> Control
 
-#-------------- VARIABLE WRAPPERS ------------------
+        get the currently shown control for month
+        """
+        return _calendar.CalendarCtrl_GetMonthControl(*args, **kwargs)
 
-wxCAL_SUNDAY_FIRST = calendarc.wxCAL_SUNDAY_FIRST
-wxCAL_MONDAY_FIRST = calendarc.wxCAL_MONDAY_FIRST
-wxCAL_SHOW_HOLIDAYS = calendarc.wxCAL_SHOW_HOLIDAYS
-wxCAL_NO_YEAR_CHANGE = calendarc.wxCAL_NO_YEAR_CHANGE
-wxCAL_NO_MONTH_CHANGE = calendarc.wxCAL_NO_MONTH_CHANGE
-wxCAL_SEQUENTIAL_MONTH_SELECTION = calendarc.wxCAL_SEQUENTIAL_MONTH_SELECTION
-wxCAL_SHOW_SURROUNDING_WEEKS = calendarc.wxCAL_SHOW_SURROUNDING_WEEKS
-wxCAL_HITTEST_NOWHERE = calendarc.wxCAL_HITTEST_NOWHERE
-wxCAL_HITTEST_HEADER = calendarc.wxCAL_HITTEST_HEADER
-wxCAL_HITTEST_DAY = calendarc.wxCAL_HITTEST_DAY
-wxCAL_HITTEST_INCMONTH = calendarc.wxCAL_HITTEST_INCMONTH
-wxCAL_HITTEST_DECMONTH = calendarc.wxCAL_HITTEST_DECMONTH
-wxCAL_HITTEST_SURROUNDING_WEEK = calendarc.wxCAL_HITTEST_SURROUNDING_WEEK
-wxCAL_BORDER_NONE = calendarc.wxCAL_BORDER_NONE
-wxCAL_BORDER_SQUARE = calendarc.wxCAL_BORDER_SQUARE
-wxCAL_BORDER_ROUND = calendarc.wxCAL_BORDER_ROUND
-wxEVT_CALENDAR_DOUBLECLICKED = calendarc.wxEVT_CALENDAR_DOUBLECLICKED
-wxEVT_CALENDAR_SEL_CHANGED = calendarc.wxEVT_CALENDAR_SEL_CHANGED
-wxEVT_CALENDAR_DAY_CHANGED = calendarc.wxEVT_CALENDAR_DAY_CHANGED
-wxEVT_CALENDAR_MONTH_CHANGED = calendarc.wxEVT_CALENDAR_MONTH_CHANGED
-wxEVT_CALENDAR_YEAR_CHANGED = calendarc.wxEVT_CALENDAR_YEAR_CHANGED
-wxEVT_CALENDAR_WEEKDAY_CLICKED = calendarc.wxEVT_CALENDAR_WEEKDAY_CLICKED
+    def GetYearControl(*args, **kwargs):
+        """
+        GetYearControl(self) -> Control
 
+        get the currently shown control for year
+        """
+        return _calendar.CalendarCtrl_GetYearControl(*args, **kwargs)
 
-#-------------- USER INCLUDE -----------------------
 
+class CalendarCtrlPtr(CalendarCtrl):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = CalendarCtrl
+_calendar.CalendarCtrl_swigregister(CalendarCtrlPtr)
+cvar = _calendar.cvar
+CalendarNameStr = cvar.CalendarNameStr
+
+def PreCalendarCtrl(*args, **kwargs):
+    """
+    PreCalendarCtrl() -> CalendarCtrl
+
+    Precreate a CalendarCtrl for 2-phase creation.
+    """
+    val = _calendar.new_PreCalendarCtrl(*args, **kwargs)
+    val.thisown = 1
+    return val
 
-# Stuff these names into the wx namespace so wxPyConstructObject can find them
 
-wx.wxCalendarEventPtr                  = wxCalendarEventPtr
-wx.wxCalendarCtrlPtr                   = wxCalendarCtrlPtr