reSWIGged

[wxWidgets.git] / wxPython / src / msw / calendar_wrap.cpp

diff --git a/wxPython/src/msw/calendar_wrap.cpp b/wxPython/src/msw/calendar_wrap.cpp
index f9ad0676162ce7df5286f2d3db2ff9c19de26e62..4cf1795143d8f340e63662310698026ad10218e9 100644 (file)
--- a/wxPython/src/msw/calendar_wrap.cpp
+++ b/wxPython/src/msw/calendar_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName

+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName

 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 


@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);

+SWIGIMPORT(const char *)     SWIG_TypePrettyName(const swig_type_info *);

 SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *);
 SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);
 SWIGIMPORT(char *)           SWIG_PackData(char *, void *, int);
 SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *);
 SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);
 SWIGIMPORT(char *)           SWIG_PackData(char *, void *, int);


@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
 }
 #endif
 

+

 /***********************************************************************
  * pyrun.swg for wxPython
  *
 /***********************************************************************
  * pyrun.swg for wxPython
  *


@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
  *
  ************************************************************************/
 

-#include "Python.h"
-

 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif


@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
 #endif
 
 

+

 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxColour swig_types[0] 
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxColour swig_types[0] 


@@ -232,47 +234,64 @@ static swig_type_info *swig_types[15];
 
 #define SWIG_name    "_calendar"
 
 
 #define SWIG_name    "_calendar"
 

-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1

 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a

-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr

 #define swig_delete_array(cptr) delete[] cptr
 #define swig_delete_array(cptr) delete[] cptr

-#define swig_const_cast(type,a) const_cast<type>(a)
-#define swig_static_cast(type,a) static_cast<type>(a)
-#define swig_reinterpret_cast(type,a) reinterpret_cast<type>(a)
-
-#ifdef HAVE_NUMERIC_CAST
-#define swig_numeric_cast(type,a) numeric_cast<type>(a)
-#else
-#define swig_numeric_cast(type,a) static_cast<type>(a)
-#endif
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)

 
 #else /* C case */
 
 #define SWIGSTATICINLINE(a) static a
 #define SWIGSTATIC(a) static a
 
 #else /* C case */
 
 #define SWIGSTATICINLINE(a) static a
 #define SWIGSTATIC(a) static a

-#define swig_new_array(type, size) ((type*) malloc((size)*sizeof(type)))
+#define swig_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)

 #define swig_delete_array(cptr) free((char*)cptr)
 #define swig_delete_array(cptr) free((char*)cptr)

-#define swig_const_cast(type,a) (type)(a)
-#define swig_static_cast(type,a) (type)(a)
-#define swig_reinterpret_cast(type,a) (type)(a)
-#define swig_numeric_cast(type,a) (type)(a)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))

 
 #endif /* __cplusplus */
 
 
 
 #endif /* __cplusplus */
 
 

-#define SWIG_FromSignedChar     PyInt_FromLong
-#define SWIG_FromUnsignedChar   PyInt_FromLong
-#define SWIG_FromShort         PyInt_FromLong
-#define SWIG_FromUnsignedShort  PyInt_FromLong
-#define SWIG_FromInt           PyInt_FromLong
-#define SWIG_FromLong          PyInt_FromLong
-#define SWIG_FromFloat         PyFloat_FromDouble
-#define SWIG_FromDouble        PyFloat_FromDouble
-#define SWIG_FromFloat         PyFloat_FromDouble
-#define SWIG_FromDouble        PyFloat_FromDouble
+/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/

 
 
 #include "wx/wxPython/wxPython.h"
 
 
 #include "wx/wxPython/wxPython.h"


@@ -284,130 +303,206 @@ static swig_type_info *swig_types[15];
 #include <limits.h>
 
 
 #include <limits.h>
 
 

-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)

 {
 {

-  if (!PyErr_Occurred()) {
-    if (value < min_value) {
-      PyObject *err = 
-       PyString_FromFormat("value %ld is less than '%s' minimum %ld", 
-                           value, type, min_value);
-      
-      PyErr_SetObject(PyExc_OverflowError, err);
-      Py_DECREF(err);
-    } else if (value > max_value) {
-      PyObject *err = 
-       PyString_FromFormat("value %ld is greater than '%s' maximum %ld", 
-                           value, type, max_value);
-      PyErr_SetObject(PyExc_OverflowError, err);
-      Py_DECREF(err);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);

     }
     }

+    return 0;

   }
   }

-  return value;
+  return 1;

 }
 
 
 }
 
 

-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)

 {
 {

-    if (PyNumber_Check(obj))
-        return PyInt_AsLong(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }

     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);

-        return 0;

     }
     }

+    return 0;

 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)

-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)

 { 
 { 

-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    

 }
 #else
 }
 #else

-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}

 #endif
 
 
 SWIGSTATICINLINE(int)
 #endif
 
 
 SWIGSTATICINLINE(int)

-SWIG_CheckInt(PyObject* obj)
+SWIG_As_int(PyObject* obj)

 {
 {

-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));

   }
   }

+  return v;

 }
 
 }
 

-
-SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)

 {
 {

-  return PyObject_IsTrue(obj) ? true : false;
+  return SWIG_AsVal_int(obj, (int*)0);

 }
 
 
 SWIGSTATICINLINE(int)
 }
 
 
 SWIGSTATICINLINE(int)

-SWIG_CheckBool(PyObject* obj)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)

 {
 {

-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;

     return 1;
   }
     return 1;
   }

+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
+    return 1;
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;

 }
 
 }
 

- static const wxString wxPyCalendarNameStr(wxCalendarNameStr); 

 
 

-SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+SWIGSTATICINLINE(bool)
+SWIG_As_bool(PyObject* obj)

 {
 {

-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));

   }
   }

+  return v;

 }
 
 }
 

+  
+SWIGSTATICINLINE(int)
+SWIG_Check_bool(PyObject* obj)
+{
+  return SWIG_AsVal_bool(obj, (bool*)0);
+}

 
 

-SWIGSTATICINLINE(unsigned long)
-SWIG_AsUnsignedLong(PyObject * obj) 
+ static const wxString wxPyCalendarNameStr(wxCalendarNameStr); 
+
+SWIGSTATICINLINE(long)
+SWIG_As_long(PyObject* obj)

 {
 {

-  if (PyLong_Check(obj)) {
-    return PyLong_AsUnsignedLong(obj);
-  } else {
-    long i = SWIG_AsLong(obj);
-    if ( !PyErr_Occurred() && (i < 0)) {
-      PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
-    }
-    return i;
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));

   }
   }

+  return v;

 }
 
 }
 

+  
+SWIGSTATICINLINE(int)
+SWIG_Check_long(PyObject* obj)
+{
+  return SWIG_AsVal_long(obj, (long*)0);
+}

 
 

+
+// See my_fragments.i

 SWIGSTATICINLINE(int)
 SWIGSTATICINLINE(int)

-SWIG_CheckUnsignedLong(PyObject* obj)
+SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)

 {
 {

-  SWIG_AsUnsignedLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
+    long v = 0;
+    if (SWIG_AsVal_long(obj, &v) && v < 0) {
+        PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
+        return 0;
+    }
+    else if (val)
+        *val = (unsigned long)v;

     return 1;
     return 1;

+}
+
+
+SWIGSTATICINLINE(unsigned long)
+SWIG_As_unsigned_SS_long(PyObject* obj)
+{
+  unsigned long v;
+  if (!SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned long));

   }
   }

+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_long(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj, (unsigned long*)0);

 }
 
 PyObject *wxCalendarCtrl_HitTest(wxCalendarCtrl *self,wxPoint const &pos){
 }
 
 PyObject *wxCalendarCtrl_HitTest(wxCalendarCtrl *self,wxPoint const &pos){


@@ -425,7 +520,7 @@ PyObject *wxCalendarCtrl_HitTest(wxCalendarCtrl *self,wxPoint const &pos){
 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif

-static PyObject *_wrap_new_CalendarDateAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CalendarDateAttr(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxColour const &arg1_defvalue = wxNullColour ;
     wxColour *arg1 = (wxColour *) &arg1_defvalue ;
     PyObject *resultobj;
     wxColour const &arg1_defvalue = wxNullColour ;
     wxColour *arg1 = (wxColour *) &arg1_defvalue ;


@@ -478,7 +573,7 @@ static PyObject *_wrap_new_CalendarDateAttr(PyObject *self, PyObject *args, PyOb
         }
     }
     if (obj4) {
         }
     }
     if (obj4) {

-        arg5 = (wxCalendarDateBorder) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -495,7 +590,7 @@ static PyObject *_wrap_new_CalendarDateAttr(PyObject *self, PyObject *args, PyOb
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour *arg2 = 0 ;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour *arg2 = 0 ;


@@ -527,7 +622,7 @@ static PyObject *_wrap_CalendarDateAttr_SetTextColour(PyObject *self, PyObject *
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour *arg2 = 0 ;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour *arg2 = 0 ;


@@ -559,7 +654,7 @@ static PyObject *_wrap_CalendarDateAttr_SetBackgroundColour(PyObject *self, PyOb
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_SetBorderColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_SetBorderColour(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour *arg2 = 0 ;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour *arg2 = 0 ;


@@ -591,7 +686,7 @@ static PyObject *_wrap_CalendarDateAttr_SetBorderColour(PyObject *self, PyObject
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxFont *arg2 = 0 ;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxFont *arg2 = 0 ;


@@ -625,7 +720,7 @@ static PyObject *_wrap_CalendarDateAttr_SetFont(PyObject *self, PyObject *args,
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_SetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_SetBorder(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     int arg2 ;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     int arg2 ;


@@ -638,7 +733,7 @@ static PyObject *_wrap_CalendarDateAttr_SetBorder(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarDateAttr_SetBorder",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarDateAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarDateAttr_SetBorder",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarDateAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

-    arg2 = (wxCalendarDateBorder) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -654,7 +749,7 @@ static PyObject *_wrap_CalendarDateAttr_SetBorder(PyObject *self, PyObject *args
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_SetHoliday(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_SetHoliday(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool arg2 ;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool arg2 ;


@@ -667,7 +762,7 @@ static PyObject *_wrap_CalendarDateAttr_SetHoliday(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarDateAttr_SetHoliday",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarDateAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarDateAttr_SetHoliday",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarDateAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -683,7 +778,7 @@ static PyObject *_wrap_CalendarDateAttr_SetHoliday(PyObject *self, PyObject *arg
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_HasTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_HasTextColour(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;


@@ -711,7 +806,7 @@ static PyObject *_wrap_CalendarDateAttr_HasTextColour(PyObject *self, PyObject *
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_HasBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_HasBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;


@@ -739,7 +834,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBackgroundColour(PyObject *self, PyOb
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_HasBorderColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_HasBorderColour(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;


@@ -767,7 +862,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBorderColour(PyObject *self, PyObject
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_HasFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_HasFont(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;


@@ -795,7 +890,7 @@ static PyObject *_wrap_CalendarDateAttr_HasFont(PyObject *self, PyObject *args,
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_HasBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_HasBorder(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;


@@ -823,7 +918,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBorder(PyObject *self, PyObject *args
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_IsHoliday(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_IsHoliday(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;


@@ -851,7 +946,7 @@ static PyObject *_wrap_CalendarDateAttr_IsHoliday(PyObject *self, PyObject *args
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_GetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour result;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour result;


@@ -881,7 +976,7 @@ static PyObject *_wrap_CalendarDateAttr_GetTextColour(PyObject *self, PyObject *
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_GetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour result;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour result;


@@ -911,7 +1006,7 @@ static PyObject *_wrap_CalendarDateAttr_GetBackgroundColour(PyObject *self, PyOb
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_GetBorderColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_GetBorderColour(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour result;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour result;


@@ -941,7 +1036,7 @@ static PyObject *_wrap_CalendarDateAttr_GetBorderColour(PyObject *self, PyObject
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxFont result;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxFont result;


@@ -971,7 +1066,7 @@ static PyObject *_wrap_CalendarDateAttr_GetFont(PyObject *self, PyObject *args,
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarDateAttr_GetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_GetBorder(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     int result;
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     int result;


@@ -990,21 +1085,21 @@ static PyObject *_wrap_CalendarDateAttr_GetBorder(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject * CalendarDateAttr_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CalendarDateAttr_swigregister(PyObject *, PyObject *args) {

     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCalendarDateAttr, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCalendarDateAttr, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }

-static PyObject *_wrap_new_CalendarEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CalendarEvent(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxEventType arg2 ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxEventType arg2 ;


@@ -1018,7 +1113,7 @@ static PyObject *_wrap_new_CalendarEvent(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_CalendarEvent",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_CalendarEvent",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

-    arg2 = (wxEventType) SWIG_AsInt(obj1); 
+    arg2 = (wxEventType)SWIG_As_int(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -1034,7 +1129,7 @@ static PyObject *_wrap_new_CalendarEvent(PyObject *self, PyObject *args, PyObjec
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarEvent_GetDate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarEvent_GetDate(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ;
     wxDateTime result;
     PyObject *resultobj;
     wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ;
     wxDateTime result;


@@ -1064,7 +1159,7 @@ static PyObject *_wrap_CalendarEvent_GetDate(PyObject *self, PyObject *args, PyO
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarEvent_SetDate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarEvent_SetDate(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ;
     wxDateTime *arg2 = 0 ;
     PyObject *resultobj;
     wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ;
     wxDateTime *arg2 = 0 ;


@@ -1098,7 +1193,7 @@ static PyObject *_wrap_CalendarEvent_SetDate(PyObject *self, PyObject *args, PyO
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarEvent_SetWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarEvent_SetWeekDay(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ;
     int arg2 ;
     PyObject *resultobj;
     wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ;
     int arg2 ;


@@ -1111,7 +1206,7 @@ static PyObject *_wrap_CalendarEvent_SetWeekDay(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarEvent_SetWeekDay",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarEvent_SetWeekDay",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

-    arg2 = (wxDateTime::WeekDay const) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -1127,7 +1222,7 @@ static PyObject *_wrap_CalendarEvent_SetWeekDay(PyObject *self, PyObject *args,
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarEvent_GetWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarEvent_GetWeekDay(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ;
     int result;
     PyObject *resultobj;
     wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ;
     int result;


@@ -1146,21 +1241,21 @@ static PyObject *_wrap_CalendarEvent_GetWeekDay(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject * CalendarEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CalendarEvent_swigregister(PyObject *, PyObject *args) {

     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCalendarEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCalendarEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }

-static int _wrap_CalendarNameStr_set(PyObject *_val) {
+static int _wrap_CalendarNameStr_set(PyObject *) {

     PyErr_SetString(PyExc_TypeError,"Variable CalendarNameStr is read-only.");
     return 1;
 }
     PyErr_SetString(PyExc_TypeError,"Variable CalendarNameStr is read-only.");
     return 1;
 }


@@ -1180,7 +1275,7 @@ static PyObject *_wrap_CalendarNameStr_get() {
 }
 
 
 }
 
 

-static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CalendarCtrl(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;


@@ -1212,7 +1307,7 @@ static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {

-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {


@@ -1237,7 +1332,7 @@ static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
         }
     }
     if (obj5) {

-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {


@@ -1270,7 +1365,7 @@ static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject
 }
 
 
 }
 
 

-static PyObject *_wrap_new_PreCalendarCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreCalendarCtrl(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *result;
     char *kwnames[] = {
     PyObject *resultobj;
     wxCalendarCtrl *result;
     char *kwnames[] = {


@@ -1293,7 +1388,7 @@ static PyObject *_wrap_new_PreCalendarCtrl(PyObject *self, PyObject *args, PyObj
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_Create(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;


@@ -1328,7 +1423,7 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 

     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
         if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxDateTime,
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
         if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxDateTime,


@@ -1352,7 +1447,7 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj
         }
     }
     if (obj6) {
         }
     }
     if (obj6) {

-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {


@@ -1386,7 +1481,7 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_SetDate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetDate(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime *arg2 = 0 ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime *arg2 = 0 ;


@@ -1420,7 +1515,7 @@ static PyObject *_wrap_CalendarCtrl_SetDate(PyObject *self, PyObject *args, PyOb
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_GetDate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetDate(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime *result;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime *result;


@@ -1449,7 +1544,7 @@ static PyObject *_wrap_CalendarCtrl_GetDate(PyObject *self, PyObject *args, PyOb
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_SetLowerDateLimit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetLowerDateLimit(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime const &arg2_defvalue = wxDefaultDateTime ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime const &arg2_defvalue = wxDefaultDateTime ;


@@ -1489,7 +1584,7 @@ static PyObject *_wrap_CalendarCtrl_SetLowerDateLimit(PyObject *self, PyObject *
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_SetUpperDateLimit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetUpperDateLimit(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime const &arg2_defvalue = wxDefaultDateTime ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime const &arg2_defvalue = wxDefaultDateTime ;


@@ -1529,7 +1624,7 @@ static PyObject *_wrap_CalendarCtrl_SetUpperDateLimit(PyObject *self, PyObject *
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_GetLowerDateLimit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetLowerDateLimit(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime *result;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime *result;


@@ -1558,7 +1653,7 @@ static PyObject *_wrap_CalendarCtrl_GetLowerDateLimit(PyObject *self, PyObject *
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_GetUpperDateLimit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetUpperDateLimit(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime *result;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime *result;


@@ -1587,7 +1682,7 @@ static PyObject *_wrap_CalendarCtrl_GetUpperDateLimit(PyObject *self, PyObject *
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_SetDateRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetDateRange(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime const &arg2_defvalue = wxDefaultDateTime ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime const &arg2_defvalue = wxDefaultDateTime ;


@@ -1639,7 +1734,7 @@ static PyObject *_wrap_CalendarCtrl_SetDateRange(PyObject *self, PyObject *args,
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_EnableYearChange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_EnableYearChange(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     bool arg2 = (bool) True ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     bool arg2 = (bool) True ;


@@ -1653,7 +1748,7 @@ static PyObject *_wrap_CalendarCtrl_EnableYearChange(PyObject *self, PyObject *a
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {

-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -1670,7 +1765,7 @@ static PyObject *_wrap_CalendarCtrl_EnableYearChange(PyObject *self, PyObject *a
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_EnableMonthChange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_EnableMonthChange(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     bool arg2 = (bool) True ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     bool arg2 = (bool) True ;


@@ -1684,7 +1779,7 @@ static PyObject *_wrap_CalendarCtrl_EnableMonthChange(PyObject *self, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {

-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -1701,7 +1796,7 @@ static PyObject *_wrap_CalendarCtrl_EnableMonthChange(PyObject *self, PyObject *
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_EnableHolidayDisplay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_EnableHolidayDisplay(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     bool arg2 = (bool) True ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     bool arg2 = (bool) True ;


@@ -1715,7 +1810,7 @@ static PyObject *_wrap_CalendarCtrl_EnableHolidayDisplay(PyObject *self, PyObjec
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {

-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -1732,7 +1827,7 @@ static PyObject *_wrap_CalendarCtrl_EnableHolidayDisplay(PyObject *self, PyObjec
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_SetHeaderColours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetHeaderColours(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour *arg2 = 0 ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour *arg2 = 0 ;


@@ -1771,7 +1866,7 @@ static PyObject *_wrap_CalendarCtrl_SetHeaderColours(PyObject *self, PyObject *a
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_GetHeaderColourFg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetHeaderColourFg(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;


@@ -1801,7 +1896,7 @@ static PyObject *_wrap_CalendarCtrl_GetHeaderColourFg(PyObject *self, PyObject *
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_GetHeaderColourBg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetHeaderColourBg(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;


@@ -1831,7 +1926,7 @@ static PyObject *_wrap_CalendarCtrl_GetHeaderColourBg(PyObject *self, PyObject *
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_SetHighlightColours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetHighlightColours(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour *arg2 = 0 ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour *arg2 = 0 ;


@@ -1870,7 +1965,7 @@ static PyObject *_wrap_CalendarCtrl_SetHighlightColours(PyObject *self, PyObject
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_GetHighlightColourFg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetHighlightColourFg(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;


@@ -1900,7 +1995,7 @@ static PyObject *_wrap_CalendarCtrl_GetHighlightColourFg(PyObject *self, PyObjec
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_GetHighlightColourBg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetHighlightColourBg(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;


@@ -1930,7 +2025,7 @@ static PyObject *_wrap_CalendarCtrl_GetHighlightColourBg(PyObject *self, PyObjec
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_SetHolidayColours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetHolidayColours(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour *arg2 = 0 ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour *arg2 = 0 ;


@@ -1969,7 +2064,7 @@ static PyObject *_wrap_CalendarCtrl_SetHolidayColours(PyObject *self, PyObject *
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_GetHolidayColourFg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetHolidayColourFg(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;


@@ -1999,7 +2094,7 @@ static PyObject *_wrap_CalendarCtrl_GetHolidayColourFg(PyObject *self, PyObject
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_GetHolidayColourBg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetHolidayColourBg(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;


@@ -2029,7 +2124,7 @@ static PyObject *_wrap_CalendarCtrl_GetHolidayColourBg(PyObject *self, PyObject
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetAttr(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     size_t arg2 ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     size_t arg2 ;


@@ -2043,7 +2138,7 @@ static PyObject *_wrap_CalendarCtrl_GetAttr(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_GetAttr",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_GetAttr",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -2059,7 +2154,7 @@ static PyObject *_wrap_CalendarCtrl_GetAttr(PyObject *self, PyObject *args, PyOb
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_SetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetAttr(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     size_t arg2 ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     size_t arg2 ;


@@ -2074,7 +2169,7 @@ static PyObject *_wrap_CalendarCtrl_SetAttr(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:CalendarCtrl_SetAttr",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:CalendarCtrl_SetAttr",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxCalendarDateAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxCalendarDateAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;


@@ -2092,7 +2187,7 @@ static PyObject *_wrap_CalendarCtrl_SetAttr(PyObject *self, PyObject *args, PyOb
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_SetHoliday(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetHoliday(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     size_t arg2 ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     size_t arg2 ;


@@ -2105,7 +2200,7 @@ static PyObject *_wrap_CalendarCtrl_SetHoliday(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_SetHoliday",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_SetHoliday",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -2121,7 +2216,7 @@ static PyObject *_wrap_CalendarCtrl_SetHoliday(PyObject *self, PyObject *args, P
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_ResetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_ResetAttr(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     size_t arg2 ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     size_t arg2 ;


@@ -2134,7 +2229,7 @@ static PyObject *_wrap_CalendarCtrl_ResetAttr(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_ResetAttr",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_ResetAttr",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -2150,7 +2245,7 @@ static PyObject *_wrap_CalendarCtrl_ResetAttr(PyObject *self, PyObject *args, Py
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxPoint *arg2 = 0 ;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxPoint *arg2 = 0 ;


@@ -2183,7 +2278,7 @@ static PyObject *_wrap_CalendarCtrl_HitTest(PyObject *self, PyObject *args, PyOb
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_GetMonthControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetMonthControl(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxControl *result;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxControl *result;


@@ -2211,7 +2306,7 @@ static PyObject *_wrap_CalendarCtrl_GetMonthControl(PyObject *self, PyObject *ar
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_GetYearControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetYearControl(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxControl *result;
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxControl *result;


@@ -2239,7 +2334,7 @@ static PyObject *_wrap_CalendarCtrl_GetYearControl(PyObject *self, PyObject *arg
 }
 
 
 }
 
 

-static PyObject *_wrap_CalendarCtrl_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;


@@ -2250,7 +2345,7 @@ static PyObject *_wrap_CalendarCtrl_GetClassDefaultAttributes(PyObject *self, Py
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:CalendarCtrl_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:CalendarCtrl_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {

-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -2272,7 +2367,7 @@ static PyObject *_wrap_CalendarCtrl_GetClassDefaultAttributes(PyObject *self, Py
 }
 
 
 }
 
 

-static PyObject * CalendarCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CalendarCtrl_swigregister(PyObject *, PyObject *args) {

     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCalendarCtrl, obj);
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCalendarCtrl, obj);


@@ -2280,63 +2375,63 @@ static PyObject * CalendarCtrl_swigregister(PyObject *self, PyObject *args) {
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {

-        { (char *)"new_CalendarDateAttr", (PyCFunction) _wrap_new_CalendarDateAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_SetTextColour", (PyCFunction) _wrap_CalendarDateAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_SetBackgroundColour", (PyCFunction) _wrap_CalendarDateAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_SetBorderColour", (PyCFunction) _wrap_CalendarDateAttr_SetBorderColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_SetFont", (PyCFunction) _wrap_CalendarDateAttr_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_SetBorder", (PyCFunction) _wrap_CalendarDateAttr_SetBorder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_SetHoliday", (PyCFunction) _wrap_CalendarDateAttr_SetHoliday, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_HasTextColour", (PyCFunction) _wrap_CalendarDateAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_HasBackgroundColour", (PyCFunction) _wrap_CalendarDateAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_HasBorderColour", (PyCFunction) _wrap_CalendarDateAttr_HasBorderColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_HasFont", (PyCFunction) _wrap_CalendarDateAttr_HasFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_HasBorder", (PyCFunction) _wrap_CalendarDateAttr_HasBorder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_IsHoliday", (PyCFunction) _wrap_CalendarDateAttr_IsHoliday, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_GetTextColour", (PyCFunction) _wrap_CalendarDateAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_GetBackgroundColour", (PyCFunction) _wrap_CalendarDateAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_GetBorderColour", (PyCFunction) _wrap_CalendarDateAttr_GetBorderColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_GetFont", (PyCFunction) _wrap_CalendarDateAttr_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_GetBorder", (PyCFunction) _wrap_CalendarDateAttr_GetBorder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_swigregister", CalendarDateAttr_swigregister, METH_VARARGS },
-        { (char *)"new_CalendarEvent", (PyCFunction) _wrap_new_CalendarEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarEvent_GetDate", (PyCFunction) _wrap_CalendarEvent_GetDate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarEvent_SetDate", (PyCFunction) _wrap_CalendarEvent_SetDate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarEvent_SetWeekDay", (PyCFunction) _wrap_CalendarEvent_SetWeekDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarEvent_GetWeekDay", (PyCFunction) _wrap_CalendarEvent_GetWeekDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarEvent_swigregister", CalendarEvent_swigregister, METH_VARARGS },
-        { (char *)"new_CalendarCtrl", (PyCFunction) _wrap_new_CalendarCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreCalendarCtrl", (PyCFunction) _wrap_new_PreCalendarCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_Create", (PyCFunction) _wrap_CalendarCtrl_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetDate", (PyCFunction) _wrap_CalendarCtrl_SetDate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetDate", (PyCFunction) _wrap_CalendarCtrl_GetDate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetLowerDateLimit", (PyCFunction) _wrap_CalendarCtrl_SetLowerDateLimit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetUpperDateLimit", (PyCFunction) _wrap_CalendarCtrl_SetUpperDateLimit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetLowerDateLimit", (PyCFunction) _wrap_CalendarCtrl_GetLowerDateLimit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetUpperDateLimit", (PyCFunction) _wrap_CalendarCtrl_GetUpperDateLimit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetDateRange", (PyCFunction) _wrap_CalendarCtrl_SetDateRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_EnableYearChange", (PyCFunction) _wrap_CalendarCtrl_EnableYearChange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_EnableMonthChange", (PyCFunction) _wrap_CalendarCtrl_EnableMonthChange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_EnableHolidayDisplay", (PyCFunction) _wrap_CalendarCtrl_EnableHolidayDisplay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetHeaderColours", (PyCFunction) _wrap_CalendarCtrl_SetHeaderColours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetHeaderColourFg", (PyCFunction) _wrap_CalendarCtrl_GetHeaderColourFg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetHeaderColourBg", (PyCFunction) _wrap_CalendarCtrl_GetHeaderColourBg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetHighlightColours", (PyCFunction) _wrap_CalendarCtrl_SetHighlightColours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetHighlightColourFg", (PyCFunction) _wrap_CalendarCtrl_GetHighlightColourFg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetHighlightColourBg", (PyCFunction) _wrap_CalendarCtrl_GetHighlightColourBg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetHolidayColours", (PyCFunction) _wrap_CalendarCtrl_SetHolidayColours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetHolidayColourFg", (PyCFunction) _wrap_CalendarCtrl_GetHolidayColourFg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetHolidayColourBg", (PyCFunction) _wrap_CalendarCtrl_GetHolidayColourBg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetAttr", (PyCFunction) _wrap_CalendarCtrl_GetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetAttr", (PyCFunction) _wrap_CalendarCtrl_SetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetHoliday", (PyCFunction) _wrap_CalendarCtrl_SetHoliday, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_ResetAttr", (PyCFunction) _wrap_CalendarCtrl_ResetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_HitTest", (PyCFunction) _wrap_CalendarCtrl_HitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetMonthControl", (PyCFunction) _wrap_CalendarCtrl_GetMonthControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetYearControl", (PyCFunction) _wrap_CalendarCtrl_GetYearControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_CalendarCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_swigregister", CalendarCtrl_swigregister, METH_VARARGS },
-        { NULL, NULL }
+        { (char *)"new_CalendarDateAttr", (PyCFunction) _wrap_new_CalendarDateAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_SetTextColour", (PyCFunction) _wrap_CalendarDateAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_SetBackgroundColour", (PyCFunction) _wrap_CalendarDateAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_SetBorderColour", (PyCFunction) _wrap_CalendarDateAttr_SetBorderColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_SetFont", (PyCFunction) _wrap_CalendarDateAttr_SetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_SetBorder", (PyCFunction) _wrap_CalendarDateAttr_SetBorder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_SetHoliday", (PyCFunction) _wrap_CalendarDateAttr_SetHoliday, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_HasTextColour", (PyCFunction) _wrap_CalendarDateAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_HasBackgroundColour", (PyCFunction) _wrap_CalendarDateAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_HasBorderColour", (PyCFunction) _wrap_CalendarDateAttr_HasBorderColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_HasFont", (PyCFunction) _wrap_CalendarDateAttr_HasFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_HasBorder", (PyCFunction) _wrap_CalendarDateAttr_HasBorder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_IsHoliday", (PyCFunction) _wrap_CalendarDateAttr_IsHoliday, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_GetTextColour", (PyCFunction) _wrap_CalendarDateAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_GetBackgroundColour", (PyCFunction) _wrap_CalendarDateAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_GetBorderColour", (PyCFunction) _wrap_CalendarDateAttr_GetBorderColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_GetFont", (PyCFunction) _wrap_CalendarDateAttr_GetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_GetBorder", (PyCFunction) _wrap_CalendarDateAttr_GetBorder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_swigregister", CalendarDateAttr_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_CalendarEvent", (PyCFunction) _wrap_new_CalendarEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarEvent_GetDate", (PyCFunction) _wrap_CalendarEvent_GetDate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarEvent_SetDate", (PyCFunction) _wrap_CalendarEvent_SetDate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarEvent_SetWeekDay", (PyCFunction) _wrap_CalendarEvent_SetWeekDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarEvent_GetWeekDay", (PyCFunction) _wrap_CalendarEvent_GetWeekDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarEvent_swigregister", CalendarEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_CalendarCtrl", (PyCFunction) _wrap_new_CalendarCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreCalendarCtrl", (PyCFunction) _wrap_new_PreCalendarCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_Create", (PyCFunction) _wrap_CalendarCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetDate", (PyCFunction) _wrap_CalendarCtrl_SetDate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetDate", (PyCFunction) _wrap_CalendarCtrl_GetDate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetLowerDateLimit", (PyCFunction) _wrap_CalendarCtrl_SetLowerDateLimit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetUpperDateLimit", (PyCFunction) _wrap_CalendarCtrl_SetUpperDateLimit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetLowerDateLimit", (PyCFunction) _wrap_CalendarCtrl_GetLowerDateLimit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetUpperDateLimit", (PyCFunction) _wrap_CalendarCtrl_GetUpperDateLimit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetDateRange", (PyCFunction) _wrap_CalendarCtrl_SetDateRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_EnableYearChange", (PyCFunction) _wrap_CalendarCtrl_EnableYearChange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_EnableMonthChange", (PyCFunction) _wrap_CalendarCtrl_EnableMonthChange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_EnableHolidayDisplay", (PyCFunction) _wrap_CalendarCtrl_EnableHolidayDisplay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetHeaderColours", (PyCFunction) _wrap_CalendarCtrl_SetHeaderColours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetHeaderColourFg", (PyCFunction) _wrap_CalendarCtrl_GetHeaderColourFg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetHeaderColourBg", (PyCFunction) _wrap_CalendarCtrl_GetHeaderColourBg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetHighlightColours", (PyCFunction) _wrap_CalendarCtrl_SetHighlightColours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetHighlightColourFg", (PyCFunction) _wrap_CalendarCtrl_GetHighlightColourFg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetHighlightColourBg", (PyCFunction) _wrap_CalendarCtrl_GetHighlightColourBg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetHolidayColours", (PyCFunction) _wrap_CalendarCtrl_SetHolidayColours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetHolidayColourFg", (PyCFunction) _wrap_CalendarCtrl_GetHolidayColourFg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetHolidayColourBg", (PyCFunction) _wrap_CalendarCtrl_GetHolidayColourBg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetAttr", (PyCFunction) _wrap_CalendarCtrl_GetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetAttr", (PyCFunction) _wrap_CalendarCtrl_SetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetHoliday", (PyCFunction) _wrap_CalendarCtrl_SetHoliday, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_ResetAttr", (PyCFunction) _wrap_CalendarCtrl_ResetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_HitTest", (PyCFunction) _wrap_CalendarCtrl_HitTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetMonthControl", (PyCFunction) _wrap_CalendarCtrl_GetMonthControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetYearControl", (PyCFunction) _wrap_CalendarCtrl_GetYearControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_CalendarCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_swigregister", CalendarCtrl_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }

 };
 
 
 };
 
 


@@ -2829,7 +2924,7 @@ _swigt__p_wxEvent,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {

-{0}};
+{0, 0, 0, 0.0, 0, 0}};

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }


@@ -2855,22 +2950,22 @@ SWIGEXPORT(void) SWIG_init(void) {
     }
     SWIG_InstallConstants(d,swig_const_table);
     
     }
     SWIG_InstallConstants(d,swig_const_table);
     

-    PyDict_SetItemString(d,"CAL_SUNDAY_FIRST", SWIG_FromInt((int)wxCAL_SUNDAY_FIRST));
-    PyDict_SetItemString(d,"CAL_MONDAY_FIRST", SWIG_FromInt((int)wxCAL_MONDAY_FIRST));
-    PyDict_SetItemString(d,"CAL_SHOW_HOLIDAYS", SWIG_FromInt((int)wxCAL_SHOW_HOLIDAYS));
-    PyDict_SetItemString(d,"CAL_NO_YEAR_CHANGE", SWIG_FromInt((int)wxCAL_NO_YEAR_CHANGE));
-    PyDict_SetItemString(d,"CAL_NO_MONTH_CHANGE", SWIG_FromInt((int)wxCAL_NO_MONTH_CHANGE));
-    PyDict_SetItemString(d,"CAL_SEQUENTIAL_MONTH_SELECTION", SWIG_FromInt((int)wxCAL_SEQUENTIAL_MONTH_SELECTION));
-    PyDict_SetItemString(d,"CAL_SHOW_SURROUNDING_WEEKS", SWIG_FromInt((int)wxCAL_SHOW_SURROUNDING_WEEKS));
-    PyDict_SetItemString(d,"CAL_HITTEST_NOWHERE", SWIG_FromInt((int)wxCAL_HITTEST_NOWHERE));
-    PyDict_SetItemString(d,"CAL_HITTEST_HEADER", SWIG_FromInt((int)wxCAL_HITTEST_HEADER));
-    PyDict_SetItemString(d,"CAL_HITTEST_DAY", SWIG_FromInt((int)wxCAL_HITTEST_DAY));
-    PyDict_SetItemString(d,"CAL_HITTEST_INCMONTH", SWIG_FromInt((int)wxCAL_HITTEST_INCMONTH));
-    PyDict_SetItemString(d,"CAL_HITTEST_DECMONTH", SWIG_FromInt((int)wxCAL_HITTEST_DECMONTH));
-    PyDict_SetItemString(d,"CAL_HITTEST_SURROUNDING_WEEK", SWIG_FromInt((int)wxCAL_HITTEST_SURROUNDING_WEEK));
-    PyDict_SetItemString(d,"CAL_BORDER_NONE", SWIG_FromInt((int)wxCAL_BORDER_NONE));
-    PyDict_SetItemString(d,"CAL_BORDER_SQUARE", SWIG_FromInt((int)wxCAL_BORDER_SQUARE));
-    PyDict_SetItemString(d,"CAL_BORDER_ROUND", SWIG_FromInt((int)wxCAL_BORDER_ROUND));
+    PyDict_SetItemString(d,"CAL_SUNDAY_FIRST", SWIG_From_int((int)wxCAL_SUNDAY_FIRST));
+    PyDict_SetItemString(d,"CAL_MONDAY_FIRST", SWIG_From_int((int)wxCAL_MONDAY_FIRST));
+    PyDict_SetItemString(d,"CAL_SHOW_HOLIDAYS", SWIG_From_int((int)wxCAL_SHOW_HOLIDAYS));
+    PyDict_SetItemString(d,"CAL_NO_YEAR_CHANGE", SWIG_From_int((int)wxCAL_NO_YEAR_CHANGE));
+    PyDict_SetItemString(d,"CAL_NO_MONTH_CHANGE", SWIG_From_int((int)wxCAL_NO_MONTH_CHANGE));
+    PyDict_SetItemString(d,"CAL_SEQUENTIAL_MONTH_SELECTION", SWIG_From_int((int)wxCAL_SEQUENTIAL_MONTH_SELECTION));
+    PyDict_SetItemString(d,"CAL_SHOW_SURROUNDING_WEEKS", SWIG_From_int((int)wxCAL_SHOW_SURROUNDING_WEEKS));
+    PyDict_SetItemString(d,"CAL_HITTEST_NOWHERE", SWIG_From_int((int)wxCAL_HITTEST_NOWHERE));
+    PyDict_SetItemString(d,"CAL_HITTEST_HEADER", SWIG_From_int((int)wxCAL_HITTEST_HEADER));
+    PyDict_SetItemString(d,"CAL_HITTEST_DAY", SWIG_From_int((int)wxCAL_HITTEST_DAY));
+    PyDict_SetItemString(d,"CAL_HITTEST_INCMONTH", SWIG_From_int((int)wxCAL_HITTEST_INCMONTH));
+    PyDict_SetItemString(d,"CAL_HITTEST_DECMONTH", SWIG_From_int((int)wxCAL_HITTEST_DECMONTH));
+    PyDict_SetItemString(d,"CAL_HITTEST_SURROUNDING_WEEK", SWIG_From_int((int)wxCAL_HITTEST_SURROUNDING_WEEK));
+    PyDict_SetItemString(d,"CAL_BORDER_NONE", SWIG_From_int((int)wxCAL_BORDER_NONE));
+    PyDict_SetItemString(d,"CAL_BORDER_SQUARE", SWIG_From_int((int)wxCAL_BORDER_SQUARE));
+    PyDict_SetItemString(d,"CAL_BORDER_ROUND", SWIG_From_int((int)wxCAL_BORDER_ROUND));

     PyDict_SetItemString(d, "wxEVT_CALENDAR_DOUBLECLICKED", PyInt_FromLong(wxEVT_CALENDAR_DOUBLECLICKED));
     PyDict_SetItemString(d, "wxEVT_CALENDAR_SEL_CHANGED", PyInt_FromLong(wxEVT_CALENDAR_SEL_CHANGED));
     PyDict_SetItemString(d, "wxEVT_CALENDAR_DAY_CHANGED", PyInt_FromLong(wxEVT_CALENDAR_DAY_CHANGED));
     PyDict_SetItemString(d, "wxEVT_CALENDAR_DOUBLECLICKED", PyInt_FromLong(wxEVT_CALENDAR_DOUBLECLICKED));
     PyDict_SetItemString(d, "wxEVT_CALENDAR_SEL_CHANGED", PyInt_FromLong(wxEVT_CALENDAR_SEL_CHANGED));
     PyDict_SetItemString(d, "wxEVT_CALENDAR_DAY_CHANGED", PyInt_FromLong(wxEVT_CALENDAR_DAY_CHANGED));