X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0122b7e3fcfd78f879470053c91a60e3c66537a3..cbd72d4fb4fd3dd85c7c414d03e78a0583522431:/wxPython/src/msw/calendar.py

diff --git a/wxPython/src/msw/calendar.py b/wxPython/src/msw/calendar.py
index 2eb6ec364a..46eef2f4d6 100644
--- a/wxPython/src/msw/calendar.py
+++ b/wxPython/src/msw/calendar.py
@@ -1,254 +1,319 @@
 # 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 
+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):
+    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__(Colour colText, Colour colBack=wxNullColour, Colour colBorder=wxNullColour, 
+            Font font=wxNullFont, 
+            int border=CAL_BORDER_NONE) -> CalendarDateAttr
+        """
+        newobj = _calendar.new_CalendarDateAttr(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(Colour colText)"""
+        return _calendar.CalendarDateAttr_SetTextColour(*args, **kwargs)
 
-from misc import *
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(Colour colBack)"""
+        return _calendar.CalendarDateAttr_SetBackgroundColour(*args, **kwargs)
 
-from windows import *
+    def SetBorderColour(*args, **kwargs):
+        """SetBorderColour(Colour col)"""
+        return _calendar.CalendarDateAttr_SetBorderColour(*args, **kwargs)
 
-from gdi import *
+    def SetFont(*args, **kwargs):
+        """SetFont(Font font)"""
+        return _calendar.CalendarDateAttr_SetFont(*args, **kwargs)
 
-from clip_dnd import *
+    def SetBorder(*args, **kwargs):
+        """SetBorder(int border)"""
+        return _calendar.CalendarDateAttr_SetBorder(*args, **kwargs)
 
-from controls import *
+    def SetHoliday(*args, **kwargs):
+        """SetHoliday(bool holiday)"""
+        return _calendar.CalendarDateAttr_SetHoliday(*args, **kwargs)
 
-from events import *
+    def HasTextColour(*args, **kwargs):
+        """HasTextColour() -> bool"""
+        return _calendar.CalendarDateAttr_HasTextColour(*args, **kwargs)
 
-from utils import *
-import wx
+    def HasBackgroundColour(*args, **kwargs):
+        """HasBackgroundColour() -> bool"""
+        return _calendar.CalendarDateAttr_HasBackgroundColour(*args, **kwargs)
 
-def EVT_CALENDAR(win, id, fn):
-    win.Connect(id, -1, wxEVT_CALENDAR_DOUBLECLICKED, fn)
+    def HasBorderColour(*args, **kwargs):
+        """HasBorderColour() -> bool"""
+        return _calendar.CalendarDateAttr_HasBorderColour(*args, **kwargs)
 
-def EVT_CALENDAR_SEL_CHANGED(win, id, fn):
-    win.Connect(id, -1, wxEVT_CALENDAR_SEL_CHANGED, fn)
+    def HasFont(*args, **kwargs):
+        """HasFont() -> bool"""
+        return _calendar.CalendarDateAttr_HasFont(*args, **kwargs)
 
-def EVT_CALENDAR_DAY(win, id, fn):
-    win.Connect(id, -1, wxEVT_CALENDAR_DAY_CHANGED, fn)
+    def HasBorder(*args, **kwargs):
+        """HasBorder() -> bool"""
+        return _calendar.CalendarDateAttr_HasBorder(*args, **kwargs)
 
-def EVT_CALENDAR_MONTH(win, id, fn):
-    win.Connect(id, -1, wxEVT_CALENDAR_MONTH_CHANGED, fn)
+    def IsHoliday(*args, **kwargs):
+        """IsHoliday() -> bool"""
+        return _calendar.CalendarDateAttr_IsHoliday(*args, **kwargs)
 
-def EVT_CALENDAR_YEAR(win, id, fn):
-    win.Connect(id, -1, wxEVT_CALENDAR_YEAR_CHANGED, fn)
+    def GetTextColour(*args, **kwargs):
+        """GetTextColour() -> Colour"""
+        return _calendar.CalendarDateAttr_GetTextColour(*args, **kwargs)
 
-def EVT_CALENDAR_WEEKDAY_CLICKED(win, id, fn):
-    win.Connect(id, -1, wxEVT_CALENDAR_WEEKDAY_CLICKED, fn)
+    def GetBackgroundColour(*args, **kwargs):
+        """GetBackgroundColour() -> Colour"""
+        return _calendar.CalendarDateAttr_GetBackgroundColour(*args, **kwargs)
 
+    def GetBorderColour(*args, **kwargs):
+        """GetBorderColour() -> Colour"""
+        return _calendar.CalendarDateAttr_GetBorderColour(*args, **kwargs)
 
-class wxCalendarDateAttrPtr :
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def SetTextColour(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_SetTextColour,(self,) + _args, _kwargs)
-        return val
-    def SetBackgroundColour(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_SetBackgroundColour,(self,) + _args, _kwargs)
-        return val
-    def SetBorderColour(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_SetBorderColour,(self,) + _args, _kwargs)
-        return val
-    def SetFont(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_SetFont,(self,) + _args, _kwargs)
-        return val
-    def SetBorder(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_SetBorder,(self,) + _args, _kwargs)
-        return val
-    def SetHoliday(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_SetHoliday,(self,) + _args, _kwargs)
-        return val
-    def HasTextColour(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_HasTextColour,(self,) + _args, _kwargs)
-        return val
-    def HasBackgroundColour(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_HasBackgroundColour,(self,) + _args, _kwargs)
-        return val
-    def HasBorderColour(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_HasBorderColour,(self,) + _args, _kwargs)
-        return val
-    def HasFont(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_HasFont,(self,) + _args, _kwargs)
-        return val
-    def HasBorder(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_HasBorder,(self,) + _args, _kwargs)
-        return val
-    def IsHoliday(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_IsHoliday,(self,) + _args, _kwargs)
-        return val
-    def GetTextColour(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_GetTextColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetBackgroundColour(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_GetBackgroundColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetBorderColour(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_GetBorderColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetFont(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_GetFont,(self,) + _args, _kwargs)
-        if val: val = wxFontPtr(val) 
-        return val
-    def GetBorder(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarDateAttr_GetBorder,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxCalendarDateAttr instance at %s>" % (self.this,)
-class wxCalendarDateAttr(wxCalendarDateAttrPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(calendarc.new_wxCalendarDateAttr,_args,_kwargs)
-        self.thisown = 1
+    def GetFont(*args, **kwargs):
+        """GetFont() -> Font"""
+        return _calendar.CalendarDateAttr_GetFont(*args, **kwargs)
+
+    def GetBorder(*args, **kwargs):
+        """GetBorder() -> int"""
+        return _calendar.CalendarDateAttr_GetBorder(*args, **kwargs)
 
 
+class CalendarDateAttrPtr(CalendarDateAttr):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = CalendarDateAttr
+_calendar.CalendarDateAttr_swigregister(CalendarDateAttrPtr)
 
-def wxCalendarDateAttrBorder(*_args,**_kwargs):
-    val = wxCalendarDateAttrPtr(apply(calendarc.new_wxCalendarDateAttrBorder,_args,_kwargs))
+def CalendarDateAttrBorder(*args, **kwargs):
+    """CalendarDateAttrBorder(int border, Colour colBorder=wxNullColour) -> CalendarDateAttr"""
+    val = _calendar.new_CalendarDateAttrBorder(*args, **kwargs)
     val.thisown = 1
     return val
 
-
-class wxCalendarEventPtr(wxCommandEventPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def GetDate(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarEvent_GetDate,(self,) + _args, _kwargs)
-        if val: val = wxDateTimePtr(val) 
-        return val
-    def GetWeekDay(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarEvent_GetWeekDay,(self,) + _args, _kwargs)
-        return val
+class CalendarEvent(core.CommandEvent):
     def __repr__(self):
-        return "<C wxCalendarEvent instance at %s>" % (self.this,)
-class wxCalendarEvent(wxCalendarEventPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(calendarc.new_wxCalendarEvent,_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__(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() -> DateTime"""
+        return _calendar.CalendarEvent_GetDate(*args, **kwargs)
+
+    def SetDate(*args, **kwargs):
+        """SetDate(DateTime date)"""
+        return _calendar.CalendarEvent_SetDate(*args, **kwargs)
 
+    def SetWeekDay(*args, **kwargs):
+        """SetWeekDay(int wd)"""
+        return _calendar.CalendarEvent_SetWeekDay(*args, **kwargs)
 
+    def GetWeekDay(*args, **kwargs):
+        """GetWeekDay() -> int"""
+        return _calendar.CalendarEvent_GetWeekDay(*args, **kwargs)
 
 
-class wxCalendarCtrlPtr(wxControlPtr):
-    def __init__(self,this):
+class CalendarEventPtr(CalendarEvent):
+    def __init__(self, this):
         self.this = this
-        self.thisown = 0
-    def Create(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_Create,(self,) + _args, _kwargs)
-        return val
-    def SetDate(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_SetDate,(self,) + _args, _kwargs)
-        return val
-    def GetDate(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_GetDate,(self,) + _args, _kwargs)
-        if val: val = wxDateTimePtr(val) 
-        return val
-    def EnableYearChange(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_EnableYearChange,(self,) + _args, _kwargs)
-        return val
-    def EnableMonthChange(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_EnableMonthChange,(self,) + _args, _kwargs)
-        return val
-    def EnableHolidayDisplay(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_EnableHolidayDisplay,(self,) + _args, _kwargs)
-        return val
-    def SetHeaderColours(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_SetHeaderColours,(self,) + _args, _kwargs)
-        return val
-    def GetHeaderColourFg(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_GetHeaderColourFg,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetHeaderColourBg(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_GetHeaderColourBg,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def SetHighlightColours(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_SetHighlightColours,(self,) + _args, _kwargs)
-        return val
-    def GetHighlightColourFg(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_GetHighlightColourFg,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetHighlightColourBg(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_GetHighlightColourBg,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def SetHolidayColours(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_SetHolidayColours,(self,) + _args, _kwargs)
-        return val
-    def GetHolidayColourFg(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_GetHolidayColourFg,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetHolidayColourBg(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_GetHolidayColourBg,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetAttr(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_GetAttr,(self,) + _args, _kwargs)
-        if val: val = wxCalendarDateAttrPtr(val) 
-        return val
-    def SetAttr(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_SetAttr,(self,) + _args, _kwargs)
-        return val
-    def SetHoliday(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_SetHoliday,(self,) + _args, _kwargs)
-        return val
-    def ResetAttr(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_ResetAttr,(self,) + _args, _kwargs)
-        return val
-    def HitTest(self, *_args, **_kwargs):
-        val = apply(calendarc.wxCalendarCtrl_HitTest,(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):
     def __repr__(self):
-        return "<C wxCalendarCtrl instance at %s>" % (self.this,)
-class wxCalendarCtrl(wxCalendarCtrlPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(calendarc.new_wxCalendarCtrl,_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__(Window parent, int id, DateTime date=wxDefaultDateTime, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
+            String name=CalendarNameStr) -> CalendarCtrl
+        """
+        newobj = _calendar.new_CalendarCtrl(*args, **kwargs)
+        self.this = newobj.this
         self.thisown = 1
+        del newobj.thisown
         self._setOORInfo(self)
 
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, DateTime date=wxDefaultDateTime, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
+            String name=CalendarNameStr) -> bool
+        """
+        return _calendar.CalendarCtrl_Create(*args, **kwargs)
 
+    def SetDate(*args, **kwargs):
+        """SetDate(DateTime date)"""
+        return _calendar.CalendarCtrl_SetDate(*args, **kwargs)
 
-def wxPreCalendarCtrl(*_args,**_kwargs):
-    val = wxCalendarCtrlPtr(apply(calendarc.new_wxPreCalendarCtrl,_args,_kwargs))
-    val.thisown = 1
-    val._setOORInfo(self)
-    return val
+    def GetDate(*args, **kwargs):
+        """GetDate() -> DateTime"""
+        return _calendar.CalendarCtrl_GetDate(*args, **kwargs)
+
+    def SetLowerDateLimit(*args, **kwargs):
+        """SetLowerDateLimit(DateTime date=wxDefaultDateTime) -> bool"""
+        return _calendar.CalendarCtrl_SetLowerDateLimit(*args, **kwargs)
+
+    def GetLowerDateLimit(*args, **kwargs):
+        """GetLowerDateLimit() -> DateTime"""
+        return _calendar.CalendarCtrl_GetLowerDateLimit(*args, **kwargs)
+
+    def SetUpperDateLimit(*args, **kwargs):
+        """SetUpperDateLimit(DateTime date=wxDefaultDateTime) -> bool"""
+        return _calendar.CalendarCtrl_SetUpperDateLimit(*args, **kwargs)
+
+    def GetUpperDateLimit(*args, **kwargs):
+        """GetUpperDateLimit() -> DateTime"""
+        return _calendar.CalendarCtrl_GetUpperDateLimit(*args, **kwargs)
 
+    def SetDateRange(*args, **kwargs):
+        """SetDateRange(DateTime lowerdate=wxDefaultDateTime, DateTime upperdate=wxDefaultDateTime) -> bool"""
+        return _calendar.CalendarCtrl_SetDateRange(*args, **kwargs)
 
+    def EnableYearChange(*args, **kwargs):
+        """EnableYearChange(bool enable=True)"""
+        return _calendar.CalendarCtrl_EnableYearChange(*args, **kwargs)
 
+    def EnableMonthChange(*args, **kwargs):
+        """EnableMonthChange(bool enable=True)"""
+        return _calendar.CalendarCtrl_EnableMonthChange(*args, **kwargs)
 
-#-------------- FUNCTION WRAPPERS ------------------
+    def EnableHolidayDisplay(*args, **kwargs):
+        """EnableHolidayDisplay(bool display=True)"""
+        return _calendar.CalendarCtrl_EnableHolidayDisplay(*args, **kwargs)
 
+    def SetHeaderColours(*args, **kwargs):
+        """SetHeaderColours(Colour colFg, Colour colBg)"""
+        return _calendar.CalendarCtrl_SetHeaderColours(*args, **kwargs)
 
+    def GetHeaderColourFg(*args, **kwargs):
+        """GetHeaderColourFg() -> Colour"""
+        return _calendar.CalendarCtrl_GetHeaderColourFg(*args, **kwargs)
 
-#-------------- VARIABLE WRAPPERS ------------------
+    def GetHeaderColourBg(*args, **kwargs):
+        """GetHeaderColourBg() -> Colour"""
+        return _calendar.CalendarCtrl_GetHeaderColourBg(*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_HITTEST_NOWHERE = calendarc.wxCAL_HITTEST_NOWHERE
-wxCAL_HITTEST_HEADER = calendarc.wxCAL_HITTEST_HEADER
-wxCAL_HITTEST_DAY = calendarc.wxCAL_HITTEST_DAY
-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 SetHighlightColours(*args, **kwargs):
+        """SetHighlightColours(Colour colFg, Colour colBg)"""
+        return _calendar.CalendarCtrl_SetHighlightColours(*args, **kwargs)
 
+    def GetHighlightColourFg(*args, **kwargs):
+        """GetHighlightColourFg() -> Colour"""
+        return _calendar.CalendarCtrl_GetHighlightColourFg(*args, **kwargs)
 
-#-------------- USER INCLUDE -----------------------
+    def GetHighlightColourBg(*args, **kwargs):
+        """GetHighlightColourBg() -> Colour"""
+        return _calendar.CalendarCtrl_GetHighlightColourBg(*args, **kwargs)
 
+    def SetHolidayColours(*args, **kwargs):
+        """SetHolidayColours(Colour colFg, Colour colBg)"""
+        return _calendar.CalendarCtrl_SetHolidayColours(*args, **kwargs)
+
+    def GetHolidayColourFg(*args, **kwargs):
+        """GetHolidayColourFg() -> Colour"""
+        return _calendar.CalendarCtrl_GetHolidayColourFg(*args, **kwargs)
+
+    def GetHolidayColourBg(*args, **kwargs):
+        """GetHolidayColourBg() -> Colour"""
+        return _calendar.CalendarCtrl_GetHolidayColourBg(*args, **kwargs)
+
+    def GetAttr(*args, **kwargs):
+        """GetAttr(size_t day) -> CalendarDateAttr"""
+        return _calendar.CalendarCtrl_GetAttr(*args, **kwargs)
+
+    def SetAttr(*args, **kwargs):
+        """SetAttr(size_t day, CalendarDateAttr attr)"""
+        return _calendar.CalendarCtrl_SetAttr(*args, **kwargs)
+
+    def SetHoliday(*args, **kwargs):
+        """SetHoliday(size_t day)"""
+        return _calendar.CalendarCtrl_SetHoliday(*args, **kwargs)
+
+    def ResetAttr(*args, **kwargs):
+        """ResetAttr(size_t day)"""
+        return _calendar.CalendarCtrl_ResetAttr(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """HitTest(Point pos, DateTime date=None, int wd=None) -> int"""
+        return _calendar.CalendarCtrl_HitTest(*args, **kwargs)
+
+    def Enable(*args, **kwargs):
+        """Enable(bool enable=True) -> bool"""
+        return _calendar.CalendarCtrl_Enable(*args, **kwargs)
+
+    def Show(*args, **kwargs):
+        """Show(bool show=True) -> bool"""
+        return _calendar.CalendarCtrl_Show(*args, **kwargs)
+
+    def GetMonthControl(*args, **kwargs):
+        """GetMonthControl() -> Control"""
+        return _calendar.CalendarCtrl_GetMonthControl(*args, **kwargs)
+
+    def GetYearControl(*args, **kwargs):
+        """GetYearControl() -> Control"""
+        return _calendar.CalendarCtrl_GetYearControl(*args, **kwargs)
+
+
+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"""
+    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