]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/contrib/ogl/mac/ogl_wrap.cpp
don't draw focus rect for custom drawn items when the list control doesn't have focus
[wxWidgets.git] / wxPython / contrib / ogl / mac / ogl_wrap.cpp
index f229e2f33be3e1cfcf77de2d27e9bca3f8b0ed5f..bbd4f533486efb1428fa85b8111de9b123125b1a 100644 (file)
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.22
+ * Version 1.3.24
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -9,7 +9,6 @@
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPYTHON
-#define SWIG_NOINCLUDE
 
 #ifdef __cplusplus
 template<class T> class SwigValueWrapper {
@@ -24,210 +23,1319 @@ public:
     T *operator&() { return tt; }
 private:
     SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
-};                                                    
+};
+#endif
+
+
+#ifndef SWIG_TEMPLATE_DISAMBIGUATOR
+#  if defined(__SUNPRO_CC) 
+#    define SWIG_TEMPLATE_DISAMBIGUATOR template
+#  else
+#    define SWIG_TEMPLATE_DISAMBIGUATOR 
+#  endif
 #endif
 
 
-#include "Python.h"
+#include <Python.h>
 
-/*************************************************************** -*- c -*-
- * python/precommon.swg
+/***********************************************************************
+ * swigrun.swg
  *
- * Rename all exported symbols from common.swg, to avoid symbol
- * clashes if multiple interpreters are included
+ *     This file contains generic CAPI SWIG runtime support for pointer
+ *     type checking.
  *
  ************************************************************************/
 
-#define SWIG_TypeRegister    SWIG_Python_TypeRegister
-#define SWIG_TypeCheck       SWIG_Python_TypeCheck
-#define SWIG_TypeCast        SWIG_Python_TypeCast
-#define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
-#define SWIG_TypeName        SWIG_Python_TypeName
-#define SWIG_TypeQuery       SWIG_Python_TypeQuery
-#define SWIG_TypeClientData  SWIG_Python_TypeClientData
-#define SWIG_PackData        SWIG_Python_PackData 
-#define SWIG_UnpackData      SWIG_Python_UnpackData 
+/* This should only be incremented when either the layout of swig_type_info changes,
+   or for whatever reason, the runtime changes incompatibly */
+#define SWIG_RUNTIME_VERSION "1"
+
+/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
+#ifdef SWIG_TYPE_TABLE
+#define SWIG_QUOTE_STRING(x) #x
+#define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x)
+#define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE)
+#else
+#define SWIG_TYPE_TABLE_NAME
+#endif
+
+#include <string.h>
+
+#ifndef SWIGINLINE
+#if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#  define SWIGINLINE inline
+#else
+#  define SWIGINLINE
+#endif
+#endif
+
+/*
+  You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
+  creating a static or dynamic library from the swig runtime code.
+  In 99.9% of the cases, swig just needs to declare them as 'static'.
+  
+  But only do this if is strictly necessary, ie, if you have problems
+  with your compiler or so.
+*/
+#ifndef SWIGRUNTIME
+#define SWIGRUNTIME static
+#endif
+#ifndef SWIGRUNTIMEINLINE
+#define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void *(*swig_converter_func)(void *);
+typedef struct swig_type_info *(*swig_dycast_func)(void **);
+
+typedef struct swig_type_info {
+  const char             *name;
+  swig_converter_func     converter;
+  const char             *str;
+  void                   *clientdata;
+  swig_dycast_func        dcast;
+  struct swig_type_info  *next;
+  struct swig_type_info  *prev;
+} swig_type_info;
+
+/* 
+  Compare two type names skipping the space characters, therefore
+  "char*" == "char *" and "Class<int>" == "Class<int >", etc.
+
+  Return 0 when the two name types are equivalent, as in
+  strncmp, but skipping ' '.
+*/
+SWIGRUNTIME int
+SWIG_TypeNameComp(const char *f1, const char *l1,
+                 const char *f2, const char *l2) {
+  for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) {
+    while ((*f1 == ' ') && (f1 != l1)) ++f1;
+    while ((*f2 == ' ') && (f2 != l2)) ++f2;
+    if (*f1 != *f2) return *f1 - *f2;
+  }
+  return (l1 - f1) - (l2 - f2);
+}
+
+/*
+  Check type equivalence in a name list like <name1>|<name2>|...
+*/
+SWIGRUNTIME int
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  int equiv = 0;
+  const char* te = tb + strlen(tb);
+  const char* ne = nb;
+  while (!equiv && *ne) {
+    for (nb = ne; *ne; ++ne) {
+      if (*ne == '|') break;
+    }
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te) == 0;
+    if (*ne) ++ne;
+  }
+  return equiv;
+}
+
+/*
+  Register a type mapping with the type-checking
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeRegisterTL(swig_type_info **tl, swig_type_info *ti) {
+  swig_type_info *tc, *head, *ret, *next;
+  /* Check to see if this type has already been registered */
+  tc = *tl;
+  while (tc) {
+    /* check simple type equivalence */
+    int typeequiv = (strcmp(tc->name, ti->name) == 0);   
+    /* check full type equivalence, resolving typedefs */
+    if (!typeequiv) {
+      /* only if tc is not a typedef (no '|' on it) */
+      if (tc->str && ti->str && !strstr(tc->str,"|")) {
+       typeequiv = SWIG_TypeEquiv(ti->str,tc->str);
+      }
+    }
+    if (typeequiv) {
+      /* Already exists in the table.  Just add additional types to the list */
+      if (ti->clientdata) tc->clientdata = ti->clientdata;
+      head = tc;
+      next = tc->next;
+      goto l1;
+    }
+    tc = tc->prev;
+  }
+  head = ti;
+  next = 0;
+
+  /* Place in list */
+  ti->prev = *tl;
+  *tl = ti;
+
+  /* Build linked lists */
+  l1:
+  ret = head;
+  tc = ti + 1;
+  /* Patch up the rest of the links */
+  while (tc->name) {
+    head->next = tc;
+    tc->prev = head;
+    head = tc;
+    tc++;
+  }
+  if (next) next->prev = head;
+  head->next = next;
+
+  return ret;
+}
+
+/*
+  Check the typename
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeCheck(const char *c, swig_type_info *ty) {
+  swig_type_info *s;
+  if (!ty) return 0;        /* Void pointer */
+  s = ty->next;             /* First element always just a name */
+  do {
+    if (strcmp(s->name,c) == 0) {
+      if (s == ty->next) return s;
+      /* Move s to the top of the linked list */
+      s->prev->next = s->next;
+      if (s->next) {
+        s->next->prev = s->prev;
+      }
+      /* Insert s as second element in the list */
+      s->next = ty->next;
+      if (ty->next) ty->next->prev = s;
+      ty->next = s;
+      s->prev = ty;
+      return s;
+    }
+    s = s->next;
+  } while (s && (s != ty->next));
+  return 0;
+}
+
+/*
+  Cast a pointer up an inheritance hierarchy
+*/
+SWIGRUNTIMEINLINE void *
+SWIG_TypeCast(swig_type_info *ty, void *ptr) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+}
+
+/* 
+   Dynamic pointer casting. Down an inheritance hierarchy
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) {
+  swig_type_info *lastty = ty;
+  if (!ty || !ty->dcast) return ty;
+  while (ty && (ty->dcast)) {
+    ty = (*ty->dcast)(ptr);
+    if (ty) lastty = ty;
+  }
+  return lastty;
+}
 
+/*
+  Return the name associated with this type
+*/
+SWIGRUNTIMEINLINE const char *
+SWIG_TypeName(const swig_type_info *ty) {
+  return ty->name;
+}
+
+/*
+  Return the pretty name associated with this type,
+  that is an unmangled type name in a form presentable to the user.
+*/
+SWIGRUNTIME const char *
+SWIG_TypePrettyName(const swig_type_info *type) {
+  /* The "str" field contains the equivalent pretty names of the
+     type, separated by vertical-bar characters.  We choose
+     to print the last name, as it is often (?) the most
+     specific. */
+  if (type->str != NULL) {
+    const char *last_name = type->str;
+    const char *s;
+    for (s = type->str; *s; s++)
+      if (*s == '|') last_name = s+1;
+    return last_name;
+  }
+  else
+    return type->name;
+}
+
+/*
+  Search for a swig_type_info structure
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeQueryTL(swig_type_info *tl, const char *name) {
+  swig_type_info *ty = tl;
+  while (ty) {
+    if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
+    if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
+    ty = ty->prev;
+  }
+  return 0;
+}
+
+/* 
+   Set the clientdata field for a type
+*/
+SWIGRUNTIME void
+SWIG_TypeClientDataTL(swig_type_info *tl, swig_type_info *ti, void *clientdata) {
+  swig_type_info *tc, *equiv;
+  if (ti->clientdata) return;
+  /* if (ti->clientdata == clientdata) return; */
+  ti->clientdata = clientdata;
+  equiv = ti->next;
+  while (equiv) {
+    if (!equiv->converter) {
+      tc = tl;
+      while (tc) {
+        if ((strcmp(tc->name, equiv->name) == 0))
+          SWIG_TypeClientDataTL(tl,tc,clientdata);
+        tc = tc->prev;
+      }
+    }
+    equiv = equiv->next;
+  }
+}
+
+/* 
+   Pack binary data into a string
+*/
+SWIGRUNTIME char *
+SWIG_PackData(char *c, void *ptr, size_t sz) {
+  static char hex[17] = "0123456789abcdef";
+  unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu =  u + sz;
+  register unsigned char uu;
+  for (; u != eu; ++u) {
+    uu = *u;
+    *(c++) = hex[(uu & 0xf0) >> 4];
+    *(c++) = hex[uu & 0xf];
+  }
+  return c;
+}
+
+/* 
+   Unpack binary data from a string
+*/
+SWIGRUNTIME const char *
+SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
+  register unsigned char *u = (unsigned char *) ptr;
+  register const unsigned char *eu =  u + sz;
+  for (; u != eu; ++u) {
+    register int d = *(c++);
+    register unsigned char uu = 0;
+    if ((d >= '0') && (d <= '9'))
+      uu = ((d - '0') << 4);
+    else if ((d >= 'a') && (d <= 'f'))
+      uu = ((d - ('a'-10)) << 4);
+    else 
+      return (char *) 0;
+    d = *(c++);
+    if ((d >= '0') && (d <= '9'))
+      uu |= (d - '0');
+    else if ((d >= 'a') && (d <= 'f'))
+      uu |= (d - ('a'-10));
+    else 
+      return (char *) 0;
+    *u = uu;
+  }
+  return c;
+}
+
+/*
+  This function will propagate the clientdata field of type to any new
+  swig_type_info structures that have been added into the list of
+  equivalent types.  It is like calling SWIG_TypeClientData(type,
+  clientdata) a second time.
+*/
+SWIGRUNTIME void
+SWIG_PropagateClientDataTL(swig_type_info *tl, swig_type_info *type) {
+  swig_type_info *equiv = type->next;
+  swig_type_info *tc;
+  if (!type->clientdata) return;
+  while (equiv) {
+    if (!equiv->converter) {
+      tc = tl;
+      while (tc) {
+        if ((strcmp(tc->name, equiv->name) == 0) && !tc->clientdata)
+          SWIG_TypeClientDataTL(tl,tc, type->clientdata);
+        tc = tc->prev;
+      }
+    }
+    equiv = equiv->next;
+  }
+}
+
+/* 
+   Pack 'void *' into a string buffer.
+*/
+SWIGRUNTIME char *
+SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) {
+  char *r = buff;
+  if ((2*sizeof(void *) + 2) > bsz) return 0;
+  *(r++) = '_';
+  r = SWIG_PackData(r,&ptr,sizeof(void *));
+  if (strlen(name) + 1 > (bsz - (r - buff))) return 0;
+  strcpy(r,name);
+  return buff;
+}
+
+SWIGRUNTIME const char *
+SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) {
+  if (*c != '_') {
+    if (strcmp(c,"NULL") == 0) {
+      *ptr = (void *) 0;
+      return name;
+    } else {
+      return 0;
+    }
+  }
+  return SWIG_UnpackData(++c,ptr,sizeof(void *));
+}
+
+SWIGRUNTIME char *
+SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) {
+  char *r = buff;
+  size_t lname = (name ? strlen(name) : 0);
+  if ((2*sz + 2 + lname) > bsz) return 0;
+  *(r++) = '_';
+  r = SWIG_PackData(r,ptr,sz);
+  if (lname) {
+    strncpy(r,name,lname+1);
+  } else {
+    *r = 0;
+  }
+  return buff;
+}
+
+SWIGRUNTIME const char *
+SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
+  if (*c != '_') {
+    if (strcmp(c,"NULL") == 0) {
+      memset(ptr,0,sz);
+      return name;
+    } else {
+      return 0;
+    }
+  }
+  return SWIG_UnpackData(++c,ptr,sz);
+}
+
+#ifdef __cplusplus
+}
+#endif
 
 /***********************************************************************
- * common.swg for wxPython
+ * common.swg
  *
- * Include only the function prototypes and such from SWIG's common.swg,
- * but not the runtime functions themselves.  This helps keep the
- * wrapper files clean of unnecessary stuff that is in the libpy.c file
- * anyway.
+ *     This file contains generic SWIG runtime support for pointer
+ *     type checking as well as a few commonly used macros to control
+ *     external linkage.
  *
+ * Author : David Beazley (beazley@cs.uchicago.edu)
+ *
+ * Copyright (c) 1999-2000, The University of Chicago
+ * 
+ * This file may be freely redistributed without license or fee provided
+ * this copyright message remains intact.
  ************************************************************************/
 
-#include <string.h>
 
 #if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#  if defined(_MSC_VER) || defined(__GNUC__)
-#    if defined(STATIC_LINKED)
-#      define SWIGEXPORT(a) a
-#      define SWIGIMPORT(a) extern a
-#    else
-#      define SWIGEXPORT(a) __declspec(dllexport) a
-#      define SWIGIMPORT(a) extern a
-#    endif
+#  if !defined(STATIC_LINKED)
+#    define SWIGEXPORT(a) __declspec(dllexport) a
 #  else
-#    if defined(__BORLANDC__)
-#      define SWIGEXPORT(a) a _export
-#      define SWIGIMPORT(a) a _export
-#    else
-#      define SWIGEXPORT(a) a
-#      define SWIGIMPORT(a) a
-#    endif
+#    define SWIGEXPORT(a) a
 #  endif
 #else
 #  define SWIGEXPORT(a) a
-#  define SWIGIMPORT(a) a
 #endif
 
-#ifdef SWIG_GLOBAL
-#  define SWIGRUNTIME(a) SWIGEXPORT(a)
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*************************************************************************/
+
+
+/* The static type info list */
+
+static swig_type_info *swig_type_list = 0;
+static swig_type_info **swig_type_list_handle = &swig_type_list;
+  
+
+/* Register a type mapping with the type-checking */
+static swig_type_info *
+SWIG_TypeRegister(swig_type_info *ti) {
+  return SWIG_TypeRegisterTL(swig_type_list_handle, ti);
+}
+
+/* Search for a swig_type_info structure */
+static swig_type_info *
+SWIG_TypeQuery(const char *name) {
+  return SWIG_TypeQueryTL(*swig_type_list_handle, name);
+}
+
+/* Set the clientdata field for a type */
+static void
+SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
+  SWIG_TypeClientDataTL(*swig_type_list_handle, ti, clientdata);
+}
+
+/* This function will propagate the clientdata field of type to
+* any new swig_type_info structures that have been added into the list
+* of equivalent types.  It is like calling
+* SWIG_TypeClientData(type, clientdata) a second time.
+*/
+static void
+SWIG_PropagateClientData(swig_type_info *type) {
+  SWIG_PropagateClientDataTL(*swig_type_list_handle, type);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+/* -----------------------------------------------------------------------------
+ * SWIG API. Portion that goes into the runtime
+ * ----------------------------------------------------------------------------- */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* -----------------------------------------------------------------------------
+ * for internal method declarations
+ * ----------------------------------------------------------------------------- */
+
+#ifndef SWIGINTERN
+#define SWIGINTERN static 
+#endif
+
+#ifndef SWIGINTERNSHORT
+#ifdef __cplusplus
+#define SWIGINTERNSHORT static inline 
+#else /* C case */
+#define SWIGINTERNSHORT static 
+#endif /* __cplusplus */
+#endif
+
+
+/*
+  Exception handling in wrappers
+*/
+#define SWIG_fail                goto fail
+#define SWIG_arg_fail(arg)       SWIG_Python_ArgFail(arg)
+#define SWIG_append_errmsg(msg)   SWIG_Python_AddErrMesg(msg,0)
+#define SWIG_preppend_errmsg(msg) SWIG_Python_AddErrMesg(msg,1)
+#define SWIG_type_error(type,obj) SWIG_Python_TypeError(type,obj)
+#define SWIG_null_ref(type)       SWIG_Python_NullRef(type)
+
+/*
+  Contract support
+*/
+#define SWIG_contract_assert(expr, msg) \
+ if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else
+
+/* -----------------------------------------------------------------------------
+ * Constant declarations
+ * ----------------------------------------------------------------------------- */
+
+/* Constant Types */
+#define SWIG_PY_INT     1
+#define SWIG_PY_FLOAT   2
+#define SWIG_PY_STRING  3
+#define SWIG_PY_POINTER 4
+#define SWIG_PY_BINARY  5
+
+/* Constant information structure */
+typedef struct swig_const_info {
+    int type;
+    char *name;
+    long lvalue;
+    double dvalue;
+    void   *pvalue;
+    swig_type_info **ptype;
+} swig_const_info;
+
+
+/* -----------------------------------------------------------------------------
+ * Alloc. memory flags
+ * ----------------------------------------------------------------------------- */
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/***********************************************************************
+ * pyrun.swg
+ *
+ *     This file contains the runtime support for Python modules
+ *     and includes code for managing global variables and pointer
+ *     type checking.
+ *
+ * Author : David Beazley (beazley@cs.uchicago.edu)
+ ************************************************************************/
+
+/* Common SWIG API */
+#define SWIG_ConvertPtr(obj, pp, type, flags)    SWIG_Python_ConvertPtr(obj, pp, type, flags)
+#define SWIG_NewPointerObj(p, type, flags)       SWIG_Python_NewPointerObj(p, type, flags)
+#define SWIG_MustGetPtr(p, type, argnum, flags)  SWIG_Python_MustGetPtr(p, type, argnum, flags)
+
+/* Python-specific SWIG API */
+#define SWIG_ConvertPacked(obj, ptr, sz, ty, flags)   SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags)
+#define SWIG_NewPackedObj(ptr, sz, type)              SWIG_Python_NewPackedObj(ptr, sz, type)
+
+
+/* -----------------------------------------------------------------------------
+ * Pointer declarations
+ * ----------------------------------------------------------------------------- */
+/*
+  Use SWIG_NO_COBJECT_TYPES to force the use of strings to represent
+  C/C++ pointers in the python side. Very useful for debugging, but
+  not always safe.
+*/
+#if !defined(SWIG_NO_COBJECT_TYPES) && !defined(SWIG_COBJECT_TYPES)
+#  define SWIG_COBJECT_TYPES
+#endif
+
+/* Flags for pointer conversion */
+#define SWIG_POINTER_EXCEPTION     0x1
+#define SWIG_POINTER_DISOWN        0x2
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* -----------------------------------------------------------------------------
+ * Create a new pointer string 
+ * ----------------------------------------------------------------------------- */
+
+#ifndef SWIG_BUFFER_SIZE
+#define SWIG_BUFFER_SIZE 1024
+#endif
+
+#if defined(SWIG_COBJECT_TYPES)
+#if !defined(SWIG_COBJECT_PYTHON)
+/* -----------------------------------------------------------------------------
+ * Implements a simple Swig Object type, and use it instead of PyCObject
+ * ----------------------------------------------------------------------------- */
+
+typedef struct {
+  PyObject_HEAD
+  void *ptr;
+  const char *desc;
+} PySwigObject;
+
+/* Declarations for objects of type PySwigObject */
+
+SWIGRUNTIME int
+PySwigObject_print(PySwigObject *v, FILE *fp, int flags)
+{
+  char result[SWIG_BUFFER_SIZE];
+  if (SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result))) {
+    fputs("<Swig Object at ", fp); fputs(result, fp); fputs(">", fp);
+    return 0; 
+  } else {
+    return 1; 
+  }
+}
+  
+SWIGRUNTIME PyObject *
+PySwigObject_repr(PySwigObject *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  return SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result)) ?
+    PyString_FromFormat("<Swig Object at %s>", result) : 0;
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_str(PySwigObject *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  return SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result)) ?
+    PyString_FromString(result) : 0;
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_long(PySwigObject *v)
+{
+  return PyLong_FromUnsignedLong((unsigned long) v->ptr);
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_oct(PySwigObject *v)
+{
+  char buf[100];
+  unsigned long x = (unsigned long)v->ptr;
+  if (x == 0)
+    strcpy(buf, "0");
+  else
+    PyOS_snprintf(buf, sizeof(buf), "0%lo", x);
+  return PyString_FromString(buf);
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_hex(PySwigObject *v)
+{
+  char buf[100];
+  PyOS_snprintf(buf, sizeof(buf), "0x%lx", (unsigned long)v->ptr);
+  return PyString_FromString(buf);
+}
+
+SWIGRUNTIME int
+PySwigObject_compare(PySwigObject *v, PySwigObject *w)
+{
+  int c = strcmp(v->desc, w->desc);
+  if (c) {
+    return c;
+  } else {
+    void *i = v->ptr;
+    void *j = w->ptr;
+    return (i < j) ? -1 : (i > j) ? 1 : 0;
+  }
+}
+
+SWIGRUNTIME void
+PySwigObject_dealloc(PySwigObject *self)
+{
+  PyObject_DEL(self);
+}
+
+SWIGRUNTIME PyTypeObject*
+PySwigObject_GetType() {
+  static char PySwigObject_Type__doc__[] = 
+    "Swig object carries a C/C++ instance pointer";
+  
+  static PyNumberMethods PySwigObject_as_number = {
+    (binaryfunc)0, /*nb_add*/
+    (binaryfunc)0, /*nb_subtract*/
+    (binaryfunc)0, /*nb_multiply*/
+    (binaryfunc)0, /*nb_divide*/
+    (binaryfunc)0, /*nb_remainder*/
+    (binaryfunc)0, /*nb_divmod*/
+    (ternaryfunc)0,/*nb_power*/
+    (unaryfunc)0,  /*nb_negative*/
+    (unaryfunc)0,  /*nb_positive*/
+    (unaryfunc)0,  /*nb_absolute*/
+    (inquiry)0,    /*nb_nonzero*/
+    0,            /*nb_invert*/
+    0,            /*nb_lshift*/
+    0,            /*nb_rshift*/
+    0,            /*nb_and*/
+    0,            /*nb_xor*/
+    0,            /*nb_or*/
+    (coercion)0,   /*nb_coerce*/
+    (unaryfunc)PySwigObject_long, /*nb_int*/
+    (unaryfunc)PySwigObject_long, /*nb_long*/
+    (unaryfunc)0,                 /*nb_float*/
+    (unaryfunc)PySwigObject_oct,  /*nb_oct*/
+    (unaryfunc)PySwigObject_hex,  /*nb_hex*/
+#if PY_VERSION_HEX >= 0x02000000
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ 
+#endif
+  };
+
+  static int type_init = 0;  
+  static PyTypeObject PySwigObject_Type;
+
+  if (!type_init) {
+    PyTypeObject tmp = {
+    PyObject_HEAD_INIT(&PyType_Type)
+    0,                                 /*ob_size*/
+    "PySwigObject",                    /*tp_name*/
+    sizeof(PySwigObject),              /*tp_basicsize*/
+    0,                                 /*tp_itemsize*/
+    /* methods */
+    (destructor)PySwigObject_dealloc,  /*tp_dealloc*/
+    (printfunc)PySwigObject_print,     /*tp_print*/
+    (getattrfunc)0,                    /*tp_getattr*/
+    (setattrfunc)0,                    /*tp_setattr*/
+    (cmpfunc)PySwigObject_compare,     /*tp_compare*/
+    (reprfunc)PySwigObject_repr,       /*tp_repr*/
+    &PySwigObject_as_number,           /*tp_as_number*/
+    0,                                 /*tp_as_sequence*/
+    0,                                 /*tp_as_mapping*/
+    (hashfunc)0,                       /*tp_hash*/
+    (ternaryfunc)0,                    /*tp_call*/
+    (reprfunc)PySwigObject_str,                /*tp_str*/
+    /* Space for future expansion */
+    0L,0L,0L,0L,
+    PySwigObject_Type__doc__,          /* Documentation string */
+#if PY_VERSION_HEX >= 0x02000000
+    0,                                  /* tp_traverse */
+    0,                                  /* tp_clear */
+#endif
+#if PY_VERSION_HEX >= 0x02010000
+    0,                                  /* tp_richcompare */
+    0,                                  /* tp_weaklistoffset */
+#endif
+#if PY_VERSION_HEX >= 0x02020000
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+    0,                                  /* tp_del */
+#endif
+#ifdef COUNT_ALLOCS
+    0,0,0,0                             /* tp_alloc -> tp_next */
+#endif
+    };
+
+    PySwigObject_Type = tmp;
+    type_init = 1;
+  }
+
+  return &PySwigObject_Type;
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_FromVoidPtrAndDesc(void *ptr, const char *desc)
+{
+  PySwigObject *self = PyObject_NEW(PySwigObject, PySwigObject_GetType());
+  if (self == NULL) return NULL;
+  self->ptr = ptr;
+  self->desc = desc;
+  return (PyObject *)self;
+}
+
+SWIGRUNTIMEINLINE void *
+PySwigObject_AsVoidPtr(PyObject *self)
+{
+  return ((PySwigObject *)self)->ptr;
+}
+
+SWIGRUNTIMEINLINE const char *
+PySwigObject_GetDesc(PyObject *self)
+{
+  return ((PySwigObject *)self)->desc;
+}
+
+SWIGRUNTIMEINLINE int
+PySwigObject_Check(PyObject *op) {
+  return ((op)->ob_type == PySwigObject_GetType()) 
+    || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0);
+}
+
+/* -----------------------------------------------------------------------------
+ * Implements a simple Swig Packed type, and use it instead of string
+ * ----------------------------------------------------------------------------- */
+
+typedef struct {
+  PyObject_HEAD
+  void *pack;
+  const char *desc;
+  size_t size;
+} PySwigPacked;
+
+SWIGRUNTIME int
+PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags)
+{
+  char result[SWIG_BUFFER_SIZE];
+  fputs("<Swig Packed ", fp); 
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
+    fputs("at ", fp); 
+    fputs(result, fp); 
+  }
+  fputs(v->desc,fp); 
+  fputs(">", fp);
+  return 0; 
+}
+  
+SWIGRUNTIME PyObject *
+PySwigPacked_repr(PySwigPacked *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
+    return PyString_FromFormat("<Swig Packed at %s%s>", result, v->desc);
+  } else {
+    return PyString_FromFormat("<Swig Packed %s>", v->desc);
+  }  
+}
+
+SWIGRUNTIME PyObject *
+PySwigPacked_str(PySwigPacked *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){
+    return PyString_FromFormat("%s%s", result, v->desc);
+  } else {
+    return PyString_FromFormat("%s", v->desc);
+  }  
+}
+
+SWIGRUNTIME int
+PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w)
+{
+  int c = strcmp(v->desc, w->desc);
+  if (c) {
+    return c;
+  } else {
+    size_t i = v->size;
+    size_t j = w->size;
+    int s = (i < j) ? -1 : (i > j) ? 1 : 0;
+    return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size);
+  }
+}
+
+SWIGRUNTIME void
+PySwigPacked_dealloc(PySwigPacked *self)
+{
+  free(self->pack);
+  PyObject_DEL(self);
+}
+
+SWIGRUNTIME PyTypeObject*
+PySwigPacked_GetType() {
+  static char PySwigPacked_Type__doc__[] = 
+    "Swig object carries a C/C++ instance pointer";
+  static int type_init = 0;
+  
+  static PyTypeObject PySwigPacked_Type;
+  if (!type_init) {
+    PyTypeObject tmp = {
+    PyObject_HEAD_INIT(&PyType_Type)
+    0,                                 /*ob_size*/
+    "PySwigPacked",                    /*tp_name*/
+    sizeof(PySwigPacked),              /*tp_basicsize*/
+    0,                                 /*tp_itemsize*/
+    /* methods */
+    (destructor)PySwigPacked_dealloc,  /*tp_dealloc*/
+    (printfunc)PySwigPacked_print,     /*tp_print*/
+    (getattrfunc)0,                    /*tp_getattr*/
+    (setattrfunc)0,                    /*tp_setattr*/
+    (cmpfunc)PySwigPacked_compare,     /*tp_compare*/
+    (reprfunc)PySwigPacked_repr,       /*tp_repr*/
+    0,                                 /*tp_as_number*/
+    0,                                 /*tp_as_sequence*/
+    0,                                 /*tp_as_mapping*/
+    (hashfunc)0,                       /*tp_hash*/
+    (ternaryfunc)0,                    /*tp_call*/
+    (reprfunc)PySwigPacked_str,                /*tp_str*/
+    /* Space for future expansion */
+    0L,0L,0L,0L,
+    PySwigPacked_Type__doc__,          /* Documentation string */
+#if PY_VERSION_HEX >= 0x02000000
+    0,                                  /* tp_traverse */
+    0,                                  /* tp_clear */
+#endif
+#if PY_VERSION_HEX >= 0x02010000
+    0,                                  /* tp_richcompare */
+    0,                                  /* tp_weaklistoffset */
+#endif
+#if PY_VERSION_HEX >= 0x02020000         
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+    0,                                  /* tp_del */
+#endif
+#ifdef COUNT_ALLOCS
+    0,0,0,0                             /* tp_alloc -> tp_next */
+#endif
+    };
+
+    PySwigPacked_Type = tmp;
+    type_init = 1;
+  }
+  
+      
+
+  return &PySwigPacked_Type;
+}
+
+SWIGRUNTIME PyObject *
+PySwigPacked_FromDataAndDesc(void *ptr, size_t size, const char *desc)
+{
+  PySwigPacked *self = PyObject_NEW(PySwigPacked, PySwigPacked_GetType());
+  if (self == NULL) {
+    return NULL;
+  } else {
+    void *pack = malloc(size);
+    memcpy(pack, ptr, size);
+    self->pack = pack;
+    self->desc = desc;
+    self->size = size;
+    return (PyObject *) self;
+  }
+}
+
+SWIGRUNTIMEINLINE const char *
+PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
+{
+  PySwigPacked *self = (PySwigPacked *)obj;
+  if (self->size != size) return 0;
+  memcpy(ptr, self->pack, size);
+  return self->desc;
+}
+
+SWIGRUNTIMEINLINE const char *
+PySwigPacked_GetDesc(PyObject *self)
+{
+  return ((PySwigPacked *)self)->desc;
+}
+
+SWIGRUNTIMEINLINE int
+PySwigPacked_Check(PyObject *op) {
+  return ((op)->ob_type == PySwigPacked_GetType()) 
+    || (strcmp((op)->ob_type->tp_name,"PySwigPacked") == 0);
+}
+
 #else
-#  define SWIGRUNTIME(a) static a
+/* -----------------------------------------------------------------------------
+ * Use the old Python PyCObject instead of PySwigObject
+ * ----------------------------------------------------------------------------- */
+
+#define PySwigObject_GetDesc(obj)                 PyCObject_GetDesc(obj)
+#define PySwigObject_Check(obj)                   PyCObject_Check(obj)
+#define PySwigObject_AsVoidPtr(obj)       PyCObject_AsVoidPtr(obj)
+#define PySwigObject_FromVoidPtrAndDesc(p, d)  PyCObject_FromVoidPtrAndDesc(p, d, NULL)
+
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#endif
+
+/* -----------------------------------------------------------------------------
+ * errors manipulation
+ * ----------------------------------------------------------------------------- */
+
+SWIGRUNTIME void
+SWIG_Python_TypeError(const char *type, PyObject *obj)
+{
+  if (type) {
+#if defined(SWIG_COBJECT_TYPES)
+    if (PySwigObject_Check(obj)) {
+      const char *otype = (const char *) PySwigObject_GetDesc(obj);
+      if (otype) {
+       PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'PySwigObject(%s)' is received",
+                    type, otype);
+       return;
+      }
+    } else 
+#endif      
+    {
+      const char *otype = (obj ? obj->ob_type->tp_name : 0); 
+      if (otype) {
+       PyObject *str = PyObject_Str(obj);
+       const char *cstr = str ? PyString_AsString(str) : 0;
+       if (cstr) {
+         PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received",
+                      type, otype, cstr);
+       } else {
+         PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
+                      type, otype);
+       }
+       Py_DECREF(str);
+       return;
+      }
+    }   
+    PyErr_Format(PyExc_TypeError, "a '%s' is expected", type);
+  } else {
+    PyErr_Format(PyExc_TypeError, "unexpected type is received");
+  }
+}
+
+SWIGRUNTIMEINLINE void
+SWIG_Python_NullRef(const char *type)
+{
+  if (type) {
+    PyErr_Format(PyExc_TypeError, "null reference of type '%s' was received",type);
+  } else {
+    PyErr_Format(PyExc_TypeError, "null reference was received");
+  }
+}
+
+SWIGRUNTIME int
+SWIG_Python_AddErrMesg(const char* mesg, int infront)
+{
+  if (PyErr_Occurred()) {
+    PyObject *type = 0;
+    PyObject *value = 0;
+    PyObject *traceback = 0;
+    PyErr_Fetch(&type, &value, &traceback);
+    if (value) {
+      PyObject *old_str = PyObject_Str(value);
+      Py_XINCREF(type);
+      PyErr_Clear();
+      if (infront) {
+       PyErr_Format(type, "%s %s", mesg, PyString_AsString(old_str));
+      } else {
+       PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg);
+      }
+      Py_DECREF(old_str);
+    }
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
+SWIGRUNTIME int
+SWIG_Python_ArgFail(int argnum)
+{
+  if (PyErr_Occurred()) {
+    /* add information about failing argument */
+    char mesg[256];
+    sprintf(mesg, "argument number %d:", argnum);
+    return SWIG_Python_AddErrMesg(mesg, 1);
+  } else {
+    return 0;
+  }
+}
+
 
-typedef void *(*swig_converter_func)(void *);
-typedef struct swig_type_info *(*swig_dycast_func)(void **);
+/* -----------------------------------------------------------------------------
+ * pointers/data manipulation
+ * ----------------------------------------------------------------------------- */
 
-typedef struct swig_type_info {
-  const char             *name;
-  swig_converter_func     converter;
-  const char             *str;
-  void                   *clientdata;
-  swig_dycast_func        dcast;
-  struct swig_type_info  *next;
-  struct swig_type_info  *prev;
-} swig_type_info;
+/* Convert a pointer value */
+SWIGRUNTIME int
+SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) {
+  swig_type_info *tc;
+  const char *c = 0;
+  static PyObject *SWIG_this = 0;
+  int    newref = 0;
+  PyObject  *pyobj = 0;
+  void *vptr;
+  
+  if (!obj) return 0;
+  if (obj == Py_None) {
+    *ptr = 0;
+    return 0;
+  }
 
+#ifdef SWIG_COBJECT_TYPES
+  if (!(PySwigObject_Check(obj))) {
+    if (!SWIG_this)
+      SWIG_this = PyString_FromString("this");
+    pyobj = obj;
+    obj = PyObject_GetAttr(obj,SWIG_this);
+    newref = 1;
+    if (!obj) goto type_error;
+    if (!PySwigObject_Check(obj)) {
+      Py_DECREF(obj);
+      goto type_error;
+    }
+  }  
+  vptr = PySwigObject_AsVoidPtr(obj);
+  c = (const char *) PySwigObject_GetDesc(obj);
+  if (newref) { Py_DECREF(obj); }
+  goto type_check;
+#else
+  if (!(PyString_Check(obj))) {
+    if (!SWIG_this)
+      SWIG_this = PyString_FromString("this");
+    pyobj = obj;
+    obj = PyObject_GetAttr(obj,SWIG_this);
+    newref = 1;
+    if (!obj) goto type_error;
+    if (!PyString_Check(obj)) {
+      Py_DECREF(obj);
+      goto type_error;
+    }
+  } 
+  c = PyString_AS_STRING(obj);
+  /* Pointer values must start with leading underscore */
+  c = SWIG_UnpackVoidPtr(c, &vptr, ty->name);
+  if (newref) { Py_DECREF(obj); }
+  if (!c) goto type_error;
+#endif
 
-SWIGIMPORT(swig_type_info *) SWIG_TypeRegister(swig_type_info *);
-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(swig_type_info *) SWIG_TypeQuery(const char *);
-SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);
-SWIGIMPORT(char *)           SWIG_PackData(char *, void *, int);
-SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
+type_check:
 
+  if (ty) {
+    tc = SWIG_TypeCheck(c,ty);
+    if (!tc) goto type_error;
+    *ptr = SWIG_TypeCast(tc,vptr);
+  } else {
+    *ptr = vptr;
+  }
 
-#ifdef __cplusplus
+  if ((pyobj) && (flags & SWIG_POINTER_DISOWN)) {
+    PyObject_SetAttrString(pyobj,(char*)"thisown",Py_False);
+  }
+  return 0;
+
+type_error:
+  PyErr_Clear();
+  if (pyobj && !obj) {    
+    obj = pyobj;
+    if (PyCFunction_Check(obj)) {
+      /* here we get the method pointer for callbacks */
+      char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
+      c = doc ? strstr(doc, "swig_ptr: ") : 0;
+      if (c) {
+       c = SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name);
+       if (!c) goto type_error;
+       goto type_check;
+      }
+    }
+  }
+  if (flags & SWIG_POINTER_EXCEPTION) {
+    if (ty) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
+    } else {
+      SWIG_Python_TypeError("C/C++ pointer", obj);
+    }
+  }
+  return -1;
 }
-#endif
 
+/* Convert a pointer value, signal an exception on a type mismatch */
+SWIGRUNTIME void *
+SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) {
+  void *result;
+  if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) {
+    PyErr_Clear();
+    if (flags & SWIG_POINTER_EXCEPTION) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
+      SWIG_Python_ArgFail(argnum);
+    }
+  }
+  return result;
+}
 
-/***********************************************************************
- * pyrun.swg for wxPython
- *
- * Include only the function prototypes and such from SWIG's pyrun.swg,
- * but not the runtime functions themselves.  This helps keep the
- * wrapper files clean of unnecessary stuff that is in the libpy.c file
- * anyway.
- *
- ************************************************************************/
-
-#include "Python.h"
+/* Convert a packed value value */
+SWIGRUNTIME int
+SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty, int flags) {
+  swig_type_info *tc;
+  const char *c = 0;
 
-#ifdef __cplusplus
-extern "C" {
+#if defined(SWIG_COBJECT_TYPES) && !defined(SWIG_COBJECT_PYTHON)
+  c = PySwigPacked_UnpackData(obj, ptr, sz);
+#else
+  if ((!obj) || (!PyString_Check(obj))) goto type_error;
+  c = PyString_AS_STRING(obj);
+  /* Pointer values must start with leading underscore */
+  c = SWIG_UnpackDataName(c, ptr, sz, ty->name);
 #endif
+  if (!c) goto type_error;
+  if (ty) {
+    tc = SWIG_TypeCheck(c,ty);
+    if (!tc) goto type_error;
+  }
+  return 0;
 
-#define SWIG_PY_INT     1
-#define SWIG_PY_FLOAT   2
-#define SWIG_PY_STRING  3
-#define SWIG_PY_POINTER 4
-#define SWIG_PY_BINARY  5
-
-/* Flags for pointer conversion */
+type_error:
+  PyErr_Clear();
+  if (flags & SWIG_POINTER_EXCEPTION) {
+    if (ty) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
+    } else {
+      SWIG_Python_TypeError("C/C++ packed data", obj);
+    }
+  }
+  return -1;
+}  
+
+/* Create a new array object */
+SWIGRUNTIME PyObject *
+SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int own) {
+  PyObject *robj = 0;
+  if (!ptr) {
+    Py_INCREF(Py_None);
+    return Py_None;
+  }
+#ifdef SWIG_COBJECT_TYPES
+  robj = PySwigObject_FromVoidPtrAndDesc((void *) ptr, (char *)type->name);
+#else
+  {
+    char result[SWIG_BUFFER_SIZE];
+    robj = SWIG_PackVoidPtr(result, ptr, type->name, sizeof(result)) ?
+      PyString_FromString(result) : 0;
+  }
+#endif
+  if (!robj || (robj == Py_None)) return robj;
+  if (type->clientdata) {
+    PyObject *inst;
+    PyObject *args = Py_BuildValue((char*)"(O)", robj);
+    Py_DECREF(robj);
+    inst = PyObject_CallObject((PyObject *) type->clientdata, args);
+    Py_DECREF(args);
+    if (inst) {
+      if (own) {
+        PyObject_SetAttrString(inst,(char*)"thisown",Py_True);
+      }
+      robj = inst;
+    }
+  }
+  return robj;
+}
 
-#define SWIG_POINTER_EXCEPTION     0x1
-#define SWIG_POINTER_DISOWN        0x2
+SWIGRUNTIME PyObject *
+SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) {
+  PyObject *robj = 0;
+  if (!ptr) {
+    Py_INCREF(Py_None);
+    return Py_None;
+  }
+#if defined(SWIG_COBJECT_TYPES) && !defined(SWIG_COBJECT_PYTHON)
+  robj = PySwigPacked_FromDataAndDesc((void *) ptr, sz, (char *)type->name);
+#else
+  {
+    char result[SWIG_BUFFER_SIZE];
+    robj = SWIG_PackDataName(result, ptr, sz, type->name, sizeof(result)) ?
+      PyString_FromString(result) : 0;
+  }
+#endif
+  return robj;
+}
 
-/* Exception handling in wrappers */
-#define SWIG_fail   goto fail
+/* -----------------------------------------------------------------------------*
+ *  Get type list 
+ * -----------------------------------------------------------------------------*/
 
-/* Constant information structure */
-typedef struct swig_const_info {
-    int type;
-    char *name;
-    long lvalue;
-    double dvalue;
-    void   *pvalue;
-    swig_type_info **ptype;
-} swig_const_info;
+#ifdef SWIG_LINK_RUNTIME
+void *SWIG_ReturnGlobalTypeList(void *);
+#endif
 
-/* Common SWIG API */
-#define SWIG_ConvertPtr(obj, pp, type, flags) \
-  SWIG_Python_ConvertPtr(obj, pp, type, flags)
-#define SWIG_NewPointerObj(p, type, flags) \
-  SWIG_Python_NewPointerObj(p, type, flags)
-#define SWIG_MustGetPtr(p, type, argnum, flags) \
-  SWIG_Python_MustGetPtr(p, type, argnum, flags)
-/* Python-specific SWIG API */
-#define SWIG_newvarlink() \
-  SWIG_Python_newvarlink()
-#define SWIG_addvarlink(p, name, get_attr, set_attr) \
-  SWIG_Python_addvarlink(p, name, get_attr, set_attr)
-#define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \
-  SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags)
-#define SWIG_NewPackedObj(ptr, sz, type) \
-  SWIG_Python_NewPackedObj(ptr, sz, type)
-#define SWIG_InstallConstants(d, constants) \
-  SWIG_Python_InstallConstants(d, constants)
-
-typedef double (*py_objasdbl_conv)(PyObject *obj);
-
-SWIGIMPORT(int)               SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int);
-SWIGIMPORT(PyObject *)        SWIG_Python_NewPointerObj(void *, swig_type_info *,int own);
-SWIGIMPORT(void *)            SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int);
-SWIGIMPORT(PyObject *)        SWIG_Python_newvarlink(void);
-SWIGIMPORT(void)              SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
-SWIGIMPORT(int)               SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int);
-SWIGIMPORT(PyObject *)        SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *);
-SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);
+SWIGRUNTIME swig_type_info **
+SWIG_Python_GetTypeListHandle() {
+  static void *type_pointer = (void *)0;
+  /* first check if module already created */
+  if (!type_pointer) {
+#ifdef SWIG_LINK_RUNTIME
+    type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
+#else
+    type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
+                                   (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);
+    if (PyErr_Occurred()) {
+      PyErr_Clear();
+      type_pointer = (void *)0;
+    }
+  }
+#endif
+  return (swig_type_info **) type_pointer;
+}
 
-/* -----------------------------------------------------------------------------
- *  the needed conversions between C++ and python
- * ----------------------------------------------------------------------------- */
-/* basic types */
 /*
-  utilities
-*/
-SWIGIMPORT(char* )         SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info);
-SWIGIMPORT(PyObject *)     SWIG_PyObj_FromCharPtr(const char* cptr);
-SWIGIMPORT(unsigned long)  SWIG_PyObj_AsUnsignedLong(PyObject * obj);
-SWIGIMPORT(long)           SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type,
-                                                   long min_value, long max_value);
-SWIGIMPORT(unsigned long)  SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type,
-                                                           unsigned long max_value);
-SWIGIMPORT(char *)         SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info);
-SWIGIMPORT(void)           SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info,
-                                                      char** cptr, size_t* size);
-SWIGIMPORT(void)           SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info,
-                                                 char* carray, size_t size);
-SWIGIMPORT(PyObject *)     SWIG_PyObj_FromCharArray(const char* carray, size_t size);
-SWIGIMPORT(float)          SWIG_PyObj_AsFloatConv(PyObject *obj,  py_objasdbl_conv pyconv);
-
-
-/* Contract support */
-
-#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else
+  Search for a swig_type_info structure
+ */
+SWIGRUNTIMEINLINE swig_type_info *
+SWIG_Python_GetTypeList() {
+  swig_type_info **tlh = SWIG_Python_GetTypeListHandle();
+  return tlh ? *tlh : (swig_type_info*)0;
+}
+
+#define SWIG_Runtime_GetTypeList SWIG_Python_GetTypeList 
 
 #ifdef __cplusplus
 }
 #endif
 
 
-
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxOGLConstraint swig_types[0] 
@@ -235,43 +1343,52 @@ SWIGIMPORT(float)          SWIG_PyObj_AsFloatConv(PyObject *obj,  py_objasdbl_co
 #define  SWIGTYPE_p_wxColour swig_types[2] 
 #define  SWIGTYPE_p_wxShapeRegion swig_types[3] 
 #define  SWIGTYPE_p_wxDC swig_types[4] 
-#define  SWIGTYPE_p_wxRealPoint swig_types[5] 
-#define  SWIGTYPE_p_wxPyControlPoint swig_types[6] 
-#define  SWIGTYPE_p_wxArrowHead swig_types[7] 
-#define  SWIGTYPE_p_char swig_types[8] 
-#define  SWIGTYPE_p_wxStringList swig_types[9] 
-#define  SWIGTYPE_p_wxPanel swig_types[10] 
-#define  SWIGTYPE_p_bool swig_types[11] 
-#define  SWIGTYPE_p_wxList swig_types[12] 
-#define  SWIGTYPE_p_wxFont swig_types[13] 
-#define  SWIGTYPE_p_wxScrolledWindow swig_types[14] 
-#define  SWIGTYPE_p_wxWindow swig_types[15] 
-#define  SWIGTYPE_p_double swig_types[16] 
-#define  SWIGTYPE_p_wxPyDivisionShape swig_types[17] 
-#define  SWIGTYPE_p_wxPyDrawnShape swig_types[18] 
-#define  SWIGTYPE_p_wxPyPolygonShape swig_types[19] 
-#define  SWIGTYPE_p_wxBitmap swig_types[20] 
-#define  SWIGTYPE_p_wxObject swig_types[21] 
-#define  SWIGTYPE_p_wxPyBitmapShape swig_types[22] 
-#define  SWIGTYPE_p_wxPyShapeEvtHandler swig_types[23] 
-#define  SWIGTYPE_p_wxEvtHandler swig_types[24] 
-#define  SWIGTYPE_p_wxPyEllipseShape swig_types[25] 
-#define  SWIGTYPE_p_wxPyShapeCanvas swig_types[26] 
-#define  SWIGTYPE_p_wxPoint swig_types[27] 
-#define  SWIGTYPE_p_wxDiagram swig_types[28] 
-#define  SWIGTYPE_p_wxPyShape swig_types[29] 
-#define  SWIGTYPE_p_wxAttachmentPoint swig_types[30] 
-#define  SWIGTYPE_p_wxClassInfo swig_types[31] 
-#define  SWIGTYPE_p_wxPyLineShape swig_types[32] 
-#define  SWIGTYPE_p_wxPyRectangleShape swig_types[33] 
-#define  SWIGTYPE_p_wxPyCompositeShape swig_types[34] 
-#define  SWIGTYPE_p_wxPyCircleShape swig_types[35] 
-#define  SWIGTYPE_p_wxPen swig_types[36] 
-#define  SWIGTYPE_p_int swig_types[37] 
-#define  SWIGTYPE_p_wxPseudoMetaFile swig_types[38] 
-#define  SWIGTYPE_p_wxPyTextShape swig_types[39] 
-#define  SWIGTYPE_p_wxPyDividedShape swig_types[40] 
-static swig_type_info *swig_types[42];
+#define  SWIGTYPE_p_wxPyControlPoint swig_types[5] 
+#define  SWIGTYPE_p_wxRealPoint swig_types[6] 
+#define  SWIGTYPE_p_form_ops_t swig_types[7] 
+#define  SWIGTYPE_p_wxDuplexMode swig_types[8] 
+#define  SWIGTYPE_p_wxArrowHead swig_types[9] 
+#define  SWIGTYPE_p_char swig_types[10] 
+#define  SWIGTYPE_p_wxPanel swig_types[11] 
+#define  SWIGTYPE_p_bool swig_types[12] 
+#define  SWIGTYPE_p_wxStringList swig_types[13] 
+#define  SWIGTYPE_p_wxList swig_types[14] 
+#define  SWIGTYPE_p_wxFont swig_types[15] 
+#define  SWIGTYPE_p_wxScrolledWindow swig_types[16] 
+#define  SWIGTYPE_p_wxWindow swig_types[17] 
+#define  SWIGTYPE_p_double swig_types[18] 
+#define  SWIGTYPE_p_wxPyDrawnShape swig_types[19] 
+#define  SWIGTYPE_p_wxPyDivisionShape swig_types[20] 
+#define  SWIGTYPE_p_wxPyPolygonShape swig_types[21] 
+#define  SWIGTYPE_p_wxObject swig_types[22] 
+#define  SWIGTYPE_p_wxBitmap swig_types[23] 
+#define  SWIGTYPE_p_wxPaperSize swig_types[24] 
+#define  SWIGTYPE_p_unsigned_int swig_types[25] 
+#define  SWIGTYPE_unsigned_int swig_types[26] 
+#define  SWIGTYPE_p_wxPyBitmapShape swig_types[27] 
+#define  SWIGTYPE_p_wxPyShapeEvtHandler swig_types[28] 
+#define  SWIGTYPE_p_wxEvtHandler swig_types[29] 
+#define  SWIGTYPE_p_wxPyEllipseShape swig_types[30] 
+#define  SWIGTYPE_p_wxPyShapeCanvas swig_types[31] 
+#define  SWIGTYPE_p_wxPoint swig_types[32] 
+#define  SWIGTYPE_p_wxDiagram swig_types[33] 
+#define  SWIGTYPE_p_wxPyShape swig_types[34] 
+#define  SWIGTYPE_p_wxAttachmentPoint swig_types[35] 
+#define  SWIGTYPE_p_unsigned_char swig_types[36] 
+#define  SWIGTYPE_ptrdiff_t swig_types[37] 
+#define  SWIGTYPE_std__ptrdiff_t swig_types[38] 
+#define  SWIGTYPE_p_wxClassInfo swig_types[39] 
+#define  SWIGTYPE_p_wxPyLineShape swig_types[40] 
+#define  SWIGTYPE_p_wxPyRectangleShape swig_types[41] 
+#define  SWIGTYPE_p_wxPyCompositeShape swig_types[42] 
+#define  SWIGTYPE_p_wxPyCircleShape swig_types[43] 
+#define  SWIGTYPE_p_wxPen swig_types[44] 
+#define  SWIGTYPE_p_int swig_types[45] 
+#define  SWIGTYPE_p_wxPseudoMetaFile swig_types[46] 
+#define  SWIGTYPE_p_wxPyTextShape swig_types[47] 
+#define  SWIGTYPE_p_unsigned_long swig_types[48] 
+#define  SWIGTYPE_p_wxPyDividedShape swig_types[49] 
+static swig_type_info *swig_types[51];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -283,90 +1400,154 @@ static swig_type_info *swig_types[42];
 
 #define SWIG_name    "_ogl"
 
-#include <limits.h>
-#include <float.h>
-#include <string.h>
+#include "wx/wxPython/wxPython.h"
+#include "wx/wxPython/pyclasses.h"
+#include "oglhelpers.h"
 
-#ifndef SWIGSTATIC
-#ifdef __cplusplus
-#define SWIGSTATIC(a) static inline a
-#else
-#define SWIGSTATIC(a) static a
-#endif
-#endif
 
-#ifndef numeric_cast
-#ifdef __cplusplus
-#ifdef HAVE_NUMERIC_CAST
-#define numeric_cast(type,a) numeric_cast<type>(a)
-#else
-#define numeric_cast(type,a) static_cast<type>(a)
-#endif
-#else
-#define numeric_cast(type,a) (type)(a)
-#endif
-#endif
+ static const wxString wxPyEmptyString(wxEmptyString); 
 
+SWIGINTERN int
+SWIG_AsVal_double(PyObject *obj, double* val)
+{
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyFloat_AsDouble(obj);
+        return 1;
+    }
+    else {
+        SWIG_type_error("number", obj);
+    }
+    return 0;
+}
 
 
-#define SWIG_PyObj_FromSignedChar     PyInt_FromLong
-#define SWIG_PyObj_FromUnsignedChar   PyInt_FromLong
-#define SWIG_PyObj_FromShort         PyInt_FromLong
-#define SWIG_PyObj_FromUnsignedShort  PyInt_FromLong
-#define SWIG_PyObj_FromInt           PyInt_FromLong
-#define SWIG_PyObj_FromLong          PyInt_FromLong
-#define SWIG_PyObj_FromFloat         PyFloat_FromDouble
-#define SWIG_PyObj_FromDouble        PyFloat_FromDouble
-#define SWIG_PyObj_FromFloat         PyFloat_FromDouble
-#define SWIG_PyObj_FromDouble        PyFloat_FromDouble
+SWIGINTERNSHORT double
+SWIG_As_double(PyObject* obj)
+{
+  double v;
+  if (!SWIG_AsVal_double(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier. 
+     */
+    memset((void*)&v, 0, sizeof(double));
+  }
+  return v;
+}
 
+  
+SWIGINTERNSHORT int
+SWIG_Check_double(PyObject* obj)
+{
+  return SWIG_AsVal_double(obj, (double*)0);
+}
 
-#include "wx/wxPython/wxPython.h"
-#include "wx/wxPython/pyclasses.h"
-#include "oglhelpers.h"
 
+#include <limits.h>
 
- static const wxString wxPyEmptyString(wxEmptyString); 
 
-SWIGSTATIC(double)
-SWIG_PyObj_AsDouble(PyObject *obj)
+SWIGINTERN int
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) :
-#if HAVE_LONG_LONG
-    (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj));
-#else
-    (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj));
-#endif
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    PyErr_SetString(PyExc_TypeError, "a double is expected");
+  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 1;
+}
+
+
+SWIGINTERN int
+SWIG_AsVal_long(PyObject* obj, long* val)
+{
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
+    else {
+        SWIG_type_error("number", obj);
+    }
+    return 0;
 }
 
 
-SWIGSTATIC(int)
-SWIG_PyObj_AsInt(PyObject *obj)
+#if INT_MAX != LONG_MAX
+SWIGINTERN int
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return numeric_cast(int,
-    SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : (char*)0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = (int)(v);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    SWIG_type_error(errmsg, obj);
+  }
+  return 0;    
+}
+#else
+SWIGINTERNSHORT int
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
+#endif
+
+
+SWIGINTERNSHORT int
+SWIG_As_int(PyObject* obj)
+{
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier. 
+     */
+    memset((void*)&v, 0, sizeof(int));
+  }
+  return v;
+}
+
+  
+SWIGINTERNSHORT int
+SWIG_Check_int(PyObject* obj)
+{
+  return SWIG_AsVal_int(obj, (int*)0);
 }
 
 
-static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
-
+    
     if (!target) {                   
         target = o;
     } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
-    } else {                         
+    } else {
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
-        }
+        }            
         o3 = PyTuple_New(1);            
         PyTuple_SetItem(o3, 0, o);      
 
@@ -376,48 +1557,128 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
         Py_DECREF(o3);
     }
     return target;
-}
+  }
+
+
+  /*@/opt/swig/share/swig/1.3.24/python/pymacros.swg,66,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
+
+
+
+  /*@/opt/swig/share/swig/1.3.24/python/pymacros.swg,66,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
 
 
     WXSHAPE_IMP_CALLBACKS(wxPyShapeEvtHandler,wxShapeEvtHandler);
 
-void wxPyShapeEvtHandler__setOORInfo(wxPyShapeEvtHandler *self,PyObject *_self){
+static void wxPyShapeEvtHandler__setOORInfo(wxPyShapeEvtHandler *self,PyObject *_self){
             self->SetClientObject(new wxPyOORClientData(_self));
         }
 
-SWIGSTATIC(bool)
-SWIG_PyObj_AsBool(PyObject *obj)
+SWIGINTERN int
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
+{
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;
+    return 1;
+  }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = res ? true : false;
+    return 1;
+  } else {
+    PyErr_Clear();
+  }  
+  if (val) {
+    SWIG_type_error("bool", obj);
+  }
+  return 0;
+}
+
+
+SWIGINTERNSHORT bool
+SWIG_As_bool(PyObject* obj)
+{
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier. 
+     */
+    memset((void*)&v, 0, sizeof(bool));
+  }
+  return v;
+}
+
+  
+SWIGINTERNSHORT int
+SWIG_Check_bool(PyObject* obj)
 {
-  return PyObject_IsTrue(obj) ? true : false;
+  return SWIG_AsVal_bool(obj, (bool*)0);
 }
 
 
     WXSHAPE_IMP_CALLBACKS(wxPyShape, wxShape);
 
-PyObject *wxPyShape_GetChildren(wxPyShape *self){
+static PyObject *wxPyShape_GetChildren(wxPyShape *self){
             wxList& list = self->GetChildren();
             return wxPy_ConvertShapeList(&list);
         }
-PyObject *wxPyShape_GetLines(wxPyShape *self){
+
+SWIGINTERNSHORT PyObject*
+  SWIG_From_bool(bool value)
+{
+  PyObject *obj = value ? Py_True : Py_False;
+  Py_INCREF(obj);
+  return obj;
+}
+
+
+
+static PyObject *wxPyShape_GetLines(wxPyShape *self){
             wxList& list = self->GetLines();
             return wxPy_ConvertShapeList(&list);
         }
 
-SWIGSTATIC(long)
-SWIG_PyObj_AsLong(PyObject * obj)
+SWIGINTERNSHORT long
+SWIG_As_long(PyObject* obj)
+{
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier. 
+     */
+    memset((void*)&v, 0, sizeof(long));
+  }
+  return v;
+}
+
+  
+SWIGINTERNSHORT int
+SWIG_Check_long(PyObject* obj)
 {
-  return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj);
+  return SWIG_AsVal_long(obj, (long*)0);
 }
 
-PyObject *wxPyShape_GetRegions(wxPyShape *self){
+
+  /*@/opt/swig/share/swig/1.3.24/python/pymacros.swg,66,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+
+static PyObject *wxPyShape_GetRegions(wxPyShape *self){
             wxList& list = self->GetRegions();
             return wxPy_ConvertList(&list);
         }
-PyObject *wxPyShape_GetAttachments(wxPyShape *self){
+static PyObject *wxPyShape_GetAttachments(wxPyShape *self){
             wxList& list = self->GetAttachments();
             return wxPy_ConvertList(&list);            
         }
-void wxPyShape_ApplyAttachmentOrdering(wxPyShape *self,PyObject *linesToSort){
+static void wxPyShape_ApplyAttachmentOrdering(wxPyShape *self,PyObject *linesToSort){
             wxList* list = wxPy_wxListHelper(linesToSort, wxT("wxPyLineShape"));
             self->ApplyAttachmentOrdering(*list);
             delete list;
@@ -467,7 +1728,7 @@ void wxPyShape_ApplyAttachmentOrdering(wxPyShape *self,PyObject *linesToSort){
 
     WXSHAPE_IMP_CALLBACKS(wxPyDrawnShape, wxDrawnShape);
 
-wxOGLConstraint *new_wxOGLConstraint(int type,wxPyShape *constraining,PyObject *constrained){
+static wxOGLConstraint *new_wxOGLConstraint(int type,wxPyShape *constraining,PyObject *constrained){
             wxList* list = wxPy_wxListHelper(constrained, wxT("wxPyShape"));
             wxOGLConstraint* rv = new wxOGLConstraint(type, constraining, *list);
             delete list;
@@ -476,17 +1737,17 @@ wxOGLConstraint *new_wxOGLConstraint(int type,wxPyShape *constraining,PyObject *
 
     WXSHAPE_IMP_CALLBACKS(wxPyCompositeShape, wxCompositeShape);
 
-wxOGLConstraint *wxPyCompositeShape_AddConstrainedShapes(wxPyCompositeShape *self,int type,wxPyShape *constraining,PyObject *constrained){
+static wxOGLConstraint *wxPyCompositeShape_AddConstrainedShapes(wxPyCompositeShape *self,int type,wxPyShape *constraining,PyObject *constrained){
             wxList* list = wxPy_wxListHelper(constrained, wxT("wxPyShape"));
             wxOGLConstraint* rv = self->AddConstraint(type, constraining, *list);
             delete list;
             return rv;
         }
-PyObject *wxPyCompositeShape_GetConstraints(wxPyCompositeShape *self){
+static PyObject *wxPyCompositeShape_GetConstraints(wxPyCompositeShape *self){
             wxList& list = self->GetConstraints();
             return wxPy_ConvertList(&list);
         }
-PyObject *wxPyCompositeShape_GetDivisions(wxPyCompositeShape *self){
+static PyObject *wxPyCompositeShape_GetDivisions(wxPyCompositeShape *self){
             wxList& list = self->GetDivisions();
             return wxPy_ConvertShapeList(&list);
         }
@@ -505,19 +1766,37 @@ PyObject *wxPyCompositeShape_GetDivisions(wxPyCompositeShape *self){
 
     WXSHAPE_IMP_CALLBACKS(wxPyLineShape, wxLineShape);
 
-void wxPyLineShape_AddArrowOrdered(wxPyLineShape *self,wxArrowHead *arrow,PyObject *referenceList,int end){
+static void wxPyLineShape_AddArrowOrdered(wxPyLineShape *self,wxArrowHead *arrow,PyObject *referenceList,int end){
             wxList* list = wxPy_wxListHelper(referenceList, wxT("wxArrowHead"));
             self->AddArrowOrdered(arrow, *list, end);
             delete list;
         }
-PyObject *wxPyLineShape_GetLineControlPoints(wxPyLineShape *self){
+static PyObject *wxPyLineShape_GetLineControlPoints(wxPyLineShape *self){
             wxList* list = self->GetLineControlPoints();
-            return wxPy_ConvertShapeList(list);
+            return wxPy_ConvertRealPointList(list);
+        }
+static void wxPyLineShape_SetLineControlPoints(wxPyLineShape *self,PyObject *list){
+            wxList* real_point_list = wxPy_wxRealPoint_ListHelper(list);
+            self->MakeLineControlPoints((int)(real_point_list->GetCount()));
+            wxList* old_control_points = self->GetLineControlPoints();
+            wxNode* old_node = old_control_points->GetFirst();
+            wxNode* real_node = real_point_list->GetFirst();
+            while(old_node)
+            {
+                wxRealPoint* old_point = (wxRealPoint*)old_node->GetData();
+                wxRealPoint* new_point = (wxRealPoint*)real_node->GetData();
+                old_point->x = new_point->x;
+                old_point->y = new_point->y;
+                old_node = old_node->GetNext();
+                real_node = real_node->GetNext();
+            }
+            self->ClearPointList(*real_point_list);
+            delete real_point_list;
         }
 
     WXSHAPE_IMP_CALLBACKS(wxPyPolygonShape, wxPolygonShape);
 
-PyObject *wxPyPolygonShape_Create(wxPyPolygonShape *self,PyObject *points){
+static PyObject *wxPyPolygonShape_Create(wxPyPolygonShape *self,PyObject *points){
             wxList* list = wxPy_wxRealPoint_ListHelper(points);
             if (list) {
                 self->Create(list);
@@ -526,32 +1805,18 @@ PyObject *wxPyPolygonShape_Create(wxPyPolygonShape *self,PyObject *points){
             }
             else return NULL;
         }
-PyObject *wxPyPolygonShape_GetPoints(wxPyPolygonShape *self){
+static PyObject *wxPyPolygonShape_GetPoints(wxPyPolygonShape *self){
             wxList* list = self->GetPoints();
-            PyObject*   pyList;
-            PyObject*   pyObj;
-            wxObject*   wxObj;
-            wxNode*     node = list->GetFirst();
-
-            wxPyBeginBlockThreads();
-            pyList = PyList_New(0);
-            while (node) {
-                wxObj = node->GetData();
-                pyObj = wxPyConstructObject(wxObj, wxT("wxRealPoint"), 0);
-                PyList_Append(pyList, pyObj);
-                node = node->GetNext();
-            }
-            wxPyEndBlockThreads();
-            return pyList;
+            return wxPy_ConvertRealPointList(list);
         }
-PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){
+static PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){
             wxList* list = self->GetOriginalPoints();
             PyObject*   pyList;
             PyObject*   pyObj;
             wxObject*   wxObj;
             wxNode*     node = list->GetFirst();
 
-            wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
             pyList = PyList_New(0);
             while (node) {
                 wxObj = node->GetData();
@@ -559,7 +1824,7 @@ PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){
                 PyList_Append(pyList, pyObj);
                 node = node->GetNext();
             }
-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);
             return pyList;
         }
 
@@ -569,7 +1834,7 @@ PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){
     // Put some wx default wxChar* values into wxStrings.
     DECLARE_DEF_STRING(ShapeCanvasNameStr);
 
-PyObject *wxDiagram_GetShapeList(wxDiagram *self){
+static PyObject *wxDiagram_GetShapeList(wxDiagram *self){
             wxList* list = self->GetShapeList();
             return wxPy_ConvertShapeList(list);
         }
@@ -590,17 +1855,17 @@ PyObject *wxDiagram_GetShapeList(wxDiagram *self){
 // work for any class for the VERY generic cases, but beyond that the helper
 // needs to know more about the type.
 wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) {
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if (!PyList_Check(pyList)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return NULL;
     }
     int count = PyList_Size(pyList);
     wxList* list = new wxList;
     if (! list) {
         PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return NULL;
     }
     for (int x=0; x<count; x++) {
@@ -611,29 +1876,29 @@ wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) {
             wxString errmsg;
             errmsg.Printf(wxT("Type error, expected list of %s objects"), className);
             PyErr_SetString(PyExc_TypeError, errmsg.mb_str());
-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);
             return NULL;
         }
         list->Append(wxo);
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return list;
 }
 
 //---------------------------------------------------------------------------
 
 wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if (!PyList_Check(pyList)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return NULL;
     }
     int count = PyList_Size(pyList);
     wxList* list = new wxList;
     if (! list) {
         PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return NULL;
     }
     for (int x=0; x<count; x++) {
@@ -652,19 +1917,19 @@ wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
             wxRealPoint* wxo = NULL;
             if (wxPyConvertSwigPtr(pyo, (void **)&wxo, wxT("wxRealPoint"))) {
                 PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples");
-                wxPyEndBlockThreads();
+                wxPyEndBlockThreads(blocked);
                 return NULL;
             }
             list->Append((wxObject*) new wxRealPoint(*wxo));
         }
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return list;
 }
 
 //---------------------------------------------------------------------------
 
-PyObject*  wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) {
+PyObject*  wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source, bool setThisOwn) {
     PyObject* target = NULL;
 
     if (source && wxIsKindOf(source, wxShapeEvtHandler)) {
@@ -679,7 +1944,7 @@ PyObject*  wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) {
         }
     }
     if (! target) {
-        target = wxPyMake_wxObject2(source, FALSE);
+        target = wxPyMake_wxObject2(source, setThisOwn, false);
         if (target != Py_None)
             ((wxShapeEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target));
     }
@@ -688,6 +1953,27 @@ PyObject*  wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) {
 
 //---------------------------------------------------------------------------
 
+PyObject* wxPy_ConvertRealPointList(wxListBase* listbase) {
+    wxList*     list = (wxList*)listbase;
+    PyObject*   pyList;
+    PyObject*   pyObj;
+    wxObject*   wxObj;
+    wxNode*     node = list->GetFirst();
+    
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
+    pyList = PyList_New(0);
+    while (node) {
+        wxObj = node->GetData();
+        pyObj = wxPyConstructObject(wxObj, wxT("wxRealPoint"), 0);
+        PyList_Append(pyList, pyObj);
+        node = node->GetNext();
+    } 
+    wxPyEndBlockThreads(blocked);
+    return pyList;
+}
+
+//---------------------------------------------------------------------------
+
 PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
     wxList*     list = (wxList*)listbase;
     PyObject*   pyList;
@@ -695,15 +1981,15 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
     wxObject*   wxObj;
     wxNode*     node = list->GetFirst();
 
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     pyList = PyList_New(0);
     while (node) {
         wxObj = node->GetData();
-        pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj);
+        pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj, false);
         PyList_Append(pyList, pyObj);
         node = node->GetNext();
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return pyList;
 }
 
@@ -736,7 +2022,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPyTextShape, wxTextShape);
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_new_ShapeRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ShapeRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *result;
     char *kwnames[] = {
@@ -751,18 +2037,18 @@ static PyObject *_wrap_new_ShapeRegion(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxShapeRegion, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxShapeRegion, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -770,11 +2056,12 @@ static PyObject *_wrap_ShapeRegion_SetText(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetText",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -798,7 +2085,7 @@ static PyObject *_wrap_ShapeRegion_SetText(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -809,7 +2096,8 @@ static PyObject *_wrap_ShapeRegion_SetFont(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetFont",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxFont* temp;
         if (obj1) {
@@ -846,7 +2134,7 @@ static PyObject *_wrap_ShapeRegion_SetFont(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double arg2 ;
@@ -859,14 +2147,15 @@ static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetMinSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -882,7 +2171,7 @@ static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double arg2 ;
@@ -895,14 +2184,15 @@ static PyObject *_wrap_ShapeRegion_SetSize(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -918,7 +2208,7 @@ static PyObject *_wrap_ShapeRegion_SetSize(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double arg2 ;
@@ -931,14 +2221,15 @@ static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetPosition",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -954,7 +2245,7 @@ static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double arg2 ;
@@ -967,14 +2258,15 @@ static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetProportions",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -990,7 +2282,7 @@ static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     int arg2 ;
@@ -1001,10 +2293,11 @@ static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetFormatMode",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1020,11 +2313,11 @@ static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1032,11 +2325,12 @@ static PyObject *_wrap_ShapeRegion_SetName(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetName",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1060,11 +2354,11 @@ static PyObject *_wrap_ShapeRegion_SetName(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1072,11 +2366,12 @@ static PyObject *_wrap_ShapeRegion_SetColour(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1100,7 +2395,7 @@ static PyObject *_wrap_ShapeRegion_SetColour(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString result;
@@ -1110,7 +2405,8 @@ static PyObject *_wrap_ShapeRegion_GetText(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetText",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetText();
@@ -1131,7 +2427,7 @@ static PyObject *_wrap_ShapeRegion_GetText(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxFont *result;
@@ -1141,7 +2437,8 @@ static PyObject *_wrap_ShapeRegion_GetFont(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetFont",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxFont *)(arg1)->GetFont();
@@ -1149,29 +2446,32 @@ static PyObject *_wrap_ShapeRegion_GetFont(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetMinSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->GetMinSize(arg2,arg3);
@@ -1180,36 +2480,35 @@ static PyObject *_wrap_ShapeRegion_GetMinSize(PyObject *self, PyObject *args, Py
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetProportion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetProportion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetProportion",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->GetProportion(arg2,arg3);
@@ -1218,36 +2517,35 @@ static PyObject *_wrap_ShapeRegion_GetProportion(PyObject *self, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->GetSize(arg2,arg3);
@@ -1256,36 +2554,35 @@ static PyObject *_wrap_ShapeRegion_GetSize(PyObject *self, PyObject *args, PyObj
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPosition",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->GetPosition(arg2,arg3);
@@ -1294,21 +2591,17 @@ static PyObject *_wrap_ShapeRegion_GetPosition(PyObject *self, PyObject *args, P
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     int result;
@@ -1318,7 +2611,8 @@ static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetFormatMode",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetFormatMode();
@@ -1326,14 +2620,16 @@ static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString result;
@@ -1343,7 +2639,8 @@ static PyObject *_wrap_ShapeRegion_GetName(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetName",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetName();
@@ -1364,7 +2661,7 @@ static PyObject *_wrap_ShapeRegion_GetName(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString result;
@@ -1374,7 +2671,8 @@ static PyObject *_wrap_ShapeRegion_GetColour(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetColour",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetColour();
@@ -1395,7 +2693,7 @@ static PyObject *_wrap_ShapeRegion_GetColour(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxColour result;
@@ -1405,7 +2703,8 @@ static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetActualColourObject",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetActualColourObject();
@@ -1415,8 +2714,8 @@ static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObjec
     }
     {
         wxColour * resultptr;
-        resultptr = new wxColour((wxColour &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
+        resultptr = new wxColour((wxColour &)(result));
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);
     }
     return resultobj;
     fail:
@@ -1424,7 +2723,7 @@ static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxList *result;
@@ -1434,7 +2733,8 @@ static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetFormattedText",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {
@@ -1445,14 +2745,14 @@ static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxList, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxList, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetPenColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetPenColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString result;
@@ -1462,7 +2762,8 @@ static PyObject *_wrap_ShapeRegion_GetPenColour(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPenColour",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetPenColour();
@@ -1483,7 +2784,7 @@ static PyObject *_wrap_ShapeRegion_GetPenColour(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     int result;
@@ -1493,7 +2794,8 @@ static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPenStyle",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetPenStyle();
@@ -1501,14 +2803,16 @@ static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     int arg2 ;
@@ -1519,10 +2823,11 @@ static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetPenStyle",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1538,11 +2843,11 @@ static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1550,11 +2855,12 @@ static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetPenColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1578,7 +2884,7 @@ static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxPen *result;
@@ -1588,7 +2894,8 @@ static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetActualPen",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPen *)(arg1)->GetActualPen();
@@ -1596,14 +2903,14 @@ static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double result;
@@ -1613,7 +2920,8 @@ static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetWidth",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->GetWidth();
@@ -1621,14 +2929,16 @@ static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double result;
@@ -1638,7 +2948,8 @@ static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetHeight",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->GetHeight();
@@ -1646,14 +2957,16 @@ static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_ClearText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_ClearText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1662,7 +2975,8 @@ static PyObject *_wrap_ShapeRegion_ClearText(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_ClearText",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->ClearText();
@@ -1677,14 +2991,14 @@ static PyObject *_wrap_ShapeRegion_ClearText(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * ShapeRegion_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ShapeRegion_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxShapeRegion, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_AttachmentPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_AttachmentPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     double arg2 = (double) 0.0 ;
@@ -1700,20 +3014,20 @@ static PyObject *_wrap_new_AttachmentPoint(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_AttachmentPoint",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
         {
-            arg1 = (int) SWIG_PyObj_AsInt(obj0);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg1 = (int)(SWIG_As_int(obj0)); 
+            if (SWIG_arg_fail(1)) SWIG_fail;
         }
     }
     if (obj1) {
         {
-            arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (double)(SWIG_As_double(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     if (obj2) {
         {
-            arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (double)(SWIG_As_double(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -1723,14 +3037,14 @@ static PyObject *_wrap_new_AttachmentPoint(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAttachmentPoint, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxAttachmentPoint, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     int arg2 ;
@@ -1741,10 +3055,11 @@ static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_id_set",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxAttachmentPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (arg1) (arg1)->m_id = arg2;
     
@@ -1755,7 +3070,7 @@ static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     int result;
@@ -1765,17 +3080,20 @@ static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AttachmentPoint_m_id_get",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxAttachmentPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->m_id);
     
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     double arg2 ;
@@ -1786,10 +3104,11 @@ static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_x_set",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxAttachmentPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (arg1) (arg1)->m_x = arg2;
     
@@ -1800,7 +3119,7 @@ static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     double result;
@@ -1810,17 +3129,20 @@ static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AttachmentPoint_m_x_get",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxAttachmentPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (double) ((arg1)->m_x);
     
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     double arg2 ;
@@ -1831,10 +3153,11 @@ static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_y_set",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxAttachmentPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (arg1) (arg1)->m_y = arg2;
     
@@ -1845,7 +3168,7 @@ static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     double result;
@@ -1855,24 +3178,27 @@ static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AttachmentPoint_m_y_get",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxAttachmentPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (double) ((arg1)->m_y);
     
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * AttachmentPoint_swigregister(PyObject *self, PyObject *args) {
+static PyObject * AttachmentPoint_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxAttachmentPoint, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) NULL ;
     wxPyShape *arg2 = (wxPyShape *) NULL ;
@@ -1885,28 +3211,28 @@ static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyO
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyShapeEvtHandler",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(1)) SWIG_fail;
     }
     if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyShapeEvtHandler *)new wxPyShapeEvtHandler(arg1,arg2);
         
         wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        if (PyErr_Occurred()) SWIG_fail;
     }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeEvtHandler, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -1919,7 +3245,8 @@ static PyObject *_wrap_PyShapeEvtHandler__setCallbackInfo(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -1936,7 +3263,7 @@ static PyObject *_wrap_PyShapeEvtHandler__setCallbackInfo(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -1947,7 +3274,8 @@ static PyObject *_wrap_PyShapeEvtHandler__setOORInfo(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler__setOORInfo",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1963,7 +3291,7 @@ static PyObject *_wrap_PyShapeEvtHandler__setOORInfo(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_SetShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_SetShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -1974,8 +3302,10 @@ static PyObject *_wrap_PyShapeEvtHandler_SetShape(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_SetShape",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetShape(arg2);
@@ -1990,7 +3320,7 @@ static PyObject *_wrap_PyShapeEvtHandler_SetShape(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShape *result;
@@ -2000,7 +3330,8 @@ static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_GetShape",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyShape *)(arg1)->GetShape();
@@ -2009,7 +3340,7 @@ static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *self, PyObject *args
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -2017,7 +3348,7 @@ static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_SetPreviousHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_SetPreviousHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShapeEvtHandler *arg2 = (wxPyShapeEvtHandler *) 0 ;
@@ -2028,8 +3359,10 @@ static PyObject *_wrap_PyShapeEvtHandler_SetPreviousHandler(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_SetPreviousHandler",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetPreviousHandler(arg2);
@@ -2044,7 +3377,7 @@ static PyObject *_wrap_PyShapeEvtHandler_SetPreviousHandler(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShapeEvtHandler *result;
@@ -2054,7 +3387,8 @@ static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_GetPreviousHandler",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyShapeEvtHandler *)(arg1)->GetPreviousHandler();
@@ -2063,7 +3397,7 @@ static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *self, PyOb
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -2071,7 +3405,7 @@ static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShapeEvtHandler *result;
@@ -2081,7 +3415,8 @@ static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_CreateNewCopy",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyShapeEvtHandler *)(arg1)->CreateNewCopy();
@@ -2090,7 +3425,7 @@ static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *self, PyObject
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -2098,7 +3433,7 @@ static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2107,7 +3442,8 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDelete(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->base_OnDelete();
@@ -2122,7 +3458,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDelete(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2133,10 +3469,15 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDraw(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2152,7 +3493,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDraw(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2163,10 +3504,15 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawContents(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2182,11 +3528,11 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawContents(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) False ;
+    bool arg3 = (bool) false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -2195,15 +3541,20 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShapeEvtHandler_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -2220,7 +3571,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2231,10 +3582,15 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLinks(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2250,7 +3606,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLinks(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2261,10 +3617,15 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnErase(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2280,7 +3641,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnErase(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2291,10 +3652,15 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseContents(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2310,7 +3676,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseContents(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2321,10 +3687,15 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnHighlight(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2340,7 +3711,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnHighlight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2357,25 +3728,26 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -2392,7 +3764,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2409,25 +3781,26 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -2444,7 +3817,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2461,25 +3834,26 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -2496,7 +3870,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2509,14 +3883,15 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2532,7 +3907,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2540,7 +3915,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -2554,31 +3929,36 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShapeEvtHandler_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -2588,14 +3968,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2603,7 +3985,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *self, PyObjec
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -2616,31 +3998,36 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShapeEvtHandler_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -2657,7 +4044,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     bool arg2 ;
@@ -2676,29 +4063,30 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -2715,7 +4103,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2732,25 +4120,26 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -2767,7 +4156,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2784,25 +4173,26 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -2819,7 +4209,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     bool arg2 ;
@@ -2838,29 +4228,30 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -2877,7 +4268,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2894,25 +4285,26 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -2929,7 +4321,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2946,25 +4338,26 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -2981,7 +4374,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -3000,26 +4393,31 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShapeEvtHandler_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3035,7 +4433,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -3046,10 +4444,15 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawControlPoints(PyObject *self
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3065,7 +4468,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawControlPoints(PyObject *self
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -3076,10 +4479,15 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseControlPoints(PyObject *sel
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3095,11 +4503,11 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseControlPoints(PyObject *sel
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3108,15 +4516,20 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShapeEvtHandler_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -3133,7 +4546,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -3154,30 +4567,32 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyShapeEvtHandler_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -3194,7 +4609,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -3213,26 +4628,28 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *se
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -3249,7 +4666,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *se
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -3268,26 +4685,28 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *self
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -3304,7 +4723,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *self
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -3317,14 +4736,15 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3340,7 +4760,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -3353,14 +4773,15 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3376,14 +4797,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *self, PyObject
 }
 
 
-static PyObject * PyShapeEvtHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyShapeEvtHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyShapeEvtHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) NULL ;
     wxPyShape *result;
@@ -3394,7 +4815,8 @@ static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwa
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyShape",kwnames,&obj0)) goto fail;
     if (obj0) {
-        if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(1)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3403,16 +4825,14 @@ static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
-    }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShape, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -3425,7 +4845,8 @@ static PyObject *_wrap_PyShape__setCallbackInfo(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -3442,22 +4863,25 @@ static PyObject *_wrap_PyShape__setCallbackInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_GetBoundingBoxMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBoundingBoxMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBoundingBoxMax",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->GetBoundingBoxMax(arg2,arg3);
@@ -3466,36 +4890,35 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMax(PyObject *self, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetBoundingBoxMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBoundingBoxMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBoundingBoxMin",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->GetBoundingBoxMin(arg2,arg3);
@@ -3504,21 +4927,17 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMin(PyObject *self, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -3529,7 +4948,9 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args,
     double *arg7 = (double *) 0 ;
     bool result;
     double temp6 ;
+    int res6 = 0 ;
     double temp7 ;
+    int res7 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3539,25 +4960,26 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args,
         (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL 
     };
     
-    arg6 = &temp6;
-    arg7 = &temp7;
+    arg6 = &temp6; res6 = SWIG_NEWOBJ;
+    arg7 = &temp7; res7 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetPerimeterPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3566,22 +4988,20 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     {
-        PyObject *o = PyFloat_FromDouble((double) (*arg6));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg7));
-        resultobj = t_output_helper(resultobj,o);
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     }
+    resultobj = t_output_helper(resultobj, ((res6 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg6)) : SWIG_NewPointerObj((void*)(arg6), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res7 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg7)) : SWIG_NewPointerObj((void*)(arg7), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *result;
@@ -3591,7 +5011,8 @@ static PyObject *_wrap_PyShape_GetCanvas(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetCanvas",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyShapeCanvas *)(arg1)->GetCanvas();
@@ -3600,7 +5021,7 @@ static PyObject *_wrap_PyShape_GetCanvas(PyObject *self, PyObject *args, PyObjec
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 0); 
     }
     return resultobj;
     fail:
@@ -3608,7 +5029,7 @@ static PyObject *_wrap_PyShape_GetCanvas(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_SetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -3619,8 +5040,10 @@ static PyObject *_wrap_PyShape_SetCanvas(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetCanvas",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetCanvas(arg2);
@@ -3635,7 +5058,7 @@ static PyObject *_wrap_PyShape_SetCanvas(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_AddToCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AddToCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -3648,10 +5071,13 @@ static PyObject *_wrap_PyShape_AddToCanvas(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_AddToCanvas",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3667,7 +5093,7 @@ static PyObject *_wrap_PyShape_AddToCanvas(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_InsertInCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_InsertInCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -3678,8 +5104,10 @@ static PyObject *_wrap_PyShape_InsertInCanvas(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_InsertInCanvas",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->InsertInCanvas(arg2);
@@ -3694,7 +5122,7 @@ static PyObject *_wrap_PyShape_InsertInCanvas(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_RemoveFromCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_RemoveFromCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -3705,8 +5133,10 @@ static PyObject *_wrap_PyShape_RemoveFromCanvas(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_RemoveFromCanvas",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->RemoveFromCanvas(arg2);
@@ -3721,7 +5151,7 @@ static PyObject *_wrap_PyShape_RemoveFromCanvas(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double result;
@@ -3731,7 +5161,8 @@ static PyObject *_wrap_PyShape_GetX(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetX",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->GetX();
@@ -3739,14 +5170,16 @@ static PyObject *_wrap_PyShape_GetX(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double result;
@@ -3756,7 +5189,8 @@ static PyObject *_wrap_PyShape_GetY(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetY",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->GetY();
@@ -3764,14 +5198,16 @@ static PyObject *_wrap_PyShape_GetY(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -3782,10 +5218,11 @@ static PyObject *_wrap_PyShape_SetX(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetX",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3801,7 +5238,7 @@ static PyObject *_wrap_PyShape_SetX(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_SetY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -3812,10 +5249,11 @@ static PyObject *_wrap_PyShape_SetY(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetY",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3831,7 +5269,7 @@ static PyObject *_wrap_PyShape_SetY(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *result;
@@ -3841,7 +5279,8 @@ static PyObject *_wrap_PyShape_GetParent(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetParent",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyShape *)(arg1)->GetParent();
@@ -3850,7 +5289,7 @@ static PyObject *_wrap_PyShape_GetParent(PyObject *self, PyObject *args, PyObjec
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -3858,7 +5297,7 @@ static PyObject *_wrap_PyShape_GetParent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_SetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -3869,8 +5308,10 @@ static PyObject *_wrap_PyShape_SetParent(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetParent",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetParent(arg2);
@@ -3885,7 +5326,7 @@ static PyObject *_wrap_PyShape_SetParent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *result;
@@ -3895,7 +5336,8 @@ static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetTopAncestor",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyShape *)(arg1)->GetTopAncestor();
@@ -3904,7 +5346,7 @@ static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *self, PyObject *args, Py
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -3912,7 +5354,7 @@ static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_GetChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *result;
@@ -3922,7 +5364,8 @@ static PyObject *_wrap_PyShape_GetChildren(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetChildren",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPyShape_GetChildren(arg1);
@@ -3937,7 +5380,7 @@ static PyObject *_wrap_PyShape_GetChildren(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_Unlink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Unlink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3946,7 +5389,8 @@ static PyObject *_wrap_PyShape_Unlink(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Unlink",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Unlink();
@@ -3961,7 +5405,7 @@ static PyObject *_wrap_PyShape_Unlink(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -3972,10 +5416,11 @@ static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDrawHandles",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3991,7 +5436,7 @@ static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4001,7 +5446,8 @@ static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetDrawHandles",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetDrawHandles();
@@ -4009,14 +5455,16 @@ static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_MakeControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_MakeControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4025,7 +5473,8 @@ static PyObject *_wrap_PyShape_MakeControlPoints(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_MakeControlPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->MakeControlPoints();
@@ -4040,7 +5489,7 @@ static PyObject *_wrap_PyShape_MakeControlPoints(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_DeleteControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_DeleteControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = (wxDC *) NULL ;
@@ -4051,9 +5500,11 @@ static PyObject *_wrap_PyShape_DeleteControlPoints(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_DeleteControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4069,7 +5520,7 @@ static PyObject *_wrap_PyShape_DeleteControlPoints(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_ResetControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ResetControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4078,7 +5529,8 @@ static PyObject *_wrap_PyShape_ResetControlPoints(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ResetControlPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->ResetControlPoints();
@@ -4093,7 +5545,7 @@ static PyObject *_wrap_PyShape_ResetControlPoints(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_GetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeEvtHandler *result;
@@ -4103,7 +5555,8 @@ static PyObject *_wrap_PyShape_GetEventHandler(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetEventHandler",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyShapeEvtHandler *)(arg1)->GetEventHandler();
@@ -4112,7 +5565,7 @@ static PyObject *_wrap_PyShape_GetEventHandler(PyObject *self, PyObject *args, P
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -4120,7 +5573,7 @@ static PyObject *_wrap_PyShape_GetEventHandler(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_SetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeEvtHandler *arg2 = (wxPyShapeEvtHandler *) 0 ;
@@ -4131,8 +5584,10 @@ static PyObject *_wrap_PyShape_SetEventHandler(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetEventHandler",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetEventHandler(arg2);
@@ -4147,7 +5602,7 @@ static PyObject *_wrap_PyShape_SetEventHandler(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_MakeMandatoryControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_MakeMandatoryControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4156,7 +5611,8 @@ static PyObject *_wrap_PyShape_MakeMandatoryControlPoints(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_MakeMandatoryControlPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->MakeMandatoryControlPoints();
@@ -4171,7 +5627,7 @@ static PyObject *_wrap_PyShape_MakeMandatoryControlPoints(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_ResetMandatoryControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ResetMandatoryControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4180,7 +5636,8 @@ static PyObject *_wrap_PyShape_ResetMandatoryControlPoints(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ResetMandatoryControlPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->ResetMandatoryControlPoints();
@@ -4195,7 +5652,7 @@ static PyObject *_wrap_PyShape_ResetMandatoryControlPoints(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Recompute(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4205,7 +5662,8 @@ static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Recompute",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Recompute();
@@ -4213,14 +5671,16 @@ static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_CalculateSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_CalculateSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4229,7 +5689,8 @@ static PyObject *_wrap_PyShape_CalculateSize(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_CalculateSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->CalculateSize();
@@ -4244,10 +5705,10 @@ static PyObject *_wrap_PyShape_CalculateSize(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_Select(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Select(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
-    bool arg2 = (bool) True ;
+    bool arg2 = (bool) true ;
     wxDC *arg3 = (wxDC *) NULL ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -4257,15 +5718,17 @@ static PyObject *_wrap_PyShape_Select(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_Select",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
-            arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (bool)(SWIG_As_bool(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4281,11 +5744,11 @@ static PyObject *_wrap_PyShape_Select(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_SetHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
-    bool arg2 = (bool) True ;
-    bool arg3 = (bool) False ;
+    bool arg2 = (bool) true ;
+    bool arg3 = (bool) false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4294,17 +5757,18 @@ static PyObject *_wrap_PyShape_SetHighlight(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_SetHighlight",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
-            arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (bool)(SWIG_As_bool(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -4321,7 +5785,7 @@ static PyObject *_wrap_PyShape_SetHighlight(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_IsHighlighted(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4331,7 +5795,8 @@ static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_IsHighlighted",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->IsHighlighted();
@@ -4339,14 +5804,16 @@ static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Selected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4356,7 +5823,8 @@ static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Selected",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Selected();
@@ -4364,14 +5832,16 @@ static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AncestorSelected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4381,7 +5851,8 @@ static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_AncestorSelected",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->AncestorSelected();
@@ -4389,18 +5860,20 @@ static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) OP_ALL ;
-    bool arg3 = (bool) False ;
+    bool arg3 = (bool) false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4409,17 +5882,18 @@ static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_SetSensitivityFilter",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
-            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (int)(SWIG_As_int(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -4436,7 +5910,7 @@ static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -4446,7 +5920,8 @@ static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetSensitivityFilter",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetSensitivityFilter();
@@ -4454,18 +5929,20 @@ static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetDraggable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetDraggable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
-    bool arg3 = (bool) False ;
+    bool arg3 = (bool) false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4474,15 +5951,16 @@ static PyObject *_wrap_PyShape_SetDraggable(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetDraggable",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -4499,7 +5977,7 @@ static PyObject *_wrap_PyShape_SetDraggable(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_SetFixedSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetFixedSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4512,14 +5990,15 @@ static PyObject *_wrap_PyShape_SetFixedSize(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetFixedSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4535,22 +6014,25 @@ static PyObject *_wrap_PyShape_SetFixedSize(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_GetFixedSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFixedSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool *arg2 = (bool *) 0 ;
     bool *arg3 = (bool *) 0 ;
     bool temp2 ;
+    int res2 = 0 ;
     bool temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->GetFixedSize(arg2,arg3);
@@ -4559,21 +6041,17 @@ static PyObject *_wrap_PyShape_GetFixedSize(PyObject *self, PyObject *args, PyOb
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_bool((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_bool, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_bool((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_bool, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4583,7 +6061,8 @@ static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedWidth",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetFixedWidth();
@@ -4591,14 +6070,16 @@ static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4608,7 +6089,8 @@ static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedHeight",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetFixedHeight();
@@ -4616,14 +6098,16 @@ static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4634,10 +6118,11 @@ static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetSpaceAttachments",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4653,7 +6138,7 @@ static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4663,7 +6148,8 @@ static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetSpaceAttachments",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetSpaceAttachments();
@@ -4671,18 +6157,20 @@ static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetShadowMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetShadowMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) False ;
+    bool arg3 = (bool) false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4691,15 +6179,16 @@ static PyObject *_wrap_PyShape_SetShadowMode(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetShadowMode",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -4716,7 +6205,7 @@ static PyObject *_wrap_PyShape_SetShadowMode(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetShadowMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetShadowMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -4726,7 +6215,8 @@ static PyObject *_wrap_PyShape_GetShadowMode(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetShadowMode",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetShadowMode();
@@ -4734,14 +6224,16 @@ static PyObject *_wrap_PyShape_GetShadowMode(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -4750,7 +6242,9 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject
     double *arg5 = (double *) 0 ;
     bool result;
     int temp4 ;
+    int res4 = 0 ;
     double temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4758,17 +6252,18 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_HitTest",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4777,22 +6272,20 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     }
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetCentreResize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetCentreResize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4803,10 +6296,11 @@ static PyObject *_wrap_PyShape_SetCentreResize(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetCentreResize",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4822,7 +6316,7 @@ static PyObject *_wrap_PyShape_SetCentreResize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetCentreResize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4832,7 +6326,8 @@ static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetCentreResize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetCentreResize();
@@ -4840,14 +6335,16 @@ static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4858,10 +6355,11 @@ static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetMaintainAspectRatio",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4877,7 +6375,7 @@ static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4887,7 +6385,8 @@ static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetMaintainAspectRatio",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetMaintainAspectRatio();
@@ -4895,14 +6394,16 @@ static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *result;
@@ -4912,7 +6413,8 @@ static PyObject *_wrap_PyShape_GetLines(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetLines",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPyShape_GetLines(arg1);
@@ -4927,7 +6429,7 @@ static PyObject *_wrap_PyShape_GetLines(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4938,10 +6440,11 @@ static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDisableLabel",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4957,7 +6460,7 @@ static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4967,7 +6470,8 @@ static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetDisableLabel",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetDisableLabel();
@@ -4975,14 +6479,16 @@ static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -4993,10 +6499,11 @@ static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetAttachmentMode",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5012,7 +6519,7 @@ static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -5022,7 +6529,8 @@ static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetAttachmentMode",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetAttachmentMode();
@@ -5030,14 +6538,16 @@ static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     long arg2 ;
@@ -5048,10 +6558,11 @@ static PyObject *_wrap_PyShape_SetId(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetId",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (long) SWIG_PyObj_AsLong(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (long)(SWIG_As_long(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5067,7 +6578,7 @@ static PyObject *_wrap_PyShape_SetId(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     long result;
@@ -5077,7 +6588,8 @@ static PyObject *_wrap_PyShape_GetId(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetId",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (long)(arg1)->GetId();
@@ -5085,14 +6597,16 @@ static PyObject *_wrap_PyShape_GetId(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromLong((long)result);
+    {
+        resultobj = SWIG_From_long((long)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -5103,7 +6617,8 @@ static PyObject *_wrap_PyShape_SetPen(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetPen",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxPen* temp;
         if (obj1) {
@@ -5136,7 +6651,7 @@ static PyObject *_wrap_PyShape_SetPen(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_SetBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -5147,7 +6662,8 @@ static PyObject *_wrap_PyShape_SetBrush(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBrush",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxBrush* temp;
         if (obj1) {
@@ -5178,7 +6694,7 @@ static PyObject *_wrap_PyShape_SetBrush(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Show(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -5189,10 +6705,11 @@ static PyObject *_wrap_PyShape_Show(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Show",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5208,7 +6725,7 @@ static PyObject *_wrap_PyShape_Show(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_IsShown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -5218,7 +6735,8 @@ static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_IsShown",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->IsShown();
@@ -5226,20 +6744,22 @@ static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_Move(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Move(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
     double arg3 ;
     double arg4 ;
-    bool arg5 = (bool) True ;
+    bool arg5 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -5250,23 +6770,28 @@ static PyObject *_wrap_PyShape_Move(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShape_Move",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (bool) SWIG_PyObj_AsBool(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (bool)(SWIG_As_bool(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -5283,7 +6808,7 @@ static PyObject *_wrap_PyShape_Move(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_Erase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Erase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5294,10 +6819,15 @@ static PyObject *_wrap_PyShape_Erase(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Erase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5313,7 +6843,7 @@ static PyObject *_wrap_PyShape_Erase(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_EraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_EraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5324,10 +6854,15 @@ static PyObject *_wrap_PyShape_EraseContents(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_EraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5343,7 +6878,7 @@ static PyObject *_wrap_PyShape_EraseContents(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_Draw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Draw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5354,10 +6889,15 @@ static PyObject *_wrap_PyShape_Draw(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Draw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5373,7 +6913,7 @@ static PyObject *_wrap_PyShape_Draw(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_Flash(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Flash(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5382,7 +6922,8 @@ static PyObject *_wrap_PyShape_Flash(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Flash",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Flash();
@@ -5397,7 +6938,7 @@ static PyObject *_wrap_PyShape_Flash(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_MoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_MoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5408,10 +6949,15 @@ static PyObject *_wrap_PyShape_MoveLinks(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_MoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5427,7 +6973,7 @@ static PyObject *_wrap_PyShape_MoveLinks(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_DrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_DrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5438,10 +6984,15 @@ static PyObject *_wrap_PyShape_DrawContents(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_DrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5457,12 +7008,12 @@ static PyObject *_wrap_PyShape_DrawContents(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
     double arg3 ;
-    bool arg4 = (bool) True ;
+    bool arg4 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -5472,19 +7023,20 @@ static PyObject *_wrap_PyShape_SetSize(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShape_SetSize",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (bool) SWIG_PyObj_AsBool(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (bool)(SWIG_As_bool(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     {
@@ -5501,7 +7053,7 @@ static PyObject *_wrap_PyShape_SetSize(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -5514,14 +7066,15 @@ static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetAttachmentSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5537,7 +7090,7 @@ static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_Attach(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Attach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -5548,8 +7101,10 @@ static PyObject *_wrap_PyShape_Attach(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Attach",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Attach(arg2);
@@ -5564,7 +7119,7 @@ static PyObject *_wrap_PyShape_Attach(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_Detach(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5573,7 +7128,8 @@ static PyObject *_wrap_PyShape_Detach(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Detach",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Detach();
@@ -5588,7 +7144,7 @@ static PyObject *_wrap_PyShape_Detach(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Constrain(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -5598,7 +7154,8 @@ static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Constrain",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Constrain();
@@ -5606,14 +7163,16 @@ static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_AddLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AddLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyLineShape *arg2 = (wxPyLineShape *) 0 ;
@@ -5634,31 +7193,34 @@ static PyObject *_wrap_PyShape_AddLine(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:PyShape_AddLine",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(3)) SWIG_fail;
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -5675,7 +7237,7 @@ static PyObject *_wrap_PyShape_AddLine(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_GetLinePosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetLinePosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyLineShape *arg2 = (wxPyLineShape *) 0 ;
@@ -5687,8 +7249,10 @@ static PyObject *_wrap_PyShape_GetLinePosition(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetLinePosition",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetLinePosition(arg2);
@@ -5696,18 +7260,20 @@ static PyObject *_wrap_PyShape_GetLinePosition(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_AddText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AddText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5715,11 +7281,12 @@ static PyObject *_wrap_PyShape_AddText(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AddText",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5743,7 +7310,7 @@ static PyObject *_wrap_PyShape_AddText(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_GetPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPen *result;
@@ -5753,7 +7320,8 @@ static PyObject *_wrap_PyShape_GetPen(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetPen",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPen *)(arg1)->GetPen();
@@ -5761,14 +7329,14 @@ static PyObject *_wrap_PyShape_GetPen(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxBrush *result;
@@ -5778,7 +7346,8 @@ static PyObject *_wrap_PyShape_GetBrush(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBrush",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxBrush *)(arg1)->GetBrush();
@@ -5786,14 +7355,14 @@ static PyObject *_wrap_PyShape_GetBrush(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetDefaultRegionSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetDefaultRegionSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5802,7 +7371,8 @@ static PyObject *_wrap_PyShape_SetDefaultRegionSize(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_SetDefaultRegionSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetDefaultRegionSize();
@@ -5817,13 +7387,13 @@ static PyObject *_wrap_PyShape_SetDefaultRegionSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_FormatText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
     wxString *arg3 = 0 ;
     int arg4 = (int) 0 ;
-    bool temp3 = False ;
+    bool temp3 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -5833,20 +7403,25 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShape_FormatText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = True;
+        temp3 = true;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     {
@@ -5871,7 +7446,7 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_SetFormatMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetFormatMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -5884,15 +7459,16 @@ static PyObject *_wrap_PyShape_SetFormatMode(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetFormatMode",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (int) SWIG_PyObj_AsInt(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (int)(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -5909,7 +7485,7 @@ static PyObject *_wrap_PyShape_SetFormatMode(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetFormatMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFormatMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -5921,11 +7497,12 @@ static PyObject *_wrap_PyShape_GetFormatMode(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_GetFormatMode",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
-            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (int)(SWIG_As_int(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     {
@@ -5935,14 +7512,16 @@ static PyObject *_wrap_PyShape_GetFormatMode(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -5955,7 +7534,8 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetFont",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxFont* temp;
         if (obj1) {
@@ -5980,8 +7560,8 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject
     }
     if (obj2) {
         {
-            arg3 = (int) SWIG_PyObj_AsInt(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (int)(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -5998,7 +7578,7 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -6010,11 +7590,12 @@ static PyObject *_wrap_PyShape_GetFont(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_GetFont",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
-            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (int)(SWIG_As_int(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     {
@@ -6024,19 +7605,19 @@ static PyObject *_wrap_PyShape_GetFont(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 = (int) 0 ;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6045,16 +7626,17 @@ static PyObject *_wrap_PyShape_SetTextColour(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetTextColour",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     if (obj2) {
         {
-            arg3 = (int) SWIG_PyObj_AsInt(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (int)(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -6079,7 +7661,7 @@ static PyObject *_wrap_PyShape_SetTextColour(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -6091,11 +7673,12 @@ static PyObject *_wrap_PyShape_GetTextColour(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_GetTextColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
-            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (int)(SWIG_As_int(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     {
@@ -6118,7 +7701,7 @@ static PyObject *_wrap_PyShape_GetTextColour(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -6128,7 +7711,8 @@ static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetNumberOfTextRegions",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetNumberOfTextRegions();
@@ -6136,19 +7720,21 @@ static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetRegionName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetRegionName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 = (int) 0 ;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6157,16 +7743,17 @@ static PyObject *_wrap_PyShape_SetRegionName(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetRegionName",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     if (obj2) {
         {
-            arg3 = (int) SWIG_PyObj_AsInt(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (int)(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -6191,7 +7778,7 @@ static PyObject *_wrap_PyShape_SetRegionName(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetRegionName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetRegionName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6203,10 +7790,11 @@ static PyObject *_wrap_PyShape_GetRegionName(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetRegionName",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6228,12 +7816,12 @@ static PyObject *_wrap_PyShape_GetRegionName(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetRegionId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6241,11 +7829,12 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetRegionId",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6254,7 +7843,9 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     {
         if (temp2)
         delete arg2;
@@ -6269,12 +7860,12 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_NameRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_NameRegions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString const &arg2_defvalue = wxPyEmptyString ;
     wxString *arg2 = (wxString *) &arg2_defvalue ;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6282,12 +7873,13 @@ static PyObject *_wrap_PyShape_NameRegions(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_NameRegions",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = True;
+            temp2 = true;
         }
     }
     {
@@ -6312,7 +7904,7 @@ static PyObject *_wrap_PyShape_NameRegions(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_GetRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetRegions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *result;
@@ -6322,7 +7914,8 @@ static PyObject *_wrap_PyShape_GetRegions(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetRegions",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPyShape_GetRegions(arg1);
@@ -6337,7 +7930,7 @@ static PyObject *_wrap_PyShape_GetRegions(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_AddRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AddRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxShapeRegion *arg2 = (wxShapeRegion *) 0 ;
@@ -6348,8 +7941,10 @@ static PyObject *_wrap_PyShape_AddRegion(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AddRegion",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->AddRegion(arg2);
@@ -6364,7 +7959,7 @@ static PyObject *_wrap_PyShape_AddRegion(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_ClearRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ClearRegions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6373,7 +7968,8 @@ static PyObject *_wrap_PyShape_ClearRegions(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ClearRegions",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->ClearRegions();
@@ -6388,7 +7984,7 @@ static PyObject *_wrap_PyShape_ClearRegions(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_AssignNewIds(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AssignNewIds(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6397,7 +7993,8 @@ static PyObject *_wrap_PyShape_AssignNewIds(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_AssignNewIds",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->AssignNewIds();
@@ -6412,27 +8009,29 @@ static PyObject *_wrap_PyShape_AssignNewIds(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_FindRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_FindRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
     int *arg3 = (int *) 0 ;
     wxPyShape *result;
-    bool temp2 = False ;
+    bool temp2 = false ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "regionName", NULL 
     };
     
-    arg3 = &temp3;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_FindRegion",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6442,12 +8041,10 @@ static PyObject *_wrap_PyShape_FindRegion(PyObject *self, PyObject *args, PyObje
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     {
         if (temp2)
         delete arg2;
@@ -6462,7 +8059,7 @@ static PyObject *_wrap_PyShape_FindRegion(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_FindRegionNames(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_FindRegionNames(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxStringList *arg2 = 0 ;
@@ -6473,10 +8070,15 @@ static PyObject *_wrap_PyShape_FindRegionNames(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_FindRegionNames",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxStringList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxStringList, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxStringList");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6492,7 +8094,7 @@ static PyObject *_wrap_PyShape_FindRegionNames(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_ClearText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ClearText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -6503,11 +8105,12 @@ static PyObject *_wrap_PyShape_ClearText(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_ClearText",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
-            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (int)(SWIG_As_int(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     {
@@ -6524,7 +8127,7 @@ static PyObject *_wrap_PyShape_ClearText(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_RemoveLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_RemoveLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyLineShape *arg2 = (wxPyLineShape *) 0 ;
@@ -6535,8 +8138,10 @@ static PyObject *_wrap_PyShape_RemoveLine(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_RemoveLine",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->RemoveLine(arg2);
@@ -6551,7 +8156,7 @@ static PyObject *_wrap_PyShape_RemoveLine(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6562,7 +8167,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a
     wxPyLineShape *arg7 = (wxPyLineShape *) NULL ;
     bool result;
     double temp3 ;
+    int res3 = 0 ;
     double temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6572,28 +8179,30 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a
         (char *) "self",(char *) "attachment",(char *) "nth",(char *) "no_arcs",(char *) "line", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPosition",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj3) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj4) {
-        if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj4, (void **)&arg7, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(7)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6602,22 +8211,20 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
     {
-        PyObject *o = PyFloat_FromDouble((double) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -6627,7 +8234,8 @@ static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetNumberOfAttachments",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetNumberOfAttachments();
@@ -6635,14 +8243,16 @@ static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6654,10 +8264,11 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AttachmentIsValid",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6666,14 +8277,16 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *result;
@@ -6683,7 +8296,8 @@ static PyObject *_wrap_PyShape_GetAttachments(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetAttachments",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPyShape_GetAttachments(arg1);
@@ -6698,7 +8312,7 @@ static PyObject *_wrap_PyShape_GetAttachments(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6709,7 +8323,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec
     wxPyLineShape *arg7 = (wxPyLineShape *) NULL ;
     bool result;
     double temp3 ;
+    int res3 = 0 ;
     double temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6719,28 +8335,30 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec
         (char *) "self",(char *) "attachment",(char *) "nth",(char *) "no_arcs",(char *) "line", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPositionEdge",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj3) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj4) {
-        if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj4, (void **)&arg7, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(7)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6749,22 +8367,20 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
     {
-        PyObject *o = PyFloat_FromDouble((double) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxRealPoint *arg2 = 0 ;
@@ -6786,7 +8402,8 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_CalcSimpleAttachment",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -6796,14 +8413,15 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar
         if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail;
     }
     {
-        arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (int)(SWIG_As_int(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (int)(SWIG_As_int(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(6)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->CalcSimpleAttachment((wxRealPoint const &)*arg2,(wxRealPoint const &)*arg3,arg4,arg5,arg6);
@@ -6813,8 +8431,8 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar
     }
     {
         wxRealPoint * resultptr;
-        resultptr = new wxRealPoint((wxRealPoint &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1);
+        resultptr = new wxRealPoint((wxRealPoint &)(result));
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRealPoint, 1);
     }
     return resultobj;
     fail:
@@ -6822,7 +8440,7 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6840,10 +8458,11 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_AttachmentSortTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         arg3 = &temp3;
@@ -6860,19 +8479,21 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_EraseLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_EraseLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
     int arg3 = (int) -1 ;
-    bool arg4 = (bool) False ;
+    bool arg4 = (bool) false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6882,21 +8503,26 @@ static PyObject *_wrap_PyShape_EraseLinks(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:PyShape_EraseLinks",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (int) SWIG_PyObj_AsInt(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (int)(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     if (obj3) {
         {
-            arg4 = (bool) SWIG_PyObj_AsBool(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (bool)(SWIG_As_bool(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     {
@@ -6913,12 +8539,12 @@ static PyObject *_wrap_PyShape_EraseLinks(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_DrawLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_DrawLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
     int arg3 = (int) -1 ;
-    bool arg4 = (bool) False ;
+    bool arg4 = (bool) false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6928,21 +8554,26 @@ static PyObject *_wrap_PyShape_DrawLinks(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:PyShape_DrawLinks",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (int) SWIG_PyObj_AsInt(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (int)(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     if (obj3) {
         {
-            arg4 = (bool) SWIG_PyObj_AsBool(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (bool)(SWIG_As_bool(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     {
@@ -6959,7 +8590,7 @@ static PyObject *_wrap_PyShape_DrawLinks(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -6977,19 +8608,25 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_MoveLineToNewAttachment",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(3)) SWIG_fail;
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6998,14 +8635,16 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_ApplyAttachmentOrdering(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ApplyAttachmentOrdering(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -7016,7 +8655,8 @@ static PyObject *_wrap_PyShape_ApplyAttachmentOrdering(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_ApplyAttachmentOrdering",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7032,7 +8672,7 @@ static PyObject *_wrap_PyShape_ApplyAttachmentOrdering(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7044,10 +8684,11 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetBranchingAttachmentRoot",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7058,8 +8699,8 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *self, PyObje
     }
     {
         wxRealPoint * resultptr;
-        resultptr = new wxRealPoint((wxRealPoint &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1);
+        resultptr = new wxRealPoint((wxRealPoint &)(result));
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRealPoint, 1);
     }
     return resultobj;
     fail:
@@ -7067,7 +8708,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7091,10 +8732,11 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_GetBranchingAttachmentInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         arg3 = &temp3;
@@ -7119,14 +8761,16 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7146,14 +8790,15 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetBranchingAttachmentPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (int) SWIG_PyObj_AsInt(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (int)(SWIG_As_int(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         arg4 = &temp4;
@@ -7170,14 +8815,16 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7189,10 +8836,11 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetAttachmentLineCount",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7201,14 +8849,16 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7219,10 +8869,11 @@ static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchNeckLength",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7238,7 +8889,7 @@ static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -7248,7 +8899,8 @@ static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchNeckLength",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetBranchNeckLength();
@@ -7256,14 +8908,16 @@ static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7274,10 +8928,11 @@ static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStemLength",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7293,7 +8948,7 @@ static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -7303,7 +8958,8 @@ static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchStemLength",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetBranchStemLength();
@@ -7311,14 +8967,16 @@ static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7329,10 +8987,11 @@ static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchSpacing",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7348,7 +9007,7 @@ static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -7358,7 +9017,8 @@ static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchSpacing",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetBranchSpacing();
@@ -7366,14 +9026,16 @@ static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     long arg2 ;
@@ -7384,10 +9046,11 @@ static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStyle",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (long) SWIG_PyObj_AsLong(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (long)(SWIG_As_long(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7403,7 +9066,7 @@ static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     long result;
@@ -7413,7 +9076,8 @@ static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchStyle",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (long)(arg1)->GetBranchStyle();
@@ -7421,14 +9085,16 @@ static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromLong((long)result);
+    {
+        resultobj = SWIG_From_long((long)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7440,10 +9106,11 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_PhysicalToLogicalAttachment",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7452,14 +9119,16 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7471,10 +9140,11 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_LogicalToPhysicalAttachment",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7483,14 +9153,16 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Draggable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -7500,7 +9172,8 @@ static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Draggable",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Draggable();
@@ -7508,14 +9181,16 @@ static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_HasDescendant(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -7527,8 +9202,10 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_HasDescendant",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->HasDescendant(arg2);
@@ -7536,18 +9213,20 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
-    bool arg2 = (bool) True ;
-    bool arg3 = (bool) True ;
+    bool arg2 = (bool) true ;
+    bool arg3 = (bool) true ;
     wxPyShape *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -7557,17 +9236,18 @@ static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_CreateNewCopy",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
-            arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (bool)(SWIG_As_bool(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -7578,7 +9258,7 @@ static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *self, PyObject *args, PyO
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -7586,7 +9266,7 @@ static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Copy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *arg2 = 0 ;
@@ -7597,10 +9277,15 @@ static PyObject *_wrap_PyShape_Copy(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Copy",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxPyShape");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7616,7 +9301,7 @@ static PyObject *_wrap_PyShape_Copy(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_CopyWithHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_CopyWithHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *arg2 = 0 ;
@@ -7627,10 +9312,15 @@ static PyObject *_wrap_PyShape_CopyWithHandler(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_CopyWithHandler",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxPyShape");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7646,7 +9336,7 @@ static PyObject *_wrap_PyShape_CopyWithHandler(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_Rotate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Rotate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -7661,18 +9351,19 @@ static PyObject *_wrap_PyShape_Rotate(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7688,7 +9379,7 @@ static PyObject *_wrap_PyShape_Rotate(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_GetRotation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetRotation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double result;
@@ -7698,7 +9389,8 @@ static PyObject *_wrap_PyShape_GetRotation(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetRotation",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->GetRotation();
@@ -7706,14 +9398,16 @@ static PyObject *_wrap_PyShape_GetRotation(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetRotation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetRotation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -7724,10 +9418,11 @@ static PyObject *_wrap_PyShape_SetRotation(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetRotation",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7743,7 +9438,7 @@ static PyObject *_wrap_PyShape_SetRotation(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_ClearAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ClearAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7752,7 +9447,8 @@ static PyObject *_wrap_PyShape_ClearAttachments(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ClearAttachments",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->ClearAttachments();
@@ -7767,7 +9463,7 @@ static PyObject *_wrap_PyShape_ClearAttachments(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_Recentre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Recentre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -7778,10 +9474,15 @@ static PyObject *_wrap_PyShape_Recentre(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Recentre",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7797,7 +9498,7 @@ static PyObject *_wrap_PyShape_Recentre(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_ClearPointList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ClearPointList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxList *arg2 = 0 ;
@@ -7808,10 +9509,15 @@ static PyObject *_wrap_PyShape_ClearPointList(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_ClearPointList",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxList, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxList");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7827,7 +9533,7 @@ static PyObject *_wrap_PyShape_ClearPointList(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPen result;
@@ -7837,7 +9543,8 @@ static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBackgroundPen",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetBackgroundPen();
@@ -7847,8 +9554,8 @@ static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *self, PyObject *args,
     }
     {
         wxPen * resultptr;
-        resultptr = new wxPen((wxPen &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPen, 1);
+        resultptr = new wxPen((wxPen &)(result));
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPen, 1);
     }
     return resultobj;
     fail:
@@ -7856,7 +9563,7 @@ static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxBrush result;
@@ -7866,7 +9573,8 @@ static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBackgroundBrush",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetBackgroundBrush();
@@ -7876,8 +9584,8 @@ static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *self, PyObject *args
     }
     {
         wxBrush * resultptr;
-        resultptr = new wxBrush((wxBrush &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxBrush, 1);
+        resultptr = new wxBrush((wxBrush &)(result));
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxBrush, 1);
     }
     return resultobj;
     fail:
@@ -7885,7 +9593,7 @@ static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7894,7 +9602,8 @@ static PyObject *_wrap_PyShape_base_OnDelete(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->base_OnDelete();
@@ -7909,7 +9618,7 @@ static PyObject *_wrap_PyShape_base_OnDelete(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -7920,10 +9629,15 @@ static PyObject *_wrap_PyShape_base_OnDraw(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7939,7 +9653,7 @@ static PyObject *_wrap_PyShape_base_OnDraw(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -7950,10 +9664,15 @@ static PyObject *_wrap_PyShape_base_OnDrawContents(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7969,11 +9688,11 @@ static PyObject *_wrap_PyShape_base_OnDrawContents(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) False ;
+    bool arg3 = (bool) false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -7982,15 +9701,20 @@ static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -8007,7 +9731,7 @@ static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8018,10 +9742,15 @@ static PyObject *_wrap_PyShape_base_OnMoveLinks(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8037,7 +9766,7 @@ static PyObject *_wrap_PyShape_base_OnMoveLinks(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8048,10 +9777,15 @@ static PyObject *_wrap_PyShape_base_OnErase(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8067,7 +9801,7 @@ static PyObject *_wrap_PyShape_base_OnErase(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8078,10 +9812,15 @@ static PyObject *_wrap_PyShape_base_OnEraseContents(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8097,7 +9836,7 @@ static PyObject *_wrap_PyShape_base_OnEraseContents(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8108,10 +9847,15 @@ static PyObject *_wrap_PyShape_base_OnHighlight(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8127,7 +9871,7 @@ static PyObject *_wrap_PyShape_base_OnHighlight(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8144,25 +9888,26 @@ static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -8179,7 +9924,7 @@ static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8196,25 +9941,26 @@ static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -8231,7 +9977,7 @@ static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8248,25 +9994,26 @@ static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -8283,7 +10030,7 @@ static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8296,14 +10043,15 @@ static PyObject *_wrap_PyShape_base_OnSize(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8319,7 +10067,7 @@ static PyObject *_wrap_PyShape_base_OnSize(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8327,7 +10075,7 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -8341,31 +10089,36 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -8375,14 +10128,16 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8390,7 +10145,7 @@ static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *self, PyObject *args, P
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -8403,31 +10158,36 @@ static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -8444,7 +10204,7 @@ static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -8463,29 +10223,30 @@ static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -8502,7 +10263,7 @@ static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8519,25 +10280,26 @@ static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -8554,7 +10316,7 @@ static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8571,25 +10333,26 @@ static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -8606,7 +10369,7 @@ static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -8625,29 +10388,30 @@ static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -8664,7 +10428,7 @@ static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8681,25 +10445,26 @@ static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -8716,7 +10481,7 @@ static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8733,25 +10498,26 @@ static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -8768,7 +10534,7 @@ static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8787,26 +10553,31 @@ static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8822,7 +10593,7 @@ static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8833,10 +10604,15 @@ static PyObject *_wrap_PyShape_base_OnDrawControlPoints(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8852,7 +10628,7 @@ static PyObject *_wrap_PyShape_base_OnDrawControlPoints(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8863,10 +10639,15 @@ static PyObject *_wrap_PyShape_base_OnEraseControlPoints(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8882,11 +10663,11 @@ static PyObject *_wrap_PyShape_base_OnEraseControlPoints(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -8895,15 +10676,20 @@ static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -8920,7 +10706,7 @@ static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -8941,30 +10727,32 @@ static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -8981,7 +10769,7 @@ static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -9000,26 +10788,28 @@ static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -9036,7 +10826,7 @@ static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -9055,26 +10845,28 @@ static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -9091,7 +10883,7 @@ static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -9104,14 +10896,15 @@ static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9127,7 +10920,7 @@ static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -9140,14 +10933,15 @@ static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9163,14 +10957,14 @@ static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * PyShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PseudoMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PseudoMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *result;
     char *kwnames[] = {
@@ -9186,7 +10980,7 @@ static PyObject *_wrap_new_PseudoMetaFile(PyObject *self, PyObject *args, PyObje
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 1); 
     }
     return resultobj;
     fail:
@@ -9194,7 +10988,7 @@ static PyObject *_wrap_new_PseudoMetaFile(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_PseudoMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PseudoMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9203,7 +10997,8 @@ static PyObject *_wrap_delete_PseudoMetaFile(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PseudoMetaFile",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
@@ -9218,7 +11013,7 @@ static PyObject *_wrap_delete_PseudoMetaFile(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxDC *arg2 = 0 ;
@@ -9233,18 +11028,23 @@ static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_Draw",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9260,7 +11060,7 @@ static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9269,7 +11069,8 @@ static PyObject *_wrap_PseudoMetaFile_Clear(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_Clear",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Clear();
@@ -9284,7 +11085,7 @@ static PyObject *_wrap_PseudoMetaFile_Clear(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Copy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPseudoMetaFile *arg2 = 0 ;
@@ -9295,10 +11096,15 @@ static PyObject *_wrap_PseudoMetaFile_Copy(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_Copy",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxPseudoMetaFile");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9314,7 +11120,7 @@ static PyObject *_wrap_PseudoMetaFile_Copy(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9327,14 +11133,15 @@ static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9350,7 +11157,7 @@ static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9363,14 +11170,15 @@ static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_ScaleTo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9386,7 +11194,7 @@ static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9399,14 +11207,15 @@ static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9422,7 +11231,7 @@ static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9437,18 +11246,19 @@ static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9464,14 +11274,14 @@ static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxString *arg2 = 0 ;
     double *arg3 = (double *) 0 ;
     double *arg4 = (double *) 0 ;
     bool result;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -9481,14 +11291,17 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_LoadFromMetaFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_double, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(3)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj3, (void **)&arg4, SWIGTYPE_p_double, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(4)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->LoadFromMetaFile((wxString const &)*arg2,arg3,arg4);
@@ -9496,7 +11309,9 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -9511,7 +11326,7 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetBounds(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetBounds(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -9528,11 +11343,16 @@ static PyObject *_wrap_PseudoMetaFile_GetBounds(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PseudoMetaFile_GetBounds",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_double, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_double, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(3)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj3, (void **)&arg4, SWIGTYPE_p_double, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(4)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj4, (void **)&arg5, SWIGTYPE_p_double, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(5)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->GetBounds(arg2,arg3,arg4,arg5);
@@ -9547,7 +11367,7 @@ static PyObject *_wrap_PseudoMetaFile_GetBounds(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_CalculateSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_CalculateSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPyDrawnShape *arg2 = (wxPyDrawnShape *) 0 ;
@@ -9558,8 +11378,10 @@ static PyObject *_wrap_PseudoMetaFile_CalculateSize(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_CalculateSize",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->CalculateSize(arg2);
@@ -9574,7 +11396,7 @@ static PyObject *_wrap_PseudoMetaFile_CalculateSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     bool arg2 ;
@@ -9585,10 +11407,11 @@ static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetRotateable",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9604,7 +11427,7 @@ static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     bool result;
@@ -9614,7 +11437,8 @@ static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetRotateable",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetRotateable();
@@ -9622,14 +11446,16 @@ static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9642,14 +11468,15 @@ static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9665,7 +11492,7 @@ static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetFillBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetFillBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -9676,7 +11503,8 @@ static PyObject *_wrap_PseudoMetaFile_SetFillBrush(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetFillBrush",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxBrush* temp;
         if (obj1) {
@@ -9707,7 +11535,7 @@ static PyObject *_wrap_PseudoMetaFile_SetFillBrush(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxBrush *result;
@@ -9717,7 +11545,8 @@ static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetFillBrush",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxBrush *)(arg1)->GetFillBrush();
@@ -9725,14 +11554,14 @@ static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetOutlinePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetOutlinePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -9743,7 +11572,8 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlinePen(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetOutlinePen",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxPen* temp;
         if (obj1) {
@@ -9776,7 +11606,7 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlinePen(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPen *result;
@@ -9786,7 +11616,8 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetOutlinePen",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPen *)(arg1)->GetOutlinePen();
@@ -9794,14 +11625,14 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
@@ -9812,10 +11643,11 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetOutlineOp",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9831,7 +11663,7 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int result;
@@ -9841,7 +11673,8 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetOutlineOp",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetOutlineOp();
@@ -9849,14 +11682,16 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     bool result;
@@ -9866,7 +11701,8 @@ static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_IsValid",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->IsValid();
@@ -9874,14 +11710,16 @@ static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -9896,7 +11734,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawLine(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawLine",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -9919,7 +11758,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawLine(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -9931,7 +11770,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawRectangle(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawRectangle",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
@@ -9950,7 +11790,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawRectangle(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -9964,14 +11804,15 @@ static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9987,7 +11828,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawArc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawArc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -10005,7 +11846,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawArc(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_DrawArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -10032,7 +11874,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawArc(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -10048,18 +11890,19 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10075,7 +11918,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawEllipse(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawEllipse(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -10087,7 +11930,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipse(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawEllipse",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
@@ -10106,7 +11950,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipse(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -10118,7 +11962,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawPoint(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawPoint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -10137,12 +11982,12 @@ static PyObject *_wrap_PseudoMetaFile_DrawPoint(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxString *arg2 = 0 ;
     wxPoint *arg3 = 0 ;
-    bool temp2 = False ;
+    bool temp2 = false ;
     wxPoint temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -10152,11 +11997,12 @@ static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawText",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         arg3 = &temp3;
@@ -10184,25 +12030,24 @@ static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
     wxPoint *arg3 = (wxPoint *) 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
-    PyObject * obj2 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "PCOUNT",(char *) "points", NULL 
+        (char *) "self",(char *) "points", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawLines",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawLines",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = wxPoint_LIST_helper(obj1, &arg2);
+        if (arg3 == NULL) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawLines(arg2,arg3);
@@ -10211,13 +12056,19 @@ static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *self, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        if (arg3) delete [] arg3;
+    }
     return resultobj;
     fail:
+    {
+        if (arg3) delete [] arg3;
+    }
     return NULL;
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
@@ -10226,22 +12077,21 @@ static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *self, PyObject *args
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
-    PyObject * obj3 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL 
+        (char *) "self",(char *) "points",(char *) "flags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PseudoMetaFile_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PseudoMetaFile_DrawPolygon",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = wxPoint_LIST_helper(obj1, &arg2);
+        if (arg3 == NULL) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (obj3) {
+    if (obj2) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     {
@@ -10252,31 +12102,36 @@ static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *self, PyObject *args
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        if (arg3) delete [] arg3;
+    }
     return resultobj;
     fail:
+    {
+        if (arg3) delete [] arg3;
+    }
     return NULL;
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
     wxPoint *arg3 = (wxPoint *) 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
-    PyObject * obj2 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "PCOUNT",(char *) "points", NULL 
+        (char *) "self",(char *) "points", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawSpline",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawSpline",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = wxPoint_LIST_helper(obj1, &arg2);
+        if (arg3 == NULL) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawSpline(arg2,arg3);
@@ -10285,13 +12140,19 @@ static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *self, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        if (arg3) delete [] arg3;
+    }
     return resultobj;
     fail:
+    {
+        if (arg3) delete [] arg3;
+    }
     return NULL;
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -10303,7 +12164,8 @@ static PyObject *_wrap_PseudoMetaFile_SetClippingRect(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetClippingRect",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
@@ -10322,7 +12184,7 @@ static PyObject *_wrap_PseudoMetaFile_SetClippingRect(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DestroyClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DestroyClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10331,7 +12193,8 @@ static PyObject *_wrap_PseudoMetaFile_DestroyClippingRect(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_DestroyClippingRect",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DestroyClippingRect();
@@ -10346,7 +12209,7 @@ static PyObject *_wrap_PseudoMetaFile_DestroyClippingRect(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -10359,7 +12222,8 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PseudoMetaFile_SetPen",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxPen* temp;
         if (obj1) {
@@ -10380,8 +12244,8 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyO
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -10398,7 +12262,7 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -10411,7 +12275,8 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PseudoMetaFile_SetBrush",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxBrush* temp;
         if (obj1) {
@@ -10430,8 +12295,8 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, P
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -10448,7 +12313,7 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -10459,7 +12324,8 @@ static PyObject *_wrap_PseudoMetaFile_SetFont(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetFont",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxFont* temp;
         if (obj1) {
@@ -10496,7 +12362,7 @@ static PyObject *_wrap_PseudoMetaFile_SetFont(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxColour *arg2 = 0 ;
@@ -10508,7 +12374,8 @@ static PyObject *_wrap_PseudoMetaFile_SetTextColour(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetTextColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
@@ -10527,7 +12394,7 @@ static PyObject *_wrap_PseudoMetaFile_SetTextColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxColour *arg2 = 0 ;
@@ -10539,7 +12406,8 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundColour(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetBackgroundColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
@@ -10558,7 +12426,7 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundColour(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
@@ -10569,10 +12437,11 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetBackgroundMode",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10588,14 +12457,14 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *self, PyObject
 }
 
 
-static PyObject * PseudoMetaFile_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PseudoMetaFile_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPseudoMetaFile, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyRectangleShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -10609,14 +12478,14 @@ static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyRectangleShape",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
-            arg1 = (double) SWIG_PyObj_AsDouble(obj0);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg1 = (double)(SWIG_As_double(obj0)); 
+            if (SWIG_arg_fail(1)) SWIG_fail;
         }
     }
     if (obj1) {
         {
-            arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (double)(SWIG_As_double(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     {
@@ -10626,14 +12495,14 @@ static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyRectangleShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyRectangleShape, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyRectangleShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -10646,7 +12515,8 @@ static PyObject *_wrap_PyRectangleShape__setCallbackInfo(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -10663,7 +12533,7 @@ static PyObject *_wrap_PyRectangleShape__setCallbackInfo(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -10674,10 +12544,11 @@ static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10693,7 +12564,7 @@ static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double result;
@@ -10703,7 +12574,8 @@ static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyRectangleShape_GetCornerRadius",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->GetCornerRadius();
@@ -10711,14 +12583,16 @@ static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10727,7 +12601,8 @@ static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyRectangleShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->base_OnDelete();
@@ -10742,7 +12617,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10753,10 +12628,15 @@ static PyObject *_wrap_PyRectangleShape_base_OnDraw(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10772,7 +12652,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDraw(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10783,10 +12663,15 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawContents(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10802,7 +12687,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawContents(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10815,15 +12700,20 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyRectangleShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -10840,7 +12730,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10851,10 +12741,15 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLinks(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10870,7 +12765,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLinks(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10881,10 +12776,15 @@ static PyObject *_wrap_PyRectangleShape_base_OnErase(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10900,7 +12800,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnErase(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10911,10 +12811,15 @@ static PyObject *_wrap_PyRectangleShape_base_OnEraseContents(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10930,7 +12835,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnEraseContents(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10941,10 +12846,15 @@ static PyObject *_wrap_PyRectangleShape_base_OnHighlight(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10960,7 +12870,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnHighlight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -10977,25 +12887,26 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -11012,7 +12923,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11029,25 +12940,26 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -11064,7 +12976,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11081,25 +12993,26 @@ static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -11116,7 +13029,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11129,14 +13042,15 @@ static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11152,7 +13066,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11160,7 +13074,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -11174,31 +13088,36 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyRectangleShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -11208,14 +13127,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11223,7 +13144,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *self, PyObject
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11236,31 +13157,36 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyRectangleShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -11277,7 +13203,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     bool arg2 ;
@@ -11296,29 +13222,30 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -11335,7 +13262,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11352,25 +13279,26 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -11387,7 +13315,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11404,25 +13332,26 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -11439,7 +13368,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     bool arg2 ;
@@ -11458,29 +13387,30 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -11497,7 +13427,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11514,25 +13444,26 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -11549,7 +13480,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11566,25 +13497,26 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -11601,7 +13533,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11620,26 +13552,31 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyRectangleShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11655,7 +13592,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11666,10 +13603,15 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawControlPoints(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11685,7 +13627,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11696,10 +13638,15 @@ static PyObject *_wrap_PyRectangleShape_base_OnEraseControlPoints(PyObject *self
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11715,11 +13662,11 @@ static PyObject *_wrap_PyRectangleShape_base_OnEraseControlPoints(PyObject *self
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11728,15 +13675,20 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyRectangleShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -11753,7 +13705,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -11774,30 +13726,32 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyRectangleShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -11814,7 +13768,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -11833,26 +13787,28 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *sel
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -11869,7 +13825,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *sel
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -11888,26 +13844,28 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -11924,7 +13882,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11937,14 +13895,15 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11960,7 +13919,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11973,14 +13932,15 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11996,14 +13956,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *self, PyObject
 }
 
 
-static PyObject * PyRectangleShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyRectangleShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyRectangleShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyControlPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyControlPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) NULL ;
     wxPyShape *arg2 = (wxPyShape *) NULL ;
@@ -12024,33 +13984,35 @@ static PyObject *_wrap_new_PyControlPoint(PyObject *self, PyObject *args, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_PyControlPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if (obj0) {
-        if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(1)) SWIG_fail;
     }
     if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (double)(SWIG_As_double(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     if (obj3) {
         {
-            arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (double)(SWIG_As_double(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (double)(SWIG_As_double(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -12060,14 +14022,14 @@ static PyObject *_wrap_new_PyControlPoint(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyControlPoint, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyControlPoint, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyControlPoint__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -12080,7 +14042,8 @@ static PyObject *_wrap_PyControlPoint__setCallbackInfo(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -12097,7 +14060,7 @@ static PyObject *_wrap_PyControlPoint__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12108,10 +14071,11 @@ static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12127,7 +14091,7 @@ static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12136,7 +14100,8 @@ static PyObject *_wrap_PyControlPoint_base_OnDelete(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControlPoint_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->base_OnDelete();
@@ -12151,7 +14116,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDelete(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12162,10 +14127,15 @@ static PyObject *_wrap_PyControlPoint_base_OnDraw(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12181,7 +14151,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDraw(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12192,10 +14162,15 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawContents(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12211,7 +14186,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawContents(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12224,15 +14199,20 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyControlPoint_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -12249,7 +14229,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12260,10 +14240,15 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLinks(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12279,7 +14264,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLinks(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12290,10 +14275,15 @@ static PyObject *_wrap_PyControlPoint_base_OnErase(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12309,7 +14299,7 @@ static PyObject *_wrap_PyControlPoint_base_OnErase(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12320,10 +14310,15 @@ static PyObject *_wrap_PyControlPoint_base_OnEraseContents(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12339,7 +14334,7 @@ static PyObject *_wrap_PyControlPoint_base_OnEraseContents(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12350,10 +14345,15 @@ static PyObject *_wrap_PyControlPoint_base_OnHighlight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12369,7 +14369,7 @@ static PyObject *_wrap_PyControlPoint_base_OnHighlight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12386,25 +14386,26 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -12421,7 +14422,7 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12438,25 +14439,26 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -12473,7 +14475,7 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12490,25 +14492,26 @@ static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -12525,7 +14528,7 @@ static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12538,14 +14541,15 @@ static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12561,7 +14565,7 @@ static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12569,7 +14573,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -12583,31 +14587,36 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyControlPoint_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -12617,14 +14626,16 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12632,7 +14643,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *self, PyObject *
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -12645,31 +14656,36 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyControlPoint_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -12686,7 +14702,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     bool arg2 ;
@@ -12705,29 +14721,30 @@ static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -12744,7 +14761,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12761,25 +14778,26 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -12796,7 +14814,7 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12813,25 +14831,26 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -12848,7 +14867,7 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     bool arg2 ;
@@ -12867,29 +14886,30 @@ static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -12906,7 +14926,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12923,25 +14943,26 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -12958,7 +14979,7 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12975,25 +14996,26 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -13010,7 +15032,7 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13029,26 +15051,31 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyControlPoint_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13064,7 +15091,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13075,10 +15102,15 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawControlPoints(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13094,7 +15126,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawControlPoints(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13105,10 +15137,15 @@ static PyObject *_wrap_PyControlPoint_base_OnEraseControlPoints(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13124,11 +15161,11 @@ static PyObject *_wrap_PyControlPoint_base_OnEraseControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -13137,15 +15174,20 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyControlPoint_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -13162,7 +15204,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -13183,30 +15225,32 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyControlPoint_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -13223,7 +15267,7 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -13242,26 +15286,28 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -13278,7 +15324,7 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -13297,26 +15343,28 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -13333,7 +15381,7 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -13346,14 +15394,15 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13369,7 +15418,7 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -13382,14 +15431,15 @@ static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13405,14 +15455,14 @@ static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject * PyControlPoint_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyControlPoint_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyControlPoint, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyBitmapShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyBitmapShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *result;
     char *kwnames[] = {
@@ -13427,14 +15477,14 @@ static PyObject *_wrap_new_PyBitmapShape(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyBitmapShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyBitmapShape, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyBitmapShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -13447,7 +15497,8 @@ static PyObject *_wrap_PyBitmapShape__setCallbackInfo(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -13464,7 +15515,7 @@ static PyObject *_wrap_PyBitmapShape__setCallbackInfo(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxBitmap *result;
@@ -13474,7 +15525,8 @@ static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyBitmapShape_GetBitmap",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {
@@ -13485,14 +15537,17 @@ static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBitmap, 0);
+    {
+        wxBitmap* resultptr = new wxBitmap(*result);
+        resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBitmap, 1);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyBitmapShape_GetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_GetFilename(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxString result;
@@ -13502,7 +15557,8 @@ static PyObject *_wrap_PyBitmapShape_GetFilename(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyBitmapShape_GetFilename",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetFilename();
@@ -13523,7 +15579,7 @@ static PyObject *_wrap_PyBitmapShape_GetFilename(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyBitmapShape_SetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_SetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -13534,10 +15590,15 @@ static PyObject *_wrap_PyBitmapShape_SetBitmap(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_SetBitmap",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxBitmap");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13553,11 +15614,11 @@ static PyObject *_wrap_PyBitmapShape_SetBitmap(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -13565,11 +15626,12 @@ static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_SetFilename",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13593,7 +15655,7 @@ static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13602,7 +15664,8 @@ static PyObject *_wrap_PyBitmapShape_base_OnDelete(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyBitmapShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->base_OnDelete();
@@ -13617,7 +15680,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDelete(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13628,10 +15691,15 @@ static PyObject *_wrap_PyBitmapShape_base_OnDraw(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13647,7 +15715,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDraw(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13658,10 +15726,15 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawContents(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13677,7 +15750,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawContents(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13690,15 +15763,20 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyBitmapShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -13715,7 +15793,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13726,10 +15804,15 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLinks(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13745,7 +15828,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLinks(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13756,10 +15839,15 @@ static PyObject *_wrap_PyBitmapShape_base_OnErase(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13775,7 +15863,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnErase(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13786,10 +15874,15 @@ static PyObject *_wrap_PyBitmapShape_base_OnEraseContents(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13805,7 +15898,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnEraseContents(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13816,10 +15909,15 @@ static PyObject *_wrap_PyBitmapShape_base_OnHighlight(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13835,7 +15933,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnHighlight(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -13852,25 +15950,26 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -13887,7 +15986,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -13904,25 +16003,26 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -13939,7 +16039,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -13956,25 +16056,26 @@ static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -13991,7 +16092,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14004,14 +16105,15 @@ static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14027,7 +16129,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14035,7 +16137,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -14049,31 +16151,36 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyBitmapShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -14083,14 +16190,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14098,7 +16207,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *self, PyObject *a
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -14111,31 +16220,36 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyBitmapShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -14152,7 +16266,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     bool arg2 ;
@@ -14171,29 +16285,30 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -14210,7 +16325,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14227,25 +16342,26 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -14262,7 +16378,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14279,25 +16395,26 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -14314,7 +16431,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     bool arg2 ;
@@ -14333,29 +16450,30 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -14372,7 +16490,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14389,25 +16507,26 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -14424,7 +16543,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14441,25 +16560,26 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -14476,7 +16596,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14495,26 +16615,31 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyBitmapShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14530,7 +16655,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14541,10 +16666,15 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawControlPoints(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14560,7 +16690,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawControlPoints(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14571,10 +16701,15 @@ static PyObject *_wrap_PyBitmapShape_base_OnEraseControlPoints(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14590,11 +16725,11 @@ static PyObject *_wrap_PyBitmapShape_base_OnEraseControlPoints(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -14603,15 +16738,20 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyBitmapShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -14628,7 +16768,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -14649,30 +16789,32 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyBitmapShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -14689,7 +16831,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -14708,26 +16850,28 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -14744,7 +16888,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -14763,26 +16907,28 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -14799,7 +16945,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14812,14 +16958,15 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14835,7 +16982,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14848,14 +16995,15 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14871,14 +17019,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * PyBitmapShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyBitmapShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyBitmapShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyDrawnShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyDrawnShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *result;
     char *kwnames[] = {
@@ -14893,14 +17041,14 @@ static PyObject *_wrap_new_PyDrawnShape(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyDrawnShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDrawnShape, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDrawnShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -14913,7 +17061,8 @@ static PyObject *_wrap_PyDrawnShape__setCallbackInfo(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -14930,7 +17079,7 @@ static PyObject *_wrap_PyDrawnShape__setCallbackInfo(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_CalculateSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_CalculateSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14939,7 +17088,8 @@ static PyObject *_wrap_PyDrawnShape_CalculateSize(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_CalculateSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->CalculateSize();
@@ -14954,7 +17104,7 @@ static PyObject *_wrap_PyDrawnShape_CalculateSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DestroyClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DestroyClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14963,7 +17113,8 @@ static PyObject *_wrap_PyDrawnShape_DestroyClippingRect(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_DestroyClippingRect",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DestroyClippingRect();
@@ -14978,7 +17129,7 @@ static PyObject *_wrap_PyDrawnShape_DestroyClippingRect(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawArc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawArc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -14996,7 +17147,8 @@ static PyObject *_wrap_PyDrawnShape_DrawArc(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_DrawArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -15023,7 +17175,7 @@ static PyObject *_wrap_PyDrawnShape_DrawArc(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
@@ -15034,10 +17186,11 @@ static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawAtAngle",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15053,7 +17206,7 @@ static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxRect *arg2 = 0 ;
@@ -15069,18 +17222,19 @@ static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15096,7 +17250,7 @@ static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -15111,7 +17265,8 @@ static PyObject *_wrap_PyDrawnShape_DrawLine(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawLine",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -15134,25 +17289,24 @@ static PyObject *_wrap_PyDrawnShape_DrawLine(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
     wxPoint *arg3 = (wxPoint *) 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
-    PyObject * obj2 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "PCOUNT",(char *) "points", NULL 
+        (char *) "self",(char *) "points", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawLines",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawLines",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = wxPoint_LIST_helper(obj1, &arg2);
+        if (arg3 == NULL) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawLines(arg2,arg3);
@@ -15161,13 +17315,19 @@ static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *self, PyObject *args, Py
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        if (arg3) delete [] arg3;
+    }
     return resultobj;
     fail:
+    {
+        if (arg3) delete [] arg3;
+    }
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -15179,7 +17339,8 @@ static PyObject *_wrap_PyDrawnShape_DrawPoint(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawPoint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -15198,7 +17359,7 @@ static PyObject *_wrap_PyDrawnShape_DrawPoint(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
@@ -15207,22 +17368,21 @@ static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *self, PyObject *args,
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
-    PyObject * obj3 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL 
+        (char *) "self",(char *) "points",(char *) "flags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyDrawnShape_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_DrawPolygon",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = wxPoint_LIST_helper(obj1, &arg2);
+        if (arg3 == NULL) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (obj3) {
+    if (obj2) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     {
@@ -15233,13 +17393,19 @@ static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *self, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        if (arg3) delete [] arg3;
+    }
     return resultobj;
     fail:
+    {
+        if (arg3) delete [] arg3;
+    }
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxRect *arg2 = 0 ;
@@ -15251,7 +17417,8 @@ static PyObject *_wrap_PyDrawnShape_DrawRectangle(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawRectangle",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
@@ -15270,7 +17437,7 @@ static PyObject *_wrap_PyDrawnShape_DrawRectangle(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxRect *arg2 = 0 ;
@@ -15284,14 +17451,15 @@ static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15307,25 +17475,24 @@ static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
     wxPoint *arg3 = (wxPoint *) 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
-    PyObject * obj2 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "PCOUNT",(char *) "points", NULL 
+        (char *) "self",(char *) "points", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawSpline",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawSpline",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = wxPoint_LIST_helper(obj1, &arg2);
+        if (arg3 == NULL) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawSpline(arg2,arg3);
@@ -15334,18 +17501,24 @@ static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *self, PyObject *args, P
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        if (arg3) delete [] arg3;
+    }
     return resultobj;
     fail:
+    {
+        if (arg3) delete [] arg3;
+    }
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxString *arg2 = 0 ;
     wxPoint *arg3 = 0 ;
-    bool temp2 = False ;
+    bool temp2 = false ;
     wxPoint temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -15355,11 +17528,12 @@ static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawText",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         arg3 = &temp3;
@@ -15387,7 +17561,7 @@ static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int result;
@@ -15397,7 +17571,8 @@ static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_GetAngle",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetAngle();
@@ -15405,14 +17580,16 @@ static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPseudoMetaFile *result;
@@ -15422,7 +17599,8 @@ static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_GetMetaFile",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {
@@ -15433,14 +17611,14 @@ static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPseudoMetaFile, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPseudoMetaFile, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double result;
@@ -15450,7 +17628,8 @@ static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_GetRotation",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->GetRotation();
@@ -15458,19 +17637,21 @@ static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -15478,11 +17659,12 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_LoadFromMetaFile",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15491,7 +17673,9 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -15506,7 +17690,7 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -15521,18 +17705,19 @@ static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15548,7 +17733,7 @@ static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxRect *arg2 = 0 ;
@@ -15560,7 +17745,8 @@ static PyObject *_wrap_PyDrawnShape_SetClippingRect(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetClippingRect",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
@@ -15579,7 +17765,7 @@ static PyObject *_wrap_PyDrawnShape_SetClippingRect(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxColour *arg2 = 0 ;
@@ -15591,7 +17777,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundColour(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnBackgroundColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
@@ -15610,7 +17797,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundColour(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
@@ -15621,10 +17808,11 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnBackgroundMode",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15640,7 +17828,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -15653,7 +17841,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_SetDrawnBrush",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxBrush* temp;
         if (obj1) {
@@ -15672,8 +17861,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -15690,7 +17879,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -15701,7 +17890,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnFont(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnFont",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxFont* temp;
         if (obj1) {
@@ -15738,7 +17928,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnFont(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -15751,7 +17941,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_SetDrawnPen",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxPen* temp;
         if (obj1) {
@@ -15772,8 +17963,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args,
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -15790,7 +17981,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxColour *arg2 = 0 ;
@@ -15802,7 +17993,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnTextColour(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnTextColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
@@ -15821,7 +18013,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnTextColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_Scale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_Scale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -15834,14 +18026,15 @@ static PyObject *_wrap_PyDrawnShape_Scale(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15857,7 +18050,7 @@ static PyObject *_wrap_PyDrawnShape_Scale(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     bool arg2 ;
@@ -15868,10 +18061,11 @@ static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetSaveToFile",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15887,7 +18081,7 @@ static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDrawnShape_Translate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_Translate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -15900,14 +18094,15 @@ static PyObject *_wrap_PyDrawnShape_Translate(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15923,7 +18118,7 @@ static PyObject *_wrap_PyDrawnShape_Translate(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15932,7 +18127,8 @@ static PyObject *_wrap_PyDrawnShape_base_OnDelete(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->base_OnDelete();
@@ -15947,7 +18143,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDelete(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15958,10 +18154,15 @@ static PyObject *_wrap_PyDrawnShape_base_OnDraw(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15977,7 +18178,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDraw(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15988,10 +18189,15 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawContents(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16007,7 +18213,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawContents(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16020,15 +18226,20 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -16045,7 +18256,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16056,10 +18267,15 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLinks(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16075,7 +18291,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLinks(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16086,10 +18302,15 @@ static PyObject *_wrap_PyDrawnShape_base_OnErase(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16105,7 +18326,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnErase(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16116,10 +18337,15 @@ static PyObject *_wrap_PyDrawnShape_base_OnEraseContents(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16135,7 +18361,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnEraseContents(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16146,10 +18372,15 @@ static PyObject *_wrap_PyDrawnShape_base_OnHighlight(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16165,7 +18396,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnHighlight(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16182,25 +18413,26 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -16217,7 +18449,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16234,25 +18466,26 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -16269,7 +18502,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16286,25 +18519,26 @@ static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -16321,7 +18555,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16334,14 +18568,15 @@ static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16357,7 +18592,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16365,7 +18600,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -16379,31 +18614,36 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDrawnShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -16413,14 +18653,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16428,7 +18670,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *self, PyObject *ar
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -16441,31 +18683,36 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDrawnShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -16482,7 +18729,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     bool arg2 ;
@@ -16501,29 +18748,30 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -16540,7 +18788,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16557,25 +18805,26 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -16592,7 +18841,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16609,25 +18858,26 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -16644,7 +18894,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     bool arg2 ;
@@ -16663,29 +18913,30 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -16702,7 +18953,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16719,25 +18970,26 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -16754,7 +19006,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16771,25 +19023,26 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -16806,7 +19059,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16825,26 +19078,31 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyDrawnShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16860,7 +19118,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16871,10 +19129,15 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawControlPoints(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16890,7 +19153,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawControlPoints(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16901,10 +19164,15 @@ static PyObject *_wrap_PyDrawnShape_base_OnEraseControlPoints(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16920,11 +19188,11 @@ static PyObject *_wrap_PyDrawnShape_base_OnEraseControlPoints(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -16933,15 +19201,20 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -16958,7 +19231,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -16979,30 +19252,32 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyDrawnShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -17019,7 +19294,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -17038,26 +19313,28 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -17074,7 +19351,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -17093,26 +19370,28 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -17129,7 +19408,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -17142,14 +19421,15 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17165,7 +19445,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -17178,14 +19458,15 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17201,14 +19482,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * PyDrawnShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyDrawnShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyDrawnShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_OGLConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_OGLConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -17223,10 +19504,11 @@ static PyObject *_wrap_new_OGLConstraint(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_OGLConstraint",kwnames,&obj0,&obj1,&obj2)) goto fail;
     {
-        arg1 = (int) SWIG_PyObj_AsInt(obj0);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg1 = (int)(SWIG_As_int(obj0)); 
+        if (SWIG_arg_fail(1)) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     arg3 = obj2;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17236,7 +19518,7 @@ static PyObject *_wrap_new_OGLConstraint(PyObject *self, PyObject *args, PyObjec
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 1); 
     }
     return resultobj;
     fail:
@@ -17244,7 +19526,7 @@ static PyObject *_wrap_new_OGLConstraint(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxOGLConstraint *arg1 = (wxOGLConstraint *) 0 ;
     bool result;
@@ -17254,7 +19536,8 @@ static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:OGLConstraint_Evaluate",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxOGLConstraint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Evaluate();
@@ -17262,14 +19545,16 @@ static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxOGLConstraint *arg1 = (wxOGLConstraint *) 0 ;
     double arg2 ;
@@ -17282,14 +19567,15 @@ static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_SetSpacing",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxOGLConstraint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17305,7 +19591,7 @@ static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLConstraint_Equals(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxOGLConstraint *arg1 = (wxOGLConstraint *) 0 ;
     double arg2 ;
@@ -17319,14 +19605,15 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_Equals",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxOGLConstraint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17335,21 +19622,23 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * OGLConstraint_swigregister(PyObject *self, PyObject *args) {
+static PyObject * OGLConstraint_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxOGLConstraint, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyCompositeShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyCompositeShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *result;
     char *kwnames[] = {
@@ -17364,14 +19653,14 @@ static PyObject *_wrap_new_PyCompositeShape(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyCompositeShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyCompositeShape, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyCompositeShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -17384,7 +19673,8 @@ static PyObject *_wrap_PyCompositeShape__setCallbackInfo(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -17401,7 +19691,7 @@ static PyObject *_wrap_PyCompositeShape__setCallbackInfo(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_AddChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -17414,10 +19704,13 @@ static PyObject *_wrap_PyCompositeShape_AddChild(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCompositeShape_AddChild",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17433,7 +19726,7 @@ static PyObject *_wrap_PyCompositeShape_AddChild(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxOGLConstraint *arg2 = (wxOGLConstraint *) 0 ;
@@ -17445,8 +19738,10 @@ static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_AddConstraint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxOGLConstraint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxOGLConstraint *)(arg1)->AddConstraint(arg2);
@@ -17455,7 +19750,7 @@ static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *self, PyObject *
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 0); 
     }
     return resultobj;
     fail:
@@ -17463,7 +19758,7 @@ static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     int arg2 ;
@@ -17479,12 +19774,14 @@ static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddConstrainedShapes",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(3)) SWIG_fail;
     arg4 = obj3;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17494,7 +19791,7 @@ static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *self, PyO
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 0); 
     }
     return resultobj;
     fail:
@@ -17502,7 +19799,7 @@ static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     int arg2 ;
@@ -17518,13 +19815,16 @@ static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddSimpleConstraint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(3)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj3, (void **)&arg4, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(4)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxOGLConstraint *)(arg1)->AddConstraint(arg2,arg3,arg4);
@@ -17533,7 +19833,7 @@ static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *self, PyOb
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 0); 
     }
     return resultobj;
     fail:
@@ -17541,7 +19841,7 @@ static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyCompositeShape_CalculateSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_CalculateSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17550,7 +19850,8 @@ static PyObject *_wrap_PyCompositeShape_CalculateSize(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_CalculateSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->CalculateSize();
@@ -17565,7 +19866,7 @@ static PyObject *_wrap_PyCompositeShape_CalculateSize(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -17577,8 +19878,10 @@ static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_ContainsDivision",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->ContainsDivision(arg2);
@@ -17586,14 +19889,16 @@ static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyCompositeShape_DeleteConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_DeleteConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxOGLConstraint *arg2 = (wxOGLConstraint *) 0 ;
@@ -17604,8 +19909,10 @@ static PyObject *_wrap_PyCompositeShape_DeleteConstraint(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_DeleteConstraint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxOGLConstraint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DeleteConstraint(arg2);
@@ -17620,7 +19927,7 @@ static PyObject *_wrap_PyCompositeShape_DeleteConstraint(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_DeleteConstraintsInvolvingChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_DeleteConstraintsInvolvingChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -17631,8 +19938,10 @@ static PyObject *_wrap_PyCompositeShape_DeleteConstraintsInvolvingChild(PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_DeleteConstraintsInvolvingChild",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DeleteConstraintsInvolvingChild(arg2);
@@ -17647,7 +19956,7 @@ static PyObject *_wrap_PyCompositeShape_DeleteConstraintsInvolvingChild(PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyShape *result;
@@ -17657,7 +19966,8 @@ static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_FindContainerImage",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyShape *)(arg1)->FindContainerImage();
@@ -17666,7 +19976,7 @@ static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *self, PyObj
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -17674,7 +19984,7 @@ static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyCompositeShape_GetConstraints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_GetConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject *result;
@@ -17684,7 +19994,8 @@ static PyObject *_wrap_PyCompositeShape_GetConstraints(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_GetConstraints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPyCompositeShape_GetConstraints(arg1);
@@ -17699,7 +20010,7 @@ static PyObject *_wrap_PyCompositeShape_GetConstraints(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_GetDivisions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_GetDivisions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject *result;
@@ -17709,7 +20020,8 @@ static PyObject *_wrap_PyCompositeShape_GetDivisions(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_GetDivisions",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPyCompositeShape_GetDivisions(arg1);
@@ -17724,7 +20036,7 @@ static PyObject *_wrap_PyCompositeShape_GetDivisions(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCompositeShape_MakeContainer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_MakeContainer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17733,7 +20045,8 @@ static PyObject *_wrap_PyCompositeShape_MakeContainer(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_MakeContainer",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->MakeContainer();
@@ -17748,7 +20061,7 @@ static PyObject *_wrap_PyCompositeShape_MakeContainer(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     bool result;
@@ -17758,7 +20071,8 @@ static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_Recompute",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Recompute();
@@ -17766,14 +20080,16 @@ static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyCompositeShape_RemoveChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -17784,8 +20100,10 @@ static PyObject *_wrap_PyCompositeShape_RemoveChild(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_RemoveChild",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->RemoveChild(arg2);
@@ -17800,7 +20118,7 @@ static PyObject *_wrap_PyCompositeShape_RemoveChild(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17809,7 +20127,8 @@ static PyObject *_wrap_PyCompositeShape_base_OnDelete(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->base_OnDelete();
@@ -17824,7 +20143,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDelete(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17835,10 +20154,15 @@ static PyObject *_wrap_PyCompositeShape_base_OnDraw(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17854,7 +20178,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDraw(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17865,10 +20189,15 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawContents(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17884,7 +20213,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawContents(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17897,15 +20226,20 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCompositeShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -17922,7 +20256,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17933,10 +20267,15 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLinks(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17952,7 +20291,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLinks(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17963,10 +20302,15 @@ static PyObject *_wrap_PyCompositeShape_base_OnErase(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17982,7 +20326,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnErase(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17993,10 +20337,15 @@ static PyObject *_wrap_PyCompositeShape_base_OnEraseContents(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18012,7 +20361,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnEraseContents(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18023,10 +20372,15 @@ static PyObject *_wrap_PyCompositeShape_base_OnHighlight(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18042,7 +20396,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnHighlight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18059,25 +20413,26 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -18094,7 +20449,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18111,25 +20466,26 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -18146,7 +20502,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18163,25 +20519,26 @@ static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -18198,7 +20555,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18211,14 +20568,15 @@ static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18234,7 +20592,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18242,7 +20600,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -18256,31 +20614,36 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCompositeShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -18290,14 +20653,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18305,7 +20670,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *self, PyObject
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -18318,31 +20683,36 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCompositeShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -18359,7 +20729,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     bool arg2 ;
@@ -18378,29 +20748,30 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -18417,7 +20788,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18434,25 +20805,26 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -18469,7 +20841,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18486,25 +20858,26 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -18521,7 +20894,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     bool arg2 ;
@@ -18540,29 +20913,30 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -18579,7 +20953,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18596,25 +20970,26 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -18631,7 +21006,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18648,25 +21023,26 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -18683,7 +21059,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18702,26 +21078,31 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyCompositeShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18737,7 +21118,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18748,10 +21129,15 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawControlPoints(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18767,7 +21153,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18778,10 +21164,15 @@ static PyObject *_wrap_PyCompositeShape_base_OnEraseControlPoints(PyObject *self
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18797,11 +21188,11 @@ static PyObject *_wrap_PyCompositeShape_base_OnEraseControlPoints(PyObject *self
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -18810,15 +21201,20 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCompositeShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -18835,7 +21231,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -18856,30 +21252,32 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyCompositeShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -18896,7 +21294,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -18915,26 +21313,28 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *sel
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -18951,7 +21351,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *sel
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -18970,26 +21370,28 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -19006,7 +21408,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -19019,14 +21421,15 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19042,7 +21445,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -19055,14 +21458,15 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19078,14 +21482,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *self, PyObject
 }
 
 
-static PyObject * PyCompositeShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyCompositeShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyCompositeShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyDividedShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -19099,14 +21503,14 @@ static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyDividedShape",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
-            arg1 = (double) SWIG_PyObj_AsDouble(obj0);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg1 = (double)(SWIG_As_double(obj0)); 
+            if (SWIG_arg_fail(1)) SWIG_fail;
         }
     }
     if (obj1) {
         {
-            arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (double)(SWIG_As_double(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     {
@@ -19116,14 +21520,14 @@ static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyDividedShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDividedShape, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDividedShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -19136,7 +21540,8 @@ static PyObject *_wrap_PyDividedShape__setCallbackInfo(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -19153,7 +21558,7 @@ static PyObject *_wrap_PyDividedShape__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_EditRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_EditRegions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19162,7 +21567,8 @@ static PyObject *_wrap_PyDividedShape_EditRegions(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDividedShape_EditRegions",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->EditRegions();
@@ -19177,7 +21583,7 @@ static PyObject *_wrap_PyDividedShape_EditRegions(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDividedShape_SetRegionSizes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_SetRegionSizes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19186,7 +21592,8 @@ static PyObject *_wrap_PyDividedShape_SetRegionSizes(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDividedShape_SetRegionSizes",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetRegionSizes();
@@ -19201,7 +21608,7 @@ static PyObject *_wrap_PyDividedShape_SetRegionSizes(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19210,7 +21617,8 @@ static PyObject *_wrap_PyDividedShape_base_OnDelete(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDividedShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->base_OnDelete();
@@ -19225,7 +21633,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDelete(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19236,10 +21644,15 @@ static PyObject *_wrap_PyDividedShape_base_OnDraw(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19255,7 +21668,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDraw(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19266,10 +21679,15 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawContents(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19285,7 +21703,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawContents(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19298,15 +21716,20 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDividedShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -19323,7 +21746,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19334,10 +21757,15 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLinks(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19353,7 +21781,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLinks(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19364,10 +21792,15 @@ static PyObject *_wrap_PyDividedShape_base_OnErase(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19383,7 +21816,7 @@ static PyObject *_wrap_PyDividedShape_base_OnErase(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19394,10 +21827,15 @@ static PyObject *_wrap_PyDividedShape_base_OnEraseContents(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19413,7 +21851,7 @@ static PyObject *_wrap_PyDividedShape_base_OnEraseContents(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19424,10 +21862,15 @@ static PyObject *_wrap_PyDividedShape_base_OnHighlight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19443,7 +21886,7 @@ static PyObject *_wrap_PyDividedShape_base_OnHighlight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19460,25 +21903,26 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -19495,7 +21939,7 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19512,25 +21956,26 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -19547,7 +21992,7 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19564,25 +22009,26 @@ static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -19599,7 +22045,7 @@ static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19612,14 +22058,15 @@ static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19635,7 +22082,7 @@ static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19643,7 +22090,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -19657,31 +22104,36 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDividedShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -19691,14 +22143,16 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19706,7 +22160,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *self, PyObject *
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -19719,31 +22173,36 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDividedShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -19760,7 +22219,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     bool arg2 ;
@@ -19779,29 +22238,30 @@ static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -19818,7 +22278,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19835,25 +22295,26 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -19870,7 +22331,7 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19887,25 +22348,26 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -19922,7 +22384,7 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     bool arg2 ;
@@ -19941,29 +22403,30 @@ static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -19980,7 +22443,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19997,25 +22460,26 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -20032,7 +22496,7 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -20049,25 +22513,26 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -20084,7 +22549,7 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -20103,26 +22568,31 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyDividedShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20138,7 +22608,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -20149,10 +22619,15 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawControlPoints(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20168,7 +22643,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawControlPoints(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -20179,10 +22654,15 @@ static PyObject *_wrap_PyDividedShape_base_OnEraseControlPoints(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20198,11 +22678,11 @@ static PyObject *_wrap_PyDividedShape_base_OnEraseControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -20211,15 +22691,20 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDividedShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -20236,7 +22721,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -20257,30 +22742,32 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyDividedShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -20297,7 +22784,7 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -20316,26 +22803,28 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -20352,7 +22841,7 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -20371,26 +22860,28 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -20407,7 +22898,7 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -20420,14 +22911,15 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20443,7 +22935,7 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -20456,14 +22948,15 @@ static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20479,14 +22972,14 @@ static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject * PyDividedShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyDividedShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyDividedShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyDivisionShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyDivisionShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *result;
     char *kwnames[] = {
@@ -20501,16 +22994,14 @@ static PyObject *_wrap_new_PyDivisionShape(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
-    }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDivisionShape, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDivisionShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -20523,7 +23014,8 @@ static PyObject *_wrap_PyDivisionShape__setCallbackInfo(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -20540,7 +23032,7 @@ static PyObject *_wrap_PyDivisionShape__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20553,14 +23045,15 @@ static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustBottom",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20576,7 +23069,7 @@ static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20589,14 +23082,15 @@ static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustLeft",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20612,7 +23106,7 @@ static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20625,14 +23119,15 @@ static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustRight",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20648,7 +23143,7 @@ static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20661,14 +23156,15 @@ static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustTop",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20684,7 +23180,7 @@ static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_Divide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_Divide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int arg2 ;
@@ -20695,10 +23191,11 @@ static PyObject *_wrap_PyDivisionShape_Divide(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_Divide",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20714,7 +23211,7 @@ static PyObject *_wrap_PyDivisionShape_Divide(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int arg2 ;
@@ -20725,10 +23222,11 @@ static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_EditEdge",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20744,7 +23242,7 @@ static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *result;
@@ -20754,7 +23252,8 @@ static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetBottomSide",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyDivisionShape *)(arg1)->GetBottomSide();
@@ -20763,7 +23262,7 @@ static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *self, PyObject *a
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -20771,7 +23270,7 @@ static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int result;
@@ -20781,7 +23280,8 @@ static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetHandleSide",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetHandleSide();
@@ -20789,14 +23289,16 @@ static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *result;
@@ -20806,7 +23308,8 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetLeftSide",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyDivisionShape *)(arg1)->GetLeftSide();
@@ -20815,7 +23318,7 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *self, PyObject *arg
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -20823,7 +23326,7 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetLeftSideColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetLeftSideColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxString result;
@@ -20833,7 +23336,8 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSideColour(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetLeftSideColour",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetLeftSideColour();
@@ -20854,7 +23358,7 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSideColour(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPen *result;
@@ -20864,7 +23368,8 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetLeftSidePen",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPen *)(arg1)->GetLeftSidePen();
@@ -20872,14 +23377,14 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *result;
@@ -20889,7 +23394,8 @@ static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetRightSide",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyDivisionShape *)(arg1)->GetRightSide();
@@ -20898,7 +23404,7 @@ static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *self, PyObject *ar
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -20906,7 +23412,7 @@ static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *result;
@@ -20916,7 +23422,8 @@ static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetTopSide",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyDivisionShape *)(arg1)->GetTopSide();
@@ -20925,7 +23432,7 @@ static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *self, PyObject *args
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -20933,7 +23440,7 @@ static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPen *result;
@@ -20943,7 +23450,8 @@ static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetTopSidePen",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPen *)(arg1)->GetTopSidePen();
@@ -20951,14 +23459,14 @@ static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int arg2 ;
@@ -20973,18 +23481,19 @@ static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDivisionShape_ResizeAdjoining",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (bool) SWIG_PyObj_AsBool(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (bool)(SWIG_As_bool(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21000,7 +23509,7 @@ static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21013,14 +23522,15 @@ static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_PopupMenu",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21036,7 +23546,7 @@ static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetBottomSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetBottomSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -21047,8 +23557,10 @@ static PyObject *_wrap_PyDivisionShape_SetBottomSide(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetBottomSide",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetBottomSide(arg2);
@@ -21063,7 +23575,7 @@ static PyObject *_wrap_PyDivisionShape_SetBottomSide(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int arg2 ;
@@ -21074,10 +23586,11 @@ static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetHandleSide",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21093,7 +23606,7 @@ static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetLeftSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetLeftSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -21104,8 +23617,10 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSide(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetLeftSide",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetLeftSide(arg2);
@@ -21120,11 +23635,11 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSide(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -21132,11 +23647,12 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetLeftSideColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21160,7 +23676,7 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetLeftSidePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetLeftSidePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -21171,7 +23687,8 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSidePen(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetLeftSidePen",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxPen* temp;
         if (obj1) {
@@ -21204,7 +23721,7 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSidePen(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetRightSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetRightSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -21215,8 +23732,10 @@ static PyObject *_wrap_PyDivisionShape_SetRightSide(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetRightSide",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetRightSide(arg2);
@@ -21231,7 +23750,7 @@ static PyObject *_wrap_PyDivisionShape_SetRightSide(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetTopSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetTopSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -21242,8 +23761,10 @@ static PyObject *_wrap_PyDivisionShape_SetTopSide(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetTopSide",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetTopSide(arg2);
@@ -21258,11 +23779,11 @@ static PyObject *_wrap_PyDivisionShape_SetTopSide(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -21270,11 +23791,12 @@ static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetTopSideColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21298,7 +23820,7 @@ static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetTopSidePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetTopSidePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -21309,7 +23831,8 @@ static PyObject *_wrap_PyDivisionShape_SetTopSidePen(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetTopSidePen",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         wxPen* temp;
         if (obj1) {
@@ -21342,7 +23865,7 @@ static PyObject *_wrap_PyDivisionShape_SetTopSidePen(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -21351,7 +23874,8 @@ static PyObject *_wrap_PyDivisionShape_base_OnDelete(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->base_OnDelete();
@@ -21366,7 +23890,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDelete(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21377,10 +23901,15 @@ static PyObject *_wrap_PyDivisionShape_base_OnDraw(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21396,7 +23925,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDraw(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21407,10 +23936,15 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawContents(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21426,7 +23960,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawContents(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21439,15 +23973,20 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDivisionShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -21464,7 +24003,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21475,10 +24014,15 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLinks(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21494,7 +24038,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLinks(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21505,10 +24049,15 @@ static PyObject *_wrap_PyDivisionShape_base_OnErase(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21524,7 +24073,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnErase(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21535,10 +24084,15 @@ static PyObject *_wrap_PyDivisionShape_base_OnEraseContents(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21554,7 +24108,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnEraseContents(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21565,10 +24119,15 @@ static PyObject *_wrap_PyDivisionShape_base_OnHighlight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21584,7 +24143,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnHighlight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21601,25 +24160,26 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -21636,7 +24196,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21653,25 +24213,26 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -21688,7 +24249,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21705,25 +24266,26 @@ static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -21740,7 +24302,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21753,14 +24315,15 @@ static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21776,7 +24339,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21784,7 +24347,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject *
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -21798,31 +24361,36 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDivisionShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -21832,14 +24400,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21847,7 +24417,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *self, PyObject
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -21860,31 +24430,36 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDivisionShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -21901,7 +24476,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     bool arg2 ;
@@ -21920,29 +24495,30 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -21959,7 +24535,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21976,25 +24552,26 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -22011,7 +24588,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -22028,25 +24605,26 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -22063,7 +24641,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     bool arg2 ;
@@ -22082,29 +24660,30 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -22121,7 +24700,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -22138,25 +24717,26 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -22173,7 +24753,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -22190,25 +24770,26 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -22225,7 +24806,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22244,26 +24825,31 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyDivisionShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22279,7 +24865,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22290,10 +24876,15 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawControlPoints(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22309,7 +24900,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22320,10 +24911,15 @@ static PyObject *_wrap_PyDivisionShape_base_OnEraseControlPoints(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22339,11 +24935,11 @@ static PyObject *_wrap_PyDivisionShape_base_OnEraseControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -22352,15 +24948,20 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDivisionShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -22377,7 +24978,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -22398,30 +24999,32 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyDivisionShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -22438,7 +25041,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -22457,26 +25060,28 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *self
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -22493,7 +25098,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *self
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -22512,26 +25117,28 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -22548,7 +25155,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -22561,14 +25168,15 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22584,7 +25192,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -22597,14 +25205,15 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22620,14 +25229,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *self, PyObject *
 }
 
 
-static PyObject * PyDivisionShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyDivisionShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyDivisionShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyEllipseShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -22641,14 +25250,14 @@ static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyEllipseShape",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
-            arg1 = (double) SWIG_PyObj_AsDouble(obj0);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg1 = (double)(SWIG_As_double(obj0)); 
+            if (SWIG_arg_fail(1)) SWIG_fail;
         }
     }
     if (obj1) {
         {
-            arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (double)(SWIG_As_double(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     {
@@ -22658,14 +25267,14 @@ static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyEllipseShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyEllipseShape, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyEllipseShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -22678,7 +25287,8 @@ static PyObject *_wrap_PyEllipseShape__setCallbackInfo(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -22695,7 +25305,7 @@ static PyObject *_wrap_PyEllipseShape__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22706,10 +25316,15 @@ static PyObject *_wrap_PyEllipseShape_base_OnDraw(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22725,7 +25340,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDraw(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22736,10 +25351,15 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawContents(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22755,7 +25375,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawContents(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22768,15 +25388,20 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyEllipseShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -22793,7 +25418,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22804,10 +25429,15 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLinks(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22823,7 +25453,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLinks(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22834,10 +25464,15 @@ static PyObject *_wrap_PyEllipseShape_base_OnErase(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22853,7 +25488,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnErase(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22864,10 +25499,15 @@ static PyObject *_wrap_PyEllipseShape_base_OnEraseContents(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22883,7 +25523,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnEraseContents(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22894,10 +25534,15 @@ static PyObject *_wrap_PyEllipseShape_base_OnHighlight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22913,7 +25558,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnHighlight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22930,25 +25575,26 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -22965,7 +25611,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22982,25 +25628,26 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -23017,7 +25664,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23034,25 +25681,26 @@ static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -23069,7 +25717,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23082,14 +25730,15 @@ static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23105,7 +25754,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23113,7 +25762,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -23127,31 +25776,36 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyEllipseShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -23161,14 +25815,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23176,7 +25832,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *self, PyObject *
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -23189,31 +25845,36 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyEllipseShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -23230,7 +25891,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     bool arg2 ;
@@ -23249,29 +25910,30 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -23288,7 +25950,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23305,25 +25967,26 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -23340,7 +26003,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23357,25 +26020,26 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -23392,7 +26056,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     bool arg2 ;
@@ -23411,29 +26075,30 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -23450,7 +26115,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23467,25 +26132,26 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -23502,7 +26168,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23519,25 +26185,26 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -23554,7 +26221,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23573,26 +26240,31 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyEllipseShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23608,7 +26280,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23619,10 +26291,15 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawControlPoints(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23638,7 +26315,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawControlPoints(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23649,10 +26326,15 @@ static PyObject *_wrap_PyEllipseShape_base_OnEraseControlPoints(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23668,11 +26350,11 @@ static PyObject *_wrap_PyEllipseShape_base_OnEraseControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -23681,15 +26363,20 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyEllipseShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -23706,7 +26393,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -23727,30 +26414,32 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyEllipseShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -23767,7 +26456,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -23786,26 +26475,28 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -23822,7 +26513,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -23841,26 +26532,28 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -23877,7 +26570,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23890,14 +26583,15 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23913,7 +26607,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23926,14 +26620,15 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23949,14 +26644,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject * PyEllipseShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyEllipseShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyEllipseShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyCircleShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyCircleShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     wxPyCircleShape *result;
@@ -23968,8 +26663,8 @@ static PyObject *_wrap_new_PyCircleShape(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyCircleShape",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
-            arg1 = (double) SWIG_PyObj_AsDouble(obj0);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg1 = (double)(SWIG_As_double(obj0)); 
+            if (SWIG_arg_fail(1)) SWIG_fail;
         }
     }
     {
@@ -23979,14 +26674,14 @@ static PyObject *_wrap_new_PyCircleShape(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyCircleShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyCircleShape, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyCircleShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -23999,7 +26694,8 @@ static PyObject *_wrap_PyCircleShape__setCallbackInfo(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -24016,7 +26712,7 @@ static PyObject *_wrap_PyCircleShape__setCallbackInfo(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24027,10 +26723,15 @@ static PyObject *_wrap_PyCircleShape_base_OnDraw(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24046,7 +26747,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDraw(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24057,10 +26758,15 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawContents(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24076,7 +26782,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawContents(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24089,15 +26795,20 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCircleShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -24114,7 +26825,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24125,10 +26836,15 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLinks(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24144,7 +26860,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLinks(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24155,10 +26871,15 @@ static PyObject *_wrap_PyCircleShape_base_OnErase(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24174,7 +26895,7 @@ static PyObject *_wrap_PyCircleShape_base_OnErase(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24185,10 +26906,15 @@ static PyObject *_wrap_PyCircleShape_base_OnEraseContents(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24204,7 +26930,7 @@ static PyObject *_wrap_PyCircleShape_base_OnEraseContents(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24215,10 +26941,15 @@ static PyObject *_wrap_PyCircleShape_base_OnHighlight(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24234,7 +26965,7 @@ static PyObject *_wrap_PyCircleShape_base_OnHighlight(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24251,25 +26982,26 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -24286,7 +27018,7 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24303,25 +27035,26 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -24338,7 +27071,7 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24355,25 +27088,26 @@ static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -24390,7 +27124,7 @@ static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24403,14 +27137,15 @@ static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24426,7 +27161,7 @@ static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24434,7 +27169,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -24448,31 +27183,36 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCircleShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -24482,14 +27222,16 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24497,7 +27239,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *self, PyObject *a
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -24510,31 +27252,36 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCircleShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -24551,7 +27298,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     bool arg2 ;
@@ -24570,29 +27317,30 @@ static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -24609,7 +27357,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24626,25 +27374,26 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -24661,7 +27410,7 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24678,25 +27427,26 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -24713,7 +27463,7 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     bool arg2 ;
@@ -24732,29 +27482,30 @@ static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -24771,7 +27522,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24788,25 +27539,26 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -24823,7 +27575,7 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24840,25 +27592,26 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -24875,7 +27628,7 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24894,26 +27647,31 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyCircleShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24929,7 +27687,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24940,10 +27698,15 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawControlPoints(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24959,7 +27722,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawControlPoints(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24970,10 +27733,15 @@ static PyObject *_wrap_PyCircleShape_base_OnEraseControlPoints(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24989,11 +27757,11 @@ static PyObject *_wrap_PyCircleShape_base_OnEraseControlPoints(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -25002,15 +27770,20 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCircleShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -25027,7 +27800,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -25048,30 +27821,32 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyCircleShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -25088,7 +27863,7 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -25107,26 +27882,28 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -25143,7 +27920,7 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -25162,26 +27939,28 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -25198,7 +27977,7 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -25211,14 +27990,15 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25234,7 +28014,7 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -25247,14 +28027,15 @@ static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25270,14 +28051,14 @@ static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * PyCircleShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyCircleShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyCircleShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ArrowHead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -25288,7 +28069,7 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k
     wxPseudoMetaFile *arg6 = (wxPseudoMetaFile *) NULL ;
     long arg7 = (long) -1 ;
     wxArrowHead *result;
-    bool temp5 = False ;
+    bool temp5 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -25303,42 +28084,43 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOOO:new_ArrowHead",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     if (obj0) {
         {
-            arg1 = (int) SWIG_PyObj_AsInt(obj0);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg1 = (int)(SWIG_As_int(obj0)); 
+            if (SWIG_arg_fail(1)) SWIG_fail;
         }
     }
     if (obj1) {
         {
-            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (int)(SWIG_As_int(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     if (obj2) {
         {
-            arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (double)(SWIG_As_double(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     if (obj3) {
         {
-            arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (double)(SWIG_As_double(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
             arg5 = wxString_in_helper(obj4);
             if (arg5 == NULL) SWIG_fail;
-            temp5 = True;
+            temp5 = true;
         }
     }
     if (obj5) {
-        if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (long) SWIG_PyObj_AsLong(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (long)(SWIG_As_long(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -25349,7 +28131,7 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 1); 
     }
     {
         if (temp5)
@@ -25365,7 +28147,7 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_delete_ArrowHead(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_ArrowHead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     PyObject * obj0 = 0 ;
@@ -25374,7 +28156,8 @@ static PyObject *_wrap_delete_ArrowHead(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ArrowHead",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
@@ -25389,7 +28172,7 @@ static PyObject *_wrap_delete_ArrowHead(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ArrowHead__GetType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead__GetType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     int result;
@@ -25399,7 +28182,8 @@ static PyObject *_wrap_ArrowHead__GetType(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead__GetType",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->_GetType();
@@ -25407,14 +28191,16 @@ static PyObject *_wrap_ArrowHead__GetType(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     int result;
@@ -25424,7 +28210,8 @@ static PyObject *_wrap_ArrowHead_GetPosition(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetPosition",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetPosition();
@@ -25432,14 +28219,16 @@ static PyObject *_wrap_ArrowHead_GetPosition(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     int arg2 ;
@@ -25450,10 +28239,11 @@ static PyObject *_wrap_ArrowHead_SetPosition(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetPosition",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25469,7 +28259,7 @@ static PyObject *_wrap_ArrowHead_SetPosition(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -25479,7 +28269,8 @@ static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetXOffset",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->GetXOffset();
@@ -25487,14 +28278,16 @@ static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -25504,7 +28297,8 @@ static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetYOffset",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->GetYOffset();
@@ -25512,14 +28306,16 @@ static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -25529,7 +28325,8 @@ static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetSpacing",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->GetSpacing();
@@ -25537,14 +28334,16 @@ static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -25554,7 +28353,8 @@ static PyObject *_wrap_ArrowHead_GetSize(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->GetSize();
@@ -25562,14 +28362,16 @@ static PyObject *_wrap_ArrowHead_GetSize(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     wxString result;
@@ -25579,7 +28381,8 @@ static PyObject *_wrap_ArrowHead_GetName(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetName",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetName();
@@ -25600,7 +28403,7 @@ static PyObject *_wrap_ArrowHead_GetName(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double arg2 ;
@@ -25611,10 +28414,11 @@ static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetXOffset",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25630,7 +28434,7 @@ static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double arg2 ;
@@ -25641,10 +28445,11 @@ static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetYOffset",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25660,7 +28465,7 @@ static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     wxPseudoMetaFile *result;
@@ -25670,7 +28475,8 @@ static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetMetaFile",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPseudoMetaFile *)(arg1)->GetMetaFile();
@@ -25679,7 +28485,7 @@ static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *self, PyObject *args, PyO
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 0); 
     }
     return resultobj;
     fail:
@@ -25687,7 +28493,7 @@ static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ArrowHead_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     long result;
@@ -25697,7 +28503,8 @@ static PyObject *_wrap_ArrowHead_GetId(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetId",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (long)(arg1)->GetId();
@@ -25705,14 +28512,16 @@ static PyObject *_wrap_ArrowHead_GetId(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromLong((long)result);
+    {
+        resultobj = SWIG_From_long((long)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     int result;
@@ -25722,7 +28531,8 @@ static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetArrowEnd",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetArrowEnd();
@@ -25730,14 +28540,16 @@ static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -25747,7 +28559,8 @@ static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetArrowSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->GetArrowSize();
@@ -25755,14 +28568,16 @@ static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double arg2 ;
@@ -25773,10 +28588,11 @@ static PyObject *_wrap_ArrowHead_SetSize(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSize",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25792,7 +28608,7 @@ static PyObject *_wrap_ArrowHead_SetSize(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double arg2 ;
@@ -25803,10 +28619,11 @@ static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSpacing",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25822,14 +28639,14 @@ static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * ArrowHead_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ArrowHead_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxArrowHead, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyLineShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyLineShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *result;
     char *kwnames[] = {
@@ -25844,14 +28661,14 @@ static PyObject *_wrap_new_PyLineShape(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyLineShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyLineShape, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -25864,7 +28681,8 @@ static PyObject *_wrap_PyLineShape__setCallbackInfo(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -25881,7 +28699,7 @@ static PyObject *_wrap_PyLineShape__setCallbackInfo(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_AddArrow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -25892,7 +28710,7 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb
     wxString *arg6 = (wxString *) &arg6_defvalue ;
     wxPseudoMetaFile *arg7 = (wxPseudoMetaFile *) NULL ;
     long arg8 = (long) -1 ;
-    bool temp6 = False ;
+    bool temp6 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -25906,43 +28724,45 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:PyLineShape_AddArrow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (int) SWIG_PyObj_AsInt(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (int)(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     if (obj3) {
         {
-            arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (double)(SWIG_As_double(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (double)(SWIG_As_double(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = True;
+            temp6 = true;
         }
     }
     if (obj6) {
-        if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(7)) SWIG_fail;
     }
     if (obj7) {
         {
-            arg8 = (long) SWIG_PyObj_AsLong(obj7);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg8 = (long)(SWIG_As_long(obj7)); 
+            if (SWIG_arg_fail(8)) SWIG_fail;
         }
     }
     {
@@ -25967,7 +28787,7 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxArrowHead *arg2 = (wxArrowHead *) 0 ;
@@ -25982,12 +28802,14 @@ static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyLineShape_AddArrowOrdered",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     arg3 = obj2;
     {
-        arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (int)(SWIG_As_int(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26003,12 +28825,12 @@ static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = False ;
+    bool temp2 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -26016,11 +28838,12 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_ClearArrow",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = True;
+        temp2 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26029,7 +28852,9 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -26044,7 +28869,7 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 = (int) -1 ;
@@ -26055,11 +28880,12 @@ static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyLineShape_ClearArrowsAtPosition",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
-            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (int)(SWIG_As_int(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     {
@@ -26076,7 +28902,7 @@ static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -26093,19 +28919,25 @@ static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_DrawArrow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(3)) SWIG_fail;
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (bool) SWIG_PyObj_AsBool(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (bool)(SWIG_As_bool(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26121,7 +28953,7 @@ static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     long arg2 ;
@@ -26133,10 +28965,11 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_DeleteArrowHeadId",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (long) SWIG_PyObj_AsLong(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (long)(SWIG_As_long(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26145,20 +28978,22 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
     bool result;
-    bool temp3 = False ;
+    bool temp3 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -26167,15 +29002,16 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_DeleteArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = True;
+        temp3 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26184,7 +29020,9 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp3)
         delete arg3;
@@ -26199,7 +29037,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool result;
@@ -26209,7 +29047,8 @@ static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_DeleteLineControlPoint",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->DeleteLineControlPoint();
@@ -26217,14 +29056,16 @@ static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_DrawArrows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DrawArrows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -26235,10 +29076,15 @@ static PyObject *_wrap_PyLineShape_DrawArrows(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_DrawArrows",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26254,7 +29100,7 @@ static PyObject *_wrap_PyLineShape_DrawArrows(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -26271,19 +29117,25 @@ static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_DrawRegion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(3)) SWIG_fail;
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26299,7 +29151,7 @@ static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -26316,19 +29168,25 @@ static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_EraseRegion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(3)) SWIG_fail;
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26344,7 +29202,7 @@ static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     long arg2 ;
@@ -26356,10 +29214,11 @@ static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_FindArrowHeadId",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (long) SWIG_PyObj_AsLong(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (long)(SWIG_As_long(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26369,7 +29228,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *self, PyObject *arg
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 0); 
     }
     return resultobj;
     fail:
@@ -26377,13 +29236,13 @@ static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
     wxArrowHead *result;
-    bool temp3 = False ;
+    bool temp3 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -26392,15 +29251,16 @@ static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = True;
+        temp3 = true;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26410,7 +29270,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *self, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 0); 
     }
     {
         if (temp3)
@@ -26426,7 +29286,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -26434,20 +29294,25 @@ static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *self, PyObject *a
     double *arg4 = (double *) 0 ;
     double *arg5 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     double temp4 ;
+    int res4 = 0 ;
     double temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_FindLineEndPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->FindLineEndPoints(arg2,arg3,arg4,arg5);
@@ -26456,29 +29321,21 @@ static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *self, PyObject *a
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -26492,14 +29349,15 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindLinePosition",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26508,14 +29366,16 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double result;
@@ -26525,7 +29385,8 @@ static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_FindMinimumWidth",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->FindMinimumWidth();
@@ -26533,14 +29394,16 @@ static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindNth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -26548,7 +29411,9 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObj
     int *arg4 = (int *) 0 ;
     bool arg5 ;
     int temp3 ;
+    int res3 = 0 ;
     int temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -26556,14 +29421,16 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObj
         (char *) "self",(char *) "image",(char *) "incoming", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindNth",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg5 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26573,21 +29440,17 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObj
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int result;
@@ -26597,7 +29460,8 @@ static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAttachmentFrom",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetAttachmentFrom();
@@ -26605,14 +29469,16 @@ static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int result;
@@ -26622,7 +29488,8 @@ static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAttachmentTo",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetAttachmentTo();
@@ -26630,14 +29497,16 @@ static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetEnds(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetEnds(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -26645,20 +29514,25 @@ static PyObject *_wrap_PyLineShape_GetEnds(PyObject *self, PyObject *args, PyObj
     double *arg4 = (double *) 0 ;
     double *arg5 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     double temp4 ;
+    int res4 = 0 ;
     double temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetEnds",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->GetEnds(arg2,arg3,arg4,arg5);
@@ -26667,29 +29541,21 @@ static PyObject *_wrap_PyLineShape_GetEnds(PyObject *self, PyObject *args, PyObj
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetFrom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *result;
@@ -26699,7 +29565,8 @@ static PyObject *_wrap_PyLineShape_GetFrom(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetFrom",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyShape *)(arg1)->GetFrom();
@@ -26708,7 +29575,7 @@ static PyObject *_wrap_PyLineShape_GetFrom(PyObject *self, PyObject *args, PyObj
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -26716,27 +29583,30 @@ static PyObject *_wrap_PyLineShape_GetFrom(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
     double *arg3 = (double *) 0 ;
     double *arg4 = (double *) 0 ;
     double temp3 ;
+    int res3 = 0 ;
     double temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "position", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetLabelPosition",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26746,21 +29616,17 @@ static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *self, PyObject *ar
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -26772,8 +29638,10 @@ static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetNextControlPoint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxRealPoint *)(arg1)->GetNextControlPoint(arg2);
@@ -26781,14 +29649,14 @@ static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRealPoint, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRealPoint, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *result;
@@ -26798,7 +29666,8 @@ static PyObject *_wrap_PyLineShape_GetTo(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetTo",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyShape *)(arg1)->GetTo();
@@ -26807,7 +29676,7 @@ static PyObject *_wrap_PyLineShape_GetTo(PyObject *self, PyObject *args, PyObjec
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -26815,7 +29684,7 @@ static PyObject *_wrap_PyLineShape_GetTo(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_Initialise(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_Initialise(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26824,7 +29693,8 @@ static PyObject *_wrap_PyLineShape_Initialise(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_Initialise",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Initialise();
@@ -26839,7 +29709,7 @@ static PyObject *_wrap_PyLineShape_Initialise(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyLineShape_InsertLineControlPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_InsertLineControlPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = (wxDC *) 0 ;
@@ -26850,8 +29720,10 @@ static PyObject *_wrap_PyLineShape_InsertLineControlPoint(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_InsertLineControlPoint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->InsertLineControlPoint(arg2);
@@ -26866,7 +29738,7 @@ static PyObject *_wrap_PyLineShape_InsertLineControlPoint(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_IsEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -26878,8 +29750,10 @@ static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_IsEnd",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->IsEnd(arg2);
@@ -26887,14 +29761,16 @@ static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_IsSpline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool result;
@@ -26904,7 +29780,8 @@ static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_IsSpline",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->IsSpline();
@@ -26912,14 +29789,16 @@ static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -26930,10 +29809,11 @@ static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_MakeLineControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26949,7 +29829,7 @@ static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     PyObject *result;
@@ -26959,7 +29839,8 @@ static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetLineControlPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPyLineShape_GetLineControlPoints(arg1);
@@ -26974,7 +29855,35 @@ static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetLineControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
+    PyObject *arg2 = (PyObject *) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "list", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetLineControlPoints",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    arg2 = obj1;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        wxPyLineShape_SetLineControlPoints(arg1,arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -26985,10 +29894,11 @@ static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentFrom",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27004,7 +29914,7 @@ static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -27017,14 +29927,15 @@ static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAttachments",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (int) SWIG_PyObj_AsInt(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (int)(SWIG_As_int(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27040,7 +29951,7 @@ static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -27051,10 +29962,11 @@ static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentTo",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27070,7 +29982,7 @@ static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_SetEnds(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetEnds(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27087,22 +29999,23 @@ static PyObject *_wrap_PyLineShape_SetEnds(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_SetEnds",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27118,7 +30031,7 @@ static PyObject *_wrap_PyLineShape_SetEnds(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyLineShape_SetFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetFrom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -27129,8 +30042,10 @@ static PyObject *_wrap_PyLineShape_SetFrom(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetFrom",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetFrom(arg2);
@@ -27145,7 +30060,7 @@ static PyObject *_wrap_PyLineShape_SetFrom(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -27156,10 +30071,11 @@ static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetIgnoreOffsets",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27175,7 +30091,7 @@ static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_SetSpline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetSpline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -27186,10 +30102,11 @@ static PyObject *_wrap_PyLineShape_SetSpline(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetSpline",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27205,7 +30122,7 @@ static PyObject *_wrap_PyLineShape_SetSpline(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyLineShape_SetTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -27216,8 +30133,10 @@ static PyObject *_wrap_PyLineShape_SetTo(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetTo",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetTo(arg2);
@@ -27232,7 +30151,7 @@ static PyObject *_wrap_PyLineShape_SetTo(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_Straighten(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_Straighten(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = (wxDC *) NULL ;
@@ -27243,9 +30162,11 @@ static PyObject *_wrap_PyLineShape_Straighten(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyLineShape_Straighten",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27261,7 +30182,7 @@ static PyObject *_wrap_PyLineShape_Straighten(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyLineShape_Unlink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_Unlink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27270,7 +30191,8 @@ static PyObject *_wrap_PyLineShape_Unlink(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_Unlink",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Unlink();
@@ -27285,7 +30207,7 @@ static PyObject *_wrap_PyLineShape_Unlink(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -27298,14 +30220,15 @@ static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAlignmentOrientation",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27321,7 +30244,7 @@ static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -27334,14 +30257,15 @@ static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAlignmentType",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (int) SWIG_PyObj_AsInt(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (int)(SWIG_As_int(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27357,7 +30281,7 @@ static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -27369,10 +30293,11 @@ static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetAlignmentOrientation",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27381,14 +30306,16 @@ static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -27400,10 +30327,11 @@ static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetAlignmentType",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27412,14 +30340,16 @@ static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int result;
@@ -27429,7 +30359,8 @@ static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAlignmentStart",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxPyLineShape const *)arg1)->GetAlignmentStart();
@@ -27437,14 +30368,16 @@ static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int result;
@@ -27454,7 +30387,8 @@ static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAlignmentEnd",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxPyLineShape const *)arg1)->GetAlignmentEnd();
@@ -27462,14 +30396,16 @@ static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27480,10 +30416,15 @@ static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27499,7 +30440,7 @@ static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27510,10 +30451,15 @@ static PyObject *_wrap_PyLineShape_base_OnDrawContents(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27529,7 +30475,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawContents(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27542,15 +30488,20 @@ static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyLineShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -27567,7 +30518,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27578,10 +30529,15 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLinks(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27597,7 +30553,7 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLinks(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27608,10 +30564,15 @@ static PyObject *_wrap_PyLineShape_base_OnErase(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27627,7 +30588,7 @@ static PyObject *_wrap_PyLineShape_base_OnErase(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27638,10 +30599,15 @@ static PyObject *_wrap_PyLineShape_base_OnEraseContents(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27657,7 +30623,7 @@ static PyObject *_wrap_PyLineShape_base_OnEraseContents(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27668,10 +30634,15 @@ static PyObject *_wrap_PyLineShape_base_OnHighlight(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27687,7 +30658,7 @@ static PyObject *_wrap_PyLineShape_base_OnHighlight(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27704,25 +30675,26 @@ static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -27739,7 +30711,7 @@ static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27756,25 +30728,26 @@ static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -27791,7 +30764,7 @@ static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27808,25 +30781,26 @@ static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -27843,7 +30817,7 @@ static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27856,14 +30830,15 @@ static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27879,7 +30854,7 @@ static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27887,7 +30862,7 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -27901,31 +30876,36 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyLineShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -27935,14 +30915,16 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27950,7 +30932,7 @@ static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *self, PyObject *arg
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -27963,31 +30945,36 @@ static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyLineShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -28004,7 +30991,7 @@ static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -28023,29 +31010,30 @@ static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -28062,7 +31050,7 @@ static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -28079,25 +31067,26 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -28114,7 +31103,7 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -28131,25 +31120,26 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -28166,7 +31156,7 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -28185,29 +31175,30 @@ static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -28224,7 +31215,7 @@ static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -28241,25 +31232,26 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -28276,7 +31268,7 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -28293,25 +31285,26 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -28328,7 +31321,7 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28347,26 +31340,31 @@ static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyLineShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28382,7 +31380,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28393,10 +31391,15 @@ static PyObject *_wrap_PyLineShape_base_OnDrawControlPoints(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28412,7 +31415,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawControlPoints(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28423,10 +31426,15 @@ static PyObject *_wrap_PyLineShape_base_OnEraseControlPoints(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28442,11 +31450,11 @@ static PyObject *_wrap_PyLineShape_base_OnEraseControlPoints(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -28455,15 +31463,20 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyLineShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -28480,7 +31493,7 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -28501,30 +31514,32 @@ static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyLineShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -28541,7 +31556,7 @@ static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -28560,26 +31575,28 @@ static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -28596,7 +31613,7 @@ static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -28615,26 +31632,28 @@ static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -28651,7 +31670,7 @@ static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -28664,14 +31683,15 @@ static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28687,7 +31707,7 @@ static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -28700,14 +31720,15 @@ static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28723,14 +31744,14 @@ static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject * PyLineShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyLineShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyLineShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyPolygonShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyPolygonShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *result;
     char *kwnames[] = {
@@ -28745,14 +31766,14 @@ static PyObject *_wrap_new_PyPolygonShape(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyPolygonShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyPolygonShape, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyPolygonShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -28765,7 +31786,8 @@ static PyObject *_wrap_PyPolygonShape__setCallbackInfo(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -28782,7 +31804,7 @@ static PyObject *_wrap_PyPolygonShape__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -28794,7 +31816,8 @@ static PyObject *_wrap_PyPolygonShape_Create(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_Create",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28810,7 +31833,7 @@ static PyObject *_wrap_PyPolygonShape_Create(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -28821,11 +31844,12 @@ static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyPolygonShape_AddPolygonPoint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
-            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (int)(SWIG_As_int(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     {
@@ -28842,7 +31866,7 @@ static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyPolygonShape_CalculatePolygonCentre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_CalculatePolygonCentre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -28851,7 +31875,8 @@ static PyObject *_wrap_PyPolygonShape_CalculatePolygonCentre(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_CalculatePolygonCentre",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->CalculatePolygonCentre();
@@ -28866,7 +31891,7 @@ static PyObject *_wrap_PyPolygonShape_CalculatePolygonCentre(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -28877,11 +31902,12 @@ static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyPolygonShape_DeletePolygonPoint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
-            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (int)(SWIG_As_int(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     {
@@ -28898,7 +31924,7 @@ static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject *result;
@@ -28908,7 +31934,8 @@ static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_GetPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPyPolygonShape_GetPoints(arg1);
@@ -28923,7 +31950,7 @@ static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyPolygonShape_GetOriginalPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetOriginalPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject *result;
@@ -28933,7 +31960,8 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalPoints(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_GetOriginalPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPyPolygonShape_GetOriginalPoints(arg1);
@@ -28948,7 +31976,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalPoints(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double result;
@@ -28958,7 +31986,8 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_GetOriginalWidth",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)((wxPyPolygonShape const *)arg1)->GetOriginalWidth();
@@ -28966,14 +31995,16 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double result;
@@ -28983,7 +32014,8 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_GetOriginalHeight",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)((wxPyPolygonShape const *)arg1)->GetOriginalHeight();
@@ -28991,14 +32023,16 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29009,10 +32043,11 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalWidth",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29028,7 +32063,7 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29039,10 +32074,11 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalHeight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29058,7 +32094,7 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -29067,7 +32103,8 @@ static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_UpdateOriginalPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->UpdateOriginalPoints();
@@ -29082,7 +32119,7 @@ static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29093,10 +32130,15 @@ static PyObject *_wrap_PyPolygonShape_base_OnDraw(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29112,7 +32154,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDraw(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29123,10 +32165,15 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawContents(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29142,7 +32189,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawContents(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29155,15 +32202,20 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyPolygonShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -29180,7 +32232,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29191,10 +32243,15 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLinks(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29210,7 +32267,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLinks(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29221,10 +32278,15 @@ static PyObject *_wrap_PyPolygonShape_base_OnErase(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29240,7 +32302,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnErase(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29251,10 +32313,15 @@ static PyObject *_wrap_PyPolygonShape_base_OnEraseContents(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29270,7 +32337,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnEraseContents(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29281,10 +32348,15 @@ static PyObject *_wrap_PyPolygonShape_base_OnHighlight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29300,7 +32372,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnHighlight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29317,25 +32389,26 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -29352,7 +32425,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29369,25 +32442,26 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -29404,7 +32478,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29421,25 +32495,26 @@ static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -29456,7 +32531,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29469,14 +32544,15 @@ static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29492,7 +32568,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29500,7 +32576,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -29514,31 +32590,36 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyPolygonShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -29548,14 +32629,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29563,7 +32646,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *self, PyObject *
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -29576,31 +32659,36 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyPolygonShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -29617,7 +32705,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     bool arg2 ;
@@ -29636,29 +32724,30 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -29675,7 +32764,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29692,25 +32781,26 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -29727,7 +32817,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29744,25 +32834,26 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -29779,7 +32870,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     bool arg2 ;
@@ -29798,29 +32889,30 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -29837,7 +32929,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29854,25 +32946,26 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -29889,7 +32982,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29906,25 +32999,26 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -29941,7 +33035,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29960,26 +33054,31 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyPolygonShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29995,7 +33094,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30006,10 +33105,15 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawControlPoints(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30025,7 +33129,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawControlPoints(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30036,10 +33140,15 @@ static PyObject *_wrap_PyPolygonShape_base_OnEraseControlPoints(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30055,11 +33164,11 @@ static PyObject *_wrap_PyPolygonShape_base_OnEraseControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -30068,15 +33177,20 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyPolygonShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -30093,7 +33207,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -30114,30 +33228,32 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyPolygonShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -30154,7 +33270,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -30173,26 +33289,28 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -30209,7 +33327,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -30228,26 +33346,28 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *self, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -30264,7 +33384,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -30277,14 +33397,15 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30300,7 +33421,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -30313,14 +33434,15 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30336,14 +33458,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject * PyPolygonShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyPolygonShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyPolygonShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyTextShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -30357,14 +33479,14 @@ static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyTextShape",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
-            arg1 = (double) SWIG_PyObj_AsDouble(obj0);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg1 = (double)(SWIG_As_double(obj0)); 
+            if (SWIG_arg_fail(1)) SWIG_fail;
         }
     }
     if (obj1) {
         {
-            arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (double)(SWIG_As_double(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     {
@@ -30374,14 +33496,14 @@ static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyTextShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTextShape, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyTextShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -30394,7 +33516,8 @@ static PyObject *_wrap_PyTextShape__setCallbackInfo(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -30411,7 +33534,7 @@ static PyObject *_wrap_PyTextShape__setCallbackInfo(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -30420,7 +33543,8 @@ static PyObject *_wrap_PyTextShape_base_OnDelete(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyTextShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->base_OnDelete();
@@ -30435,7 +33559,7 @@ static PyObject *_wrap_PyTextShape_base_OnDelete(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30446,10 +33570,15 @@ static PyObject *_wrap_PyTextShape_base_OnDraw(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30465,7 +33594,7 @@ static PyObject *_wrap_PyTextShape_base_OnDraw(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30476,10 +33605,15 @@ static PyObject *_wrap_PyTextShape_base_OnDrawContents(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30495,7 +33629,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawContents(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30508,15 +33642,20 @@ static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyTextShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -30533,7 +33672,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30544,10 +33683,15 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLinks(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30563,7 +33707,7 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLinks(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30574,10 +33718,15 @@ static PyObject *_wrap_PyTextShape_base_OnErase(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30593,7 +33742,7 @@ static PyObject *_wrap_PyTextShape_base_OnErase(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30604,10 +33753,15 @@ static PyObject *_wrap_PyTextShape_base_OnEraseContents(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30623,7 +33777,7 @@ static PyObject *_wrap_PyTextShape_base_OnEraseContents(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30634,10 +33788,15 @@ static PyObject *_wrap_PyTextShape_base_OnHighlight(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30653,7 +33812,7 @@ static PyObject *_wrap_PyTextShape_base_OnHighlight(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30670,25 +33829,26 @@ static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -30705,7 +33865,7 @@ static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30722,25 +33882,26 @@ static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -30757,7 +33918,7 @@ static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30774,25 +33935,26 @@ static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -30809,7 +33971,7 @@ static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30822,14 +33984,15 @@ static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30845,7 +34008,7 @@ static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30853,7 +34016,7 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -30867,31 +34030,36 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyTextShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -30901,14 +34069,16 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30916,7 +34086,7 @@ static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *self, PyObject *arg
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) True ;
+    bool arg7 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -30929,31 +34099,36 @@ static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyTextShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     if (obj6) {
         {
-            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (bool)(SWIG_As_bool(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -30970,7 +34145,7 @@ static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     bool arg2 ;
@@ -30989,29 +34164,30 @@ static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -31028,7 +34204,7 @@ static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -31045,25 +34221,26 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -31080,7 +34257,7 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -31097,25 +34274,26 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -31132,7 +34310,7 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     bool arg2 ;
@@ -31151,29 +34329,30 @@ static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -31190,7 +34369,7 @@ static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -31207,25 +34386,26 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -31242,7 +34422,7 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -31259,25 +34439,26 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -31294,7 +34475,7 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -31313,26 +34494,31 @@ static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyTextShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31348,7 +34534,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -31359,10 +34545,15 @@ static PyObject *_wrap_PyTextShape_base_OnDrawControlPoints(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31378,7 +34569,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawControlPoints(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -31389,10 +34580,15 @@ static PyObject *_wrap_PyTextShape_base_OnEraseControlPoints(PyObject *self, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31408,11 +34604,11 @@ static PyObject *_wrap_PyTextShape_base_OnEraseControlPoints(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) True ;
+    bool arg3 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -31421,15 +34617,20 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyTextShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
-            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = (bool)(SWIG_As_bool(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
         }
     }
     {
@@ -31446,7 +34647,7 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -31467,30 +34668,32 @@ static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyTextShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (bool)(SWIG_As_bool(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj6) {
         {
-            arg7 = (int) SWIG_PyObj_AsInt(obj6);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg7 = (int)(SWIG_As_int(obj6)); 
+            if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
     {
@@ -31507,7 +34710,7 @@ static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -31526,26 +34729,28 @@ static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *self, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -31562,7 +34767,7 @@ static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -31581,26 +34786,28 @@ static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *self, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
-            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg6 = (int)(SWIG_As_int(obj5)); 
+            if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     {
@@ -31617,7 +34824,7 @@ static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -31630,14 +34837,15 @@ static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31653,7 +34861,7 @@ static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -31666,14 +34874,15 @@ static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31689,14 +34898,14 @@ static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject * PyTextShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyTextShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyTextShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Diagram(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Diagram(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *result;
     char *kwnames[] = {
@@ -31712,7 +34921,7 @@ static PyObject *_wrap_new_Diagram(PyObject *self, PyObject *args, PyObject *kwa
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 1); 
     }
     return resultobj;
     fail:
@@ -31720,7 +34929,7 @@ static PyObject *_wrap_new_Diagram(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Diagram_AddShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_AddShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -31733,10 +34942,13 @@ static PyObject *_wrap_Diagram_AddShape(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Diagram_AddShape",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31752,7 +34964,7 @@ static PyObject *_wrap_Diagram_AddShape(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Diagram_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxDC *arg2 = 0 ;
@@ -31763,10 +34975,15 @@ static PyObject *_wrap_Diagram_Clear(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_Clear",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31782,7 +34999,7 @@ static PyObject *_wrap_Diagram_Clear(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Diagram_DeleteAllShapes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_DeleteAllShapes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     PyObject * obj0 = 0 ;
@@ -31791,7 +35008,8 @@ static PyObject *_wrap_Diagram_DeleteAllShapes(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_DeleteAllShapes",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DeleteAllShapes();
@@ -31806,7 +35024,7 @@ static PyObject *_wrap_Diagram_DeleteAllShapes(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Diagram_DrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_DrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxDC *arg2 = 0 ;
@@ -31825,26 +35043,31 @@ static PyObject *_wrap_Diagram_DrawOutline(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:Diagram_DrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (double)(SWIG_As_double(obj4)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg6 = (double)(SWIG_As_double(obj5)); 
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31860,7 +35083,7 @@ static PyObject *_wrap_Diagram_DrawOutline(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Diagram_FindShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_FindShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     long arg2 ;
@@ -31872,10 +35095,11 @@ static PyObject *_wrap_Diagram_FindShape(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_FindShape",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (long) SWIG_PyObj_AsLong(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (long)(SWIG_As_long(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31885,7 +35109,7 @@ static PyObject *_wrap_Diagram_FindShape(PyObject *self, PyObject *args, PyObjec
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
     return resultobj;
     fail:
@@ -31893,7 +35117,7 @@ static PyObject *_wrap_Diagram_FindShape(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Diagram_GetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShapeCanvas *result;
@@ -31903,7 +35127,8 @@ static PyObject *_wrap_Diagram_GetCanvas(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetCanvas",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyShapeCanvas *)(arg1)->GetCanvas();
@@ -31912,7 +35137,7 @@ static PyObject *_wrap_Diagram_GetCanvas(PyObject *self, PyObject *args, PyObjec
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 0); 
     }
     return resultobj;
     fail:
@@ -31920,7 +35145,7 @@ static PyObject *_wrap_Diagram_GetCanvas(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Diagram_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     int result;
@@ -31930,7 +35155,8 @@ static PyObject *_wrap_Diagram_GetCount(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetCount",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetCount();
@@ -31938,14 +35164,16 @@ static PyObject *_wrap_Diagram_GetCount(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     double result;
@@ -31955,7 +35183,8 @@ static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetGridSpacing",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (double)(arg1)->GetGridSpacing();
@@ -31963,14 +35192,16 @@ static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromDouble((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     int result;
@@ -31980,7 +35211,8 @@ static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetMouseTolerance",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetMouseTolerance();
@@ -31988,14 +35220,16 @@ static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_PyObj_FromInt((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Diagram_GetShapeList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetShapeList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     PyObject *result;
@@ -32005,7 +35239,8 @@ static PyObject *_wrap_Diagram_GetShapeList(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetShapeList",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxDiagram_GetShapeList(arg1);
@@ -32020,7 +35255,7 @@ static PyObject *_wrap_Diagram_GetShapeList(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool result;
@@ -32030,7 +35265,8 @@ static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetQuickEditMode",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetQuickEditMode();
@@ -32038,14 +35274,16 @@ static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool result;
@@ -32055,7 +35293,8 @@ static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetSnapToGrid",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetSnapToGrid();
@@ -32063,14 +35302,16 @@ static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Diagram_InsertShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_InsertShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -32081,8 +35322,10 @@ static PyObject *_wrap_Diagram_InsertShape(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_InsertShape",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->InsertShape(arg2);
@@ -32097,7 +35340,7 @@ static PyObject *_wrap_Diagram_InsertShape(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Diagram_RecentreAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_RecentreAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxDC *arg2 = 0 ;
@@ -32108,10 +35351,15 @@ static PyObject *_wrap_Diagram_RecentreAll(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_RecentreAll",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32127,7 +35375,7 @@ static PyObject *_wrap_Diagram_RecentreAll(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Diagram_Redraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_Redraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxDC *arg2 = 0 ;
@@ -32138,10 +35386,15 @@ static PyObject *_wrap_Diagram_Redraw(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_Redraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32157,7 +35410,7 @@ static PyObject *_wrap_Diagram_Redraw(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Diagram_RemoveAllShapes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_RemoveAllShapes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     PyObject * obj0 = 0 ;
@@ -32166,7 +35419,8 @@ static PyObject *_wrap_Diagram_RemoveAllShapes(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_RemoveAllShapes",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->RemoveAllShapes();
@@ -32181,7 +35435,7 @@ static PyObject *_wrap_Diagram_RemoveAllShapes(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Diagram_RemoveShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_RemoveShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -32192,8 +35446,10 @@ static PyObject *_wrap_Diagram_RemoveShape(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_RemoveShape",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->RemoveShape(arg2);
@@ -32208,7 +35464,7 @@ static PyObject *_wrap_Diagram_RemoveShape(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Diagram_SetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -32219,8 +35475,10 @@ static PyObject *_wrap_Diagram_SetCanvas(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetCanvas",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetCanvas(arg2);
@@ -32235,7 +35493,7 @@ static PyObject *_wrap_Diagram_SetCanvas(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     double arg2 ;
@@ -32246,10 +35504,11 @@ static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetGridSpacing",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32265,7 +35524,7 @@ static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     int arg2 ;
@@ -32276,10 +35535,11 @@ static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetMouseTolerance",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32295,7 +35555,7 @@ static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool arg2 ;
@@ -32306,10 +35566,11 @@ static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetQuickEditMode",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32325,7 +35586,7 @@ static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool arg2 ;
@@ -32336,10 +35597,11 @@ static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetSnapToGrid",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32355,7 +35617,7 @@ static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Diagram_ShowAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_ShowAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool arg2 ;
@@ -32366,10 +35628,11 @@ static PyObject *_wrap_Diagram_ShowAll(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_ShowAll",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32385,13 +35648,15 @@ static PyObject *_wrap_Diagram_ShowAll(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Diagram_Snap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_Snap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -32400,16 +35665,23 @@ static PyObject *_wrap_Diagram_Snap(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Diagram_Snap",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        temp2 = PyFloat_AsDouble(obj1);
-        if (PyErr_Occurred()) SWIG_fail;
-        arg2 = &temp2;
+        if (!(SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_double,0) != -1)) {
+            temp2 = SWIG_As_double(obj1);
+            if (SWIG_arg_fail(2)) SWIG_fail;
+            arg2 = &temp2;
+            res2 = SWIG_NEWOBJ;
+        }
     }
     {
-        temp3 = PyFloat_AsDouble(obj2);
-        if (PyErr_Occurred()) SWIG_fail;
-        arg3 = &temp3;
+        if (!(SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_double,0) != -1)) {
+            temp3 = SWIG_As_double(obj2);
+            if (SWIG_arg_fail(3)) SWIG_fail;
+            arg3 = &temp3;
+            res3 = SWIG_NEWOBJ;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32419,28 +35691,24 @@ static PyObject *_wrap_Diagram_Snap(PyObject *self, PyObject *args, PyObject *kw
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * Diagram_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Diagram_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDiagram, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyShapeCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
     int arg2 = (int) -1 ;
@@ -32454,7 +35722,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
     wxPyShapeCanvas *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = False ;
+    bool temp6 = false ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -32467,12 +35735,13 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_PyShapeCanvas",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if (obj0) {
-        if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(1)) SWIG_fail;
     }
     if (obj1) {
         {
-            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = (int)(SWIG_As_int(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
     }
     if (obj2) {
@@ -32489,27 +35758,26 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
     }
     if (obj4) {
         {
-            arg5 = (long) SWIG_PyObj_AsLong(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (long)(SWIG_As_long(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj5) {
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = True;
+            temp6 = true;
         }
     }
     {
+        if (!wxPyCheckForApp()) SWIG_fail;
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyShapeCanvas *)new wxPyShapeCanvas(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    {
-        resultobj = wxPyMake_wxObject(result); 
-    }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeCanvas, 1);
     {
         if (temp6)
         delete arg6;
@@ -32524,7 +35792,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeCanvas__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -32537,7 +35805,8 @@ static PyObject *_wrap_PyShapeCanvas__setCallbackInfo(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeCanvas__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
     {
@@ -32554,7 +35823,7 @@ static PyObject *_wrap_PyShapeCanvas__setCallbackInfo(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_AddShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_AddShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -32567,10 +35836,13 @@ static PyObject *_wrap_PyShapeCanvas_AddShape(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShapeCanvas_AddShape",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32586,7 +35858,7 @@ static PyObject *_wrap_PyShapeCanvas_AddShape(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32596,6 +35868,7 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, P
     wxPyShape *arg6 = (wxPyShape *) NULL ;
     wxPyShape *result;
     int temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -32605,22 +35878,25 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, P
         (char *) "self",(char *) "x1",(char *) "y",(char *) "info",(char *) "notImage", NULL 
     };
     
-    arg4 = &temp4;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeCanvas_FindShape",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
-        if ((SWIG_ConvertPtr(obj3,(void **) &arg5, SWIGTYPE_p_wxClassInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj3, (void **)&arg5, SWIGTYPE_p_wxClassInfo, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     if (obj4) {
-        if ((SWIG_ConvertPtr(obj4,(void **) &arg6, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        SWIG_Python_ConvertPtr(obj4, (void **)&arg6, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32630,19 +35906,17 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, P
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32651,6 +35925,7 @@ static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *self, PyO
     int arg5 ;
     wxPyShape *result;
     int temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -32659,20 +35934,21 @@ static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *self, PyO
         (char *) "self",(char *) "x1",(char *) "y",(char *) "op", NULL 
     };
     
-    arg4 = &temp4;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShapeCanvas_FindFirstSensitiveShape",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg5 = (int) SWIG_PyObj_AsInt(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg5 = (int)(SWIG_As_int(obj3)); 
+        if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32682,19 +35958,17 @@ static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *self, PyO
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxShapeEvtHandler(result); 
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
+        resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxDiagram *result;
@@ -32704,7 +35978,8 @@ static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeCanvas_GetDiagram",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxDiagram *)(arg1)->GetDiagram();
@@ -32713,7 +35988,7 @@ static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *self, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 0); 
     }
     return resultobj;
     fail:
@@ -32721,7 +35996,7 @@ static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     bool result;
@@ -32731,7 +36006,8 @@ static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeCanvas_GetQuickEditMode",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetQuickEditMode();
@@ -32739,14 +36015,16 @@ static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_InsertShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_InsertShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -32757,8 +36035,10 @@ static PyObject *_wrap_PyShapeCanvas_InsertShape(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_InsertShape",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->InsertShape(arg2);
@@ -32773,7 +36053,7 @@ static PyObject *_wrap_PyShapeCanvas_InsertShape(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32788,19 +36068,20 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     {
@@ -32817,7 +36098,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32832,19 +36113,20 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     {
@@ -32861,7 +36143,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32876,19 +36158,20 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     {
@@ -32905,7 +36188,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32920,19 +36203,20 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     {
@@ -32949,7 +36233,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     bool arg2 ;
@@ -32966,23 +36250,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShapeCanvas_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -32999,7 +36284,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     bool arg2 ;
@@ -33016,23 +36301,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShapeCanvas_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg4 = (double)(SWIG_As_double(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
     }
     if (obj4) {
         {
-            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg5 = (int)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     {
@@ -33049,7 +36335,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -33064,19 +36350,20 @@ static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     {
@@ -33093,7 +36380,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -33108,19 +36395,20 @@ static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg2 = (double)(SWIG_As_double(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
-        if (PyErr_Occurred()) SWIG_fail;
+        arg3 = (double)(SWIG_As_double(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
     }
     if (obj3) {
         {
-            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
-            if (PyErr_Occurred()) SWIG_fail;
+            arg4 = (int)(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
         }
     }
     {
@@ -33137,7 +36425,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_Redraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_Redraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxDC *arg2 = 0 ;
@@ -33148,10 +36436,15 @@ static PyObject *_wrap_PyShapeCanvas_Redraw(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_Redraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (arg2 == NULL) {
+            SWIG_null_ref("wxDC");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -33167,7 +36460,7 @@ static PyObject *_wrap_PyShapeCanvas_Redraw(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_RemoveShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_RemoveShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -33178,8 +36471,10 @@ static PyObject *_wrap_PyShapeCanvas_RemoveShape(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_RemoveShape",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->RemoveShape(arg2);
@@ -33194,7 +36489,7 @@ static PyObject *_wrap_PyShapeCanvas_RemoveShape(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_SetDiagram(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_SetDiagram(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxDiagram *arg2 = (wxDiagram *) 0 ;
@@ -33205,8 +36500,10 @@ static PyObject *_wrap_PyShapeCanvas_SetDiagram(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_SetDiagram",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetDiagram(arg2);
@@ -33221,13 +36518,15 @@ static PyObject *_wrap_PyShapeCanvas_SetDiagram(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -33236,16 +36535,23 @@ static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeCanvas_Snap",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        temp2 = PyFloat_AsDouble(obj1);
-        if (PyErr_Occurred()) SWIG_fail;
-        arg2 = &temp2;
+        if (!(SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_double,0) != -1)) {
+            temp2 = SWIG_As_double(obj1);
+            if (SWIG_arg_fail(2)) SWIG_fail;
+            arg2 = &temp2;
+            res2 = SWIG_NEWOBJ;
+        }
     }
     {
-        temp3 = PyFloat_AsDouble(obj2);
-        if (PyErr_Occurred()) SWIG_fail;
-        arg3 = &temp3;
+        if (!(SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_double,0) != -1)) {
+            temp3 = SWIG_As_double(obj2);
+            if (SWIG_arg_fail(3)) SWIG_fail;
+            arg3 = &temp3;
+            res3 = SWIG_NEWOBJ;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -33255,28 +36561,24 @@ static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *self, PyObject *args, PyObje
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * PyShapeCanvas_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyShapeCanvas_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyShapeCanvas, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_OGLInitialize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLInitialize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -33284,6 +36586,7 @@ static PyObject *_wrap_OGLInitialize(PyObject *self, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":OGLInitialize",kwnames)) goto fail;
     {
+        if (!wxPyCheckForApp()) SWIG_fail;
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxOGLInitialize();
         
@@ -33297,7 +36600,7 @@ static PyObject *_wrap_OGLInitialize(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_OGLCleanUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLCleanUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -33305,6 +36608,7 @@ static PyObject *_wrap_OGLCleanUp(PyObject *self, PyObject *args, PyObject *kwar
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":OGLCleanUp",kwnames)) goto fail;
     {
+        if (!wxPyCheckForApp()) SWIG_fail;
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxOGLCleanUp();
         
@@ -33319,879 +36623,880 @@ static PyObject *_wrap_OGLCleanUp(PyObject *self, PyObject *args, PyObject *kwar
 
 
 static PyMethodDef SwigMethods[] = {
-        { (char *)"new_ShapeRegion", (PyCFunction) _wrap_new_ShapeRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetText", (PyCFunction) _wrap_ShapeRegion_SetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetFont", (PyCFunction) _wrap_ShapeRegion_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetMinSize", (PyCFunction) _wrap_ShapeRegion_SetMinSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetSize", (PyCFunction) _wrap_ShapeRegion_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetPosition", (PyCFunction) _wrap_ShapeRegion_SetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetProportions", (PyCFunction) _wrap_ShapeRegion_SetProportions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetFormatMode", (PyCFunction) _wrap_ShapeRegion_SetFormatMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetName", (PyCFunction) _wrap_ShapeRegion_SetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetColour", (PyCFunction) _wrap_ShapeRegion_SetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetText", (PyCFunction) _wrap_ShapeRegion_GetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetFont", (PyCFunction) _wrap_ShapeRegion_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetMinSize", (PyCFunction) _wrap_ShapeRegion_GetMinSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetProportion", (PyCFunction) _wrap_ShapeRegion_GetProportion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetSize", (PyCFunction) _wrap_ShapeRegion_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetPosition", (PyCFunction) _wrap_ShapeRegion_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetFormatMode", (PyCFunction) _wrap_ShapeRegion_GetFormatMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetName", (PyCFunction) _wrap_ShapeRegion_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetColour", (PyCFunction) _wrap_ShapeRegion_GetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetActualColourObject", (PyCFunction) _wrap_ShapeRegion_GetActualColourObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetFormattedText", (PyCFunction) _wrap_ShapeRegion_GetFormattedText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetPenColour", (PyCFunction) _wrap_ShapeRegion_GetPenColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetPenStyle", (PyCFunction) _wrap_ShapeRegion_GetPenStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetPenStyle", (PyCFunction) _wrap_ShapeRegion_SetPenStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetPenColour", (PyCFunction) _wrap_ShapeRegion_SetPenColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetActualPen", (PyCFunction) _wrap_ShapeRegion_GetActualPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetWidth", (PyCFunction) _wrap_ShapeRegion_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetHeight", (PyCFunction) _wrap_ShapeRegion_GetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_ClearText", (PyCFunction) _wrap_ShapeRegion_ClearText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_swigregister", ShapeRegion_swigregister, METH_VARARGS },
-        { (char *)"new_AttachmentPoint", (PyCFunction) _wrap_new_AttachmentPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_m_id_set", (PyCFunction) _wrap_AttachmentPoint_m_id_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_m_id_get", (PyCFunction) _wrap_AttachmentPoint_m_id_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_m_x_set", (PyCFunction) _wrap_AttachmentPoint_m_x_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_m_x_get", (PyCFunction) _wrap_AttachmentPoint_m_x_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_m_y_set", (PyCFunction) _wrap_AttachmentPoint_m_y_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_m_y_get", (PyCFunction) _wrap_AttachmentPoint_m_y_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_swigregister", AttachmentPoint_swigregister, METH_VARARGS },
-        { (char *)"new_PyShapeEvtHandler", (PyCFunction) _wrap_new_PyShapeEvtHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler__setCallbackInfo", (PyCFunction) _wrap_PyShapeEvtHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler__setOORInfo", (PyCFunction) _wrap_PyShapeEvtHandler__setOORInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_SetShape", (PyCFunction) _wrap_PyShapeEvtHandler_SetShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_GetShape", (PyCFunction) _wrap_PyShapeEvtHandler_GetShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_SetPreviousHandler", (PyCFunction) _wrap_PyShapeEvtHandler_SetPreviousHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_GetPreviousHandler", (PyCFunction) _wrap_PyShapeEvtHandler_GetPreviousHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_CreateNewCopy", (PyCFunction) _wrap_PyShapeEvtHandler_CreateNewCopy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDelete", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDraw", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDrawContents", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDrawBranches", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnMoveLinks", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnErase", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnEraseContents", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnHighlight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnLeftClick", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnRightClick", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnSize", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnMovePre", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnMovePost", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnBeginDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnEndDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDragRight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnBeginDragRight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnEndDragRight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDrawOutline", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDrawControlPoints", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnEraseControlPoints", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnMoveLink", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnSizingDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnBeginSize", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnEndSize", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_swigregister", PyShapeEvtHandler_swigregister, METH_VARARGS },
-        { (char *)"new_PyShape", (PyCFunction) _wrap_new_PyShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape__setCallbackInfo", (PyCFunction) _wrap_PyShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBoundingBoxMax", (PyCFunction) _wrap_PyShape_GetBoundingBoxMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBoundingBoxMin", (PyCFunction) _wrap_PyShape_GetBoundingBoxMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetPerimeterPoint", (PyCFunction) _wrap_PyShape_GetPerimeterPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetCanvas", (PyCFunction) _wrap_PyShape_GetCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetCanvas", (PyCFunction) _wrap_PyShape_SetCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AddToCanvas", (PyCFunction) _wrap_PyShape_AddToCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_InsertInCanvas", (PyCFunction) _wrap_PyShape_InsertInCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_RemoveFromCanvas", (PyCFunction) _wrap_PyShape_RemoveFromCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetX", (PyCFunction) _wrap_PyShape_GetX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetY", (PyCFunction) _wrap_PyShape_GetY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetX", (PyCFunction) _wrap_PyShape_SetX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetY", (PyCFunction) _wrap_PyShape_SetY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetParent", (PyCFunction) _wrap_PyShape_GetParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetParent", (PyCFunction) _wrap_PyShape_SetParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetTopAncestor", (PyCFunction) _wrap_PyShape_GetTopAncestor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetChildren", (PyCFunction) _wrap_PyShape_GetChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Unlink", (PyCFunction) _wrap_PyShape_Unlink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetDrawHandles", (PyCFunction) _wrap_PyShape_SetDrawHandles, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetDrawHandles", (PyCFunction) _wrap_PyShape_GetDrawHandles, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_MakeControlPoints", (PyCFunction) _wrap_PyShape_MakeControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_DeleteControlPoints", (PyCFunction) _wrap_PyShape_DeleteControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ResetControlPoints", (PyCFunction) _wrap_PyShape_ResetControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetEventHandler", (PyCFunction) _wrap_PyShape_GetEventHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetEventHandler", (PyCFunction) _wrap_PyShape_SetEventHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_MakeMandatoryControlPoints", (PyCFunction) _wrap_PyShape_MakeMandatoryControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ResetMandatoryControlPoints", (PyCFunction) _wrap_PyShape_ResetMandatoryControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Recompute", (PyCFunction) _wrap_PyShape_Recompute, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_CalculateSize", (PyCFunction) _wrap_PyShape_CalculateSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Select", (PyCFunction) _wrap_PyShape_Select, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetHighlight", (PyCFunction) _wrap_PyShape_SetHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_IsHighlighted", (PyCFunction) _wrap_PyShape_IsHighlighted, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Selected", (PyCFunction) _wrap_PyShape_Selected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AncestorSelected", (PyCFunction) _wrap_PyShape_AncestorSelected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetSensitivityFilter", (PyCFunction) _wrap_PyShape_SetSensitivityFilter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetSensitivityFilter", (PyCFunction) _wrap_PyShape_GetSensitivityFilter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetDraggable", (PyCFunction) _wrap_PyShape_SetDraggable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetFixedSize", (PyCFunction) _wrap_PyShape_SetFixedSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetFixedSize", (PyCFunction) _wrap_PyShape_GetFixedSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetFixedWidth", (PyCFunction) _wrap_PyShape_GetFixedWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetFixedHeight", (PyCFunction) _wrap_PyShape_GetFixedHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetSpaceAttachments", (PyCFunction) _wrap_PyShape_SetSpaceAttachments, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetSpaceAttachments", (PyCFunction) _wrap_PyShape_GetSpaceAttachments, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetShadowMode", (PyCFunction) _wrap_PyShape_SetShadowMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetShadowMode", (PyCFunction) _wrap_PyShape_GetShadowMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_HitTest", (PyCFunction) _wrap_PyShape_HitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetCentreResize", (PyCFunction) _wrap_PyShape_SetCentreResize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetCentreResize", (PyCFunction) _wrap_PyShape_GetCentreResize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetMaintainAspectRatio", (PyCFunction) _wrap_PyShape_SetMaintainAspectRatio, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetMaintainAspectRatio", (PyCFunction) _wrap_PyShape_GetMaintainAspectRatio, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetLines", (PyCFunction) _wrap_PyShape_GetLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetDisableLabel", (PyCFunction) _wrap_PyShape_SetDisableLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetDisableLabel", (PyCFunction) _wrap_PyShape_GetDisableLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetAttachmentMode", (PyCFunction) _wrap_PyShape_SetAttachmentMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetAttachmentMode", (PyCFunction) _wrap_PyShape_GetAttachmentMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetId", (PyCFunction) _wrap_PyShape_SetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetId", (PyCFunction) _wrap_PyShape_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetPen", (PyCFunction) _wrap_PyShape_SetPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetBrush", (PyCFunction) _wrap_PyShape_SetBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Show", (PyCFunction) _wrap_PyShape_Show, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_IsShown", (PyCFunction) _wrap_PyShape_IsShown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Move", (PyCFunction) _wrap_PyShape_Move, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Erase", (PyCFunction) _wrap_PyShape_Erase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_EraseContents", (PyCFunction) _wrap_PyShape_EraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Draw", (PyCFunction) _wrap_PyShape_Draw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Flash", (PyCFunction) _wrap_PyShape_Flash, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_MoveLinks", (PyCFunction) _wrap_PyShape_MoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_DrawContents", (PyCFunction) _wrap_PyShape_DrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetSize", (PyCFunction) _wrap_PyShape_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetAttachmentSize", (PyCFunction) _wrap_PyShape_SetAttachmentSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Attach", (PyCFunction) _wrap_PyShape_Attach, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Detach", (PyCFunction) _wrap_PyShape_Detach, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Constrain", (PyCFunction) _wrap_PyShape_Constrain, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AddLine", (PyCFunction) _wrap_PyShape_AddLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetLinePosition", (PyCFunction) _wrap_PyShape_GetLinePosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AddText", (PyCFunction) _wrap_PyShape_AddText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetPen", (PyCFunction) _wrap_PyShape_GetPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBrush", (PyCFunction) _wrap_PyShape_GetBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetDefaultRegionSize", (PyCFunction) _wrap_PyShape_SetDefaultRegionSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_FormatText", (PyCFunction) _wrap_PyShape_FormatText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetFormatMode", (PyCFunction) _wrap_PyShape_SetFormatMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetFormatMode", (PyCFunction) _wrap_PyShape_GetFormatMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetFont", (PyCFunction) _wrap_PyShape_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetFont", (PyCFunction) _wrap_PyShape_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetTextColour", (PyCFunction) _wrap_PyShape_SetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetTextColour", (PyCFunction) _wrap_PyShape_GetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetNumberOfTextRegions", (PyCFunction) _wrap_PyShape_GetNumberOfTextRegions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetRegionName", (PyCFunction) _wrap_PyShape_SetRegionName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetRegionName", (PyCFunction) _wrap_PyShape_GetRegionName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetRegionId", (PyCFunction) _wrap_PyShape_GetRegionId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_NameRegions", (PyCFunction) _wrap_PyShape_NameRegions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetRegions", (PyCFunction) _wrap_PyShape_GetRegions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AddRegion", (PyCFunction) _wrap_PyShape_AddRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ClearRegions", (PyCFunction) _wrap_PyShape_ClearRegions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AssignNewIds", (PyCFunction) _wrap_PyShape_AssignNewIds, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_FindRegion", (PyCFunction) _wrap_PyShape_FindRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_FindRegionNames", (PyCFunction) _wrap_PyShape_FindRegionNames, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ClearText", (PyCFunction) _wrap_PyShape_ClearText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_RemoveLine", (PyCFunction) _wrap_PyShape_RemoveLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetAttachmentPosition", (PyCFunction) _wrap_PyShape_GetAttachmentPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetNumberOfAttachments", (PyCFunction) _wrap_PyShape_GetNumberOfAttachments, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AttachmentIsValid", (PyCFunction) _wrap_PyShape_AttachmentIsValid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetAttachments", (PyCFunction) _wrap_PyShape_GetAttachments, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetAttachmentPositionEdge", (PyCFunction) _wrap_PyShape_GetAttachmentPositionEdge, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_CalcSimpleAttachment", (PyCFunction) _wrap_PyShape_CalcSimpleAttachment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AttachmentSortTest", (PyCFunction) _wrap_PyShape_AttachmentSortTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_EraseLinks", (PyCFunction) _wrap_PyShape_EraseLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_DrawLinks", (PyCFunction) _wrap_PyShape_DrawLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_MoveLineToNewAttachment", (PyCFunction) _wrap_PyShape_MoveLineToNewAttachment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ApplyAttachmentOrdering", (PyCFunction) _wrap_PyShape_ApplyAttachmentOrdering, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchingAttachmentRoot", (PyCFunction) _wrap_PyShape_GetBranchingAttachmentRoot, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchingAttachmentInfo", (PyCFunction) _wrap_PyShape_GetBranchingAttachmentInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchingAttachmentPoint", (PyCFunction) _wrap_PyShape_GetBranchingAttachmentPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetAttachmentLineCount", (PyCFunction) _wrap_PyShape_GetAttachmentLineCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetBranchNeckLength", (PyCFunction) _wrap_PyShape_SetBranchNeckLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchNeckLength", (PyCFunction) _wrap_PyShape_GetBranchNeckLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetBranchStemLength", (PyCFunction) _wrap_PyShape_SetBranchStemLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchStemLength", (PyCFunction) _wrap_PyShape_GetBranchStemLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetBranchSpacing", (PyCFunction) _wrap_PyShape_SetBranchSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchSpacing", (PyCFunction) _wrap_PyShape_GetBranchSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetBranchStyle", (PyCFunction) _wrap_PyShape_SetBranchStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchStyle", (PyCFunction) _wrap_PyShape_GetBranchStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_PhysicalToLogicalAttachment", (PyCFunction) _wrap_PyShape_PhysicalToLogicalAttachment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_LogicalToPhysicalAttachment", (PyCFunction) _wrap_PyShape_LogicalToPhysicalAttachment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Draggable", (PyCFunction) _wrap_PyShape_Draggable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_HasDescendant", (PyCFunction) _wrap_PyShape_HasDescendant, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_CreateNewCopy", (PyCFunction) _wrap_PyShape_CreateNewCopy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Copy", (PyCFunction) _wrap_PyShape_Copy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_CopyWithHandler", (PyCFunction) _wrap_PyShape_CopyWithHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Rotate", (PyCFunction) _wrap_PyShape_Rotate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetRotation", (PyCFunction) _wrap_PyShape_GetRotation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetRotation", (PyCFunction) _wrap_PyShape_SetRotation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ClearAttachments", (PyCFunction) _wrap_PyShape_ClearAttachments, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Recentre", (PyCFunction) _wrap_PyShape_Recentre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ClearPointList", (PyCFunction) _wrap_PyShape_ClearPointList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBackgroundPen", (PyCFunction) _wrap_PyShape_GetBackgroundPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBackgroundBrush", (PyCFunction) _wrap_PyShape_GetBackgroundBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDelete", (PyCFunction) _wrap_PyShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDraw", (PyCFunction) _wrap_PyShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDrawContents", (PyCFunction) _wrap_PyShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDrawBranches", (PyCFunction) _wrap_PyShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnMoveLinks", (PyCFunction) _wrap_PyShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnErase", (PyCFunction) _wrap_PyShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnEraseContents", (PyCFunction) _wrap_PyShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnHighlight", (PyCFunction) _wrap_PyShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnLeftClick", (PyCFunction) _wrap_PyShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnRightClick", (PyCFunction) _wrap_PyShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnSize", (PyCFunction) _wrap_PyShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnMovePre", (PyCFunction) _wrap_PyShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnMovePost", (PyCFunction) _wrap_PyShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDragLeft", (PyCFunction) _wrap_PyShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDragRight", (PyCFunction) _wrap_PyShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnEndDragRight", (PyCFunction) _wrap_PyShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDrawOutline", (PyCFunction) _wrap_PyShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnMoveLink", (PyCFunction) _wrap_PyShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnBeginSize", (PyCFunction) _wrap_PyShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnEndSize", (PyCFunction) _wrap_PyShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_swigregister", PyShape_swigregister, METH_VARARGS },
-        { (char *)"new_PseudoMetaFile", (PyCFunction) _wrap_new_PseudoMetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_PseudoMetaFile", (PyCFunction) _wrap_delete_PseudoMetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_Draw", (PyCFunction) _wrap_PseudoMetaFile_Draw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_Clear", (PyCFunction) _wrap_PseudoMetaFile_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_Copy", (PyCFunction) _wrap_PseudoMetaFile_Copy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_Scale", (PyCFunction) _wrap_PseudoMetaFile_Scale, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_ScaleTo", (PyCFunction) _wrap_PseudoMetaFile_ScaleTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_Translate", (PyCFunction) _wrap_PseudoMetaFile_Translate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_Rotate", (PyCFunction) _wrap_PseudoMetaFile_Rotate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_LoadFromMetaFile", (PyCFunction) _wrap_PseudoMetaFile_LoadFromMetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_GetBounds", (PyCFunction) _wrap_PseudoMetaFile_GetBounds, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_CalculateSize", (PyCFunction) _wrap_PseudoMetaFile_CalculateSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetRotateable", (PyCFunction) _wrap_PseudoMetaFile_SetRotateable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_GetRotateable", (PyCFunction) _wrap_PseudoMetaFile_GetRotateable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetSize", (PyCFunction) _wrap_PseudoMetaFile_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetFillBrush", (PyCFunction) _wrap_PseudoMetaFile_SetFillBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_GetFillBrush", (PyCFunction) _wrap_PseudoMetaFile_GetFillBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetOutlinePen", (PyCFunction) _wrap_PseudoMetaFile_SetOutlinePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_GetOutlinePen", (PyCFunction) _wrap_PseudoMetaFile_GetOutlinePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetOutlineOp", (PyCFunction) _wrap_PseudoMetaFile_SetOutlineOp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_GetOutlineOp", (PyCFunction) _wrap_PseudoMetaFile_GetOutlineOp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_IsValid", (PyCFunction) _wrap_PseudoMetaFile_IsValid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawLine", (PyCFunction) _wrap_PseudoMetaFile_DrawLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawRectangle", (PyCFunction) _wrap_PseudoMetaFile_DrawRectangle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawRoundedRectangle", (PyCFunction) _wrap_PseudoMetaFile_DrawRoundedRectangle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawArc", (PyCFunction) _wrap_PseudoMetaFile_DrawArc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawEllipticArc", (PyCFunction) _wrap_PseudoMetaFile_DrawEllipticArc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawEllipse", (PyCFunction) _wrap_PseudoMetaFile_DrawEllipse, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawPoint", (PyCFunction) _wrap_PseudoMetaFile_DrawPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawText", (PyCFunction) _wrap_PseudoMetaFile_DrawText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawLines", (PyCFunction) _wrap_PseudoMetaFile_DrawLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawPolygon", (PyCFunction) _wrap_PseudoMetaFile_DrawPolygon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawSpline", (PyCFunction) _wrap_PseudoMetaFile_DrawSpline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetClippingRect", (PyCFunction) _wrap_PseudoMetaFile_SetClippingRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DestroyClippingRect", (PyCFunction) _wrap_PseudoMetaFile_DestroyClippingRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetPen", (PyCFunction) _wrap_PseudoMetaFile_SetPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetBrush", (PyCFunction) _wrap_PseudoMetaFile_SetBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetFont", (PyCFunction) _wrap_PseudoMetaFile_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetTextColour", (PyCFunction) _wrap_PseudoMetaFile_SetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetBackgroundColour", (PyCFunction) _wrap_PseudoMetaFile_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetBackgroundMode", (PyCFunction) _wrap_PseudoMetaFile_SetBackgroundMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_swigregister", PseudoMetaFile_swigregister, METH_VARARGS },
-        { (char *)"new_PyRectangleShape", (PyCFunction) _wrap_new_PyRectangleShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape__setCallbackInfo", (PyCFunction) _wrap_PyRectangleShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_SetCornerRadius", (PyCFunction) _wrap_PyRectangleShape_SetCornerRadius, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_GetCornerRadius", (PyCFunction) _wrap_PyRectangleShape_GetCornerRadius, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDelete", (PyCFunction) _wrap_PyRectangleShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDraw", (PyCFunction) _wrap_PyRectangleShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDrawContents", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDrawBranches", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnMoveLinks", (PyCFunction) _wrap_PyRectangleShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnErase", (PyCFunction) _wrap_PyRectangleShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnEraseContents", (PyCFunction) _wrap_PyRectangleShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnHighlight", (PyCFunction) _wrap_PyRectangleShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnLeftClick", (PyCFunction) _wrap_PyRectangleShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyRectangleShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnRightClick", (PyCFunction) _wrap_PyRectangleShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnSize", (PyCFunction) _wrap_PyRectangleShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnMovePre", (PyCFunction) _wrap_PyRectangleShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnMovePost", (PyCFunction) _wrap_PyRectangleShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDragRight", (PyCFunction) _wrap_PyRectangleShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyRectangleShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnEndDragRight", (PyCFunction) _wrap_PyRectangleShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDrawOutline", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyRectangleShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnMoveLink", (PyCFunction) _wrap_PyRectangleShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnBeginSize", (PyCFunction) _wrap_PyRectangleShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnEndSize", (PyCFunction) _wrap_PyRectangleShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_swigregister", PyRectangleShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyControlPoint", (PyCFunction) _wrap_new_PyControlPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint__setCallbackInfo", (PyCFunction) _wrap_PyControlPoint__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_SetCornerRadius", (PyCFunction) _wrap_PyControlPoint_SetCornerRadius, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDelete", (PyCFunction) _wrap_PyControlPoint_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDraw", (PyCFunction) _wrap_PyControlPoint_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDrawContents", (PyCFunction) _wrap_PyControlPoint_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDrawBranches", (PyCFunction) _wrap_PyControlPoint_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnMoveLinks", (PyCFunction) _wrap_PyControlPoint_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnErase", (PyCFunction) _wrap_PyControlPoint_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnEraseContents", (PyCFunction) _wrap_PyControlPoint_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnHighlight", (PyCFunction) _wrap_PyControlPoint_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnLeftClick", (PyCFunction) _wrap_PyControlPoint_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyControlPoint_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnRightClick", (PyCFunction) _wrap_PyControlPoint_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnSize", (PyCFunction) _wrap_PyControlPoint_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnMovePre", (PyCFunction) _wrap_PyControlPoint_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnMovePost", (PyCFunction) _wrap_PyControlPoint_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnBeginDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnEndDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDragRight", (PyCFunction) _wrap_PyControlPoint_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnBeginDragRight", (PyCFunction) _wrap_PyControlPoint_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnEndDragRight", (PyCFunction) _wrap_PyControlPoint_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDrawOutline", (PyCFunction) _wrap_PyControlPoint_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDrawControlPoints", (PyCFunction) _wrap_PyControlPoint_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnEraseControlPoints", (PyCFunction) _wrap_PyControlPoint_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnMoveLink", (PyCFunction) _wrap_PyControlPoint_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnSizingDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnBeginSize", (PyCFunction) _wrap_PyControlPoint_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnEndSize", (PyCFunction) _wrap_PyControlPoint_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_swigregister", PyControlPoint_swigregister, METH_VARARGS },
-        { (char *)"new_PyBitmapShape", (PyCFunction) _wrap_new_PyBitmapShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape__setCallbackInfo", (PyCFunction) _wrap_PyBitmapShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_GetBitmap", (PyCFunction) _wrap_PyBitmapShape_GetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_GetFilename", (PyCFunction) _wrap_PyBitmapShape_GetFilename, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_SetBitmap", (PyCFunction) _wrap_PyBitmapShape_SetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_SetFilename", (PyCFunction) _wrap_PyBitmapShape_SetFilename, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDelete", (PyCFunction) _wrap_PyBitmapShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDraw", (PyCFunction) _wrap_PyBitmapShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDrawContents", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDrawBranches", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnMoveLinks", (PyCFunction) _wrap_PyBitmapShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnErase", (PyCFunction) _wrap_PyBitmapShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnEraseContents", (PyCFunction) _wrap_PyBitmapShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnHighlight", (PyCFunction) _wrap_PyBitmapShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnLeftClick", (PyCFunction) _wrap_PyBitmapShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyBitmapShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnRightClick", (PyCFunction) _wrap_PyBitmapShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnSize", (PyCFunction) _wrap_PyBitmapShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnMovePre", (PyCFunction) _wrap_PyBitmapShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnMovePost", (PyCFunction) _wrap_PyBitmapShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDragRight", (PyCFunction) _wrap_PyBitmapShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyBitmapShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnEndDragRight", (PyCFunction) _wrap_PyBitmapShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDrawOutline", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyBitmapShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnMoveLink", (PyCFunction) _wrap_PyBitmapShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnBeginSize", (PyCFunction) _wrap_PyBitmapShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnEndSize", (PyCFunction) _wrap_PyBitmapShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_swigregister", PyBitmapShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyDrawnShape", (PyCFunction) _wrap_new_PyDrawnShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape__setCallbackInfo", (PyCFunction) _wrap_PyDrawnShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_CalculateSize", (PyCFunction) _wrap_PyDrawnShape_CalculateSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DestroyClippingRect", (PyCFunction) _wrap_PyDrawnShape_DestroyClippingRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawArc", (PyCFunction) _wrap_PyDrawnShape_DrawArc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawAtAngle", (PyCFunction) _wrap_PyDrawnShape_DrawAtAngle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawEllipticArc", (PyCFunction) _wrap_PyDrawnShape_DrawEllipticArc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawLine", (PyCFunction) _wrap_PyDrawnShape_DrawLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawLines", (PyCFunction) _wrap_PyDrawnShape_DrawLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawPoint", (PyCFunction) _wrap_PyDrawnShape_DrawPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawPolygon", (PyCFunction) _wrap_PyDrawnShape_DrawPolygon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawRectangle", (PyCFunction) _wrap_PyDrawnShape_DrawRectangle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawRoundedRectangle", (PyCFunction) _wrap_PyDrawnShape_DrawRoundedRectangle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawSpline", (PyCFunction) _wrap_PyDrawnShape_DrawSpline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawText", (PyCFunction) _wrap_PyDrawnShape_DrawText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_GetAngle", (PyCFunction) _wrap_PyDrawnShape_GetAngle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_GetMetaFile", (PyCFunction) _wrap_PyDrawnShape_GetMetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_GetRotation", (PyCFunction) _wrap_PyDrawnShape_GetRotation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_LoadFromMetaFile", (PyCFunction) _wrap_PyDrawnShape_LoadFromMetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_Rotate", (PyCFunction) _wrap_PyDrawnShape_Rotate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetClippingRect", (PyCFunction) _wrap_PyDrawnShape_SetClippingRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetDrawnBackgroundColour", (PyCFunction) _wrap_PyDrawnShape_SetDrawnBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetDrawnBackgroundMode", (PyCFunction) _wrap_PyDrawnShape_SetDrawnBackgroundMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetDrawnBrush", (PyCFunction) _wrap_PyDrawnShape_SetDrawnBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetDrawnFont", (PyCFunction) _wrap_PyDrawnShape_SetDrawnFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetDrawnPen", (PyCFunction) _wrap_PyDrawnShape_SetDrawnPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetDrawnTextColour", (PyCFunction) _wrap_PyDrawnShape_SetDrawnTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_Scale", (PyCFunction) _wrap_PyDrawnShape_Scale, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetSaveToFile", (PyCFunction) _wrap_PyDrawnShape_SetSaveToFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_Translate", (PyCFunction) _wrap_PyDrawnShape_Translate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDelete", (PyCFunction) _wrap_PyDrawnShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDraw", (PyCFunction) _wrap_PyDrawnShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDrawContents", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDrawBranches", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnMoveLinks", (PyCFunction) _wrap_PyDrawnShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnErase", (PyCFunction) _wrap_PyDrawnShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnEraseContents", (PyCFunction) _wrap_PyDrawnShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnHighlight", (PyCFunction) _wrap_PyDrawnShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnLeftClick", (PyCFunction) _wrap_PyDrawnShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyDrawnShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnRightClick", (PyCFunction) _wrap_PyDrawnShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnSize", (PyCFunction) _wrap_PyDrawnShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnMovePre", (PyCFunction) _wrap_PyDrawnShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnMovePost", (PyCFunction) _wrap_PyDrawnShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDragRight", (PyCFunction) _wrap_PyDrawnShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyDrawnShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnEndDragRight", (PyCFunction) _wrap_PyDrawnShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDrawOutline", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyDrawnShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnMoveLink", (PyCFunction) _wrap_PyDrawnShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnBeginSize", (PyCFunction) _wrap_PyDrawnShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnEndSize", (PyCFunction) _wrap_PyDrawnShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_swigregister", PyDrawnShape_swigregister, METH_VARARGS },
-        { (char *)"new_OGLConstraint", (PyCFunction) _wrap_new_OGLConstraint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"OGLConstraint_Evaluate", (PyCFunction) _wrap_OGLConstraint_Evaluate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"OGLConstraint_SetSpacing", (PyCFunction) _wrap_OGLConstraint_SetSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"OGLConstraint_Equals", (PyCFunction) _wrap_OGLConstraint_Equals, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"OGLConstraint_swigregister", OGLConstraint_swigregister, METH_VARARGS },
-        { (char *)"new_PyCompositeShape", (PyCFunction) _wrap_new_PyCompositeShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape__setCallbackInfo", (PyCFunction) _wrap_PyCompositeShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_AddChild", (PyCFunction) _wrap_PyCompositeShape_AddChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_AddConstraint", (PyCFunction) _wrap_PyCompositeShape_AddConstraint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_AddConstrainedShapes", (PyCFunction) _wrap_PyCompositeShape_AddConstrainedShapes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_AddSimpleConstraint", (PyCFunction) _wrap_PyCompositeShape_AddSimpleConstraint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_CalculateSize", (PyCFunction) _wrap_PyCompositeShape_CalculateSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_ContainsDivision", (PyCFunction) _wrap_PyCompositeShape_ContainsDivision, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_DeleteConstraint", (PyCFunction) _wrap_PyCompositeShape_DeleteConstraint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_DeleteConstraintsInvolvingChild", (PyCFunction) _wrap_PyCompositeShape_DeleteConstraintsInvolvingChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_FindContainerImage", (PyCFunction) _wrap_PyCompositeShape_FindContainerImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_GetConstraints", (PyCFunction) _wrap_PyCompositeShape_GetConstraints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_GetDivisions", (PyCFunction) _wrap_PyCompositeShape_GetDivisions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_MakeContainer", (PyCFunction) _wrap_PyCompositeShape_MakeContainer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_Recompute", (PyCFunction) _wrap_PyCompositeShape_Recompute, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_RemoveChild", (PyCFunction) _wrap_PyCompositeShape_RemoveChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDelete", (PyCFunction) _wrap_PyCompositeShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDraw", (PyCFunction) _wrap_PyCompositeShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDrawContents", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDrawBranches", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnMoveLinks", (PyCFunction) _wrap_PyCompositeShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnErase", (PyCFunction) _wrap_PyCompositeShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnEraseContents", (PyCFunction) _wrap_PyCompositeShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnHighlight", (PyCFunction) _wrap_PyCompositeShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnLeftClick", (PyCFunction) _wrap_PyCompositeShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyCompositeShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnRightClick", (PyCFunction) _wrap_PyCompositeShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnSize", (PyCFunction) _wrap_PyCompositeShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnMovePre", (PyCFunction) _wrap_PyCompositeShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnMovePost", (PyCFunction) _wrap_PyCompositeShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDragRight", (PyCFunction) _wrap_PyCompositeShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyCompositeShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnEndDragRight", (PyCFunction) _wrap_PyCompositeShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDrawOutline", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyCompositeShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnMoveLink", (PyCFunction) _wrap_PyCompositeShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnBeginSize", (PyCFunction) _wrap_PyCompositeShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnEndSize", (PyCFunction) _wrap_PyCompositeShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_swigregister", PyCompositeShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyDividedShape", (PyCFunction) _wrap_new_PyDividedShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape__setCallbackInfo", (PyCFunction) _wrap_PyDividedShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_EditRegions", (PyCFunction) _wrap_PyDividedShape_EditRegions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_SetRegionSizes", (PyCFunction) _wrap_PyDividedShape_SetRegionSizes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDelete", (PyCFunction) _wrap_PyDividedShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDraw", (PyCFunction) _wrap_PyDividedShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDrawContents", (PyCFunction) _wrap_PyDividedShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDrawBranches", (PyCFunction) _wrap_PyDividedShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnMoveLinks", (PyCFunction) _wrap_PyDividedShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnErase", (PyCFunction) _wrap_PyDividedShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnEraseContents", (PyCFunction) _wrap_PyDividedShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnHighlight", (PyCFunction) _wrap_PyDividedShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnLeftClick", (PyCFunction) _wrap_PyDividedShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyDividedShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnRightClick", (PyCFunction) _wrap_PyDividedShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnSize", (PyCFunction) _wrap_PyDividedShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnMovePre", (PyCFunction) _wrap_PyDividedShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnMovePost", (PyCFunction) _wrap_PyDividedShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDragRight", (PyCFunction) _wrap_PyDividedShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyDividedShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnEndDragRight", (PyCFunction) _wrap_PyDividedShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDrawOutline", (PyCFunction) _wrap_PyDividedShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyDividedShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyDividedShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnMoveLink", (PyCFunction) _wrap_PyDividedShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnBeginSize", (PyCFunction) _wrap_PyDividedShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnEndSize", (PyCFunction) _wrap_PyDividedShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_swigregister", PyDividedShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyDivisionShape", (PyCFunction) _wrap_new_PyDivisionShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape__setCallbackInfo", (PyCFunction) _wrap_PyDivisionShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_AdjustBottom", (PyCFunction) _wrap_PyDivisionShape_AdjustBottom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_AdjustLeft", (PyCFunction) _wrap_PyDivisionShape_AdjustLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_AdjustRight", (PyCFunction) _wrap_PyDivisionShape_AdjustRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_AdjustTop", (PyCFunction) _wrap_PyDivisionShape_AdjustTop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_Divide", (PyCFunction) _wrap_PyDivisionShape_Divide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_EditEdge", (PyCFunction) _wrap_PyDivisionShape_EditEdge, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetBottomSide", (PyCFunction) _wrap_PyDivisionShape_GetBottomSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetHandleSide", (PyCFunction) _wrap_PyDivisionShape_GetHandleSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetLeftSide", (PyCFunction) _wrap_PyDivisionShape_GetLeftSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetLeftSideColour", (PyCFunction) _wrap_PyDivisionShape_GetLeftSideColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetLeftSidePen", (PyCFunction) _wrap_PyDivisionShape_GetLeftSidePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetRightSide", (PyCFunction) _wrap_PyDivisionShape_GetRightSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetTopSide", (PyCFunction) _wrap_PyDivisionShape_GetTopSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetTopSidePen", (PyCFunction) _wrap_PyDivisionShape_GetTopSidePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_ResizeAdjoining", (PyCFunction) _wrap_PyDivisionShape_ResizeAdjoining, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_PopupMenu", (PyCFunction) _wrap_PyDivisionShape_PopupMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetBottomSide", (PyCFunction) _wrap_PyDivisionShape_SetBottomSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetHandleSide", (PyCFunction) _wrap_PyDivisionShape_SetHandleSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetLeftSide", (PyCFunction) _wrap_PyDivisionShape_SetLeftSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetLeftSideColour", (PyCFunction) _wrap_PyDivisionShape_SetLeftSideColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetLeftSidePen", (PyCFunction) _wrap_PyDivisionShape_SetLeftSidePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetRightSide", (PyCFunction) _wrap_PyDivisionShape_SetRightSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetTopSide", (PyCFunction) _wrap_PyDivisionShape_SetTopSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetTopSideColour", (PyCFunction) _wrap_PyDivisionShape_SetTopSideColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetTopSidePen", (PyCFunction) _wrap_PyDivisionShape_SetTopSidePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDelete", (PyCFunction) _wrap_PyDivisionShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDraw", (PyCFunction) _wrap_PyDivisionShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDrawContents", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDrawBranches", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnMoveLinks", (PyCFunction) _wrap_PyDivisionShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnErase", (PyCFunction) _wrap_PyDivisionShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnEraseContents", (PyCFunction) _wrap_PyDivisionShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnHighlight", (PyCFunction) _wrap_PyDivisionShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnLeftClick", (PyCFunction) _wrap_PyDivisionShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyDivisionShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnRightClick", (PyCFunction) _wrap_PyDivisionShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnSize", (PyCFunction) _wrap_PyDivisionShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnMovePre", (PyCFunction) _wrap_PyDivisionShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnMovePost", (PyCFunction) _wrap_PyDivisionShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDragRight", (PyCFunction) _wrap_PyDivisionShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyDivisionShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnEndDragRight", (PyCFunction) _wrap_PyDivisionShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDrawOutline", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyDivisionShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnMoveLink", (PyCFunction) _wrap_PyDivisionShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnBeginSize", (PyCFunction) _wrap_PyDivisionShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnEndSize", (PyCFunction) _wrap_PyDivisionShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_swigregister", PyDivisionShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyEllipseShape", (PyCFunction) _wrap_new_PyEllipseShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape__setCallbackInfo", (PyCFunction) _wrap_PyEllipseShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDraw", (PyCFunction) _wrap_PyEllipseShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDrawContents", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDrawBranches", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnMoveLinks", (PyCFunction) _wrap_PyEllipseShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnErase", (PyCFunction) _wrap_PyEllipseShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnEraseContents", (PyCFunction) _wrap_PyEllipseShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnHighlight", (PyCFunction) _wrap_PyEllipseShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnLeftClick", (PyCFunction) _wrap_PyEllipseShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyEllipseShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnRightClick", (PyCFunction) _wrap_PyEllipseShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnSize", (PyCFunction) _wrap_PyEllipseShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnMovePre", (PyCFunction) _wrap_PyEllipseShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnMovePost", (PyCFunction) _wrap_PyEllipseShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDragRight", (PyCFunction) _wrap_PyEllipseShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyEllipseShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnEndDragRight", (PyCFunction) _wrap_PyEllipseShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDrawOutline", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyEllipseShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnMoveLink", (PyCFunction) _wrap_PyEllipseShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnBeginSize", (PyCFunction) _wrap_PyEllipseShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnEndSize", (PyCFunction) _wrap_PyEllipseShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_swigregister", PyEllipseShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyCircleShape", (PyCFunction) _wrap_new_PyCircleShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape__setCallbackInfo", (PyCFunction) _wrap_PyCircleShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDraw", (PyCFunction) _wrap_PyCircleShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDrawContents", (PyCFunction) _wrap_PyCircleShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDrawBranches", (PyCFunction) _wrap_PyCircleShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnMoveLinks", (PyCFunction) _wrap_PyCircleShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnErase", (PyCFunction) _wrap_PyCircleShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnEraseContents", (PyCFunction) _wrap_PyCircleShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnHighlight", (PyCFunction) _wrap_PyCircleShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnLeftClick", (PyCFunction) _wrap_PyCircleShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyCircleShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnRightClick", (PyCFunction) _wrap_PyCircleShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnSize", (PyCFunction) _wrap_PyCircleShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnMovePre", (PyCFunction) _wrap_PyCircleShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnMovePost", (PyCFunction) _wrap_PyCircleShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDragRight", (PyCFunction) _wrap_PyCircleShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyCircleShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnEndDragRight", (PyCFunction) _wrap_PyCircleShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDrawOutline", (PyCFunction) _wrap_PyCircleShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyCircleShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyCircleShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnMoveLink", (PyCFunction) _wrap_PyCircleShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnBeginSize", (PyCFunction) _wrap_PyCircleShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnEndSize", (PyCFunction) _wrap_PyCircleShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_swigregister", PyCircleShape_swigregister, METH_VARARGS },
-        { (char *)"new_ArrowHead", (PyCFunction) _wrap_new_ArrowHead, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_ArrowHead", (PyCFunction) _wrap_delete_ArrowHead, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead__GetType", (PyCFunction) _wrap_ArrowHead__GetType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetPosition", (PyCFunction) _wrap_ArrowHead_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_SetPosition", (PyCFunction) _wrap_ArrowHead_SetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetXOffset", (PyCFunction) _wrap_ArrowHead_GetXOffset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetYOffset", (PyCFunction) _wrap_ArrowHead_GetYOffset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetSpacing", (PyCFunction) _wrap_ArrowHead_GetSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetSize", (PyCFunction) _wrap_ArrowHead_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetName", (PyCFunction) _wrap_ArrowHead_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_SetXOffset", (PyCFunction) _wrap_ArrowHead_SetXOffset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_SetYOffset", (PyCFunction) _wrap_ArrowHead_SetYOffset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetMetaFile", (PyCFunction) _wrap_ArrowHead_GetMetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetId", (PyCFunction) _wrap_ArrowHead_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetArrowEnd", (PyCFunction) _wrap_ArrowHead_GetArrowEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetArrowSize", (PyCFunction) _wrap_ArrowHead_GetArrowSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_SetSize", (PyCFunction) _wrap_ArrowHead_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_SetSpacing", (PyCFunction) _wrap_ArrowHead_SetSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_swigregister", ArrowHead_swigregister, METH_VARARGS },
-        { (char *)"new_PyLineShape", (PyCFunction) _wrap_new_PyLineShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape__setCallbackInfo", (PyCFunction) _wrap_PyLineShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_AddArrow", (PyCFunction) _wrap_PyLineShape_AddArrow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_AddArrowOrdered", (PyCFunction) _wrap_PyLineShape_AddArrowOrdered, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_ClearArrow", (PyCFunction) _wrap_PyLineShape_ClearArrow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_ClearArrowsAtPosition", (PyCFunction) _wrap_PyLineShape_ClearArrowsAtPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_DrawArrow", (PyCFunction) _wrap_PyLineShape_DrawArrow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_DeleteArrowHeadId", (PyCFunction) _wrap_PyLineShape_DeleteArrowHeadId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_DeleteArrowHead", (PyCFunction) _wrap_PyLineShape_DeleteArrowHead, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_DeleteLineControlPoint", (PyCFunction) _wrap_PyLineShape_DeleteLineControlPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_DrawArrows", (PyCFunction) _wrap_PyLineShape_DrawArrows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_DrawRegion", (PyCFunction) _wrap_PyLineShape_DrawRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_EraseRegion", (PyCFunction) _wrap_PyLineShape_EraseRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_FindArrowHeadId", (PyCFunction) _wrap_PyLineShape_FindArrowHeadId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_FindArrowHead", (PyCFunction) _wrap_PyLineShape_FindArrowHead, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_FindLineEndPoints", (PyCFunction) _wrap_PyLineShape_FindLineEndPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_FindLinePosition", (PyCFunction) _wrap_PyLineShape_FindLinePosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_FindMinimumWidth", (PyCFunction) _wrap_PyLineShape_FindMinimumWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_FindNth", (PyCFunction) _wrap_PyLineShape_FindNth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetAttachmentFrom", (PyCFunction) _wrap_PyLineShape_GetAttachmentFrom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetAttachmentTo", (PyCFunction) _wrap_PyLineShape_GetAttachmentTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetEnds", (PyCFunction) _wrap_PyLineShape_GetEnds, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetFrom", (PyCFunction) _wrap_PyLineShape_GetFrom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetLabelPosition", (PyCFunction) _wrap_PyLineShape_GetLabelPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetNextControlPoint", (PyCFunction) _wrap_PyLineShape_GetNextControlPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetTo", (PyCFunction) _wrap_PyLineShape_GetTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_Initialise", (PyCFunction) _wrap_PyLineShape_Initialise, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_InsertLineControlPoint", (PyCFunction) _wrap_PyLineShape_InsertLineControlPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_IsEnd", (PyCFunction) _wrap_PyLineShape_IsEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_IsSpline", (PyCFunction) _wrap_PyLineShape_IsSpline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_MakeLineControlPoints", (PyCFunction) _wrap_PyLineShape_MakeLineControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetLineControlPoints", (PyCFunction) _wrap_PyLineShape_GetLineControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetAttachmentFrom", (PyCFunction) _wrap_PyLineShape_SetAttachmentFrom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetAttachments", (PyCFunction) _wrap_PyLineShape_SetAttachments, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetAttachmentTo", (PyCFunction) _wrap_PyLineShape_SetAttachmentTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetEnds", (PyCFunction) _wrap_PyLineShape_SetEnds, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetFrom", (PyCFunction) _wrap_PyLineShape_SetFrom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetIgnoreOffsets", (PyCFunction) _wrap_PyLineShape_SetIgnoreOffsets, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetSpline", (PyCFunction) _wrap_PyLineShape_SetSpline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetTo", (PyCFunction) _wrap_PyLineShape_SetTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_Straighten", (PyCFunction) _wrap_PyLineShape_Straighten, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_Unlink", (PyCFunction) _wrap_PyLineShape_Unlink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetAlignmentOrientation", (PyCFunction) _wrap_PyLineShape_SetAlignmentOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetAlignmentType", (PyCFunction) _wrap_PyLineShape_SetAlignmentType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetAlignmentOrientation", (PyCFunction) _wrap_PyLineShape_GetAlignmentOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetAlignmentType", (PyCFunction) _wrap_PyLineShape_GetAlignmentType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetAlignmentStart", (PyCFunction) _wrap_PyLineShape_GetAlignmentStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetAlignmentEnd", (PyCFunction) _wrap_PyLineShape_GetAlignmentEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDraw", (PyCFunction) _wrap_PyLineShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDrawContents", (PyCFunction) _wrap_PyLineShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDrawBranches", (PyCFunction) _wrap_PyLineShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnMoveLinks", (PyCFunction) _wrap_PyLineShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnErase", (PyCFunction) _wrap_PyLineShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnEraseContents", (PyCFunction) _wrap_PyLineShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnHighlight", (PyCFunction) _wrap_PyLineShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnLeftClick", (PyCFunction) _wrap_PyLineShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyLineShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnRightClick", (PyCFunction) _wrap_PyLineShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnSize", (PyCFunction) _wrap_PyLineShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnMovePre", (PyCFunction) _wrap_PyLineShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnMovePost", (PyCFunction) _wrap_PyLineShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDragRight", (PyCFunction) _wrap_PyLineShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyLineShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnEndDragRight", (PyCFunction) _wrap_PyLineShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDrawOutline", (PyCFunction) _wrap_PyLineShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyLineShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyLineShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnMoveLink", (PyCFunction) _wrap_PyLineShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnBeginSize", (PyCFunction) _wrap_PyLineShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnEndSize", (PyCFunction) _wrap_PyLineShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_swigregister", PyLineShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyPolygonShape", (PyCFunction) _wrap_new_PyPolygonShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape__setCallbackInfo", (PyCFunction) _wrap_PyPolygonShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_Create", (PyCFunction) _wrap_PyPolygonShape_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_AddPolygonPoint", (PyCFunction) _wrap_PyPolygonShape_AddPolygonPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_CalculatePolygonCentre", (PyCFunction) _wrap_PyPolygonShape_CalculatePolygonCentre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_DeletePolygonPoint", (PyCFunction) _wrap_PyPolygonShape_DeletePolygonPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_GetPoints", (PyCFunction) _wrap_PyPolygonShape_GetPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_GetOriginalPoints", (PyCFunction) _wrap_PyPolygonShape_GetOriginalPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_GetOriginalWidth", (PyCFunction) _wrap_PyPolygonShape_GetOriginalWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_GetOriginalHeight", (PyCFunction) _wrap_PyPolygonShape_GetOriginalHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_SetOriginalWidth", (PyCFunction) _wrap_PyPolygonShape_SetOriginalWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_SetOriginalHeight", (PyCFunction) _wrap_PyPolygonShape_SetOriginalHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_UpdateOriginalPoints", (PyCFunction) _wrap_PyPolygonShape_UpdateOriginalPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDraw", (PyCFunction) _wrap_PyPolygonShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDrawContents", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDrawBranches", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnMoveLinks", (PyCFunction) _wrap_PyPolygonShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnErase", (PyCFunction) _wrap_PyPolygonShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnEraseContents", (PyCFunction) _wrap_PyPolygonShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnHighlight", (PyCFunction) _wrap_PyPolygonShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnLeftClick", (PyCFunction) _wrap_PyPolygonShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyPolygonShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnRightClick", (PyCFunction) _wrap_PyPolygonShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnSize", (PyCFunction) _wrap_PyPolygonShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnMovePre", (PyCFunction) _wrap_PyPolygonShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnMovePost", (PyCFunction) _wrap_PyPolygonShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDragRight", (PyCFunction) _wrap_PyPolygonShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyPolygonShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnEndDragRight", (PyCFunction) _wrap_PyPolygonShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDrawOutline", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyPolygonShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnMoveLink", (PyCFunction) _wrap_PyPolygonShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnBeginSize", (PyCFunction) _wrap_PyPolygonShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnEndSize", (PyCFunction) _wrap_PyPolygonShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_swigregister", PyPolygonShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyTextShape", (PyCFunction) _wrap_new_PyTextShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape__setCallbackInfo", (PyCFunction) _wrap_PyTextShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDelete", (PyCFunction) _wrap_PyTextShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDraw", (PyCFunction) _wrap_PyTextShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDrawContents", (PyCFunction) _wrap_PyTextShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDrawBranches", (PyCFunction) _wrap_PyTextShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnMoveLinks", (PyCFunction) _wrap_PyTextShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnErase", (PyCFunction) _wrap_PyTextShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnEraseContents", (PyCFunction) _wrap_PyTextShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnHighlight", (PyCFunction) _wrap_PyTextShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnLeftClick", (PyCFunction) _wrap_PyTextShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyTextShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnRightClick", (PyCFunction) _wrap_PyTextShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnSize", (PyCFunction) _wrap_PyTextShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnMovePre", (PyCFunction) _wrap_PyTextShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnMovePost", (PyCFunction) _wrap_PyTextShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDragRight", (PyCFunction) _wrap_PyTextShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyTextShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnEndDragRight", (PyCFunction) _wrap_PyTextShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDrawOutline", (PyCFunction) _wrap_PyTextShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyTextShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyTextShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnMoveLink", (PyCFunction) _wrap_PyTextShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnBeginSize", (PyCFunction) _wrap_PyTextShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnEndSize", (PyCFunction) _wrap_PyTextShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_swigregister", PyTextShape_swigregister, METH_VARARGS },
-        { (char *)"new_Diagram", (PyCFunction) _wrap_new_Diagram, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_AddShape", (PyCFunction) _wrap_Diagram_AddShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_Clear", (PyCFunction) _wrap_Diagram_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_DeleteAllShapes", (PyCFunction) _wrap_Diagram_DeleteAllShapes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_DrawOutline", (PyCFunction) _wrap_Diagram_DrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_FindShape", (PyCFunction) _wrap_Diagram_FindShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetCanvas", (PyCFunction) _wrap_Diagram_GetCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetCount", (PyCFunction) _wrap_Diagram_GetCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetGridSpacing", (PyCFunction) _wrap_Diagram_GetGridSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetMouseTolerance", (PyCFunction) _wrap_Diagram_GetMouseTolerance, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetShapeList", (PyCFunction) _wrap_Diagram_GetShapeList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetQuickEditMode", (PyCFunction) _wrap_Diagram_GetQuickEditMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetSnapToGrid", (PyCFunction) _wrap_Diagram_GetSnapToGrid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_InsertShape", (PyCFunction) _wrap_Diagram_InsertShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_RecentreAll", (PyCFunction) _wrap_Diagram_RecentreAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_Redraw", (PyCFunction) _wrap_Diagram_Redraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_RemoveAllShapes", (PyCFunction) _wrap_Diagram_RemoveAllShapes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_RemoveShape", (PyCFunction) _wrap_Diagram_RemoveShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_SetCanvas", (PyCFunction) _wrap_Diagram_SetCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_SetGridSpacing", (PyCFunction) _wrap_Diagram_SetGridSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_SetMouseTolerance", (PyCFunction) _wrap_Diagram_SetMouseTolerance, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_SetQuickEditMode", (PyCFunction) _wrap_Diagram_SetQuickEditMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_SetSnapToGrid", (PyCFunction) _wrap_Diagram_SetSnapToGrid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_ShowAll", (PyCFunction) _wrap_Diagram_ShowAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_Snap", (PyCFunction) _wrap_Diagram_Snap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_swigregister", Diagram_swigregister, METH_VARARGS },
-        { (char *)"new_PyShapeCanvas", (PyCFunction) _wrap_new_PyShapeCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas__setCallbackInfo", (PyCFunction) _wrap_PyShapeCanvas__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_AddShape", (PyCFunction) _wrap_PyShapeCanvas_AddShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_FindShape", (PyCFunction) _wrap_PyShapeCanvas_FindShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_FindFirstSensitiveShape", (PyCFunction) _wrap_PyShapeCanvas_FindFirstSensitiveShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_GetDiagram", (PyCFunction) _wrap_PyShapeCanvas_GetDiagram, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_GetQuickEditMode", (PyCFunction) _wrap_PyShapeCanvas_GetQuickEditMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_InsertShape", (PyCFunction) _wrap_PyShapeCanvas_InsertShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnBeginDragLeft", (PyCFunction) _wrap_PyShapeCanvas_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnBeginDragRight", (PyCFunction) _wrap_PyShapeCanvas_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnEndDragLeft", (PyCFunction) _wrap_PyShapeCanvas_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnEndDragRight", (PyCFunction) _wrap_PyShapeCanvas_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnDragLeft", (PyCFunction) _wrap_PyShapeCanvas_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnDragRight", (PyCFunction) _wrap_PyShapeCanvas_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnLeftClick", (PyCFunction) _wrap_PyShapeCanvas_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnRightClick", (PyCFunction) _wrap_PyShapeCanvas_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_Redraw", (PyCFunction) _wrap_PyShapeCanvas_Redraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_RemoveShape", (PyCFunction) _wrap_PyShapeCanvas_RemoveShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_SetDiagram", (PyCFunction) _wrap_PyShapeCanvas_SetDiagram, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_Snap", (PyCFunction) _wrap_PyShapeCanvas_Snap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_swigregister", PyShapeCanvas_swigregister, METH_VARARGS },
-        { (char *)"OGLInitialize", (PyCFunction) _wrap_OGLInitialize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"OGLCleanUp", (PyCFunction) _wrap_OGLCleanUp, METH_VARARGS | METH_KEYWORDS },
-        { NULL, NULL }
+        { (char *)"new_ShapeRegion", (PyCFunction) _wrap_new_ShapeRegion, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_SetText", (PyCFunction) _wrap_ShapeRegion_SetText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_SetFont", (PyCFunction) _wrap_ShapeRegion_SetFont, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_SetMinSize", (PyCFunction) _wrap_ShapeRegion_SetMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_SetSize", (PyCFunction) _wrap_ShapeRegion_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_SetPosition", (PyCFunction) _wrap_ShapeRegion_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_SetProportions", (PyCFunction) _wrap_ShapeRegion_SetProportions, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_SetFormatMode", (PyCFunction) _wrap_ShapeRegion_SetFormatMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_SetName", (PyCFunction) _wrap_ShapeRegion_SetName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_SetColour", (PyCFunction) _wrap_ShapeRegion_SetColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetText", (PyCFunction) _wrap_ShapeRegion_GetText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetFont", (PyCFunction) _wrap_ShapeRegion_GetFont, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetMinSize", (PyCFunction) _wrap_ShapeRegion_GetMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetProportion", (PyCFunction) _wrap_ShapeRegion_GetProportion, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetSize", (PyCFunction) _wrap_ShapeRegion_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetPosition", (PyCFunction) _wrap_ShapeRegion_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetFormatMode", (PyCFunction) _wrap_ShapeRegion_GetFormatMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetName", (PyCFunction) _wrap_ShapeRegion_GetName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetColour", (PyCFunction) _wrap_ShapeRegion_GetColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetActualColourObject", (PyCFunction) _wrap_ShapeRegion_GetActualColourObject, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetFormattedText", (PyCFunction) _wrap_ShapeRegion_GetFormattedText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetPenColour", (PyCFunction) _wrap_ShapeRegion_GetPenColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetPenStyle", (PyCFunction) _wrap_ShapeRegion_GetPenStyle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_SetPenStyle", (PyCFunction) _wrap_ShapeRegion_SetPenStyle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_SetPenColour", (PyCFunction) _wrap_ShapeRegion_SetPenColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetActualPen", (PyCFunction) _wrap_ShapeRegion_GetActualPen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetWidth", (PyCFunction) _wrap_ShapeRegion_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_GetHeight", (PyCFunction) _wrap_ShapeRegion_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_ClearText", (PyCFunction) _wrap_ShapeRegion_ClearText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShapeRegion_swigregister", ShapeRegion_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_AttachmentPoint", (PyCFunction) _wrap_new_AttachmentPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AttachmentPoint_m_id_set", (PyCFunction) _wrap_AttachmentPoint_m_id_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AttachmentPoint_m_id_get", (PyCFunction) _wrap_AttachmentPoint_m_id_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AttachmentPoint_m_x_set", (PyCFunction) _wrap_AttachmentPoint_m_x_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AttachmentPoint_m_x_get", (PyCFunction) _wrap_AttachmentPoint_m_x_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AttachmentPoint_m_y_set", (PyCFunction) _wrap_AttachmentPoint_m_y_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AttachmentPoint_m_y_get", (PyCFunction) _wrap_AttachmentPoint_m_y_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AttachmentPoint_swigregister", AttachmentPoint_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyShapeEvtHandler", (PyCFunction) _wrap_new_PyShapeEvtHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler__setCallbackInfo", (PyCFunction) _wrap_PyShapeEvtHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler__setOORInfo", (PyCFunction) _wrap_PyShapeEvtHandler__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_SetShape", (PyCFunction) _wrap_PyShapeEvtHandler_SetShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_GetShape", (PyCFunction) _wrap_PyShapeEvtHandler_GetShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_SetPreviousHandler", (PyCFunction) _wrap_PyShapeEvtHandler_SetPreviousHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_GetPreviousHandler", (PyCFunction) _wrap_PyShapeEvtHandler_GetPreviousHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_CreateNewCopy", (PyCFunction) _wrap_PyShapeEvtHandler_CreateNewCopy, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnDelete", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnDraw", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnDrawContents", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnDrawBranches", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnMoveLinks", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnErase", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnEraseContents", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnHighlight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnLeftClick", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnRightClick", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnSize", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnMovePre", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnMovePost", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnBeginDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnEndDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnDragRight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnBeginDragRight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnEndDragRight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnDrawOutline", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnDrawControlPoints", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnEraseControlPoints", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnMoveLink", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnSizingDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnBeginSize", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_base_OnEndSize", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeEvtHandler_swigregister", PyShapeEvtHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyShape", (PyCFunction) _wrap_new_PyShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape__setCallbackInfo", (PyCFunction) _wrap_PyShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetBoundingBoxMax", (PyCFunction) _wrap_PyShape_GetBoundingBoxMax, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetBoundingBoxMin", (PyCFunction) _wrap_PyShape_GetBoundingBoxMin, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetPerimeterPoint", (PyCFunction) _wrap_PyShape_GetPerimeterPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetCanvas", (PyCFunction) _wrap_PyShape_GetCanvas, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetCanvas", (PyCFunction) _wrap_PyShape_SetCanvas, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_AddToCanvas", (PyCFunction) _wrap_PyShape_AddToCanvas, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_InsertInCanvas", (PyCFunction) _wrap_PyShape_InsertInCanvas, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_RemoveFromCanvas", (PyCFunction) _wrap_PyShape_RemoveFromCanvas, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetX", (PyCFunction) _wrap_PyShape_GetX, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetY", (PyCFunction) _wrap_PyShape_GetY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetX", (PyCFunction) _wrap_PyShape_SetX, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetY", (PyCFunction) _wrap_PyShape_SetY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetParent", (PyCFunction) _wrap_PyShape_GetParent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetParent", (PyCFunction) _wrap_PyShape_SetParent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetTopAncestor", (PyCFunction) _wrap_PyShape_GetTopAncestor, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetChildren", (PyCFunction) _wrap_PyShape_GetChildren, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Unlink", (PyCFunction) _wrap_PyShape_Unlink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetDrawHandles", (PyCFunction) _wrap_PyShape_SetDrawHandles, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetDrawHandles", (PyCFunction) _wrap_PyShape_GetDrawHandles, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_MakeControlPoints", (PyCFunction) _wrap_PyShape_MakeControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_DeleteControlPoints", (PyCFunction) _wrap_PyShape_DeleteControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_ResetControlPoints", (PyCFunction) _wrap_PyShape_ResetControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetEventHandler", (PyCFunction) _wrap_PyShape_GetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetEventHandler", (PyCFunction) _wrap_PyShape_SetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_MakeMandatoryControlPoints", (PyCFunction) _wrap_PyShape_MakeMandatoryControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_ResetMandatoryControlPoints", (PyCFunction) _wrap_PyShape_ResetMandatoryControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Recompute", (PyCFunction) _wrap_PyShape_Recompute, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_CalculateSize", (PyCFunction) _wrap_PyShape_CalculateSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Select", (PyCFunction) _wrap_PyShape_Select, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetHighlight", (PyCFunction) _wrap_PyShape_SetHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_IsHighlighted", (PyCFunction) _wrap_PyShape_IsHighlighted, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Selected", (PyCFunction) _wrap_PyShape_Selected, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_AncestorSelected", (PyCFunction) _wrap_PyShape_AncestorSelected, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetSensitivityFilter", (PyCFunction) _wrap_PyShape_SetSensitivityFilter, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetSensitivityFilter", (PyCFunction) _wrap_PyShape_GetSensitivityFilter, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetDraggable", (PyCFunction) _wrap_PyShape_SetDraggable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetFixedSize", (PyCFunction) _wrap_PyShape_SetFixedSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetFixedSize", (PyCFunction) _wrap_PyShape_GetFixedSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetFixedWidth", (PyCFunction) _wrap_PyShape_GetFixedWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetFixedHeight", (PyCFunction) _wrap_PyShape_GetFixedHeight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetSpaceAttachments", (PyCFunction) _wrap_PyShape_SetSpaceAttachments, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetSpaceAttachments", (PyCFunction) _wrap_PyShape_GetSpaceAttachments, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetShadowMode", (PyCFunction) _wrap_PyShape_SetShadowMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetShadowMode", (PyCFunction) _wrap_PyShape_GetShadowMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_HitTest", (PyCFunction) _wrap_PyShape_HitTest, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetCentreResize", (PyCFunction) _wrap_PyShape_SetCentreResize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetCentreResize", (PyCFunction) _wrap_PyShape_GetCentreResize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetMaintainAspectRatio", (PyCFunction) _wrap_PyShape_SetMaintainAspectRatio, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetMaintainAspectRatio", (PyCFunction) _wrap_PyShape_GetMaintainAspectRatio, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetLines", (PyCFunction) _wrap_PyShape_GetLines, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetDisableLabel", (PyCFunction) _wrap_PyShape_SetDisableLabel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetDisableLabel", (PyCFunction) _wrap_PyShape_GetDisableLabel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetAttachmentMode", (PyCFunction) _wrap_PyShape_SetAttachmentMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetAttachmentMode", (PyCFunction) _wrap_PyShape_GetAttachmentMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetId", (PyCFunction) _wrap_PyShape_SetId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetId", (PyCFunction) _wrap_PyShape_GetId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetPen", (PyCFunction) _wrap_PyShape_SetPen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetBrush", (PyCFunction) _wrap_PyShape_SetBrush, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Show", (PyCFunction) _wrap_PyShape_Show, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_IsShown", (PyCFunction) _wrap_PyShape_IsShown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Move", (PyCFunction) _wrap_PyShape_Move, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Erase", (PyCFunction) _wrap_PyShape_Erase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_EraseContents", (PyCFunction) _wrap_PyShape_EraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Draw", (PyCFunction) _wrap_PyShape_Draw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Flash", (PyCFunction) _wrap_PyShape_Flash, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_MoveLinks", (PyCFunction) _wrap_PyShape_MoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_DrawContents", (PyCFunction) _wrap_PyShape_DrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetSize", (PyCFunction) _wrap_PyShape_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetAttachmentSize", (PyCFunction) _wrap_PyShape_SetAttachmentSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Attach", (PyCFunction) _wrap_PyShape_Attach, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Detach", (PyCFunction) _wrap_PyShape_Detach, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Constrain", (PyCFunction) _wrap_PyShape_Constrain, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_AddLine", (PyCFunction) _wrap_PyShape_AddLine, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetLinePosition", (PyCFunction) _wrap_PyShape_GetLinePosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_AddText", (PyCFunction) _wrap_PyShape_AddText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetPen", (PyCFunction) _wrap_PyShape_GetPen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetBrush", (PyCFunction) _wrap_PyShape_GetBrush, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetDefaultRegionSize", (PyCFunction) _wrap_PyShape_SetDefaultRegionSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_FormatText", (PyCFunction) _wrap_PyShape_FormatText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetFormatMode", (PyCFunction) _wrap_PyShape_SetFormatMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetFormatMode", (PyCFunction) _wrap_PyShape_GetFormatMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetFont", (PyCFunction) _wrap_PyShape_SetFont, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetFont", (PyCFunction) _wrap_PyShape_GetFont, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetTextColour", (PyCFunction) _wrap_PyShape_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetTextColour", (PyCFunction) _wrap_PyShape_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetNumberOfTextRegions", (PyCFunction) _wrap_PyShape_GetNumberOfTextRegions, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetRegionName", (PyCFunction) _wrap_PyShape_SetRegionName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetRegionName", (PyCFunction) _wrap_PyShape_GetRegionName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetRegionId", (PyCFunction) _wrap_PyShape_GetRegionId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_NameRegions", (PyCFunction) _wrap_PyShape_NameRegions, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetRegions", (PyCFunction) _wrap_PyShape_GetRegions, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_AddRegion", (PyCFunction) _wrap_PyShape_AddRegion, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_ClearRegions", (PyCFunction) _wrap_PyShape_ClearRegions, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_AssignNewIds", (PyCFunction) _wrap_PyShape_AssignNewIds, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_FindRegion", (PyCFunction) _wrap_PyShape_FindRegion, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_FindRegionNames", (PyCFunction) _wrap_PyShape_FindRegionNames, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_ClearText", (PyCFunction) _wrap_PyShape_ClearText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_RemoveLine", (PyCFunction) _wrap_PyShape_RemoveLine, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetAttachmentPosition", (PyCFunction) _wrap_PyShape_GetAttachmentPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetNumberOfAttachments", (PyCFunction) _wrap_PyShape_GetNumberOfAttachments, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_AttachmentIsValid", (PyCFunction) _wrap_PyShape_AttachmentIsValid, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetAttachments", (PyCFunction) _wrap_PyShape_GetAttachments, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetAttachmentPositionEdge", (PyCFunction) _wrap_PyShape_GetAttachmentPositionEdge, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_CalcSimpleAttachment", (PyCFunction) _wrap_PyShape_CalcSimpleAttachment, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_AttachmentSortTest", (PyCFunction) _wrap_PyShape_AttachmentSortTest, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_EraseLinks", (PyCFunction) _wrap_PyShape_EraseLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_DrawLinks", (PyCFunction) _wrap_PyShape_DrawLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_MoveLineToNewAttachment", (PyCFunction) _wrap_PyShape_MoveLineToNewAttachment, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_ApplyAttachmentOrdering", (PyCFunction) _wrap_PyShape_ApplyAttachmentOrdering, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetBranchingAttachmentRoot", (PyCFunction) _wrap_PyShape_GetBranchingAttachmentRoot, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetBranchingAttachmentInfo", (PyCFunction) _wrap_PyShape_GetBranchingAttachmentInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetBranchingAttachmentPoint", (PyCFunction) _wrap_PyShape_GetBranchingAttachmentPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetAttachmentLineCount", (PyCFunction) _wrap_PyShape_GetAttachmentLineCount, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetBranchNeckLength", (PyCFunction) _wrap_PyShape_SetBranchNeckLength, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetBranchNeckLength", (PyCFunction) _wrap_PyShape_GetBranchNeckLength, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetBranchStemLength", (PyCFunction) _wrap_PyShape_SetBranchStemLength, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetBranchStemLength", (PyCFunction) _wrap_PyShape_GetBranchStemLength, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetBranchSpacing", (PyCFunction) _wrap_PyShape_SetBranchSpacing, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetBranchSpacing", (PyCFunction) _wrap_PyShape_GetBranchSpacing, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetBranchStyle", (PyCFunction) _wrap_PyShape_SetBranchStyle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetBranchStyle", (PyCFunction) _wrap_PyShape_GetBranchStyle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_PhysicalToLogicalAttachment", (PyCFunction) _wrap_PyShape_PhysicalToLogicalAttachment, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_LogicalToPhysicalAttachment", (PyCFunction) _wrap_PyShape_LogicalToPhysicalAttachment, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Draggable", (PyCFunction) _wrap_PyShape_Draggable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_HasDescendant", (PyCFunction) _wrap_PyShape_HasDescendant, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_CreateNewCopy", (PyCFunction) _wrap_PyShape_CreateNewCopy, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Copy", (PyCFunction) _wrap_PyShape_Copy, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_CopyWithHandler", (PyCFunction) _wrap_PyShape_CopyWithHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Rotate", (PyCFunction) _wrap_PyShape_Rotate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetRotation", (PyCFunction) _wrap_PyShape_GetRotation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_SetRotation", (PyCFunction) _wrap_PyShape_SetRotation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_ClearAttachments", (PyCFunction) _wrap_PyShape_ClearAttachments, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_Recentre", (PyCFunction) _wrap_PyShape_Recentre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_ClearPointList", (PyCFunction) _wrap_PyShape_ClearPointList, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetBackgroundPen", (PyCFunction) _wrap_PyShape_GetBackgroundPen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_GetBackgroundBrush", (PyCFunction) _wrap_PyShape_GetBackgroundBrush, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnDelete", (PyCFunction) _wrap_PyShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnDraw", (PyCFunction) _wrap_PyShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnDrawContents", (PyCFunction) _wrap_PyShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnDrawBranches", (PyCFunction) _wrap_PyShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnMoveLinks", (PyCFunction) _wrap_PyShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnErase", (PyCFunction) _wrap_PyShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnEraseContents", (PyCFunction) _wrap_PyShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnHighlight", (PyCFunction) _wrap_PyShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnLeftClick", (PyCFunction) _wrap_PyShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnRightClick", (PyCFunction) _wrap_PyShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnSize", (PyCFunction) _wrap_PyShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnMovePre", (PyCFunction) _wrap_PyShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnMovePost", (PyCFunction) _wrap_PyShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnDragLeft", (PyCFunction) _wrap_PyShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnDragRight", (PyCFunction) _wrap_PyShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnEndDragRight", (PyCFunction) _wrap_PyShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnDrawOutline", (PyCFunction) _wrap_PyShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnMoveLink", (PyCFunction) _wrap_PyShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnBeginSize", (PyCFunction) _wrap_PyShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_base_OnEndSize", (PyCFunction) _wrap_PyShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShape_swigregister", PyShape_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PseudoMetaFile", (PyCFunction) _wrap_new_PseudoMetaFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_PseudoMetaFile", (PyCFunction) _wrap_delete_PseudoMetaFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_Draw", (PyCFunction) _wrap_PseudoMetaFile_Draw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_Clear", (PyCFunction) _wrap_PseudoMetaFile_Clear, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_Copy", (PyCFunction) _wrap_PseudoMetaFile_Copy, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_Scale", (PyCFunction) _wrap_PseudoMetaFile_Scale, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_ScaleTo", (PyCFunction) _wrap_PseudoMetaFile_ScaleTo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_Translate", (PyCFunction) _wrap_PseudoMetaFile_Translate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_Rotate", (PyCFunction) _wrap_PseudoMetaFile_Rotate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_LoadFromMetaFile", (PyCFunction) _wrap_PseudoMetaFile_LoadFromMetaFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_GetBounds", (PyCFunction) _wrap_PseudoMetaFile_GetBounds, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_CalculateSize", (PyCFunction) _wrap_PseudoMetaFile_CalculateSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_SetRotateable", (PyCFunction) _wrap_PseudoMetaFile_SetRotateable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_GetRotateable", (PyCFunction) _wrap_PseudoMetaFile_GetRotateable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_SetSize", (PyCFunction) _wrap_PseudoMetaFile_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_SetFillBrush", (PyCFunction) _wrap_PseudoMetaFile_SetFillBrush, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_GetFillBrush", (PyCFunction) _wrap_PseudoMetaFile_GetFillBrush, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_SetOutlinePen", (PyCFunction) _wrap_PseudoMetaFile_SetOutlinePen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_GetOutlinePen", (PyCFunction) _wrap_PseudoMetaFile_GetOutlinePen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_SetOutlineOp", (PyCFunction) _wrap_PseudoMetaFile_SetOutlineOp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_GetOutlineOp", (PyCFunction) _wrap_PseudoMetaFile_GetOutlineOp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_IsValid", (PyCFunction) _wrap_PseudoMetaFile_IsValid, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_DrawLine", (PyCFunction) _wrap_PseudoMetaFile_DrawLine, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_DrawRectangle", (PyCFunction) _wrap_PseudoMetaFile_DrawRectangle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_DrawRoundedRectangle", (PyCFunction) _wrap_PseudoMetaFile_DrawRoundedRectangle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_DrawArc", (PyCFunction) _wrap_PseudoMetaFile_DrawArc, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_DrawEllipticArc", (PyCFunction) _wrap_PseudoMetaFile_DrawEllipticArc, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_DrawEllipse", (PyCFunction) _wrap_PseudoMetaFile_DrawEllipse, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_DrawPoint", (PyCFunction) _wrap_PseudoMetaFile_DrawPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_DrawText", (PyCFunction) _wrap_PseudoMetaFile_DrawText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_DrawLines", (PyCFunction) _wrap_PseudoMetaFile_DrawLines, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_DrawPolygon", (PyCFunction) _wrap_PseudoMetaFile_DrawPolygon, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_DrawSpline", (PyCFunction) _wrap_PseudoMetaFile_DrawSpline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_SetClippingRect", (PyCFunction) _wrap_PseudoMetaFile_SetClippingRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_DestroyClippingRect", (PyCFunction) _wrap_PseudoMetaFile_DestroyClippingRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_SetPen", (PyCFunction) _wrap_PseudoMetaFile_SetPen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_SetBrush", (PyCFunction) _wrap_PseudoMetaFile_SetBrush, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_SetFont", (PyCFunction) _wrap_PseudoMetaFile_SetFont, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_SetTextColour", (PyCFunction) _wrap_PseudoMetaFile_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_SetBackgroundColour", (PyCFunction) _wrap_PseudoMetaFile_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_SetBackgroundMode", (PyCFunction) _wrap_PseudoMetaFile_SetBackgroundMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PseudoMetaFile_swigregister", PseudoMetaFile_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyRectangleShape", (PyCFunction) _wrap_new_PyRectangleShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape__setCallbackInfo", (PyCFunction) _wrap_PyRectangleShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_SetCornerRadius", (PyCFunction) _wrap_PyRectangleShape_SetCornerRadius, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_GetCornerRadius", (PyCFunction) _wrap_PyRectangleShape_GetCornerRadius, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnDelete", (PyCFunction) _wrap_PyRectangleShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnDraw", (PyCFunction) _wrap_PyRectangleShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnDrawContents", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnDrawBranches", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnMoveLinks", (PyCFunction) _wrap_PyRectangleShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnErase", (PyCFunction) _wrap_PyRectangleShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnEraseContents", (PyCFunction) _wrap_PyRectangleShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnHighlight", (PyCFunction) _wrap_PyRectangleShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnLeftClick", (PyCFunction) _wrap_PyRectangleShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyRectangleShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnRightClick", (PyCFunction) _wrap_PyRectangleShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnSize", (PyCFunction) _wrap_PyRectangleShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnMovePre", (PyCFunction) _wrap_PyRectangleShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnMovePost", (PyCFunction) _wrap_PyRectangleShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnDragRight", (PyCFunction) _wrap_PyRectangleShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyRectangleShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnEndDragRight", (PyCFunction) _wrap_PyRectangleShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnDrawOutline", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyRectangleShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnMoveLink", (PyCFunction) _wrap_PyRectangleShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnBeginSize", (PyCFunction) _wrap_PyRectangleShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_base_OnEndSize", (PyCFunction) _wrap_PyRectangleShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyRectangleShape_swigregister", PyRectangleShape_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyControlPoint", (PyCFunction) _wrap_new_PyControlPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint__setCallbackInfo", (PyCFunction) _wrap_PyControlPoint__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_SetCornerRadius", (PyCFunction) _wrap_PyControlPoint_SetCornerRadius, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnDelete", (PyCFunction) _wrap_PyControlPoint_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnDraw", (PyCFunction) _wrap_PyControlPoint_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnDrawContents", (PyCFunction) _wrap_PyControlPoint_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnDrawBranches", (PyCFunction) _wrap_PyControlPoint_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnMoveLinks", (PyCFunction) _wrap_PyControlPoint_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnErase", (PyCFunction) _wrap_PyControlPoint_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnEraseContents", (PyCFunction) _wrap_PyControlPoint_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnHighlight", (PyCFunction) _wrap_PyControlPoint_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnLeftClick", (PyCFunction) _wrap_PyControlPoint_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyControlPoint_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnRightClick", (PyCFunction) _wrap_PyControlPoint_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnSize", (PyCFunction) _wrap_PyControlPoint_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnMovePre", (PyCFunction) _wrap_PyControlPoint_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnMovePost", (PyCFunction) _wrap_PyControlPoint_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnBeginDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnEndDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnDragRight", (PyCFunction) _wrap_PyControlPoint_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnBeginDragRight", (PyCFunction) _wrap_PyControlPoint_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnEndDragRight", (PyCFunction) _wrap_PyControlPoint_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnDrawOutline", (PyCFunction) _wrap_PyControlPoint_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnDrawControlPoints", (PyCFunction) _wrap_PyControlPoint_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnEraseControlPoints", (PyCFunction) _wrap_PyControlPoint_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnMoveLink", (PyCFunction) _wrap_PyControlPoint_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnSizingDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnBeginSize", (PyCFunction) _wrap_PyControlPoint_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_base_OnEndSize", (PyCFunction) _wrap_PyControlPoint_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyControlPoint_swigregister", PyControlPoint_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyBitmapShape", (PyCFunction) _wrap_new_PyBitmapShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape__setCallbackInfo", (PyCFunction) _wrap_PyBitmapShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_GetBitmap", (PyCFunction) _wrap_PyBitmapShape_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_GetFilename", (PyCFunction) _wrap_PyBitmapShape_GetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_SetBitmap", (PyCFunction) _wrap_PyBitmapShape_SetBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_SetFilename", (PyCFunction) _wrap_PyBitmapShape_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnDelete", (PyCFunction) _wrap_PyBitmapShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnDraw", (PyCFunction) _wrap_PyBitmapShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnDrawContents", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnDrawBranches", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnMoveLinks", (PyCFunction) _wrap_PyBitmapShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnErase", (PyCFunction) _wrap_PyBitmapShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnEraseContents", (PyCFunction) _wrap_PyBitmapShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnHighlight", (PyCFunction) _wrap_PyBitmapShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnLeftClick", (PyCFunction) _wrap_PyBitmapShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyBitmapShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnRightClick", (PyCFunction) _wrap_PyBitmapShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnSize", (PyCFunction) _wrap_PyBitmapShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnMovePre", (PyCFunction) _wrap_PyBitmapShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnMovePost", (PyCFunction) _wrap_PyBitmapShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnDragRight", (PyCFunction) _wrap_PyBitmapShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyBitmapShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnEndDragRight", (PyCFunction) _wrap_PyBitmapShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnDrawOutline", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyBitmapShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnMoveLink", (PyCFunction) _wrap_PyBitmapShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnBeginSize", (PyCFunction) _wrap_PyBitmapShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_base_OnEndSize", (PyCFunction) _wrap_PyBitmapShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyBitmapShape_swigregister", PyBitmapShape_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyDrawnShape", (PyCFunction) _wrap_new_PyDrawnShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape__setCallbackInfo", (PyCFunction) _wrap_PyDrawnShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_CalculateSize", (PyCFunction) _wrap_PyDrawnShape_CalculateSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_DestroyClippingRect", (PyCFunction) _wrap_PyDrawnShape_DestroyClippingRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_DrawArc", (PyCFunction) _wrap_PyDrawnShape_DrawArc, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_DrawAtAngle", (PyCFunction) _wrap_PyDrawnShape_DrawAtAngle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_DrawEllipticArc", (PyCFunction) _wrap_PyDrawnShape_DrawEllipticArc, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_DrawLine", (PyCFunction) _wrap_PyDrawnShape_DrawLine, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_DrawLines", (PyCFunction) _wrap_PyDrawnShape_DrawLines, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_DrawPoint", (PyCFunction) _wrap_PyDrawnShape_DrawPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_DrawPolygon", (PyCFunction) _wrap_PyDrawnShape_DrawPolygon, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_DrawRectangle", (PyCFunction) _wrap_PyDrawnShape_DrawRectangle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_DrawRoundedRectangle", (PyCFunction) _wrap_PyDrawnShape_DrawRoundedRectangle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_DrawSpline", (PyCFunction) _wrap_PyDrawnShape_DrawSpline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_DrawText", (PyCFunction) _wrap_PyDrawnShape_DrawText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_GetAngle", (PyCFunction) _wrap_PyDrawnShape_GetAngle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_GetMetaFile", (PyCFunction) _wrap_PyDrawnShape_GetMetaFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_GetRotation", (PyCFunction) _wrap_PyDrawnShape_GetRotation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_LoadFromMetaFile", (PyCFunction) _wrap_PyDrawnShape_LoadFromMetaFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_Rotate", (PyCFunction) _wrap_PyDrawnShape_Rotate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_SetClippingRect", (PyCFunction) _wrap_PyDrawnShape_SetClippingRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_SetDrawnBackgroundColour", (PyCFunction) _wrap_PyDrawnShape_SetDrawnBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_SetDrawnBackgroundMode", (PyCFunction) _wrap_PyDrawnShape_SetDrawnBackgroundMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_SetDrawnBrush", (PyCFunction) _wrap_PyDrawnShape_SetDrawnBrush, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_SetDrawnFont", (PyCFunction) _wrap_PyDrawnShape_SetDrawnFont, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_SetDrawnPen", (PyCFunction) _wrap_PyDrawnShape_SetDrawnPen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_SetDrawnTextColour", (PyCFunction) _wrap_PyDrawnShape_SetDrawnTextColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_Scale", (PyCFunction) _wrap_PyDrawnShape_Scale, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_SetSaveToFile", (PyCFunction) _wrap_PyDrawnShape_SetSaveToFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_Translate", (PyCFunction) _wrap_PyDrawnShape_Translate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnDelete", (PyCFunction) _wrap_PyDrawnShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnDraw", (PyCFunction) _wrap_PyDrawnShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnDrawContents", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnDrawBranches", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnMoveLinks", (PyCFunction) _wrap_PyDrawnShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnErase", (PyCFunction) _wrap_PyDrawnShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnEraseContents", (PyCFunction) _wrap_PyDrawnShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnHighlight", (PyCFunction) _wrap_PyDrawnShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnLeftClick", (PyCFunction) _wrap_PyDrawnShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyDrawnShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnRightClick", (PyCFunction) _wrap_PyDrawnShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnSize", (PyCFunction) _wrap_PyDrawnShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnMovePre", (PyCFunction) _wrap_PyDrawnShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnMovePost", (PyCFunction) _wrap_PyDrawnShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnDragRight", (PyCFunction) _wrap_PyDrawnShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyDrawnShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnEndDragRight", (PyCFunction) _wrap_PyDrawnShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnDrawOutline", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyDrawnShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnMoveLink", (PyCFunction) _wrap_PyDrawnShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnBeginSize", (PyCFunction) _wrap_PyDrawnShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_base_OnEndSize", (PyCFunction) _wrap_PyDrawnShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDrawnShape_swigregister", PyDrawnShape_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_OGLConstraint", (PyCFunction) _wrap_new_OGLConstraint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"OGLConstraint_Evaluate", (PyCFunction) _wrap_OGLConstraint_Evaluate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"OGLConstraint_SetSpacing", (PyCFunction) _wrap_OGLConstraint_SetSpacing, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"OGLConstraint_Equals", (PyCFunction) _wrap_OGLConstraint_Equals, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"OGLConstraint_swigregister", OGLConstraint_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyCompositeShape", (PyCFunction) _wrap_new_PyCompositeShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape__setCallbackInfo", (PyCFunction) _wrap_PyCompositeShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_AddChild", (PyCFunction) _wrap_PyCompositeShape_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_AddConstraint", (PyCFunction) _wrap_PyCompositeShape_AddConstraint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_AddConstrainedShapes", (PyCFunction) _wrap_PyCompositeShape_AddConstrainedShapes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_AddSimpleConstraint", (PyCFunction) _wrap_PyCompositeShape_AddSimpleConstraint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_CalculateSize", (PyCFunction) _wrap_PyCompositeShape_CalculateSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_ContainsDivision", (PyCFunction) _wrap_PyCompositeShape_ContainsDivision, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_DeleteConstraint", (PyCFunction) _wrap_PyCompositeShape_DeleteConstraint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_DeleteConstraintsInvolvingChild", (PyCFunction) _wrap_PyCompositeShape_DeleteConstraintsInvolvingChild, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_FindContainerImage", (PyCFunction) _wrap_PyCompositeShape_FindContainerImage, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_GetConstraints", (PyCFunction) _wrap_PyCompositeShape_GetConstraints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_GetDivisions", (PyCFunction) _wrap_PyCompositeShape_GetDivisions, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_MakeContainer", (PyCFunction) _wrap_PyCompositeShape_MakeContainer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_Recompute", (PyCFunction) _wrap_PyCompositeShape_Recompute, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_RemoveChild", (PyCFunction) _wrap_PyCompositeShape_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnDelete", (PyCFunction) _wrap_PyCompositeShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnDraw", (PyCFunction) _wrap_PyCompositeShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnDrawContents", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnDrawBranches", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnMoveLinks", (PyCFunction) _wrap_PyCompositeShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnErase", (PyCFunction) _wrap_PyCompositeShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnEraseContents", (PyCFunction) _wrap_PyCompositeShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnHighlight", (PyCFunction) _wrap_PyCompositeShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnLeftClick", (PyCFunction) _wrap_PyCompositeShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyCompositeShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnRightClick", (PyCFunction) _wrap_PyCompositeShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnSize", (PyCFunction) _wrap_PyCompositeShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnMovePre", (PyCFunction) _wrap_PyCompositeShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnMovePost", (PyCFunction) _wrap_PyCompositeShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnDragRight", (PyCFunction) _wrap_PyCompositeShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyCompositeShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnEndDragRight", (PyCFunction) _wrap_PyCompositeShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnDrawOutline", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyCompositeShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnMoveLink", (PyCFunction) _wrap_PyCompositeShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnBeginSize", (PyCFunction) _wrap_PyCompositeShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_base_OnEndSize", (PyCFunction) _wrap_PyCompositeShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCompositeShape_swigregister", PyCompositeShape_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyDividedShape", (PyCFunction) _wrap_new_PyDividedShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape__setCallbackInfo", (PyCFunction) _wrap_PyDividedShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_EditRegions", (PyCFunction) _wrap_PyDividedShape_EditRegions, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_SetRegionSizes", (PyCFunction) _wrap_PyDividedShape_SetRegionSizes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnDelete", (PyCFunction) _wrap_PyDividedShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnDraw", (PyCFunction) _wrap_PyDividedShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnDrawContents", (PyCFunction) _wrap_PyDividedShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnDrawBranches", (PyCFunction) _wrap_PyDividedShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnMoveLinks", (PyCFunction) _wrap_PyDividedShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnErase", (PyCFunction) _wrap_PyDividedShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnEraseContents", (PyCFunction) _wrap_PyDividedShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnHighlight", (PyCFunction) _wrap_PyDividedShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnLeftClick", (PyCFunction) _wrap_PyDividedShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyDividedShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnRightClick", (PyCFunction) _wrap_PyDividedShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnSize", (PyCFunction) _wrap_PyDividedShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnMovePre", (PyCFunction) _wrap_PyDividedShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnMovePost", (PyCFunction) _wrap_PyDividedShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnDragRight", (PyCFunction) _wrap_PyDividedShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyDividedShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnEndDragRight", (PyCFunction) _wrap_PyDividedShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnDrawOutline", (PyCFunction) _wrap_PyDividedShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyDividedShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyDividedShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnMoveLink", (PyCFunction) _wrap_PyDividedShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnBeginSize", (PyCFunction) _wrap_PyDividedShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_base_OnEndSize", (PyCFunction) _wrap_PyDividedShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDividedShape_swigregister", PyDividedShape_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyDivisionShape", (PyCFunction) _wrap_new_PyDivisionShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape__setCallbackInfo", (PyCFunction) _wrap_PyDivisionShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_AdjustBottom", (PyCFunction) _wrap_PyDivisionShape_AdjustBottom, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_AdjustLeft", (PyCFunction) _wrap_PyDivisionShape_AdjustLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_AdjustRight", (PyCFunction) _wrap_PyDivisionShape_AdjustRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_AdjustTop", (PyCFunction) _wrap_PyDivisionShape_AdjustTop, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_Divide", (PyCFunction) _wrap_PyDivisionShape_Divide, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_EditEdge", (PyCFunction) _wrap_PyDivisionShape_EditEdge, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_GetBottomSide", (PyCFunction) _wrap_PyDivisionShape_GetBottomSide, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_GetHandleSide", (PyCFunction) _wrap_PyDivisionShape_GetHandleSide, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_GetLeftSide", (PyCFunction) _wrap_PyDivisionShape_GetLeftSide, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_GetLeftSideColour", (PyCFunction) _wrap_PyDivisionShape_GetLeftSideColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_GetLeftSidePen", (PyCFunction) _wrap_PyDivisionShape_GetLeftSidePen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_GetRightSide", (PyCFunction) _wrap_PyDivisionShape_GetRightSide, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_GetTopSide", (PyCFunction) _wrap_PyDivisionShape_GetTopSide, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_GetTopSidePen", (PyCFunction) _wrap_PyDivisionShape_GetTopSidePen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_ResizeAdjoining", (PyCFunction) _wrap_PyDivisionShape_ResizeAdjoining, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_PopupMenu", (PyCFunction) _wrap_PyDivisionShape_PopupMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_SetBottomSide", (PyCFunction) _wrap_PyDivisionShape_SetBottomSide, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_SetHandleSide", (PyCFunction) _wrap_PyDivisionShape_SetHandleSide, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_SetLeftSide", (PyCFunction) _wrap_PyDivisionShape_SetLeftSide, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_SetLeftSideColour", (PyCFunction) _wrap_PyDivisionShape_SetLeftSideColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_SetLeftSidePen", (PyCFunction) _wrap_PyDivisionShape_SetLeftSidePen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_SetRightSide", (PyCFunction) _wrap_PyDivisionShape_SetRightSide, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_SetTopSide", (PyCFunction) _wrap_PyDivisionShape_SetTopSide, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_SetTopSideColour", (PyCFunction) _wrap_PyDivisionShape_SetTopSideColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_SetTopSidePen", (PyCFunction) _wrap_PyDivisionShape_SetTopSidePen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnDelete", (PyCFunction) _wrap_PyDivisionShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnDraw", (PyCFunction) _wrap_PyDivisionShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnDrawContents", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnDrawBranches", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnMoveLinks", (PyCFunction) _wrap_PyDivisionShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnErase", (PyCFunction) _wrap_PyDivisionShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnEraseContents", (PyCFunction) _wrap_PyDivisionShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnHighlight", (PyCFunction) _wrap_PyDivisionShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnLeftClick", (PyCFunction) _wrap_PyDivisionShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyDivisionShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnRightClick", (PyCFunction) _wrap_PyDivisionShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnSize", (PyCFunction) _wrap_PyDivisionShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnMovePre", (PyCFunction) _wrap_PyDivisionShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnMovePost", (PyCFunction) _wrap_PyDivisionShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnDragRight", (PyCFunction) _wrap_PyDivisionShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyDivisionShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnEndDragRight", (PyCFunction) _wrap_PyDivisionShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnDrawOutline", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyDivisionShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnMoveLink", (PyCFunction) _wrap_PyDivisionShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnBeginSize", (PyCFunction) _wrap_PyDivisionShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_base_OnEndSize", (PyCFunction) _wrap_PyDivisionShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyDivisionShape_swigregister", PyDivisionShape_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyEllipseShape", (PyCFunction) _wrap_new_PyEllipseShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape__setCallbackInfo", (PyCFunction) _wrap_PyEllipseShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnDraw", (PyCFunction) _wrap_PyEllipseShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnDrawContents", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnDrawBranches", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnMoveLinks", (PyCFunction) _wrap_PyEllipseShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnErase", (PyCFunction) _wrap_PyEllipseShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnEraseContents", (PyCFunction) _wrap_PyEllipseShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnHighlight", (PyCFunction) _wrap_PyEllipseShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnLeftClick", (PyCFunction) _wrap_PyEllipseShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyEllipseShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnRightClick", (PyCFunction) _wrap_PyEllipseShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnSize", (PyCFunction) _wrap_PyEllipseShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnMovePre", (PyCFunction) _wrap_PyEllipseShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnMovePost", (PyCFunction) _wrap_PyEllipseShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnDragRight", (PyCFunction) _wrap_PyEllipseShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyEllipseShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnEndDragRight", (PyCFunction) _wrap_PyEllipseShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnDrawOutline", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyEllipseShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnMoveLink", (PyCFunction) _wrap_PyEllipseShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnBeginSize", (PyCFunction) _wrap_PyEllipseShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_base_OnEndSize", (PyCFunction) _wrap_PyEllipseShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEllipseShape_swigregister", PyEllipseShape_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyCircleShape", (PyCFunction) _wrap_new_PyCircleShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape__setCallbackInfo", (PyCFunction) _wrap_PyCircleShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnDraw", (PyCFunction) _wrap_PyCircleShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnDrawContents", (PyCFunction) _wrap_PyCircleShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnDrawBranches", (PyCFunction) _wrap_PyCircleShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnMoveLinks", (PyCFunction) _wrap_PyCircleShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnErase", (PyCFunction) _wrap_PyCircleShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnEraseContents", (PyCFunction) _wrap_PyCircleShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnHighlight", (PyCFunction) _wrap_PyCircleShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnLeftClick", (PyCFunction) _wrap_PyCircleShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyCircleShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnRightClick", (PyCFunction) _wrap_PyCircleShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnSize", (PyCFunction) _wrap_PyCircleShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnMovePre", (PyCFunction) _wrap_PyCircleShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnMovePost", (PyCFunction) _wrap_PyCircleShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnDragRight", (PyCFunction) _wrap_PyCircleShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyCircleShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnEndDragRight", (PyCFunction) _wrap_PyCircleShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnDrawOutline", (PyCFunction) _wrap_PyCircleShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyCircleShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyCircleShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnMoveLink", (PyCFunction) _wrap_PyCircleShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnBeginSize", (PyCFunction) _wrap_PyCircleShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_base_OnEndSize", (PyCFunction) _wrap_PyCircleShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCircleShape_swigregister", PyCircleShape_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_ArrowHead", (PyCFunction) _wrap_new_ArrowHead, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_ArrowHead", (PyCFunction) _wrap_delete_ArrowHead, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead__GetType", (PyCFunction) _wrap_ArrowHead__GetType, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_GetPosition", (PyCFunction) _wrap_ArrowHead_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_SetPosition", (PyCFunction) _wrap_ArrowHead_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_GetXOffset", (PyCFunction) _wrap_ArrowHead_GetXOffset, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_GetYOffset", (PyCFunction) _wrap_ArrowHead_GetYOffset, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_GetSpacing", (PyCFunction) _wrap_ArrowHead_GetSpacing, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_GetSize", (PyCFunction) _wrap_ArrowHead_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_GetName", (PyCFunction) _wrap_ArrowHead_GetName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_SetXOffset", (PyCFunction) _wrap_ArrowHead_SetXOffset, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_SetYOffset", (PyCFunction) _wrap_ArrowHead_SetYOffset, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_GetMetaFile", (PyCFunction) _wrap_ArrowHead_GetMetaFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_GetId", (PyCFunction) _wrap_ArrowHead_GetId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_GetArrowEnd", (PyCFunction) _wrap_ArrowHead_GetArrowEnd, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_GetArrowSize", (PyCFunction) _wrap_ArrowHead_GetArrowSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_SetSize", (PyCFunction) _wrap_ArrowHead_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_SetSpacing", (PyCFunction) _wrap_ArrowHead_SetSpacing, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArrowHead_swigregister", ArrowHead_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyLineShape", (PyCFunction) _wrap_new_PyLineShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape__setCallbackInfo", (PyCFunction) _wrap_PyLineShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_AddArrow", (PyCFunction) _wrap_PyLineShape_AddArrow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_AddArrowOrdered", (PyCFunction) _wrap_PyLineShape_AddArrowOrdered, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_ClearArrow", (PyCFunction) _wrap_PyLineShape_ClearArrow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_ClearArrowsAtPosition", (PyCFunction) _wrap_PyLineShape_ClearArrowsAtPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_DrawArrow", (PyCFunction) _wrap_PyLineShape_DrawArrow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_DeleteArrowHeadId", (PyCFunction) _wrap_PyLineShape_DeleteArrowHeadId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_DeleteArrowHead", (PyCFunction) _wrap_PyLineShape_DeleteArrowHead, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_DeleteLineControlPoint", (PyCFunction) _wrap_PyLineShape_DeleteLineControlPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_DrawArrows", (PyCFunction) _wrap_PyLineShape_DrawArrows, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_DrawRegion", (PyCFunction) _wrap_PyLineShape_DrawRegion, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_EraseRegion", (PyCFunction) _wrap_PyLineShape_EraseRegion, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_FindArrowHeadId", (PyCFunction) _wrap_PyLineShape_FindArrowHeadId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_FindArrowHead", (PyCFunction) _wrap_PyLineShape_FindArrowHead, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_FindLineEndPoints", (PyCFunction) _wrap_PyLineShape_FindLineEndPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_FindLinePosition", (PyCFunction) _wrap_PyLineShape_FindLinePosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_FindMinimumWidth", (PyCFunction) _wrap_PyLineShape_FindMinimumWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_FindNth", (PyCFunction) _wrap_PyLineShape_FindNth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_GetAttachmentFrom", (PyCFunction) _wrap_PyLineShape_GetAttachmentFrom, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_GetAttachmentTo", (PyCFunction) _wrap_PyLineShape_GetAttachmentTo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_GetEnds", (PyCFunction) _wrap_PyLineShape_GetEnds, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_GetFrom", (PyCFunction) _wrap_PyLineShape_GetFrom, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_GetLabelPosition", (PyCFunction) _wrap_PyLineShape_GetLabelPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_GetNextControlPoint", (PyCFunction) _wrap_PyLineShape_GetNextControlPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_GetTo", (PyCFunction) _wrap_PyLineShape_GetTo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_Initialise", (PyCFunction) _wrap_PyLineShape_Initialise, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_InsertLineControlPoint", (PyCFunction) _wrap_PyLineShape_InsertLineControlPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_IsEnd", (PyCFunction) _wrap_PyLineShape_IsEnd, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_IsSpline", (PyCFunction) _wrap_PyLineShape_IsSpline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_MakeLineControlPoints", (PyCFunction) _wrap_PyLineShape_MakeLineControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_GetLineControlPoints", (PyCFunction) _wrap_PyLineShape_GetLineControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_SetLineControlPoints", (PyCFunction) _wrap_PyLineShape_SetLineControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_SetAttachmentFrom", (PyCFunction) _wrap_PyLineShape_SetAttachmentFrom, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_SetAttachments", (PyCFunction) _wrap_PyLineShape_SetAttachments, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_SetAttachmentTo", (PyCFunction) _wrap_PyLineShape_SetAttachmentTo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_SetEnds", (PyCFunction) _wrap_PyLineShape_SetEnds, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_SetFrom", (PyCFunction) _wrap_PyLineShape_SetFrom, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_SetIgnoreOffsets", (PyCFunction) _wrap_PyLineShape_SetIgnoreOffsets, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_SetSpline", (PyCFunction) _wrap_PyLineShape_SetSpline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_SetTo", (PyCFunction) _wrap_PyLineShape_SetTo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_Straighten", (PyCFunction) _wrap_PyLineShape_Straighten, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_Unlink", (PyCFunction) _wrap_PyLineShape_Unlink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_SetAlignmentOrientation", (PyCFunction) _wrap_PyLineShape_SetAlignmentOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_SetAlignmentType", (PyCFunction) _wrap_PyLineShape_SetAlignmentType, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_GetAlignmentOrientation", (PyCFunction) _wrap_PyLineShape_GetAlignmentOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_GetAlignmentType", (PyCFunction) _wrap_PyLineShape_GetAlignmentType, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_GetAlignmentStart", (PyCFunction) _wrap_PyLineShape_GetAlignmentStart, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_GetAlignmentEnd", (PyCFunction) _wrap_PyLineShape_GetAlignmentEnd, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnDraw", (PyCFunction) _wrap_PyLineShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnDrawContents", (PyCFunction) _wrap_PyLineShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnDrawBranches", (PyCFunction) _wrap_PyLineShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnMoveLinks", (PyCFunction) _wrap_PyLineShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnErase", (PyCFunction) _wrap_PyLineShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnEraseContents", (PyCFunction) _wrap_PyLineShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnHighlight", (PyCFunction) _wrap_PyLineShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnLeftClick", (PyCFunction) _wrap_PyLineShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyLineShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnRightClick", (PyCFunction) _wrap_PyLineShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnSize", (PyCFunction) _wrap_PyLineShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnMovePre", (PyCFunction) _wrap_PyLineShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnMovePost", (PyCFunction) _wrap_PyLineShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnDragRight", (PyCFunction) _wrap_PyLineShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyLineShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnEndDragRight", (PyCFunction) _wrap_PyLineShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnDrawOutline", (PyCFunction) _wrap_PyLineShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyLineShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyLineShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnMoveLink", (PyCFunction) _wrap_PyLineShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnBeginSize", (PyCFunction) _wrap_PyLineShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_base_OnEndSize", (PyCFunction) _wrap_PyLineShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLineShape_swigregister", PyLineShape_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyPolygonShape", (PyCFunction) _wrap_new_PyPolygonShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape__setCallbackInfo", (PyCFunction) _wrap_PyPolygonShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_Create", (PyCFunction) _wrap_PyPolygonShape_Create, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_AddPolygonPoint", (PyCFunction) _wrap_PyPolygonShape_AddPolygonPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_CalculatePolygonCentre", (PyCFunction) _wrap_PyPolygonShape_CalculatePolygonCentre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_DeletePolygonPoint", (PyCFunction) _wrap_PyPolygonShape_DeletePolygonPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_GetPoints", (PyCFunction) _wrap_PyPolygonShape_GetPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_GetOriginalPoints", (PyCFunction) _wrap_PyPolygonShape_GetOriginalPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_GetOriginalWidth", (PyCFunction) _wrap_PyPolygonShape_GetOriginalWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_GetOriginalHeight", (PyCFunction) _wrap_PyPolygonShape_GetOriginalHeight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_SetOriginalWidth", (PyCFunction) _wrap_PyPolygonShape_SetOriginalWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_SetOriginalHeight", (PyCFunction) _wrap_PyPolygonShape_SetOriginalHeight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_UpdateOriginalPoints", (PyCFunction) _wrap_PyPolygonShape_UpdateOriginalPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnDraw", (PyCFunction) _wrap_PyPolygonShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnDrawContents", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnDrawBranches", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnMoveLinks", (PyCFunction) _wrap_PyPolygonShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnErase", (PyCFunction) _wrap_PyPolygonShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnEraseContents", (PyCFunction) _wrap_PyPolygonShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnHighlight", (PyCFunction) _wrap_PyPolygonShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnLeftClick", (PyCFunction) _wrap_PyPolygonShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyPolygonShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnRightClick", (PyCFunction) _wrap_PyPolygonShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnSize", (PyCFunction) _wrap_PyPolygonShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnMovePre", (PyCFunction) _wrap_PyPolygonShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnMovePost", (PyCFunction) _wrap_PyPolygonShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnDragRight", (PyCFunction) _wrap_PyPolygonShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyPolygonShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnEndDragRight", (PyCFunction) _wrap_PyPolygonShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnDrawOutline", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyPolygonShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnMoveLink", (PyCFunction) _wrap_PyPolygonShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnBeginSize", (PyCFunction) _wrap_PyPolygonShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_base_OnEndSize", (PyCFunction) _wrap_PyPolygonShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPolygonShape_swigregister", PyPolygonShape_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyTextShape", (PyCFunction) _wrap_new_PyTextShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape__setCallbackInfo", (PyCFunction) _wrap_PyTextShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnDelete", (PyCFunction) _wrap_PyTextShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnDraw", (PyCFunction) _wrap_PyTextShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnDrawContents", (PyCFunction) _wrap_PyTextShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnDrawBranches", (PyCFunction) _wrap_PyTextShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnMoveLinks", (PyCFunction) _wrap_PyTextShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnErase", (PyCFunction) _wrap_PyTextShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnEraseContents", (PyCFunction) _wrap_PyTextShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnHighlight", (PyCFunction) _wrap_PyTextShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnLeftClick", (PyCFunction) _wrap_PyTextShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyTextShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnRightClick", (PyCFunction) _wrap_PyTextShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnSize", (PyCFunction) _wrap_PyTextShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnMovePre", (PyCFunction) _wrap_PyTextShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnMovePost", (PyCFunction) _wrap_PyTextShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnDragRight", (PyCFunction) _wrap_PyTextShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyTextShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnEndDragRight", (PyCFunction) _wrap_PyTextShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnDrawOutline", (PyCFunction) _wrap_PyTextShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyTextShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyTextShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnMoveLink", (PyCFunction) _wrap_PyTextShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnBeginSize", (PyCFunction) _wrap_PyTextShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_base_OnEndSize", (PyCFunction) _wrap_PyTextShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyTextShape_swigregister", PyTextShape_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_Diagram", (PyCFunction) _wrap_new_Diagram, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_AddShape", (PyCFunction) _wrap_Diagram_AddShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_Clear", (PyCFunction) _wrap_Diagram_Clear, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_DeleteAllShapes", (PyCFunction) _wrap_Diagram_DeleteAllShapes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_DrawOutline", (PyCFunction) _wrap_Diagram_DrawOutline, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_FindShape", (PyCFunction) _wrap_Diagram_FindShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_GetCanvas", (PyCFunction) _wrap_Diagram_GetCanvas, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_GetCount", (PyCFunction) _wrap_Diagram_GetCount, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_GetGridSpacing", (PyCFunction) _wrap_Diagram_GetGridSpacing, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_GetMouseTolerance", (PyCFunction) _wrap_Diagram_GetMouseTolerance, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_GetShapeList", (PyCFunction) _wrap_Diagram_GetShapeList, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_GetQuickEditMode", (PyCFunction) _wrap_Diagram_GetQuickEditMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_GetSnapToGrid", (PyCFunction) _wrap_Diagram_GetSnapToGrid, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_InsertShape", (PyCFunction) _wrap_Diagram_InsertShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_RecentreAll", (PyCFunction) _wrap_Diagram_RecentreAll, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_Redraw", (PyCFunction) _wrap_Diagram_Redraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_RemoveAllShapes", (PyCFunction) _wrap_Diagram_RemoveAllShapes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_RemoveShape", (PyCFunction) _wrap_Diagram_RemoveShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_SetCanvas", (PyCFunction) _wrap_Diagram_SetCanvas, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_SetGridSpacing", (PyCFunction) _wrap_Diagram_SetGridSpacing, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_SetMouseTolerance", (PyCFunction) _wrap_Diagram_SetMouseTolerance, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_SetQuickEditMode", (PyCFunction) _wrap_Diagram_SetQuickEditMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_SetSnapToGrid", (PyCFunction) _wrap_Diagram_SetSnapToGrid, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_ShowAll", (PyCFunction) _wrap_Diagram_ShowAll, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_Snap", (PyCFunction) _wrap_Diagram_Snap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Diagram_swigregister", Diagram_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyShapeCanvas", (PyCFunction) _wrap_new_PyShapeCanvas, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas__setCallbackInfo", (PyCFunction) _wrap_PyShapeCanvas__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_AddShape", (PyCFunction) _wrap_PyShapeCanvas_AddShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_FindShape", (PyCFunction) _wrap_PyShapeCanvas_FindShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_FindFirstSensitiveShape", (PyCFunction) _wrap_PyShapeCanvas_FindFirstSensitiveShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_GetDiagram", (PyCFunction) _wrap_PyShapeCanvas_GetDiagram, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_GetQuickEditMode", (PyCFunction) _wrap_PyShapeCanvas_GetQuickEditMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_InsertShape", (PyCFunction) _wrap_PyShapeCanvas_InsertShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_base_OnBeginDragLeft", (PyCFunction) _wrap_PyShapeCanvas_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_base_OnBeginDragRight", (PyCFunction) _wrap_PyShapeCanvas_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_base_OnEndDragLeft", (PyCFunction) _wrap_PyShapeCanvas_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_base_OnEndDragRight", (PyCFunction) _wrap_PyShapeCanvas_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_base_OnDragLeft", (PyCFunction) _wrap_PyShapeCanvas_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_base_OnDragRight", (PyCFunction) _wrap_PyShapeCanvas_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_base_OnLeftClick", (PyCFunction) _wrap_PyShapeCanvas_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_base_OnRightClick", (PyCFunction) _wrap_PyShapeCanvas_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_Redraw", (PyCFunction) _wrap_PyShapeCanvas_Redraw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_RemoveShape", (PyCFunction) _wrap_PyShapeCanvas_RemoveShape, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_SetDiagram", (PyCFunction) _wrap_PyShapeCanvas_SetDiagram, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_Snap", (PyCFunction) _wrap_PyShapeCanvas_Snap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyShapeCanvas_swigregister", PyShapeCanvas_swigregister, METH_VARARGS, NULL},
+        { (char *)"OGLInitialize", (PyCFunction) _wrap_OGLInitialize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"OGLCleanUp", (PyCFunction) _wrap_OGLCleanUp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -34203,6 +37508,9 @@ static void *_p_wxScrolledWindowTo_p_wxPanel(void *x) {
 static void *_p_wxPyVScrolledWindowTo_p_wxPanel(void *x) {
     return (void *)((wxPanel *)  ((wxPyVScrolledWindow *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxPanel(void *x) {
+    return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxPyVListBoxTo_p_wxPanel(void *x) {
     return (void *)((wxPanel *) (wxPyVScrolledWindow *) ((wxPyVListBox *) x));
 }
@@ -34224,6 +37532,9 @@ static void *_p_wxPyPreviewControlBarTo_p_wxPanel(void *x) {
 static void *_p_wxPyShapeCanvasTo_p_wxPanel(void *x) {
     return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPyShapeCanvas *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxScrolledWindow(void *x) {
+    return (void *)((wxScrolledWindow *)  ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxPreviewCanvasTo_p_wxScrolledWindow(void *x) {
     return (void *)((wxScrolledWindow *)  ((wxPreviewCanvas *) x));
 }
@@ -34251,6 +37562,9 @@ static void *_p_wxProgressDialogTo_p_wxWindow(void *x) {
 static void *_p_wxMessageDialogTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxMessageDialog *) x));
 }
+static void *_p_wxPasswordEntryDialogTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x));
+}
 static void *_p_wxTextEntryDialogTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxTextEntryDialog *) x));
 }
@@ -34269,9 +37583,6 @@ static void *_p_wxPanelTo_p_wxWindow(void *x) {
 static void *_p_wxStatusBarTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *)  ((wxStatusBar *) x));
 }
-static void *_p_wxMDIClientWindowTo_p_wxWindow(void *x) {
-    return (void *)((wxWindow *)  ((wxMDIClientWindow *) x));
-}
 static void *_p_wxPyVScrolledWindowTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxPanel *) ((wxPyVScrolledWindow *) x));
 }
@@ -34302,6 +37613,12 @@ static void *_p_wxSplitterWindowTo_p_wxWindow(void *x) {
 static void *_p_wxSashWindowTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *)  ((wxSashWindow *) x));
 }
+static void *_p_wxMDIClientWindowTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *)  ((wxMDIClientWindow *) x));
+}
+static void *_p_wxPyScrolledWindowTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *) (wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxControlTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *)  ((wxControl *) x));
 }
@@ -34353,12 +37670,6 @@ static void *_p_wxColourDialogTo_p_wxWindow(void *x) {
 static void *_p_wxDialogTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxTopLevelWindow *) ((wxDialog *) x));
 }
-static void *_p_wxPageSetupDialogTo_p_wxWindow(void *x) {
-    return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxPageSetupDialog *) x));
-}
-static void *_p_wxPrintDialogTo_p_wxWindow(void *x) {
-    return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxPrintDialog *) x));
-}
 static void *_p_wxMDIParentFrameTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxMDIParentFrame *) x));
 }
@@ -34443,8 +37754,8 @@ static void *_p_wxInitDialogEventTo_p_wxObject(void *x) {
 static void *_p_wxLayoutAlgorithmTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxLayoutAlgorithm *) x));
 }
-static void *_p_wxTaskBarIconTo_p_wxObject(void *x) {
-    return (void *)((wxObject *) (wxEvtHandler *) ((wxTaskBarIcon *) x));
+static void *_p_wxPyTaskBarIconTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvtHandler *) ((wxPyTaskBarIcon *) x));
 }
 static void *_p_wxFindDialogEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxFindDialogEvent *) x));
@@ -34527,6 +37838,9 @@ static void *_p_wxSingleChoiceDialogTo_p_wxObject(void *x) {
 static void *_p_wxTextEntryDialogTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxTextEntryDialog *) x));
 }
+static void *_p_wxPasswordEntryDialogTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x));
+}
 static void *_p_wxMessageDialogTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxMessageDialog *) x));
 }
@@ -34545,6 +37859,9 @@ static void *_p_wxPrinterTo_p_wxObject(void *x) {
 static void *_p_wxMenuItemTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxMenuItem *) x));
 }
+static void *_p_wxDateEventTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxDateEvent *) x));
+}
 static void *_p_wxIdleEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxIdleEvent *) x));
 }
@@ -34623,6 +37940,9 @@ static void *_p_wxPyHtmlListBoxTo_p_wxObject(void *x) {
 static void *_p_wxPyTextShapeTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxPyShapeEvtHandler *)(wxPyShape *)(wxPyRectangleShape *) ((wxPyTextShape *) x));
 }
+static void *_p_wxStdDialogButtonSizerTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxSizer *)(wxBoxSizer *) ((wxStdDialogButtonSizer *) x));
+}
 static void *_p_wxAcceleratorTableTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxAcceleratorTable *) x));
 }
@@ -34707,6 +38027,9 @@ static void *_p_wxPyVScrolledWindowTo_p_wxObject(void *x) {
 static void *_p_wxMDIClientWindowTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMDIClientWindow *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxSashEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxSashEvent *) x));
 }
@@ -34732,10 +38055,10 @@ static void *_p_wxFontDialogTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFontDialog *) x));
 }
 static void *_p_wxPageSetupDialogTo_p_wxObject(void *x) {
-    return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxPageSetupDialog *) x));
+    return (void *)((wxObject *)  ((wxPageSetupDialog *) x));
 }
 static void *_p_wxPrintDialogTo_p_wxObject(void *x) {
-    return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxPrintDialog *) x));
+    return (void *)((wxObject *)  ((wxPrintDialog *) x));
 }
 static void *_p_wxAttachmentPointTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxAttachmentPoint *) x));
@@ -34878,6 +38201,9 @@ static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) {
 static void *_p_wxMenuTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *)  ((wxMenu *) x));
 }
+static void *_p_wxPasswordEntryDialogTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x));
+}
 static void *_p_wxTextEntryDialogTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxTextEntryDialog *) x));
 }
@@ -34941,6 +38267,9 @@ static void *_p_wxTopLevelWindowTo_p_wxEvtHandler(void *x) {
 static void *_p_wxMDIClientWindowTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *) ((wxMDIClientWindow *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxControlTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x));
 }
@@ -34980,15 +38309,12 @@ static void *_p_wxPreviewControlBarTo_p_wxEvtHandler(void *x) {
 static void *_p_wxPyPreviewControlBarTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPreviewControlBar *) ((wxPyPreviewControlBar *) x));
 }
-static void *_p_wxTaskBarIconTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *)  ((wxTaskBarIcon *) x));
+static void *_p_wxPyTaskBarIconTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxPyTaskBarIcon *) x));
 }
 static void *_p_wxFrameTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *) ((wxFrame *) x));
 }
-static void *_p_wxFontDialogTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFontDialog *) x));
-}
 static void *_p_wxDirDialogTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxDirDialog *) x));
 }
@@ -34998,11 +38324,8 @@ static void *_p_wxColourDialogTo_p_wxEvtHandler(void *x) {
 static void *_p_wxDialogTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *) ((wxDialog *) x));
 }
-static void *_p_wxPageSetupDialogTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxPageSetupDialog *) x));
-}
-static void *_p_wxPrintDialogTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxPrintDialog *) x));
+static void *_p_wxFontDialogTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFontDialog *) x));
 }
 static void *_p_wxMDIParentFrameTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxMDIParentFrame *) x));
@@ -35070,47 +38393,56 @@ static void *_p_wxPyDividedShapeTo_p_wxPyRectangleShape(void *x) {
 static void *_p_wxPyDivisionShapeTo_p_wxPyCompositeShape(void *x) {
     return (void *)((wxPyCompositeShape *)  ((wxPyDivisionShape *) x));
 }
-static swig_type_info _swigt__p_wxOGLConstraint[] = {{"_p_wxOGLConstraint", 0, "wxOGLConstraint *", 0},{"_p_wxOGLConstraint"},{0}};
-static swig_type_info _swigt__p_wxBrush[] = {{"_p_wxBrush", 0, "wxBrush *", 0},{"_p_wxBrush"},{0}};
-static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0},{"_p_wxColour"},{0}};
-static swig_type_info _swigt__p_wxShapeRegion[] = {{"_p_wxShapeRegion", 0, "wxShapeRegion *", 0},{"_p_wxShapeRegion"},{0}};
-static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC"},{0}};
-static swig_type_info _swigt__p_wxRealPoint[] = {{"_p_wxRealPoint", 0, "wxRealPoint *", 0},{"_p_wxRealPoint"},{0}};
-static swig_type_info _swigt__p_wxPyControlPoint[] = {{"_p_wxPyControlPoint", 0, "wxPyControlPoint *", 0},{"_p_wxPyControlPoint"},{0}};
-static swig_type_info _swigt__p_wxArrowHead[] = {{"_p_wxArrowHead", 0, "wxArrowHead *", 0},{"_p_wxArrowHead"},{0}};
-static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}};
-static swig_type_info _swigt__p_wxStringList[] = {{"_p_wxStringList", 0, "wxStringList *", 0},{"_p_wxStringList"},{0}};
-static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0},{"_p_wxPanel"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxPanel},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{0}};
-static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0},{"_p_bool"},{0}};
-static swig_type_info _swigt__p_wxList[] = {{"_p_wxList", 0, "wxList *", 0},{"_p_wxList"},{0}};
-static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}};
-static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxScrolledWindow},{0}};
-static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{0}};
-static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0},{"_p_double"},{0}};
-static swig_type_info _swigt__p_wxPyDivisionShape[] = {{"_p_wxPyDivisionShape", 0, "wxPyDivisionShape *", 0},{"_p_wxPyDivisionShape"},{0}};
-static swig_type_info _swigt__p_wxPyDrawnShape[] = {{"_p_wxPyDrawnShape", 0, "wxPyDrawnShape *", 0},{"_p_wxPyDrawnShape"},{0}};
-static swig_type_info _swigt__p_wxPyPolygonShape[] = {{"_p_wxPyPolygonShape", 0, "wxPyPolygonShape *", 0},{"_p_wxPyPolygonShape"},{0}};
-static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}};
-static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxObject},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxOGLConstraint", _p_wxOGLConstraintTo_p_wxObject},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxObject},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxObject},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxArrowHead", _p_wxArrowHeadTo_p_wxObject},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject},{"_p_wxPyShapeEvtHandler", _p_wxPyShapeEvtHandlerTo_p_wxObject},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxObject},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxFrame", _p_wxFrameTo_p_wxObject},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject},{"_p_wxDiagram", _p_wxDiagramTo_p_wxObject},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject},{"_p_wxObject"},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject},{"_p_wxPanel", _p_wxPanelTo_p_wxObject},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject},{"_p_wxDialog", _p_wxDialogTo_p_wxObject},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxObject},{"_p_wxAttachmentPoint", _p_wxAttachmentPointTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxObject},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxObject},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxObject},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxPseudoMetaFile", _p_wxPseudoMetaFileTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxShapeRegion", _p_wxShapeRegionTo_p_wxObject},{0}};
-static swig_type_info _swigt__p_wxPyBitmapShape[] = {{"_p_wxPyBitmapShape", 0, "wxPyBitmapShape *", 0},{"_p_wxPyBitmapShape"},{0}};
-static swig_type_info _swigt__p_wxPyShapeEvtHandler[] = {{"_p_wxPyShapeEvtHandler", 0, "wxPyShapeEvtHandler *", 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShapeEvtHandler},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyShapeEvtHandler"},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShapeEvtHandler},{0}};
-static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxEvtHandler},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler},{0}};
-static swig_type_info _swigt__p_wxPyEllipseShape[] = {{"_p_wxPyEllipseShape", 0, "wxPyEllipseShape *", 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyEllipseShape},{"_p_wxPyEllipseShape"},{0}};
-static swig_type_info _swigt__p_wxPyShapeCanvas[] = {{"_p_wxPyShapeCanvas", 0, "wxPyShapeCanvas *", 0},{"_p_wxPyShapeCanvas"},{0}};
-static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{"_p_wxPoint"},{0}};
-static swig_type_info _swigt__p_wxDiagram[] = {{"_p_wxDiagram", 0, "wxDiagram *", 0},{"_p_wxDiagram"},{0}};
-static swig_type_info _swigt__p_wxPyShape[] = {{"_p_wxPyShape", 0, "wxPyShape *", 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShape},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShape},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShape},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShape},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShape},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShape},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShape},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShape},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShape},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShape},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShape},{"_p_wxPyShape"},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShape},{0}};
-static swig_type_info _swigt__p_wxAttachmentPoint[] = {{"_p_wxAttachmentPoint", 0, "wxAttachmentPoint *", 0},{"_p_wxAttachmentPoint"},{0}};
-static swig_type_info _swigt__p_wxClassInfo[] = {{"_p_wxClassInfo", 0, "wxClassInfo *", 0},{"_p_wxClassInfo"},{0}};
-static swig_type_info _swigt__p_wxPyLineShape[] = {{"_p_wxPyLineShape", 0, "wxPyLineShape *", 0},{"_p_wxPyLineShape"},{0}};
-static swig_type_info _swigt__p_wxPyRectangleShape[] = {{"_p_wxPyRectangleShape", 0, "wxPyRectangleShape *", 0},{"_p_wxPyRectangleShape"},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyRectangleShape},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyRectangleShape},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyRectangleShape},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyRectangleShape},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyRectangleShape},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyRectangleShape},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyRectangleShape},{0}};
-static swig_type_info _swigt__p_wxPyCompositeShape[] = {{"_p_wxPyCompositeShape", 0, "wxPyCompositeShape *", 0},{"_p_wxPyCompositeShape"},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyCompositeShape},{0}};
-static swig_type_info _swigt__p_wxPyCircleShape[] = {{"_p_wxPyCircleShape", 0, "wxPyCircleShape *", 0},{"_p_wxPyCircleShape"},{0}};
-static swig_type_info _swigt__p_wxPen[] = {{"_p_wxPen", 0, "wxPen *", 0},{"_p_wxPen"},{0}};
-static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{0}};
-static swig_type_info _swigt__p_wxPseudoMetaFile[] = {{"_p_wxPseudoMetaFile", 0, "wxPseudoMetaFile *", 0},{"_p_wxPseudoMetaFile"},{0}};
-static swig_type_info _swigt__p_wxPyTextShape[] = {{"_p_wxPyTextShape", 0, "wxPyTextShape *", 0},{"_p_wxPyTextShape"},{0}};
-static swig_type_info _swigt__p_wxPyDividedShape[] = {{"_p_wxPyDividedShape", 0, "wxPyDividedShape *", 0},{"_p_wxPyDividedShape"},{0}};
+static swig_type_info _swigt__p_wxOGLConstraint[] = {{"_p_wxOGLConstraint", 0, "wxOGLConstraint *", 0, 0, 0, 0},{"_p_wxOGLConstraint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxBrush[] = {{"_p_wxBrush", 0, "wxBrush *", 0, 0, 0, 0},{"_p_wxBrush", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0, 0, 0, 0},{"_p_wxColour", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxShapeRegion[] = {{"_p_wxShapeRegion", 0, "wxShapeRegion *", 0, 0, 0, 0},{"_p_wxShapeRegion", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0, 0, 0, 0},{"_p_wxDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyControlPoint[] = {{"_p_wxPyControlPoint", 0, "wxPyControlPoint *", 0, 0, 0, 0},{"_p_wxPyControlPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxRealPoint[] = {{"_p_wxRealPoint", 0, "wxRealPoint *", 0, 0, 0, 0},{"_p_wxRealPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_form_ops_t[] = {{"_p_form_ops_t", 0, "enum form_ops_t *|form_ops_t *", 0, 0, 0, 0},{"_p_form_ops_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxDuplexMode[] = {{"_p_wxDuplexMode", 0, "enum wxDuplexMode *|wxDuplexMode *", 0, 0, 0, 0},{"_p_wxDuplexMode", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxArrowHead[] = {{"_p_wxArrowHead", 0, "wxArrowHead *", 0, 0, 0, 0},{"_p_wxArrowHead", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0, 0, 0, 0},{"_p_wxPanel", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0, 0, 0, 0},{"_p_bool", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxStringList[] = {{"_p_wxStringList", 0, "wxStringList *", 0, 0, 0, 0},{"_p_wxStringList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxList[] = {{"_p_wxList", 0, "wxList *", 0, 0, 0, 0},{"_p_wxList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0, 0, 0, 0},{"_p_wxFont", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0, 0, 0, 0},{"_p_wxScrolledWindow", 0, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPasswordEntryDialog", _p_wxPasswordEntryDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0, 0, 0, 0},{"_p_double", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyDrawnShape[] = {{"_p_wxPyDrawnShape", 0, "wxPyDrawnShape *", 0, 0, 0, 0},{"_p_wxPyDrawnShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyDivisionShape[] = {{"_p_wxPyDivisionShape", 0, "wxPyDivisionShape *", 0, 0, 0, 0},{"_p_wxPyDivisionShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyPolygonShape[] = {{"_p_wxPyPolygonShape", 0, "wxPyPolygonShape *", 0, 0, 0, 0},{"_p_wxPyPolygonShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxOGLConstraint", _p_wxOGLConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxArrowHead", _p_wxArrowHeadTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", _p_wxPyTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPasswordEntryDialog", _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDateEvent", _p_wxDateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShapeEvtHandler", _p_wxPyShapeEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStdDialogButtonSizer", _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDiagram", _p_wxDiagramTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAttachmentPoint", _p_wxAttachmentPointTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPseudoMetaFile", _p_wxPseudoMetaFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShapeRegion", _p_wxShapeRegionTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0, 0, 0, 0},{"_p_wxBitmap", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPaperSize[] = {{"_p_wxPaperSize", 0, "enum wxPaperSize *|wxPaperSize *", 0, 0, 0, 0},{"_p_wxPaperSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_unsigned_int[] = {{"_p_unsigned_int", 0, "unsigned int *|time_t *", 0, 0, 0, 0},{"_p_unsigned_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__unsigned_int[] = {{"_unsigned_int", 0, "unsigned int|std::size_t", 0, 0, 0, 0},{"_unsigned_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyBitmapShape[] = {{"_p_wxPyBitmapShape", 0, "wxPyBitmapShape *", 0, 0, 0, 0},{"_p_wxPyBitmapShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyShapeEvtHandler[] = {{"_p_wxPyShapeEvtHandler", 0, "wxPyShapeEvtHandler *", 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyShapeEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPasswordEntryDialog", _p_wxPasswordEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyEllipseShape[] = {{"_p_wxPyEllipseShape", 0, "wxPyEllipseShape *", 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyEllipseShape, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyShapeCanvas[] = {{"_p_wxPyShapeCanvas", 0, "wxPyShapeCanvas *", 0, 0, 0, 0},{"_p_wxPyShapeCanvas", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxDiagram[] = {{"_p_wxDiagram", 0, "wxDiagram *", 0, 0, 0, 0},{"_p_wxDiagram", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyShape[] = {{"_p_wxPyShape", 0, "wxPyShape *", 0, 0, 0, 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyShape", 0, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxAttachmentPoint[] = {{"_p_wxAttachmentPoint", 0, "wxAttachmentPoint *", 0, 0, 0, 0},{"_p_wxAttachmentPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *|byte *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__ptrdiff_t[] = {{"_ptrdiff_t", 0, "ptrdiff_t", 0, 0, 0, 0},{"_ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__std__ptrdiff_t[] = {{"_std__ptrdiff_t", 0, "std::ptrdiff_t", 0, 0, 0, 0},{"_std__ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxClassInfo[] = {{"_p_wxClassInfo", 0, "wxClassInfo *", 0, 0, 0, 0},{"_p_wxClassInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyLineShape[] = {{"_p_wxPyLineShape", 0, "wxPyLineShape *", 0, 0, 0, 0},{"_p_wxPyLineShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyRectangleShape[] = {{"_p_wxPyRectangleShape", 0, "wxPyRectangleShape *", 0, 0, 0, 0},{"_p_wxPyRectangleShape", 0, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyCompositeShape[] = {{"_p_wxPyCompositeShape", 0, "wxPyCompositeShape *", 0, 0, 0, 0},{"_p_wxPyCompositeShape", 0, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyCompositeShape, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyCircleShape[] = {{"_p_wxPyCircleShape", 0, "wxPyCircleShape *", 0, 0, 0, 0},{"_p_wxPyCircleShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPen[] = {{"_p_wxPen", 0, "wxPen *", 0, 0, 0, 0},{"_p_wxPen", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPseudoMetaFile[] = {{"_p_wxPseudoMetaFile", 0, "wxPseudoMetaFile *", 0, 0, 0, 0},{"_p_wxPseudoMetaFile", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyTextShape[] = {{"_p_wxPyTextShape", 0, "wxPyTextShape *", 0, 0, 0, 0},{"_p_wxPyTextShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_unsigned_long[] = {{"_p_unsigned_long", 0, "unsigned long *|wxUIntPtr *", 0, 0, 0, 0},{"_p_unsigned_long", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyDividedShape[] = {{"_p_wxPyDividedShape", 0, "wxPyDividedShape *", 0, 0, 0, 0},{"_p_wxPyDividedShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 
 static swig_type_info *swig_types_initial[] = {
 _swigt__p_wxOGLConstraint, 
@@ -35118,23 +38450,28 @@ _swigt__p_wxBrush,
 _swigt__p_wxColour, 
 _swigt__p_wxShapeRegion, 
 _swigt__p_wxDC, 
-_swigt__p_wxRealPoint, 
 _swigt__p_wxPyControlPoint, 
+_swigt__p_wxRealPoint, 
+_swigt__p_form_ops_t, 
+_swigt__p_wxDuplexMode, 
 _swigt__p_wxArrowHead, 
 _swigt__p_char, 
-_swigt__p_wxStringList, 
 _swigt__p_wxPanel, 
 _swigt__p_bool, 
+_swigt__p_wxStringList, 
 _swigt__p_wxList, 
 _swigt__p_wxFont, 
 _swigt__p_wxScrolledWindow, 
 _swigt__p_wxWindow, 
 _swigt__p_double, 
-_swigt__p_wxPyDivisionShape, 
 _swigt__p_wxPyDrawnShape, 
+_swigt__p_wxPyDivisionShape, 
 _swigt__p_wxPyPolygonShape, 
-_swigt__p_wxBitmap, 
 _swigt__p_wxObject, 
+_swigt__p_wxBitmap, 
+_swigt__p_wxPaperSize, 
+_swigt__p_unsigned_int, 
+_swigt__unsigned_int, 
 _swigt__p_wxPyBitmapShape, 
 _swigt__p_wxPyShapeEvtHandler, 
 _swigt__p_wxEvtHandler, 
@@ -35144,6 +38481,9 @@ _swigt__p_wxPoint,
 _swigt__p_wxDiagram, 
 _swigt__p_wxPyShape, 
 _swigt__p_wxAttachmentPoint, 
+_swigt__p_unsigned_char, 
+_swigt__ptrdiff_t, 
+_swigt__std__ptrdiff_t, 
 _swigt__p_wxClassInfo, 
 _swigt__p_wxPyLineShape, 
 _swigt__p_wxPyRectangleShape, 
@@ -35153,6 +38493,7 @@ _swigt__p_wxPen,
 _swigt__p_int, 
 _swigt__p_wxPseudoMetaFile, 
 _swigt__p_wxPyTextShape, 
+_swigt__p_unsigned_long, 
 _swigt__p_wxPyDividedShape, 
 0
 };
@@ -35161,12 +38502,318 @@ _swigt__p_wxPyDividedShape,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
+
+#ifdef __cplusplus
+}
+#endif
+
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+    
+    /* Python-specific SWIG API */
+#define SWIG_newvarlink()                             SWIG_Python_newvarlink()
+#define SWIG_addvarlink(p, name, get_attr, set_attr)  SWIG_Python_addvarlink(p, name, get_attr, set_attr)
+#define SWIG_InstallConstants(d, constants)           SWIG_Python_InstallConstants(d, constants)
+    
+    /* -----------------------------------------------------------------------------
+     * global variable support code.
+     * ----------------------------------------------------------------------------- */
+    
+    typedef struct swig_globalvar {
+        char       *name;                  /* Name of global variable */
+        PyObject *(*get_attr)();           /* Return the current value */
+        int       (*set_attr)(PyObject *); /* Set the value */
+        struct swig_globalvar *next;
+    } swig_globalvar;
+    
+    typedef struct swig_varlinkobject {
+        PyObject_HEAD
+        swig_globalvar *vars;
+    } swig_varlinkobject;
+    
+    static PyObject *
+    swig_varlink_repr(swig_varlinkobject *v) {
+        v = v;
+        return PyString_FromString("<Swig global variables>");
+    }
+    
+    static int
+    swig_varlink_print(swig_varlinkobject *v, FILE *fp, int flags) {
+        swig_globalvar  *var;
+        flags = flags;
+        fprintf(fp,"Swig global variables { ");
+        for (var = v->vars; var; var=var->next) {
+            fprintf(fp,"%s", var->name);
+            if (var->next) fprintf(fp,", ");
+        }
+        fprintf(fp," }\n");
+        return 0;
+    }
+    
+    static PyObject *
+    swig_varlink_getattr(swig_varlinkobject *v, char *n) {
+        swig_globalvar *var = v->vars;
+        while (var) {
+            if (strcmp(var->name,n) == 0) {
+                return (*var->get_attr)();
+            }
+            var = var->next;
+        }
+        PyErr_SetString(PyExc_NameError,"Unknown C global variable");
+        return NULL;
+    }
+    
+    static int
+    swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) {
+        swig_globalvar *var = v->vars;
+        while (var) {
+            if (strcmp(var->name,n) == 0) {
+                return (*var->set_attr)(p);
+            }
+            var = var->next;
+        }
+        PyErr_SetString(PyExc_NameError,"Unknown C global variable");
+        return 1;
+    }
+    
+    static PyTypeObject varlinktype = {
+        PyObject_HEAD_INIT(0)              
+        0,                                  /* Number of items in variable part (ob_size) */
+        (char *)"swigvarlink",              /* Type name (tp_name) */
+        sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
+        0,                                  /* Itemsize (tp_itemsize) */
+        0,                                  /* Deallocator (tp_dealloc) */ 
+        (printfunc) swig_varlink_print,     /* Print (tp_print) */
+        (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */
+        (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */
+        0,                                  /* tp_compare */
+        (reprfunc) swig_varlink_repr,       /* tp_repr */
+        0,                                  /* tp_as_number */
+        0,                                  /* tp_as_sequence */
+        0,                                  /* tp_as_mapping */
+        0,                                  /* tp_hash */
+        0,                                  /* tp_call */
+        0,                                  /* tp_str */
+        0,                                  /* tp_getattro */
+        0,                                  /* tp_setattro */
+        0,                                  /* tp_as_buffer */
+        0,                                  /* tp_flags */
+        0,                                  /* tp_doc */
+#if PY_VERSION_HEX >= 0x02000000
+        0,                                  /* tp_traverse */
+        0,                                  /* tp_clear */
+#endif
+#if PY_VERSION_HEX >= 0x02010000
+        0,                                  /* tp_richcompare */
+        0,                                  /* tp_weaklistoffset */
+#endif
+#if PY_VERSION_HEX >= 0x02020000
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+        0,                                  /* tp_del */
+#endif
+#ifdef COUNT_ALLOCS
+        0,0,0,0                             /* tp_alloc -> tp_next */
+#endif
+    };
+    
+    /* Create a variable linking object for use later */
+    static PyObject *
+    SWIG_Python_newvarlink(void) {
+        swig_varlinkobject *result = 0;
+        result = PyMem_NEW(swig_varlinkobject,1);
+        varlinktype.ob_type = &PyType_Type;    /* Patch varlinktype into a PyType */
+        result->ob_type = &varlinktype;
+        result->vars = 0;
+        result->ob_refcnt = 0;
+        Py_XINCREF((PyObject *) result);
+        return ((PyObject*) result);
+    }
+    
+    static void
+    SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
+        swig_varlinkobject *v;
+        swig_globalvar *gv;
+        v= (swig_varlinkobject *) p;
+        gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
+        gv->name = (char *) malloc(strlen(name)+1);
+        strcpy(gv->name,name);
+        gv->get_attr = get_attr;
+        gv->set_attr = set_attr;
+        gv->next = v->vars;
+        v->vars = gv;
+    }
+    
+    /* -----------------------------------------------------------------------------
+     * constants/methods manipulation
+     * ----------------------------------------------------------------------------- */
+    
+    /* Install Constants */
+    static void
+    SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) {
+        PyObject *obj = 0;
+        size_t i;
+        for (i = 0; constants[i].type; i++) {
+            switch(constants[i].type) {
+                case SWIG_PY_INT:
+                obj = PyInt_FromLong(constants[i].lvalue);
+                break;
+                case SWIG_PY_FLOAT:
+                obj = PyFloat_FromDouble(constants[i].dvalue);
+                break;
+                case SWIG_PY_STRING:
+                if (constants[i].pvalue) {
+                    obj = PyString_FromString((char *) constants[i].pvalue);
+                } else {
+                    Py_INCREF(Py_None);
+                    obj = Py_None;
+                }
+                break;
+                case SWIG_PY_POINTER:
+                obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
+                break;
+                case SWIG_PY_BINARY:
+                obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype));
+                break;
+                default:
+                obj = 0;
+                break;
+            }
+            if (obj) {
+                PyDict_SetItemString(d,constants[i].name,obj);
+                Py_DECREF(obj);
+            }
+        }
+    }
+    
+    /* -----------------------------------------------------------------------------*/
+    /* Fix SwigMethods to carry the callback ptrs when needed */
+    /* -----------------------------------------------------------------------------*/
+    
+    static void
+    SWIG_Python_FixMethods(PyMethodDef *methods,
+    swig_const_info *const_table,
+    swig_type_info **types,
+    swig_type_info **types_initial) {
+        size_t i;
+        for (i = 0; methods[i].ml_name; ++i) {
+            char *c = methods[i].ml_doc;
+            if (c && (c = strstr(c, "swig_ptr: "))) {
+                int j;
+                swig_const_info *ci = 0;
+                char *name = c + 10;
+                for (j = 0; const_table[j].type; j++) {
+                    if (strncmp(const_table[j].name, name, 
+                    strlen(const_table[j].name)) == 0) {
+                        ci = &(const_table[j]);
+                        break;
+                    }
+                }
+                if (ci) {
+                    size_t shift = (ci->ptype) - types;
+                    swig_type_info *ty = types_initial[shift];
+                    size_t ldoc = (c - methods[i].ml_doc);
+                    size_t lptr = strlen(ty->name)+2*sizeof(void*)+2;
+                    char *ndoc = (char*)malloc(ldoc + lptr + 10);
+                    char *buff = ndoc;
+                    void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue: (void *)(ci->lvalue);
+                    strncpy(buff, methods[i].ml_doc, ldoc);
+                    buff += ldoc;
+                    strncpy(buff, "swig_ptr: ", 10);
+                    buff += 10;
+                    SWIG_PackVoidPtr(buff, ptr, ty->name, lptr);
+                    methods[i].ml_doc = ndoc;
+                }
+            }
+        }
+    }
+    
+    /* -----------------------------------------------------------------------------*
+     *  Initialize type list
+     * -----------------------------------------------------------------------------*/
+    
+#if PY_MAJOR_VERSION < 2
+    /* PyModule_AddObject function was introduced in Python 2.0.  The following function
+    is copied out of Python/modsupport.c in python version 2.3.4 */
+    static int
+    PyModule_AddObject(PyObject *m, char *name, PyObject *o)
+    {
+        PyObject *dict;
+        if (!PyModule_Check(m)) {
+            PyErr_SetString(PyExc_TypeError,
+            "PyModule_AddObject() needs module as first arg");
+            return -1;
+        }
+        if (!o) {
+            PyErr_SetString(PyExc_TypeError,
+            "PyModule_AddObject() needs non-NULL value");
+            return -1;
+        }
+        
+        dict = PyModule_GetDict(m);
+        if (dict == NULL) {
+            /* Internal error -- modules must have a dict! */
+            PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__",
+            PyModule_GetName(m));
+            return -1;
+        }
+        if (PyDict_SetItemString(dict, name, o))
+        return -1;
+        Py_DECREF(o);
+        return 0;
+    }
+#endif
+    
+    static swig_type_info **
+    SWIG_Python_SetTypeListHandle(swig_type_info **type_list_handle) {
+        static PyMethodDef swig_empty_runtime_method_table[] = {
+            {
+                NULL, NULL, 0, NULL
+            } 
+        };/* Sentinel */
+        
+        PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
+        swig_empty_runtime_method_table);
+        PyObject *pointer = PyCObject_FromVoidPtr((void *) type_list_handle, NULL);
+        if (pointer && module) {
+            PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
+        }
+        return type_list_handle;
+    } 
+    
+    static swig_type_info **
+    SWIG_Python_LookupTypePointer(swig_type_info **type_list_handle) {
+        swig_type_info **type_pointer;
+        
+        /* first check if module already created */
+        type_pointer = SWIG_Python_GetTypeListHandle();
+        if (type_pointer) {
+            return type_pointer;
+        } else {
+            /* create a new module and variable */
+            return SWIG_Python_SetTypeListHandle(type_list_handle);
+        }
+    }
+    
 #ifdef __cplusplus
 }
 #endif
 
+/* -----------------------------------------------------------------------------*
+ *  Partial Init method
+ * -----------------------------------------------------------------------------*/
+
+#ifdef SWIG_LINK_RUNTIME
+#ifdef __cplusplus
+extern "C"
+#endif
+SWIGEXPORT(void *) SWIG_ReturnGlobalTypeList(void *);
+#endif
+
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -35176,10 +38823,21 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyObject *m, *d;
     int       i;
     if (!SWIG_globals) SWIG_globals = SWIG_newvarlink();
+    
+    /* Fix SwigMethods to carry the callback ptrs when needed */
+    SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_types_initial);
+    
     m = Py_InitModule((char *) SWIG_name, SwigMethods);
     d = PyModule_GetDict(m);
     
     if (!typeinit) {
+#ifdef SWIG_LINK_RUNTIME
+        swig_type_list_handle = (swig_type_info **) SWIG_ReturnGlobalTypeList(swig_type_list_handle);
+#else
+#  ifndef SWIG_STATIC_RUNTIME
+        swig_type_list_handle = SWIG_Python_LookupTypePointer(swig_type_list_handle);
+#  endif
+#endif
         for (i = 0; swig_types_initial[i]; i++) {
             swig_types[i] = SWIG_TypeRegister(swig_types_initial[i]);
         }
@@ -35187,70 +38845,198 @@ SWIGEXPORT(void) SWIG_init(void) {
     }
     SWIG_InstallConstants(d,swig_const_table);
     
-    PyDict_SetItemString(d,"oglMETAFLAGS_OUTLINE", SWIG_PyObj_FromInt((int)oglMETAFLAGS_OUTLINE));
-    PyDict_SetItemString(d,"oglMETAFLAGS_ATTACHMENTS", SWIG_PyObj_FromInt((int)oglMETAFLAGS_ATTACHMENTS));
-    PyDict_SetItemString(d,"KEY_SHIFT", SWIG_PyObj_FromInt((int)KEY_SHIFT));
-    PyDict_SetItemString(d,"KEY_CTRL", SWIG_PyObj_FromInt((int)KEY_CTRL));
-    PyDict_SetItemString(d,"ARROW_NONE", SWIG_PyObj_FromInt((int)ARROW_NONE));
-    PyDict_SetItemString(d,"ARROW_END", SWIG_PyObj_FromInt((int)ARROW_END));
-    PyDict_SetItemString(d,"ARROW_BOTH", SWIG_PyObj_FromInt((int)ARROW_BOTH));
-    PyDict_SetItemString(d,"ARROW_MIDDLE", SWIG_PyObj_FromInt((int)ARROW_MIDDLE));
-    PyDict_SetItemString(d,"ARROW_START", SWIG_PyObj_FromInt((int)ARROW_START));
-    PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", SWIG_PyObj_FromInt((int)ARROW_HOLLOW_CIRCLE));
-    PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", SWIG_PyObj_FromInt((int)ARROW_FILLED_CIRCLE));
-    PyDict_SetItemString(d,"ARROW_ARROW", SWIG_PyObj_FromInt((int)ARROW_ARROW));
-    PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", SWIG_PyObj_FromInt((int)ARROW_SINGLE_OBLIQUE));
-    PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", SWIG_PyObj_FromInt((int)ARROW_DOUBLE_OBLIQUE));
-    PyDict_SetItemString(d,"ARROW_METAFILE", SWIG_PyObj_FromInt((int)ARROW_METAFILE));
-    PyDict_SetItemString(d,"ARROW_POSITION_END", SWIG_PyObj_FromInt((int)ARROW_POSITION_END));
-    PyDict_SetItemString(d,"ARROW_POSITION_START", SWIG_PyObj_FromInt((int)ARROW_POSITION_START));
-    PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_VERTICAL));
-    PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_HORIZONTAL));
-    PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_DIAGONAL));
-    PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", SWIG_PyObj_FromInt((int)CONTROL_POINT_ENDPOINT_TO));
-    PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", SWIG_PyObj_FromInt((int)CONTROL_POINT_ENDPOINT_FROM));
-    PyDict_SetItemString(d,"CONTROL_POINT_LINE", SWIG_PyObj_FromInt((int)CONTROL_POINT_LINE));
-    PyDict_SetItemString(d,"FORMAT_NONE", SWIG_PyObj_FromInt((int)FORMAT_NONE));
-    PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", SWIG_PyObj_FromInt((int)FORMAT_CENTRE_HORIZ));
-    PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", SWIG_PyObj_FromInt((int)FORMAT_CENTRE_VERT));
-    PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", SWIG_PyObj_FromInt((int)FORMAT_SIZE_TO_CONTENTS));
-    PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_HORIZ));
-    PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_VERT));
-    PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_TO_NEXT_HANDLE));
-    PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_NONE));
-    PyDict_SetItemString(d,"SHADOW_NONE", SWIG_PyObj_FromInt((int)SHADOW_NONE));
-    PyDict_SetItemString(d,"SHADOW_LEFT", SWIG_PyObj_FromInt((int)SHADOW_LEFT));
-    PyDict_SetItemString(d,"SHADOW_RIGHT", SWIG_PyObj_FromInt((int)SHADOW_RIGHT));
-    PyDict_SetItemString(d,"OP_CLICK_LEFT", SWIG_PyObj_FromInt((int)OP_CLICK_LEFT));
-    PyDict_SetItemString(d,"OP_CLICK_RIGHT", SWIG_PyObj_FromInt((int)OP_CLICK_RIGHT));
-    PyDict_SetItemString(d,"OP_DRAG_LEFT", SWIG_PyObj_FromInt((int)OP_DRAG_LEFT));
-    PyDict_SetItemString(d,"OP_DRAG_RIGHT", SWIG_PyObj_FromInt((int)OP_DRAG_RIGHT));
-    PyDict_SetItemString(d,"OP_ALL", SWIG_PyObj_FromInt((int)OP_ALL));
-    PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_NONE));
-    PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_EDGE));
-    PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_BRANCHING));
-    PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", SWIG_PyObj_FromInt((int)BRANCHING_ATTACHMENT_NORMAL));
-    PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", SWIG_PyObj_FromInt((int)BRANCHING_ATTACHMENT_BLOB));
-    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_VERTICALLY));
-    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_HORIZONTALLY));
-    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_BOTH));
-    PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", SWIG_PyObj_FromInt((int)gyCONSTRAINT_LEFT_OF));
-    PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", SWIG_PyObj_FromInt((int)gyCONSTRAINT_RIGHT_OF));
-    PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ABOVE));
-    PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", SWIG_PyObj_FromInt((int)gyCONSTRAINT_BELOW));
-    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_TOP));
-    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_BOTTOM));
-    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_LEFT));
-    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_RIGHT));
-    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_TOP));
-    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_BOTTOM));
-    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_LEFT));
-    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_RIGHT));
-    PyDict_SetItemString(d,"DIVISION_SIDE_NONE", SWIG_PyObj_FromInt((int)DIVISION_SIDE_NONE));
-    PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", SWIG_PyObj_FromInt((int)DIVISION_SIDE_LEFT));
-    PyDict_SetItemString(d,"DIVISION_SIDE_TOP", SWIG_PyObj_FromInt((int)DIVISION_SIDE_TOP));
-    PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", SWIG_PyObj_FromInt((int)DIVISION_SIDE_RIGHT));
-    PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", SWIG_PyObj_FromInt((int)DIVISION_SIDE_BOTTOM));
+    {
+        PyDict_SetItemString(d,"oglMETAFLAGS_OUTLINE", SWIG_From_int((int)(oglMETAFLAGS_OUTLINE))); 
+    }
+    {
+        PyDict_SetItemString(d,"oglMETAFLAGS_ATTACHMENTS", SWIG_From_int((int)(oglMETAFLAGS_ATTACHMENTS))); 
+    }
+    {
+        PyDict_SetItemString(d,"KEY_SHIFT", SWIG_From_int((int)(KEY_SHIFT))); 
+    }
+    {
+        PyDict_SetItemString(d,"KEY_CTRL", SWIG_From_int((int)(KEY_CTRL))); 
+    }
+    {
+        PyDict_SetItemString(d,"ARROW_NONE", SWIG_From_int((int)(ARROW_NONE))); 
+    }
+    {
+        PyDict_SetItemString(d,"ARROW_END", SWIG_From_int((int)(ARROW_END))); 
+    }
+    {
+        PyDict_SetItemString(d,"ARROW_BOTH", SWIG_From_int((int)(ARROW_BOTH))); 
+    }
+    {
+        PyDict_SetItemString(d,"ARROW_MIDDLE", SWIG_From_int((int)(ARROW_MIDDLE))); 
+    }
+    {
+        PyDict_SetItemString(d,"ARROW_START", SWIG_From_int((int)(ARROW_START))); 
+    }
+    {
+        PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", SWIG_From_int((int)(ARROW_HOLLOW_CIRCLE))); 
+    }
+    {
+        PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", SWIG_From_int((int)(ARROW_FILLED_CIRCLE))); 
+    }
+    {
+        PyDict_SetItemString(d,"ARROW_ARROW", SWIG_From_int((int)(ARROW_ARROW))); 
+    }
+    {
+        PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", SWIG_From_int((int)(ARROW_SINGLE_OBLIQUE))); 
+    }
+    {
+        PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", SWIG_From_int((int)(ARROW_DOUBLE_OBLIQUE))); 
+    }
+    {
+        PyDict_SetItemString(d,"ARROW_METAFILE", SWIG_From_int((int)(ARROW_METAFILE))); 
+    }
+    {
+        PyDict_SetItemString(d,"ARROW_POSITION_END", SWIG_From_int((int)(ARROW_POSITION_END))); 
+    }
+    {
+        PyDict_SetItemString(d,"ARROW_POSITION_START", SWIG_From_int((int)(ARROW_POSITION_START))); 
+    }
+    {
+        PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", SWIG_From_int((int)(CONTROL_POINT_VERTICAL))); 
+    }
+    {
+        PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", SWIG_From_int((int)(CONTROL_POINT_HORIZONTAL))); 
+    }
+    {
+        PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", SWIG_From_int((int)(CONTROL_POINT_DIAGONAL))); 
+    }
+    {
+        PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", SWIG_From_int((int)(CONTROL_POINT_ENDPOINT_TO))); 
+    }
+    {
+        PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", SWIG_From_int((int)(CONTROL_POINT_ENDPOINT_FROM))); 
+    }
+    {
+        PyDict_SetItemString(d,"CONTROL_POINT_LINE", SWIG_From_int((int)(CONTROL_POINT_LINE))); 
+    }
+    {
+        PyDict_SetItemString(d,"FORMAT_NONE", SWIG_From_int((int)(FORMAT_NONE))); 
+    }
+    {
+        PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", SWIG_From_int((int)(FORMAT_CENTRE_HORIZ))); 
+    }
+    {
+        PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", SWIG_From_int((int)(FORMAT_CENTRE_VERT))); 
+    }
+    {
+        PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", SWIG_From_int((int)(FORMAT_SIZE_TO_CONTENTS))); 
+    }
+    {
+        PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", SWIG_From_int((int)(LINE_ALIGNMENT_HORIZ))); 
+    }
+    {
+        PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", SWIG_From_int((int)(LINE_ALIGNMENT_VERT))); 
+    }
+    {
+        PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", SWIG_From_int((int)(LINE_ALIGNMENT_TO_NEXT_HANDLE))); 
+    }
+    {
+        PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", SWIG_From_int((int)(LINE_ALIGNMENT_NONE))); 
+    }
+    {
+        PyDict_SetItemString(d,"SHADOW_NONE", SWIG_From_int((int)(SHADOW_NONE))); 
+    }
+    {
+        PyDict_SetItemString(d,"SHADOW_LEFT", SWIG_From_int((int)(SHADOW_LEFT))); 
+    }
+    {
+        PyDict_SetItemString(d,"SHADOW_RIGHT", SWIG_From_int((int)(SHADOW_RIGHT))); 
+    }
+    {
+        PyDict_SetItemString(d,"OP_CLICK_LEFT", SWIG_From_int((int)(OP_CLICK_LEFT))); 
+    }
+    {
+        PyDict_SetItemString(d,"OP_CLICK_RIGHT", SWIG_From_int((int)(OP_CLICK_RIGHT))); 
+    }
+    {
+        PyDict_SetItemString(d,"OP_DRAG_LEFT", SWIG_From_int((int)(OP_DRAG_LEFT))); 
+    }
+    {
+        PyDict_SetItemString(d,"OP_DRAG_RIGHT", SWIG_From_int((int)(OP_DRAG_RIGHT))); 
+    }
+    {
+        PyDict_SetItemString(d,"OP_ALL", SWIG_From_int((int)(OP_ALL))); 
+    }
+    {
+        PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", SWIG_From_int((int)(ATTACHMENT_MODE_NONE))); 
+    }
+    {
+        PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", SWIG_From_int((int)(ATTACHMENT_MODE_EDGE))); 
+    }
+    {
+        PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", SWIG_From_int((int)(ATTACHMENT_MODE_BRANCHING))); 
+    }
+    {
+        PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", SWIG_From_int((int)(BRANCHING_ATTACHMENT_NORMAL))); 
+    }
+    {
+        PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", SWIG_From_int((int)(BRANCHING_ATTACHMENT_BLOB))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", SWIG_From_int((int)(gyCONSTRAINT_CENTRED_VERTICALLY))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", SWIG_From_int((int)(gyCONSTRAINT_CENTRED_HORIZONTALLY))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", SWIG_From_int((int)(gyCONSTRAINT_CENTRED_BOTH))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", SWIG_From_int((int)(gyCONSTRAINT_LEFT_OF))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", SWIG_From_int((int)(gyCONSTRAINT_RIGHT_OF))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", SWIG_From_int((int)(gyCONSTRAINT_ABOVE))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", SWIG_From_int((int)(gyCONSTRAINT_BELOW))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", SWIG_From_int((int)(gyCONSTRAINT_ALIGNED_TOP))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", SWIG_From_int((int)(gyCONSTRAINT_ALIGNED_BOTTOM))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", SWIG_From_int((int)(gyCONSTRAINT_ALIGNED_LEFT))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", SWIG_From_int((int)(gyCONSTRAINT_ALIGNED_RIGHT))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", SWIG_From_int((int)(gyCONSTRAINT_MIDALIGNED_TOP))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", SWIG_From_int((int)(gyCONSTRAINT_MIDALIGNED_BOTTOM))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", SWIG_From_int((int)(gyCONSTRAINT_MIDALIGNED_LEFT))); 
+    }
+    {
+        PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", SWIG_From_int((int)(gyCONSTRAINT_MIDALIGNED_RIGHT))); 
+    }
+    {
+        PyDict_SetItemString(d,"DIVISION_SIDE_NONE", SWIG_From_int((int)(DIVISION_SIDE_NONE))); 
+    }
+    {
+        PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", SWIG_From_int((int)(DIVISION_SIDE_LEFT))); 
+    }
+    {
+        PyDict_SetItemString(d,"DIVISION_SIDE_TOP", SWIG_From_int((int)(DIVISION_SIDE_TOP))); 
+    }
+    {
+        PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", SWIG_From_int((int)(DIVISION_SIDE_RIGHT))); 
+    }
+    {
+        PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", SWIG_From_int((int)(DIVISION_SIDE_BOTTOM))); 
+    }
     
     
     //     initoglbasicc();